From b00400ef890e8c574a76855e95871b1e7bf8042c Mon Sep 17 00:00:00 2001
From: Renato Botelho <renato@netgate.com>
Date: Fri, 18 Mar 2016 09:10:29 -0300
Subject: Stop creating a meta package pfSense-vmware and pre-install
 pfSense-pkg-Open-VM-Tools on ova

---
 build.sh                          | 5 ++++-
 tools/builder_common.sh           | 8 +++-----
 tools/conf/pfPorts/poudriere_bulk | 1 -
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/build.sh b/build.sh
index e6f2a8d..19d8adb 100755
--- a/build.sh
+++ b/build.sh
@@ -434,8 +434,11 @@ for _IMGTOBUILD in $_IMAGESTOBUILD; do
 			create_nanobsd_diskimage ${_IMGTOBUILD} "${FLASH_SIZE}"
 			;;
 		ova)
-			install_pkg_install_ports ${PRODUCT_NAME}-vmware
+			old_custom_package_list="${custom_package_list}"
+			export custom_package_list="${custom_package_list} ${PRODUCT_NAME}-pkg-Open-VM-Tools"
+			install_pkg_install_ports
 			create_ova_image
+			export custom_package_list="${old_custom_package_list}"
 			install_pkg_install_ports
 			;;
 	esac
diff --git a/tools/builder_common.sh b/tools/builder_common.sh
index 4de5fa4..acd090e 100644
--- a/tools/builder_common.sh
+++ b/tools/builder_common.sh
@@ -2201,11 +2201,9 @@ poudriere_bulk() {
 
 	# Change version of pfSense meta ports for snapshots
 	if [ -z "${_IS_RELEASE}" ]; then
-		for meta_pkg in ${PRODUCT_NAME} ${PRODUCT_NAME}-vmware; do
-			local _meta_pkg_version="$(echo "${PRODUCT_VERSION}" | sed 's,DEVELOPMENT,ALPHA,')-${DATESTRING}"
-			sed -i '' -e "/^DISTVERSION/ s,^.*,DISTVERSION=	${_meta_pkg_version}," \
-				/usr/local/poudriere/ports/${POUDRIERE_PORTS_NAME}/security/${meta_pkg}/Makefile
-		done
+		local _meta_pkg_version="$(echo "${PRODUCT_VERSION}" | sed 's,DEVELOPMENT,ALPHA,')-${DATESTRING}"
+		sed -i '' -e "/^DISTVERSION/ s,^.*,DISTVERSION=	${_meta_pkg_version}," \
+			/usr/local/poudriere/ports/${POUDRIERE_PORTS_NAME}/security/${PRODUCT_NAME}/Makefile
 	fi
 
 	for jail_arch in ${_archs}; do
diff --git a/tools/conf/pfPorts/poudriere_bulk b/tools/conf/pfPorts/poudriere_bulk
index c3b38f9..8bddf4c 100644
--- a/tools/conf/pfPorts/poudriere_bulk
+++ b/tools/conf/pfPorts/poudriere_bulk
@@ -6,7 +6,6 @@ benchmarks/iperf
 benchmarks/iperf3
 net/py-speedtest-cli
 security/%%PRODUCT_NAME%%
-security/%%PRODUCT_NAME%%-vmware
 sysutils/%%PRODUCT_NAME%%-builder
 sysutils/bsdinstaller
 net/%%PRODUCT_NAME%%-pkg-pfBlockerNG
-- 
cgit v1.1