ports-mgmt/poudriere-devel: Also adapt "testport" to accept portconfig

Approved by: bapt Obtained from: freebsd/poudriere@9c2a5dc
freebsd · Oct 11, 2023 · 2ab2d37 · 2ab2d37
1 parent 7ae5aaf
commit 2ab2d37
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/ports-mgmt/poudriere-devel/Makefile b/ports-mgmt/poudriere-devel/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	poudriere
 DISTVERSION=	3.3.99.20220831
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	LOCAL/bdrewery/${PORTNAME}/ \
 		http://mirror.shatow.net/freebsd/${PORTNAME}/ \

diff --git a/ports-mgmt/poudriere-devel/files/patch-portconfig b/ports-mgmt/poudriere-devel/files/patch-portconfig
@@ -26,3 +26,18 @@ index 745c20d8..51a9aff9 100755
  			LOCALBASE=/nonexistent \
  			-C ${PORTSDIR}/${origin} \
  			${RECURSE_COMMAND}
+diff --git a/src/share/poudriere/testport.sh b/src/share/poudriere/testport.sh
+index 07b788310..c684a3d27 100755
+--- src/share/poudriere/testport.sh
++++ src/share/poudriere/testport.sh
+@@ -231,7 +231,9 @@ injail /usr/bin/make -C ${portdir} maintainer ECHO_CMD=true || \
+     err 1 "Port is broken"
+
+ if [ $CONFIGSTR -eq 1 ]; then
+-	command -v dialog4ports >/dev/null 2>&1 || err 1 "You must have ports-mgmt/dialog4ports installed on the host to use -c."
++	command -v portconfig >/dev/null 2>&1 || \
++	    command -v dialog4ports >/dev/null 2>&1 || \
++	    err 1 "You must have ports-mgmt/dialog4ports or ports-mgmt/portconfig installed on the host to use -c."
+ 	__MAKE_CONF=$(mktemp -t poudriere-make.conf)
+ 	setup_makeconf "${__MAKE_CONF}" "${JAILNAME}" "${PTNAME}" "${SETNAME}"
+ 	PORTSDIR=${portsdir} \