try 3

msimerson · Dec 9, 2024 · 30fa12e · 30fa12e
1 parent 6e06225
commit 30fa12e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/include/vpopmail.sh b/include/vpopmail.sh
@@ -106,11 +106,15 @@ mail_vpopmail_UNSET=$VPOPMAIL_OPTIONS_UNSET
 		echo "CFLAGS+=	-fcommon" | tee -a "/usr/ports/mail/vpopmail/Makefile" || exit
 	fi
 
-	MT6_STAGE_PORT_FUNCTION=$(declare -f install_vpopmail_port)
-	export MT6_STAGE_PORT_FUNCTION
 	tell_status "installing vpopmail port with custom options"
-	stage_port_install mail/vpopmail
-	unset MT6_STAGE_PORT_FUNCTION
+
+        stage_pkg_install pkgconf portconfig
+
+	stage_exec make -C "/usr/ports/$1" extract
+	vpopmail_port_fixups
+        stage_exec make -C "/usr/ports/$1" build deinstall install clean || return 1
+
+        tell_status "port $1 installed"
 }
 
 install_qmail()

diff --git a/mail-toaster.sh b/mail-toaster.sh
@@ -890,12 +890,6 @@ stage_port_install()
 
 	stage_pkg_install pkgconf portconfig
 
-	# enable caller to do fixups in port workdir
-	if [ -n "$MT6_STAGE_PORT_FUNCTION" ]; then
-		stage_exec make -C "/usr/ports/$1" extract
-		eval "$MT6_STAGE_PORT_FUNCTION"
-	fi
-
 	stage_exec make -C "/usr/ports/$1" build deinstall install clean || return 1
 
 	tell_status "port $1 installed"