try

msimerson · Dec 9, 2024 · 968ccc9 · 968ccc9
1 parent f06ddb8
commit 968ccc9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/mail-toaster.sh b/mail-toaster.sh
@@ -895,7 +895,7 @@ stage_port_install()
 	if [ -n "$MT6_STAGE_PORT_FUNCTION" ]; then
 		echo "jexec $SAFE_NAME make -C /usr/ports/$1 extract"
 		jexec "$SAFE_NAME" make -C "/usr/ports/$1" extract
-		$MT6_STAGE_PORT_FUNCTION
+		eval "$MT6_STAGE_PORT_FUNCTION"
 	fi
 
 	echo "jexec $SAFE_NAME make -C /usr/ports/$1 build deinstall install clean"

diff --git a/provision/vpopmail.sh b/provision/vpopmail.sh
@@ -255,7 +255,7 @@ install_quota_report()
 		"$_qr"
 }
 
-MT6_STAGE_PORT_FUNCTION() {
+vpopmail_port_fixups() {
 	sed -i '' \
 		-e '/pw_name char(32)/         s/char(32)/VARCHAR (64)/'  \
 		-e '/pw_domain char(96)/       s/char(96)/VARCHAR (96)/'  \
@@ -289,9 +289,10 @@ install_vpopmail()
 
 	#stage_port_install devel/gmake
 
-	export -f MT6_STAGE_PORT_FUNCTION
+	MT6_STAGE_PORT_FUNCTION=$(vpopmail_port_fixups)
+	export MT6_STAGE_PORT_FUNCTION
 	install_vpopmail_port
-	unset -f MT6_STAGE_PORT_FUNCTION
+	unset MT6_STAGE_PORT_FUNCTION
 
 	#install_vpopmail_source