Index: head/sysutils/freesbie/Makefile
===================================================================
--- head/sysutils/freesbie/Makefile	(revision 449959)
+++ head/sysutils/freesbie/Makefile	(revision 449960)
@@ -1,39 +1,38 @@
 # Created by: Thomas E. Zander <riggs@rrr.de>
 # $FreeBSD$
 
 PORTNAME=	freesbie
 PORTVERSION=	2.0.20070710
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	LOCAL/riggs/freesbie
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/2.0.//}
 
 MAINTAINER=	riggs@FreeBSD.org
 COMMENT=	Yet another cool answer to the system-on-cd question
 
 LICENSE=	BSD2CLAUSE
 
+ONLY_FOR_ARCHS=	amd64 i386 powerpc
+ONLY_FOR_ARCHS_REASON=	FreeSBIE build system only supports amd64, i386 and powerpc
+
 RUN_DEPENDS=	cdrecord:sysutils/cdrtools
 
 USES=		tar:bzip2
+NO_ARCH=	yes
 NO_BUILD=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}2
-
-ONLY_FOR_ARCHS=	amd64 i386 powerpc
-ONLY_FOR_ARCHS_REASON=	FreeSBIE build system only supports amd64, i386 and powerpc
-
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-pkgng
 
 pre-configure:
 	@${SED} -e "s:%%ARCH%%:${ARCH}:g" ${FILESDIR}/conf-arch-FREESBIE.in > ${WRKSRC}/conf/${ARCH}/FREESBIE
 
 do-install:
 	@ ${MKDIR} ${STAGEDIR}${DATADIR}
 	@ ${RM} ${WRKSRC}/scripts/iso.sh.orig \
 		${WRKSRC}/scripts/pkginstall.sh.orig \
 		${WRKSRC}/scripts/pkgselect.sh.orig
 	@ cd ${WRKSRC} && ${FIND} . -type f -print | tar -cf - -T - | \
 	tar -xf - -C ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
Index: head/sysutils/freesbie/files/patch-scripts-iso.sh
===================================================================
--- head/sysutils/freesbie/files/patch-scripts-iso.sh	(revision 449959)
+++ head/sysutils/freesbie/files/patch-scripts-iso.sh	(nonexistent)
@@ -1,11 +0,0 @@
---- scripts/iso.sh.orig	2006-10-01 14:00:47.000000000 +0200
-+++ scripts/iso.sh	2011-11-06 18:07:26.544790101 +0100
-@@ -48,7 +48,7 @@
- 
- echo "Running mkisofs..."
- 
--mkisofs -b boot/cdboot -no-emul-boot -J -r -ldots -l -L -V ${FREESBIE_LABEL} -p FreeSBIE -o $ISOPATH . >> ${LOGFILE} 2>&1
-+mkisofs -b boot/cdboot -no-emul-boot -J -r -ldots -l -allow-leading-dots -V ${FREESBIE_LABEL} -p FreeSBIE -o $ISOPATH . >> ${LOGFILE} 2>&1
- 
- echo "ISO created:"
- 

