From owner-svn-ports-head@freebsd.org Sun Jan 26 19:00:19 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2B2921F7D53; Sun, 26 Jan 2020 19:00:19 +0000 (UTC) (envelope-from se@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 485MdZ4s0Qz4Nm7; Sun, 26 Jan 2020 19:00:18 +0000 (UTC) (envelope-from se@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A1C3B2590F; Sun, 26 Jan 2020 19:00:18 +0000 (UTC) (envelope-from se@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00QJ0IlX068359; Sun, 26 Jan 2020 19:00:18 GMT (envelope-from se@FreeBSD.org) Received: (from se@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00QJ0IgZ068358; Sun, 26 Jan 2020 19:00:18 GMT (envelope-from se@FreeBSD.org) Message-Id: <202001261900.00QJ0IgZ068358@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: se set sender to se@FreeBSD.org using -f From: Stefan Esser Date: Sun, 26 Jan 2020 19:00:18 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: se X-SVN-Commit-Paths: in head/ports-mgmt/portmaster: . files X-SVN-Commit-Revision: 524228 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Jan 2020 19:00:19 -0000 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"