From owner-svn-src-user@FreeBSD.ORG  Sat Aug  7 20:07:15 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EBAFE106566C;
	Sat,  7 Aug 2010 20:07:15 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id DB33D8FC08;
	Sat,  7 Aug 2010 20:07:15 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o77K7FUx042569;
	Sat, 7 Aug 2010 20:07:15 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o77K7FBI042567;
	Sat, 7 Aug 2010 20:07:15 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201008072007.o77K7FBI042567@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Sat, 7 Aug 2010 20:07:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r211036 - user/dougb/portmaster/files
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 07 Aug 2010 20:07:16 -0000

Author: dougb
Date: Sat Aug  7 20:07:15 2010
New Revision: 211036
URL: http://svn.freebsd.org/changeset/base/211036

Log:
  Add a $FreeBSD line
  
  Re-sort the --options to make it easier to maintain
  
  Use a better method of generating completions for portmaster [a-z]<TAB>

Modified:
  user/dougb/portmaster/files/bash-completions

Modified: user/dougb/portmaster/files/bash-completions
==============================================================================
--- user/dougb/portmaster/files/bash-completions	Sat Aug  7 19:27:49 2010	(r211035)
+++ user/dougb/portmaster/files/bash-completions	Sat Aug  7 20:07:15 2010	(r211036)
@@ -1,3 +1,5 @@
+# $FreeBSD$
+#
 _portmaster () {
 	local cur
 	cur=${COMP_WORDS[COMP_CWORD]}
@@ -7,18 +9,21 @@ _portmaster () {
 		COMPREPLY=( $( compgen -d $cur ) ) ;;
 	*/*)	COMPREPLY=( $( compgen -d /usr/ports/$cur ) ) ;;
 	--*)	COMPREPLY=( $( compgen -W '--force-config --show-work \
-		--clean-distfiles --clean-distfiles-all	--check-depends \
-		--check-port-dbdir --list-origins --packages --packages-only \
+		--packages --packages-only \
 		--packages-build --packages-if-newer --delete-build-only \
-		--always-fetch --packages-delete \
+		--always-fetch --delete-packages \
 		--local-packagedir= --packages-local \
 		--no-confirm --no-term-title --no-index-fetch \
 		--index --index-first --index-only \
+		--clean-distfiles --clean-distfiles-all	\
+		--clean-packages --clean-packages-all \
+		--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=( ${COMPREPLY[@]} $( compgen -d /usr/ports/$cur ) )
+		COMPREPLY=( ${COMPREPLY[@]#/ports/} )
 		;;
 	esac