svn commit: r456849 - in head/ports-mgmt/portmaster: . files

[Stefan Esser]

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 at 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