Index: anches/releng-11/nanobsd/cfg/wlpkgbuild-node-make.conf
===================================================================
--- /branches/releng-11/nanobsd/cfg/wlpkgbuild-node-make.conf	(revision 14122)
+++ 	(revision )
@@ -1,18 +1,0 @@
-NO_NLS='yes'
-NO_PROFILE='yes'
-NO_GAMES='yes'
-NO_FORTRAN='yes'
-NO_RESCUE='yes'
-NO_SENDMAIL='yes'
-NO_LPR='yes'
-NO_I4B='yes'
-NO_GPIB='yes'
-NO_BLUETOOTH='yes'
-NO_IPFILTER='yes'
-NO_ATM='yes'
-NO_DICT='yes'
-NO_SHAREDOCS='yes'
-
-# To reduce the size of installed ports
-OPTIONS_UNSET+= DOCS EXAMPLES X11 PYTHON TOOLBOX
-
Index: /branches/releng-11/nanobsd/tools/package-build.sh
===================================================================
--- /branches/releng-11/nanobsd/tools/package-build.sh	(revision 14122)
+++ /branches/releng-11/nanobsd/tools/package-build.sh	(revision 14123)
@@ -8,8 +8,10 @@
 . `dirname $0`/common.inc.sh
 
+
 cfg_dir=`dirname $0`/../cfg
 abs_cfg_dir=`cd $cfg_dir; pwd -P`
 
-poudriere_pkglist_file=${cfg_dir}/wlpkgbuild-default-node-pkglist
+# Wireless Leiden configuration file
+. $cfg_dir/nanobsd.wleiden
 
 
@@ -52,10 +54,11 @@
 	POUDRIERE_OPTIONS=wlpkgbuild-node-options
 
-	# Clean old stuff (legacy directories)
+
+	# Clean old stuff (legacy directories & symlinks)
 	rm -Rf /usr/local/etc/poudriere.d/$POUDRIERE_MAKE_CONF_FILE
 	rm -Rf /usr/local/etc/poudriere.d/$POUDRIERE_OPTIONS
 
-	# Generate new symlinks
-	ln -s ${abs_cfg_dir}/$POUDRIERE_MAKE_CONF_FILE /usr/local/etc/poudriere.d/$POUDRIERE_MAKE_CONF_FILE
+	# Generate new content
+	echo "$PKG_MAKE_CONF" > /usr/local/etc/poudriere.d/$POUDRIERE_MAKE_CONF_FILE
 	ln -s ${abs_cfg_dir}/$POUDRIERE_OPTIONS /usr/local/etc/poudriere.d/$POUDRIERE_OPTIONS
 }
@@ -63,10 +66,7 @@
 
 packages_build() {
-	poudriere bulk -j wlpkgbuild -p default -z node -f ${poudriere_pkglist_file}
+	poudriere bulk -j wlpkgbuild -p default -z node $*
 }
 
-# Make package list
-. $cfg_dir/nanobsd.wleiden
-echo $PACKAGE_LIST | tr " " "\n" > ${poudriere_pkglist_file}
 
 
@@ -77,10 +77,12 @@
 	packages_refresh
 elif [ "x$1" = "xconfig" ]; then
+	packages_refresh
 	packages_config $*
 elif [ "x$1" = "xrebuild" ]; then
 	packages_refresh
-	packages_build
+	packages_build $PACKAGE_LIST
 elif [ "x$1" = "xbuild" ]; then
-	packages_build
+	packages_refresh
+	packages_build $PACKAGE_LIST
 else
 	echo "Usage $0 <initenv|config|rebuild|build>"