diff options
| author | Guido Falsi <madpilot@FreeBSD.org> | 2023-10-11 08:49:52 +0000 |
|---|---|---|
| committer | Guido Falsi <madpilot@FreeBSD.org> | 2023-10-11 08:49:52 +0000 |
| commit | 7ae5aaf4ca84d8b994c17f93ebd59f8731802b53 (patch) | |
| tree | f014c8af6d06fd7a491318093b67dc28177b9685 | |
| parent | a19cc8636d027bb5610c2c54487192a29335a748 (diff) | |
| download | ports-7ae5aaf4ca84d8b994c17f93ebd59f8731802b53.tar.gz ports-7ae5aaf4ca84d8b994c17f93ebd59f8731802b53.zip | |
ports-mgmt/poudriere: Also adapt "testport" to accept portconfig
Approved by: bapt
Obtained from: https://github.com/freebsd/poudriere/commit/9c2a5dcc81d35b388a69ba711db77b5f20e261f3
| -rw-r--r-- | ports-mgmt/poudriere/Makefile | 2 | ||||
| -rw-r--r-- | ports-mgmt/poudriere/files/patch-portconfig | 15 |
2 files changed, 16 insertions, 1 deletions
diff --git a/ports-mgmt/poudriere/Makefile b/ports-mgmt/poudriere/Makefile index 2894302c41a2..135ce57818ed 100644 --- a/ports-mgmt/poudriere/Makefile +++ b/ports-mgmt/poudriere/Makefile @@ -1,6 +1,6 @@ PORTNAME= poudriere DISTVERSION= 3.3.7 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= ports-mgmt MASTER_SITES= LOCAL/bdrewery/${PORTNAME}/ \ http://mirror.shatow.net/freebsd/${PORTNAME}/ \ diff --git a/ports-mgmt/poudriere/files/patch-portconfig b/ports-mgmt/poudriere/files/patch-portconfig index 723ffd38cf69..ef7d75cc1471 100644 --- a/ports-mgmt/poudriere/files/patch-portconfig +++ b/ports-mgmt/poudriere/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} \ |