Index: branches/releng-10/nanobsd/cfg/nanobsd.wleiden
===================================================================
--- branches/releng-10/nanobsd/cfg/nanobsd.wleiden	(revision 12873)
+++ branches/releng-10/nanobsd/cfg/nanobsd.wleiden	(revision 12874)
@@ -270,19 +270,4 @@
 
 
-# pkgdb should live on persistent storage only
-cust_alternate_pkg_db () (
-	mkdir -p ${NANO_WORLDDIR}/usr/local/var/db/pkg ${NANO_WORLDDIR}/usr/local/tmp
-        touch ${NANO_WORLDDIR}/usr/local/tmp/.hack-to-avoid-pruning-directory
-        # sh profile
-	( echo 'PKG_DBDIR=/usr/local/var/db/pkg; export PKG_DBDIR'; \
-	echo 'PKG_TMPDIR=/usr/local/tmp; export PKG_TMPDIR' ) >> ${NANO_WORLDDIR}/etc/profile
-        # csh profile
-	( echo 'setenv PKG_DBDIR /usr/local/var/db/pkg'; \
-	echo 'setenv PKG_TMPDIR /usr/local/tmp' ) >> ${NANO_WORLDDIR}/etc/csh.cshrc
-
-	rmdir ${NANO_WORLDDIR}/var/db/pkg
-        ln -s /usr/local/var/db/pkg ${NANO_WORLDDIR}/var/db/pkg
-)
-
 # Make tools available for root by default
 cust_root_bin_to_tools() {
@@ -293,59 +278,6 @@
 # to source /etc/profile in chroot to get PKG_* included, for alternate installs
 cust_pkg () (
-	# If the package directory doesn't exist, we're done.
-	if [ ! -d ${NANO_PACKAGE_DIR} ]; then
-		echo "DONE 0 packages"
-		return 0
-	fi
-
-	# Make sure to enable /dev as easy_install requires it for example
-	mount -t devfs devfs ${NANO_WORLDDIR}/dev
-        trap "umount ${NANO_WORLDDIR}/dev" 0
-        trap "exit 1" 1 2 3 15
-
-	# Copy packages into chroot
-	mkdir -p ${NANO_WORLDDIR}/Pkg
-	(
-		cd ${NANO_PACKAGE_DIR}
-		find ${NANO_PACKAGE_LIST} -print |
-		    cpio -Ldumpv ${NANO_WORLDDIR}/Pkg
-	)
-
-	# Count & report how many we have to install
-	todo=`ls ${NANO_WORLDDIR}/Pkg | wc -l`
-	echo "=== TODO: $todo"
-	ls ${NANO_WORLDDIR}/Pkg
-	echo "==="
-        NANO_PKG_DBDIR=${NANO_WORLDDIR}/`chroot ${NANO_WORLDDIR} sh -c '. /etc/profile; echo ${PKG_DBDIR:-/var/db/pkg}'`
-	while true
-	do
-		# Record how many we have now
-		have=`ls ${NANO_PKG_DBDIR} | wc -l`
-
-		# Attempt to install more packages
-		# ...but no more than 200 at a time due to pkg_add's internal
-		# limitations.
-		chroot ${NANO_WORLDDIR} sh -c \
-			'. /etc/profile; ls Pkg/*tbz | xargs -n 200 pkg_add -F' || true
-
-		# See what that got us
-		now=`ls ${NANO_PKG_DBDIR} | wc -l`
-		echo "=== NOW $now"
-		ls ${NANO_PKG_DBDIR}
-		echo "==="
-
-
-		if [ $now -eq $todo ] ; then
-			echo "DONE $now packages"
-			break
-		elif [ $now -eq $have ] ; then
-			echo "FAILED: Nothing happened on this pass"
-			exit 2
-		fi
-	done
-	rm -rf ${NANO_WORLDDIR}/Pkg
-
-        # Return normal trap behaviour
-        trap - 1 2 3 15 
+	cp /etc/resolv.conf ${NANO_WORLDDIR}/etc
+	env ASSUME_ALWAYS_YES=yes pkg --chroot ${NANO_WORLDDIR} install ${PACKAGE_LIST}
 )
 
@@ -425,5 +357,4 @@
 # XXX: Determine size before installing all find of additions to see how much
 # base we are actually using ## du -h -d 0
-customize_cmd cust_alternate_pkg_db
 customize_cmd cust_pkg
 customize_cmd cust_install_files
Index: branches/releng-10/nanobsd/tools/package-build.sh
===================================================================
--- branches/releng-10/nanobsd/tools/package-build.sh	(revision 12873)
+++ branches/releng-10/nanobsd/tools/package-build.sh	(revision 12874)
@@ -127,5 +127,5 @@
   ${MAKE} package-links
   PKGNAME=`${MAKE} extract-message | awk '{print $NF}'`
-  pkg create $PKGNAME ${NANO_PACKAGE_DIR}/${PKGNAME}.tbz || exit 1
+  ${MAKE} package-recursive PACKAGES=/root/nanobsd/pkg  || exit 1
 
   p_info Checking dependencies