- Update to 3.15

- Add extra mirror
- Remove PKGNGPATCH option

Changes:
  - The pkgng patch has been fully integrated upstream with its
    history copied from the pkgng repo over to portmaster's repo
  - Add extra messages before/after killing background processes so
    that 'Terminated' messages look less unexpected
  - Fix running from / trying to build the entire tree
  - pkgng: Fix -s not respecting the automatic flag
  - Fix "Argument list too long" errors
  - Add PM_SU_CMD documentation to the sample config file [1]
  - Fix -o not showing the specified origin [pkgng patch bug]

Submitted by: Oleg Pudeyev <oleg@bsdpower.com> [1]

7 files changed, 7 insertions, 131 deletions

diff --git a/ports-mgmt/portmaster/Makefile b/ports-mgmt/portmaster/Makefile
index 1032b0baaa98..e7eb3782929d 100644
--- a/ports-mgmt/portmaster/Makefile
+++ b/ports-mgmt/portmaster/Makefile
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
 PORTNAME=	portmaster
-PORTVERSION=	3.14
-PORTREVISION=	9
+PORTVERSION=	3.15
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	GH \
+		LOCAL/bdrewery/${PORTNAME}/ \
   		http://mirror.shatow.net/freebsd/portmaster/
 DISTNAME=	${GH_ACCOUNT}-${GH_PROJECT}-${PORTVERSION}-${GH_COMMIT}
 
@@ -15,12 +15,10 @@ LICENSE=	BSD
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	portmaster
-GH_COMMIT=	31009f6
+GH_COMMIT=	36a0273
 GH_TAGNAME=	${GH_COMMIT}
 
-OPTIONS_DEFINE=	BASH ZSH PKGNGPATCH
-OPTIONS_DEFAULT+=	PKGNGPATCH
-PKGNGPATCH_DESC=Enable PKGNG support
+OPTIONS_DEFINE=	BASH ZSH
 
 PLIST_FILES=	sbin/portmaster etc/portmaster.rc.sample
 
@@ -28,16 +26,6 @@ MAN8=		portmaster.8
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MPKGNGPATCH}
-PATCH_SITES+=	http://mirror.shatow.net/freebsd/portmaster/
-PATCHFILES+=	patch-portmaster-pkgng.gz
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-files::with_pkgng_current
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-files::pkg_install-pkgng-ss
-.  if ${PORT_OPTIONS:MZSH}
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-files::zsh-completions
-.  endif
-.endif
-
 .if ${PORT_OPTIONS:MBASH}
 PLIST_FILES+=	etc/bash_completion.d/portmaster.sh
 PLIST_DIRSTRY+=	etc/bash_completion.d
@@ -71,8 +59,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/files/zsh-completions \
 		${PREFIX}/share/zsh/site-functions/_portmaster
 .endif
-.if ${PORT_OPTIONS:MPKGNGPATCH}
 	${CAT} ${PKGMESSAGE}
-.endif
 
 .include <bsd.port.mk>
