Index: head/sysutils/firstboot-pkgs/Makefile
===================================================================
--- head/sysutils/firstboot-pkgs/Makefile	(revision 432858)
+++ head/sysutils/firstboot-pkgs/Makefile	(revision 432859)
@@ -1,20 +1,20 @@
 # $FreeBSD$
 
 PORTNAME=	firstboot-pkgs
-PORTVERSION=	1.4
+PORTVERSION=	1.5
 CATEGORIES=	sysutils
 MASTER_SITES=	# none
 DISTFILES=	# none
 EXTRACT_ONLY=	# none
 
 MAINTAINER=	cperciva@FreeBSD.org
 COMMENT=	Install packages when the system first boots
 
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 NO_INSTALL=	yes
 NO_ARCH=	yes
 
 USE_RC_SUBR=	firstboot_pkgs
 
 .include <bsd.port.mk>
Index: head/sysutils/firstboot-pkgs/files/firstboot_pkgs.in
===================================================================
--- head/sysutils/firstboot-pkgs/files/firstboot_pkgs.in	(revision 432858)
+++ head/sysutils/firstboot-pkgs/files/firstboot_pkgs.in	(revision 432859)
@@ -1,56 +1,56 @@
 #!/bin/sh
 
 # $FreeBSD$
 # KEYWORD: firstboot
 # PROVIDE: firstboot_pkgs
 # REQUIRE: NETWORKING
 # BEFORE: LOGIN
 
 # Add the following lines to /etc/rc.conf.local or /etc/rc.conf (in the disk
 # image, since this only runs on the first boot) to enable this:
 #
 # firstboot_pkgs_enable="YES"
 #
 # and place a list of packages in firstboot_pkgs_list, e.g.,
 #
 # firstboot_pkgs_list="apache22 php5 mysql56-server"
 
 . /etc/rc.subr
 
 : ${firstboot_pkgs_enable:="NO"}
 
 name="firstboot_pkgs"
 rcvar=firstboot_pkgs_enable
 start_cmd="firstboot_pkgs_run"
 stop_cmd=":"
 
 firstboot_pkgs_run()
 {
 
 	# Count rc.d scripts
 	nscriptso=`ls /usr/local/etc/rc.d | wc -l`
 
 	# Bootstrap if necessary
 	if ! pkg -N 2>/dev/null; then
 		env ASSUME_ALWAYS_YES=YES pkg bootstrap |
 		    cat
 	fi
 
 	# Install requested packages, if any
-	if ! [ -z "$firstboot_pkgs_list" ]; then
-		env ASSUME_ALWAYS_YES=YES pkg install $firstboot_pkgs_list </dev/null |
+	for package in ${firstboot_pkgs_list}; do
+		env ASSUME_ALWAYS_YES=YES pkg install ${package} </dev/null |
 		    cat
-	fi
+	done
 
 	# Count rc.d scripts again
 	nscriptsn=`ls /usr/local/etc/rc.d | wc -l`
 
 	# If we have more scripts, request a reboot
 	if [ $nscriptsn -ne $nscriptso ]; then
 		echo "Requesting reboot after installing packages with rc.d scripts."
 		touch ${firstboot_sentinel}-reboot
 	fi
 }
 
 load_rc_config $name
 run_rc_command "$1"