diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2021-08-30 17:20:21 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2021-08-30 17:21:44 +0000 |
| commit | c555f0f92a6524a104b42d915465e3fb5fe7e08c (patch) | |
| tree | f603f29734da41061fb860dfcbb30a9bcc70bf4a | |
| parent | 9dae753b0964d09acd7cafe5858b70eb0c6580cf (diff) | |
| download | ports-c555f0f92a6524a104b42d915465e3fb5fe7e08c.tar.gz ports-c555f0f92a6524a104b42d915465e3fb5fe7e08c.zip | |
ports-mgmt/poudriere: Bring in fix for distclean make.conf error
| -rw-r--r-- | ports-mgmt/poudriere/Makefile | 2 | ||||
| -rw-r--r-- | ports-mgmt/poudriere/files/patch-8bfaa898b32370bbfff9bf37fc833d7abc4b8b67 | 24 |
2 files changed, 25 insertions, 1 deletions
diff --git a/ports-mgmt/poudriere/Makefile b/ports-mgmt/poudriere/Makefile index 062bc57b7b35..215a512ad71c 100644 --- a/ports-mgmt/poudriere/Makefile +++ b/ports-mgmt/poudriere/Makefile @@ -1,6 +1,6 @@ PORTNAME= poudriere DISTVERSION= 3.3.7 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= ports-mgmt MASTER_SITES= LOCAL/bdrewery/${PORTNAME}/ \ http://mirror.shatow.net/freebsd/${PORTNAME}/ \ diff --git a/ports-mgmt/poudriere/files/patch-8bfaa898b32370bbfff9bf37fc833d7abc4b8b67 b/ports-mgmt/poudriere/files/patch-8bfaa898b32370bbfff9bf37fc833d7abc4b8b67 new file mode 100644 index 000000000000..892ab3d338ae --- /dev/null +++ b/ports-mgmt/poudriere/files/patch-8bfaa898b32370bbfff9bf37fc833d7abc4b8b67 @@ -0,0 +1,24 @@ +commit 8bfaa898b32370bbfff9bf37fc833d7abc4b8b67 +Author: Bryan Drewery <bryan@shatow.net> +Date: Sat Aug 28 11:57:56 2021 -0700 + + distclean: Fix reading make.conf + + Fixes #910 + Fixes fa0308152e6 ("Move make.conf ports_env handling to its own not-spammy file") + + (cherry picked from commit 95971acb6ffd51b2432a38efd1111dd189f68edd) + +diff --git src/share/poudriere/distclean.sh src/share/poudriere/distclean.sh +index 08889f1dd..f77163fc4 100755 +--- src/share/poudriere/distclean.sh ++++ src/share/poudriere/distclean.sh +@@ -144,7 +144,7 @@ for PTNAME in ${PTNAMES}; do + + __MAKE_CONF=$(mktemp -t poudriere-make.conf) + export __MAKE_CONF +- setup_ports_env "/" "${__MAKE_CONF}" ++ setup_ports_env "" "${__MAKE_CONF}" + if [ -z "${NO_PACKAGE_BUILDING}" ]; then + echo "BATCH=yes" + echo "PACKAGE_BUILDING=yes" |