Property changes on: head/sysutils/freesbie/files/patch-scripts-iso.sh
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/sysutils/freesbie/files/extra-patch-pkgng
===================================================================
--- head/sysutils/freesbie/files/extra-patch-pkgng	(revision 449959)
+++ head/sysutils/freesbie/files/extra-patch-pkgng	(nonexistent)
@@ -1,90 +0,0 @@
---- scripts/pkginstall.sh.orig	2007-01-16 19:14:46.000000000 +0900
-+++ scripts/pkginstall.sh	2014-03-10 15:36:47.962245461 +0900
-@@ -52,7 +52,7 @@
- 
- 	# pkg_info might fail if the listed package isn't present
- 	set +e
--	origins=$(pkg_info -EX "^$(escape_pkg ${pkg})($|-[^-]+$)")
-+	origins=$(pkg query -x "%n-%v" "^$(escape_pkg ${pkg})($|-[^-]+$)")
- 	retval=$?
- 	set -e
- 	if [ ${retval} -eq 0 ]; then
-@@ -84,7 +84,7 @@
-     touch deps
-     echo -n "Finding dependencies... "
-     while read pkg; do
--	deps=$(pkg_info -qr ${pkg} | cut -d ' ' -f 2)
-+	deps=$(pkg query "%dn-%dv" ${pkg})
- 	for dep in ${deps}; do
- 	    echo ${dep} >> tmp_deps
- 	done      
-@@ -142,7 +142,7 @@
-     export PACKAGE_BUILDING=yo
-     chrootpkgpath=${CHROOTWD#$BASEDIR}
-     pkgfile=${WORKDIR}/sortpkg
--    pkgaddcmd="chroot ${BASEDIR} pkg_add -v"
-+    pkgaddcmd="/usr/local/sbin/pkg -c ${BASEDIR} add -f "
-     totpkg=$(wc -l $pkgfile | awk '{print $1}')
-     echo "Copying ${totpkg} packages"
-     cd ${CHROOTWD}
-@@ -159,7 +159,11 @@
- 	count=$((${count} + 1))
- 
- 	echo "Running pkg_create -b ${pkg} ${CHROOTWD}/${pkg}.tar" >> ${LOGFILE}
--	pkg_create -b ${pkg} ${CHROOTWD}/${pkg}.tar >> ${LOGFILE} 2>&1
-+	rpkg=`pkg query %dn-%dv ${pkg}` 
-+	for spkg in ${rpkg}; do
-+		pkg create -o ${CHROOTWD} -n -f tar ${spkg} >> ${LOGFILE} 2>&1
-+	done
-+	pkg create -o ${CHROOTWD} -n -f tar ${pkg} >> ${LOGFILE} 2>&1
- 
- 	echo "Running $pkgaddcmd ${chrootpkgpath}/${pkg}.tar" >> ${LOGFILE}
- 	$pkgaddcmd ${chrootpkgpath}/${pkg}.tar >> ${LOGFILE} 2>&1
-@@ -168,12 +172,17 @@
- 
-     done < $pkgfile
-     echo "]"
-+    if [ -f ${WORKDIR}/extra/customroot/var/db ]; then
-+	chroot ${BASEDIR} pkg backup -d test.db
-+	env PKG_DBDIR=${WORKDIR}extra/customroot/var/db/pkg pkg backup -r ${BASEDIR}/test.db
-+	rm ${BASEDIR}/test.db
-+    fi
-     set -e
- }
- 
- delete_old_packages() {
-     echo "Deleting previously installed packages"
--    chroot ${BASEDIR} pkg_delete -a >> ${LOGFILE} 2>&1
-+    pkg -c ${BASEDIR} delete -afy >> ${LOGFILE} 2>&1
- }
- 
- # Deletes workdirs
---- scripts/pkgselect.sh.orig	2014-02-16 02:43:17.000000000 +0000
-+++ scripts/pkgselect.sh	2014-02-25 20:55:34.000000000 +0000
-@@ -21,7 +21,7 @@
- 
- # Check if there are packages installed on the system
- check_pkgs() {
--    count=$(pkg_info -Qoa | wc -l)
-+    count=$(pkg query -a "%n-%v:%o" | wc -l)
-     if [ ${count} -eq 0 ]; then
- 	/usr/bin/dialog --title "FreeSBIE Packages selection" --clear \
- 	--msgbox "Sorry, you don't have any packages installed.\n\nPlease install at least the packages you want\nto include in your distribution." 10 50
-@@ -40,7 +40,7 @@
-     # Create a different file for each category. Each row in each file
-     # will look like:
-     # PKGNAME PKGNAME-version    
--    pkg_info -Qoa | awk \
-+    pkg query -a "%n-%v:%o" | awk \
- ' BEGIN { FS=":|/" } 
- { 
-     a=$1;
-@@ -63,7 +63,7 @@
- 
- 	    # pkg_info might fail if the listed package isn't present
- 	    set +e
--	    origins=$(pkg_info -QoX "^$(escape_pkg ${pkg})($|-[^-]+$)")
-+	    origins=$(pkg query -x "%n-%v:%o" "^$(escape_pkg ${pkg})($|-[^-]+$)")
- 	    retval=$?
- 	    set -e
- 	    if [ ${retval} -eq 0 ]; then

Property changes on: head/sysutils/freesbie/files/extra-patch-pkgng
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/sysutils/freesbie/files/patch-extra_installports.sh
===================================================================
--- head/sysutils/freesbie/files/patch-extra_installports.sh	(nonexistent)
+++ head/sysutils/freesbie/files/patch-extra_installports.sh	(revision 449960)
@@ -0,0 +1,11 @@
+--- extra/installports.sh.orig	2007-01-04 18:28:56 UTC
++++ extra/installports.sh
+@@ -35,7 +35,7 @@ if [ ! -z "${INSTALL_PORTS}" ]; then
+ 	mkdir -p ${BASEDIR}/usr/ports ${BASEDIR}/usr/src
+ 	mount_nullfs ${PORTSDIR:-/usr/ports} ${BASEDIR}/usr/ports
+ 	mount_nullfs ${SRCDIR:-/usr/src} ${BASEDIR}/usr/src
+-	mount_devfs none ${BASEDIR}/dev
++	mount -t devfs none ${BASEDIR}/dev
+ 
+ 	print_error_umount() {
+ 		echo "Something went wrong, check errors!" >&2

Property changes on: head/sysutils/freesbie/files/patch-extra_installports.sh
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/sysutils/freesbie/files/patch-extra_varmfs.sh
===================================================================
--- head/sysutils/freesbie/files/patch-extra_varmfs.sh	(nonexistent)
+++ head/sysutils/freesbie/files/patch-extra_varmfs.sh	(revision 449960)
@@ -0,0 +1,8 @@
+--- extra/varmfs.sh.orig	2006-04-24 11:14:33 UTC
++++ extra/varmfs.sh
+@@ -28,4 +28,4 @@ mtree -Pcp ${BASEDIR}/var > ${TMPFILE}
+ mv ${TMPFILE} ${BASEDIR}/etc/mtree/var.dist
+ 
+ echo "Generating pkg_info.txt"
+-chroot ${BASEDIR} pkg_info > ${BASEDIR}/pkg_info.txt
++chroot ${BASEDIR} pkg info > ${BASEDIR}/pkg_info.txt

Property changes on: head/sysutils/freesbie/files/patch-extra_varmfs.sh
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/sysutils/freesbie/files/patch-scripts_iso.sh
===================================================================
--- head/sysutils/freesbie/files/patch-scripts_iso.sh	(nonexistent)
+++ head/sysutils/freesbie/files/patch-scripts_iso.sh	(revision 449960)
@@ -0,0 +1,11 @@
+--- scripts/iso.sh.orig	2006-10-01 12:00:47 UTC
++++ scripts/iso.sh
+@@ -48,7 +48,7 @@ cd ${CLONEDIR}
+ 
+ echo "Running mkisofs..."
+ 
+-mkisofs -b boot/cdboot -no-emul-boot -J -r -ldots -l -L -V ${FREESBIE_LABEL} -p FreeSBIE -o $ISOPATH . >> ${LOGFILE} 2>&1
++mkisofs -b boot/cdboot -no-emul-boot -J -r -ldots -l -allow-leading-dots -V ${FREESBIE_LABEL} -p FreeSBIE -o $ISOPATH . >> ${LOGFILE} 2>&1
+ 
+ echo "ISO created:"
+ 

Property changes on: head/sysutils/freesbie/files/patch-scripts_iso.sh
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/sysutils/freesbie/files/patch-scripts_pkginstall.sh
===================================================================
--- head/sysutils/freesbie/files/patch-scripts_pkginstall.sh	(nonexistent)
+++ head/sysutils/freesbie/files/patch-scripts_pkginstall.sh	(revision 449960)
@@ -0,0 +1,61 @@
+--- scripts/pkginstall.sh.orig	2007-01-16 10:14:46 UTC
++++ scripts/pkginstall.sh
+@@ -52,7 +52,7 @@ find_origins() {
+ 
+ 	# pkg_info might fail if the listed package isn't present
+ 	set +e
+-	origins=$(pkg_info -EX "^$(escape_pkg ${pkg})($|-[^-]+$)")
++	origins=$(pkg query -x "%n-%v" "^$(escape_pkg ${pkg})($|-[^-]+$)")
+ 	retval=$?
+ 	set -e
+ 	if [ ${retval} -eq 0 ]; then
+@@ -84,7 +84,7 @@ find_deps() {
+     touch deps
+     echo -n "Finding dependencies... "
+     while read pkg; do
+-	deps=$(pkg_info -qr ${pkg} | cut -d ' ' -f 2)
++	deps=$(pkg query "%dn-%dv" ${pkg})
+ 	for dep in ${deps}; do
+ 	    echo ${dep} >> tmp_deps
+ 	done      
+@@ -142,7 +142,7 @@ copy_packages() {
+     export PACKAGE_BUILDING=yo
+     chrootpkgpath=${CHROOTWD#$BASEDIR}
+     pkgfile=${WORKDIR}/sortpkg
+-    pkgaddcmd="chroot ${BASEDIR} pkg_add -v"
++    pkgaddcmd="/usr/local/sbin/pkg -c ${BASEDIR} add -f "
+     totpkg=$(wc -l $pkgfile | awk '{print $1}')
+     echo "Copying ${totpkg} packages"
+     cd ${CHROOTWD}
+@@ -159,7 +159,11 @@ copy_packages() {
+ 	count=$((${count} + 1))
+ 
+ 	echo "Running pkg_create -b ${pkg} ${CHROOTWD}/${pkg}.tar" >> ${LOGFILE}
+-	pkg_create -b ${pkg} ${CHROOTWD}/${pkg}.tar >> ${LOGFILE} 2>&1
++	rpkg=`pkg query %dn-%dv ${pkg}` 
++	for spkg in ${rpkg}; do
++		pkg create -o ${CHROOTWD} -n -f tar ${spkg} >> ${LOGFILE} 2>&1
++	done
++	pkg create -o ${CHROOTWD} -n -f tar ${pkg} >> ${LOGFILE} 2>&1
+ 
+ 	echo "Running $pkgaddcmd ${chrootpkgpath}/${pkg}.tar" >> ${LOGFILE}
+ 	$pkgaddcmd ${chrootpkgpath}/${pkg}.tar >> ${LOGFILE} 2>&1
+@@ -168,12 +172,17 @@ copy_packages() {
+ 
+     done < $pkgfile
+     echo "]"
++    if [ -f ${WORKDIR}/extra/customroot/var/db ]; then
++	chroot ${BASEDIR} pkg backup -d test.db
++	env PKG_DBDIR=${WORKDIR}extra/customroot/var/db/pkg pkg backup -r ${BASEDIR}/test.db
++	rm ${BASEDIR}/test.db
++    fi
+     set -e
+ }
+ 
+ delete_old_packages() {
+     echo "Deleting previously installed packages"
+-    chroot ${BASEDIR} pkg_delete -a >> ${LOGFILE} 2>&1
++    pkg -c ${BASEDIR} delete -afy >> ${LOGFILE} 2>&1
+ }
+ 
+ # Deletes workdirs

Property changes on: head/sysutils/freesbie/files/patch-scripts_pkginstall.sh
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/sysutils/freesbie/files/patch-scripts_pkgselect.sh
===================================================================
--- head/sysutils/freesbie/files/patch-scripts_pkgselect.sh	(nonexistent)
+++ head/sysutils/freesbie/files/patch-scripts_pkgselect.sh	(revision 449960)
@@ -0,0 +1,29 @@
+--- scripts/pkgselect.sh.orig	2006-05-26 23:20:09 UTC
++++ scripts/pkgselect.sh
+@@ -21,7 +21,7 @@ PKGFILE=${PKGFILE:-${LOCALDIR}/conf/pack
+ 
+ # Check if there are packages installed on the system
+ check_pkgs() {
+-    count=$(pkg_info -Qoa | wc -l)
++    count=$(pkg query -a "%n-%v:%o" | wc -l)
+     if [ ${count} -eq 0 ]; then
+ 	/usr/bin/dialog --title "FreeSBIE Packages selection" --clear \
+ 	--msgbox "Sorry, you don't have any packages installed.\n\nPlease install at least the packages you want\nto include in your distribution." 10 50
+@@ -40,7 +40,7 @@ create_lists() {
+     # Create a different file for each category. Each row in each file
+     # will look like:
+     # PKGNAME PKGNAME-version    
+-    pkg_info -Qoa | awk \
++    pkg query -a "%n-%v:%o" | awk \
+ ' BEGIN { FS=":|/" } 
+ { 
+     a=$1;
+@@ -63,7 +63,7 @@ create_lists() {
+ 
+ 	    # pkg_info might fail if the listed package isn't present
+ 	    set +e
+-	    origins=$(pkg_info -QoX "^$(escape_pkg ${pkg})($|-[^-]+$)")
++	    origins=$(pkg query -x "%n-%v:%o" "^$(escape_pkg ${pkg})($|-[^-]+$)")
+ 	    retval=$?
+ 	    set -e
+ 	    if [ ${retval} -eq 0 ]; then

Property changes on: head/sysutils/freesbie/files/patch-scripts_pkgselect.sh
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/sysutils/freesbie/pkg-message
===================================================================
--- head/sysutils/freesbie/pkg-message	(nonexistent)
+++ head/sysutils/freesbie/pkg-message	(revision 449960)
@@ -0,0 +1,5 @@
+===========================================================================
+Note that the FreeSBIE project is not actively maintained. There were no
+upstream releases since 2007. If you are a regular user of this port,
+please consider adopting the upstream project.
+===========================================================================

Property changes on: head/sysutils/freesbie/pkg-message
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property