Do not depend of pfSense-builder meta package, track dependencies usi…

…ng pkg

build.sh

@@ -345,7 +345,7 @@ if [ -z "${_SKIP_REBUILD_PRESTAGE}" ]; then
 	git_last_commit
 
 	# Ensure binaries are present that builder system requires
-	builder_setup
+	depend_check
 
 	# Build world, kernel and install
 	make_world

tools/builder_common.sh

@@ -1055,6 +1055,15 @@ setup_pkg_repo() {
 	fi
 }
 
+depend_check() {
+	for _pkg in BUILDER_PKG_DEPENDENCIES; do
+		if ! pkg info -e ${_pkg}; then
+			echo "Missing dependency (${_pkg})."
+			print_error_pfS
+		fi
+	done
+}
+
 # This routine ensures any ports / binaries that the builder
 # system needs are on disk and ready for execution.
 builder_setup() {

tools/builder_defaults.sh

@@ -255,6 +255,11 @@ case "${PRODUCT_VERSION##*-}" in
 		exit 1
 esac
 
+export BUILDER_PKG_DEPENDENCIES="devel/git ftp/curl net/rsync sysutils/screen" \
+    "sysutils/vmdktool sysutils/py-salt security/sudo www/nginx" \
+    "emulators/qemu-user-static security/sssd security/pam_ldap" \
+    "security/pam_mkhomedir archivers/gtar textproc/xmlstarlet"
+
 # Host to rsync pkg repos from poudriere
 export PKG_RSYNC_HOSTNAME=${PKG_RSYNC_HOSTNAME:-${STAGING_HOSTNAME}}
 export PKG_RSYNC_USERNAME=${PKG_RSYNC_USERNAME:-"wwwsync"}