Date: Sun, 26 Jan 2020 19:00:18 +0000 (UTC) From: Stefan Esser <se@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r524228 - in head/ports-mgmt/portmaster: . files Message-ID: <202001261900.00QJ0IgZ068358@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: se Date: Sun Jan 26 19:00:18 2020 New Revision: 524228 URL: https://svnweb.freebsd.org/changeset/ports/524228 Log: Make portmaster fall back to other locations if invoked in, e.g., /sys/conf. PR: 237061 Approved by: antoine (implicit) Modified: head/ports-mgmt/portmaster/Makefile head/ports-mgmt/portmaster/files/patch-portmaster Modified: head/ports-mgmt/portmaster/Makefile ============================================================================== --- head/ports-mgmt/portmaster/Makefile Sun Jan 26 18:19:00 2020 (r524227) +++ head/ports-mgmt/portmaster/Makefile Sun Jan 26 19:00:18 2020 (r524228) @@ -2,7 +2,7 @@ PORTNAME= portmaster PORTVERSION= 3.19 -PORTREVISION= 21 +PORTREVISION= 22 CATEGORIES= ports-mgmt MAINTAINER= se@FreeBSD.org Modified: head/ports-mgmt/portmaster/files/patch-portmaster ============================================================================== --- head/ports-mgmt/portmaster/files/patch-portmaster Sun Jan 26 18:19:00 2020 (r524227) +++ head/ports-mgmt/portmaster/files/patch-portmaster Sun Jan 26 19:00:18 2020 (r524228) @@ -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"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202001261900.00QJ0IgZ068358>