diff --git a/ports-mgmt/portmaster/distinfo b/ports-mgmt/portmaster/distinfo
index 4b024edc6037..d1e8a12f9eea 100644
--- a/ports-mgmt/portmaster/distinfo
+++ b/ports-mgmt/portmaster/distinfo
@@ -1,4 +1,2 @@
-SHA256 (portmaster-portmaster-3.14-31009f6.tar.gz) = 9029531c486d937c09974baa0174f5a59b5e54c2400ab60caabb09af3add9605
-SIZE (portmaster-portmaster-3.14-31009f6.tar.gz) = 42265
-SHA256 (patch-portmaster-pkgng.gz) = f55e9e8e2117988a5b1e58c269c109d00d1468892b6d742210c9bafca41e1d34
-SIZE (patch-portmaster-pkgng.gz) = 9937
+SHA256 (portmaster-portmaster-3.15-36a0273.tar.gz) = 87571acac8b74a7b1135fd6f13da61d86b90bd82df38b49a00fc9aee3f2c42b0
+SIZE (portmaster-portmaster-3.15-36a0273.tar.gz) = 44493
diff --git a/ports-mgmt/portmaster/files/extra-patch-files::pkg_install-pkgng-ss b/ports-mgmt/portmaster/files/extra-patch-files::pkg_install-pkgng-ss
deleted file mode 100644
index bf0a72e6700d..000000000000
--- a/ports-mgmt/portmaster/files/extra-patch-files::pkg_install-pkgng-ss
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 8d713d8a417e6d4540f3f826870f670fc503df83
-Author: John Hein <jhein@symmetricom.com>
-Date:   Sun Oct 28 14:48:33 2012 -0600
-
-    Fix short-circuit logic for pkg_install to not call pkg(8)
-
-diff --git portmaster portmaster
-index 3abb942..ff06955 100755
---- portmaster
-+++ portmaster
-@@ -4304,7 +4304,7 @@ if [ "$$" -ne "$PM_PARENT_PID" -o -n "$PM_URB" ]; then
- fi
- 
- INSTALLED_LIST="${INSTALLED_LIST}\t${ilist}\n"
--[ -z "$use_pkgng" -a -e "$pdb/$new_port/+DISPLAY" -o -n "$use_pkgng" -a -n "`pkg query "%M" $new_port`" ] &&
-+[ -z "$use_pkgng" -a -e "$pdb/$new_port/+DISPLAY" ] || ( [ -n "$use_pkgng" ] && [ -n "`pkg query %M $new_port`" ] ) &&
- 	DISPLAY_LIST="${DISPLAY_LIST}$new_port "
- CUR_DEPS="${CUR_DEPS}${new_port}:${portdir}:"
- 
diff --git a/ports-mgmt/portmaster/files/extra-patch-files::with_pkgng_current b/ports-mgmt/portmaster/files/extra-patch-files::with_pkgng_current
deleted file mode 100644
index 3f0c39052d37..000000000000
--- a/ports-mgmt/portmaster/files/extra-patch-files::with_pkgng_current
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/portmaster b/portmaster
-index ee95f41..3abb942 100755
---- portmaster
-+++ portmaster
-@@ -385,7 +385,7 @@ if [ "$$" -eq "$PM_PARENT_PID" ]; then
- 	[ -n "$port_dbdir" ] && export port_dbdir
- 
- 	# Detect if pkgng is being used
--	use_pkgng="`pm_make_b -V WITH_PKGNG`"
-+	use_pkgng=`pm_make_b -f/usr/share/mk/bsd.port.mk -V WITH_PKGNG 2>/dev/null`
- 	[ -n "$use_pkgng" ] && export use_pkgng
- fi
- 
diff --git a/ports-mgmt/portmaster/files/extra-patch-files::zsh-completions b/ports-mgmt/portmaster/files/extra-patch-files::zsh-completions
deleted file mode 100644
index d7cc34157c70..000000000000
--- a/ports-mgmt/portmaster/files/extra-patch-files::zsh-completions
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: files/zsh-completions
-diff -u files/zsh-completions.orig files/zsh-completions
---- files/zsh-completions.orig	2012-10-10 21:46:28.000000000 +0900
-+++ files/zsh-completions	2012-10-16 01:37:31.000000000 +0900
-@@ -61,7 +61,11 @@
- 
- case "$state" in
-   pkgs)
--    array=("${PKG_DBDIR:-/var/db/pkg}"/*(/:t))
-+    if [ -n "$(make -f /usr/share/mk/bsd.port.mk -V WITH_PKGNG)" ]; then
-+      array=($(pkg info -aq))
-+    else
-+      array=("${PKG_DBDIR:-/var/db/pkg}"/*(/:t))
-+    fi
-     _describe -t packages "installed ports" array
-     ;;
-   ports)
-@@ -71,7 +75,11 @@
-     _tags packages ports
-     while _tags; do
-       if _requested packages; then
--        array=("${PKG_DBDIR:-/var/db/pkg}"/*(/:t))
-+        if [ -n "$(make -f /usr/share/mk/bsd.port.mk -V WITH_PKGNG)" ]; then
-+          array=($(pkg info -aq))
-+        else
-+          array=("${PKG_DBDIR:-/var/db/pkg}"/*(/:t))
-+        fi
-         _describe -t packages "installed ports" array && ret=0
-       fi
-       if _requested ports; then
diff --git a/ports-mgmt/portmaster/files/patch-files-bash-completions b/ports-mgmt/portmaster/files/patch-files-bash-completions
deleted file mode 100644
index adda427233e2..000000000000
--- a/ports-mgmt/portmaster/files/patch-files-bash-completions
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git files/bash-completions files/bash-completions
-index 2293183..d5bf298 100644
---- files/bash-completions
-+++ files/bash-completions
-@@ -1,13 +1,25 @@
- # $FreeBSD$
- #
-+_pkgs_list() {
-+	local dbdir="$1"
-+	shift 1 # the rest will be passed diretly to compgen
-+	if [ -n "$(make -f /usr/share/mk/bsd.port.mk -V WITH_PKGNG)" ]; then
-+		compgen -W "$(pkg info -aq)" $*
-+	else
-+		cd ${dbdir} && compgen -d $*
-+	fi
-+}
-+
- _portmaster () {
--	local cur
-+	local cur dbdir portsdir
- 	cur=${COMP_WORDS[COMP_CWORD]}
-+	dbdir=${PKG_DBDIR:-/var/db/pkg}
-+	portsdir=${PORTSDIR:-/usr/ports}
- 
- 	case "$cur" in
--	/usr/ports/*)
-+	${portsdir}/*)
- 		COMPREPLY=( $( compgen -d $cur ) ) ;;
--	*/*)	COMPREPLY=( $( compgen -d /usr/ports/$cur ) ) ;;
-+	*/*)	COMPREPLY=( $( compgen -d ${portsdir}/$cur ) ) ;;
- 	--*)	COMPREPLY=( $( compgen -W '--force-config --show-work \
- 		--packages --packages-only \
- 		--packages-build --packages-if-newer --delete-build-only \
-@@ -20,9 +32,9 @@ _portmaster () {
- 		--check-depends --check-port-dbdir --list-origins \
- 		--help --version' -- $cur ) )
- 		;;
--	*)	COMPREPLY=( $( compgen -d /var/db/pkg/$cur ) )
--		COMPREPLY=( ${COMPREPLY[@]#/var/db/pkg/} )
--		COMPREPLY=( ${COMPREPLY[@]} $( compgen -d /usr/ports/$cur ) )
-+	*)	COMPREPLY=( $(_pkgs_list ${dbdir} "${cur}" ) )
-+		COMPREPLY=( ${COMPREPLY[@]#${dbdir}/} )
-+		COMPREPLY=( ${COMPREPLY[@]} $( compgen -d ${portsdir}/$cur ) )
- 		COMPREPLY=( ${COMPREPLY[@]#/ports/} )
- 		;;
- 	esac
diff --git a/ports-mgmt/portmaster/pkg-message b/ports-mgmt/portmaster/pkg-message
index 802773f00f1e..f47965755cb1 100644
--- a/ports-mgmt/portmaster/pkg-message
+++ b/ports-mgmt/portmaster/pkg-message
@@ -1,5 +1,5 @@
 If you want to switch to the new pkg(8) format, and have not already done so,
-there are some extra steps to take:
+there are some extra 1-time steps to take:
 
     Enable PKGNG as your package format: