From owner-svn-ports-all@freebsd.org  Wed Dec 20 20:05:28 2017
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id B0AD7EA1250;
 Wed, 20 Dec 2017 20:05:28 +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 mx1.freebsd.org (Postfix) with ESMTPS id 7CFCB7F905;
 Wed, 20 Dec 2017 20:05:28 +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 vBKK5RhT009583;
 Wed, 20 Dec 2017 20:05:27 GMT (envelope-from se@FreeBSD.org)
Received: (from se@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBKK5Rri009581;
 Wed, 20 Dec 2017 20:05:27 GMT (envelope-from se@FreeBSD.org)
Message-Id: <201712202005.vBKK5Rri009581@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: se set sender to se@FreeBSD.org
 using -f
From: Stefan Esser <se@FreeBSD.org>
Date: Wed, 20 Dec 2017 20:05:27 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r456849 - 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: 456849
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 20 Dec 2017 20:05:28 -0000

Author: se
Date: Wed Dec 20 20:05:27 2017
New Revision: 456849
URL: https://svnweb.freebsd.org/changeset/ports/456849

Log:
  Fix execution of portmaster in a port directory without any port or package
  parameters.
  
  Reported by:	lenzi.sergio@gmail.com
  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	Wed Dec 20 19:59:04 2017	(r456848)
+++ head/ports-mgmt/portmaster/Makefile	Wed Dec 20 20:05:27 2017	(r456849)
@@ -2,7 +2,7 @@
 
 PORTNAME=	portmaster
 PORTVERSION=	3.17.11
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	LOCAL/bdrewery/${PORTNAME}/ \
 		http://mirror.shatow.net/freebsd/${PORTNAME}/ \

Modified: head/ports-mgmt/portmaster/files/patch-portmaster
==============================================================================
--- head/ports-mgmt/portmaster/files/patch-portmaster	Wed Dec 20 19:59:04 2017	(r456848)
+++ head/ports-mgmt/portmaster/files/patch-portmaster	Wed Dec 20 20:05:27 2017	(r456849)
@@ -178,6 +178,15 @@
  		esac
  
  		case "$PM_NEEDS_UPDATE" in
+@@ -2880,7 +2880,7 @@
+ 		NO_DEP_UPDATES=no_dep_updates ; build_l=''
+ 		export NO_DEP_UPDATES build_l
+ 
+-		pm_cd_pd Mk && PM_WRKDIRPREFIX=`pm_make_b -V WRKDIRPREFIX` && pm_cd ~-
++		pm_cd_pd Mk && PM_WRKDIRPREFIX=`pm_make_b -V WRKDIRPREFIX` && pm_cd "$OLDPWD"
+ 	fi
+ 
+ 	if [ -n "$PM_BUILD_ONLY_LIST" ]; then
 @@ -3033,7 +3021,7 @@ if [ -z "$REPLACE_ORIGIN" ]; then
  			*)	echo '' ; no_valid_port ;;
  			esac