diff options
| author | Stefan Eßer <se@FreeBSD.org> | 2020-01-26 19:00:18 +0000 |
|---|---|---|
| committer | Stefan Eßer <se@FreeBSD.org> | 2020-01-26 19:00:18 +0000 |
| commit | 09a6aa76b73c213862f715fb627d99b6cb44d1a3 (patch) | |
| tree | fb4dfb2772b937cdff42e696e87d0453a5fb148f /ports-mgmt/portmaster | |
| parent | fdbfc11b4d1a2ca532e7f429ad525919d7e922ce (diff) | |
| download | ports-09a6aa76b73c213862f715fb627d99b6cb44d1a3.tar.gz ports-09a6aa76b73c213862f715fb627d99b6cb44d1a3.zip | |
Notes
Diffstat (limited to 'ports-mgmt/portmaster')
| -rw-r--r-- | ports-mgmt/portmaster/Makefile | 2 | ||||
| -rw-r--r-- | ports-mgmt/portmaster/files/patch-portmaster | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/ports-mgmt/portmaster/Makefile b/ports-mgmt/portmaster/Makefile index aaca44e59808..aaaedf5abc15 100644 --- a/ports-mgmt/portmaster/Makefile +++ b/ports-mgmt/portmaster/Makefile @@ -2,7 +2,7 @@ PORTNAME= portmaster PORTVERSION= 3.19 -PORTREVISION= 21 +PORTREVISION= 22 CATEGORIES= ports-mgmt MAINTAINER= se@FreeBSD.org diff --git a/ports-mgmt/portmaster/files/patch-portmaster b/ports-mgmt/portmaster/files/patch-portmaster index 15f47052c44b..6652c021f797 100644 --- a/ports-mgmt/portmaster/files/patch-portmaster +++ b/ports-mgmt/portmaster/files/patch-portmaster @@ -121,6 +121,15 @@ pm_sv () { [ -n "$PM_SU_VERBOSE" ] && echo -e "===>>> SU $*"; } # Do this here so we can have a reasonably good guess. +@@ -359,7 +360,7 @@ pm_sv () { [ -n "$PM_SU_VERBOSE" ] && echo + if [ "$$" -eq "$PM_PARENT_PID" ]; then + if [ -z "$pd" ]; then + if [ -z "$PORTSDIR" ]; then +- pd=`pm_make_b -f/usr/share/mk/bsd.port.mk -V PORTSDIR 2>/dev/null` ++ pd=`pm_make_b -f/usr/share/mk/bsd.port.mk -V PORTSDIR 2>/dev/null` || pd="" + [ -z "$pd" ] && pm_isdir /usr/ports && pd=/usr/ports + else + pd=$PORTSDIR @@ -433,6 +434,8 @@ usage () { echo '' echo "$progname --list-origins" |