From owner-svn-ports-all@FreeBSD.ORG  Thu Dec  6 17:46:11 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 70F76317;
 Thu,  6 Dec 2012 17:46:11 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 3D26F8FC13;
 Thu,  6 Dec 2012 17:46:11 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qB6HkBGq001800;
 Thu, 6 Dec 2012 17:46:11 GMT (envelope-from bdrewery@svn.freebsd.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qB6HkAfF001798;
 Thu, 6 Dec 2012 17:46:10 GMT (envelope-from bdrewery@svn.freebsd.org)
Message-Id: <201212061746.qB6HkAfF001798@svn.freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Thu, 6 Dec 2012 17:46:10 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r308394 - in head/ports-mgmt/portmaster: . files
X-SVN-Group: ports-head
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.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 06 Dec 2012 17:46:11 -0000

Author: bdrewery
Date: Thu Dec  6 17:46:10 2012
New Revision: 308394
URL: http://svnweb.freebsd.org/changeset/ports/308394

Log:
  - Add upstream patch for fixing bash completions with PKGNG
    and to respect env PORTSDIR/PKG_DBDIR
  
  Feature safe:	yes

Added:
  head/ports-mgmt/portmaster/files/patch-files-bash-completions   (contents, props changed)
Modified:
  head/ports-mgmt/portmaster/Makefile

Modified: head/ports-mgmt/portmaster/Makefile
==============================================================================
--- head/ports-mgmt/portmaster/Makefile	Thu Dec  6 16:55:35 2012	(r308393)
+++ head/ports-mgmt/portmaster/Makefile	Thu Dec  6 17:46:10 2012	(r308394)
@@ -2,7 +2,7 @@
 
 PORTNAME=	portmaster
 PORTVERSION=	3.14
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	GH \
   		http://mirror.shatow.net/freebsd/portmaster/

Added: head/ports-mgmt/portmaster/files/patch-files-bash-completions
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/ports-mgmt/portmaster/files/patch-files-bash-completions	Thu Dec  6 17:46:10 2012	(r308394)
@@ -0,0 +1,46 @@
+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
\ No newline at end of file