From da3cbc263ebe86e2034d76dd73fea7b3a6b5350f Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Thu, 25 Aug 2022 10:24:08 +0200
Subject: [PATCH] build/ports: build aux.conf only as dependency

Avoids spurious build errors for lang/rust on early shared LibreSSL/OpenSSL
build on the same machine.  Also rebuilds benefit from this not wanting to
build rust at all if not necessary (go is not that bad).
---
 build/ports.sh | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/build/ports.sh b/build/ports.sh
index 3331ef8..e8b2bf1 100644
--- a/build/ports.sh
+++ b/build/ports.sh
@@ -56,14 +56,8 @@ if check_packages ${SELF} ${ARGS}; then
 	exit 0
 fi
 
-PORTCONFIGS="${CONFIGDIR}/ports.conf"
-
-# inject auxiliary ports only if not already removed
-if ! check_packages packages; then
-	PORTCONFIGS="${CONFIGDIR}/aux.conf ${PORTCONFIGS}"
-fi
-
-PORTSLIST=$(list_ports ${PORTCONFIGS})
+PORTSLIST=$(list_ports ${CONFIGDIR}/ports.conf)
+AUXLIST=$(list_ports ${CONFIGDIR}/aux.conf)
 
 git_branch ${SRCDIR} ${SRCBRANCH} SRCBRANCH
 git_branch ${PORTSDIR} ${PORTSBRANCH} PORTSBRANCH
@@ -187,7 +181,7 @@ UNAME_r=\$(freebsd-version)
 		pkg create -no ${PACKAGESDIR}-cache/All \${PKGNAME}
 	done
 
-	echo "${PORTSLIST}" | while read PORT_DEPENDS; do
+	(echo "${PORTSLIST}"; echo "${AUXLIST}") | while read PORT_DEPENDS; do
 		PORT_DEPNAME=\$(pkg query -e "%o == \${PORT_DEPENDS%%@*}" %n)
 		if [ -n "\${PORT_DEPNAME}" ]; then
 			echo ">>> Locking package dependency: \${PORT_DEPNAME}"