From owner-svn-src-user@FreeBSD.ORG  Sat Aug  7 20:22:03 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 4CD6F1065673;
	Sat,  7 Aug 2010 20:22:03 +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 222648FC1F;
	Sat,  7 Aug 2010 20:22:03 +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 o77KM3Wi045938;
	Sat, 7 Aug 2010 20:22:03 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o77KM3uh045936;
	Sat, 7 Aug 2010 20:22:03 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201008072022.o77KM3uh045936@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Sat, 7 Aug 2010 20:22:03 +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: r211038 - 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:22:03 -0000

Author: dougb
Date: Sat Aug  7 20:22:02 2010
New Revision: 211038
URL: http://svn.freebsd.org/changeset/base/211038

Log:
  Add $FreeBSD$
  
  Add new features, and update -G/--force-config help

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

Modified: user/dougb/portmaster/files/zsh-completions
==============================================================================
--- user/dougb/portmaster/files/zsh-completions	Sat Aug  7 20:10:56 2010	(r211037)
+++ user/dougb/portmaster/files/zsh-completions	Sat Aug  7 20:22:02 2010	(r211038)
@@ -1,20 +1,21 @@
 #compdef portmaster
-# for portmaster 2.18
+
+# $FreeBSD$
 
 local context state line array ret=1
 typeset -A opt_args
 
 _arguments -A "-*" : \
-  "--force-config['make config' for all ports]" \
+  "--force-config['make config' for all ports (overrides -G)]" \
   "-C[prevents 'make clean' from being run before building]" \
-  "(-F)-G[prevents recursive 'make config' (overrides --force-config)]" \
+  "-G[prevents 'make config']" \
   "-H[hide details of the port build and install in a log file]" \
   "-K[prevents 'make clean' from being run after building]" \
   "(-b)-B[prevents creation of the backup package for the installed port]" \
   "(-B)-b[create and keep a backup package of an installed port]" \
   "-g[create a package of the new port]" \
-  "-n[run through configure, but do not make or install any ports]" \
-  "-t[recurse dependencies thoroughly, using all-depends-array]" \
+  "-n[run through all steps, but do not make or install any ports]" \
+  "-t[recurse dependencies thoroughly, using all-depends-list]" \
   "-v[verbose output]" \
   "-w[save old shared libraries before deinstall]" \
   "(-i)-f[always rebuild ports (overrides -i)]" \
@@ -47,9 +48,11 @@ _arguments -A "-*" : \
   "-L[list all installed ports by category, and search for updates]" \
   "-e[expunge a port via pkg_delete, and remove its distfiles]:full name of port directory in /var/db/pkg:->pkgs" \
   "-s[clean out stale ports that used to be depended on]" \
-  "(-G)-F[fetch distfiles only]" \
+  "-F[fetch distfiles only]" \
   "--clean-distfiles[offer to delete stale distfiles]" \
   "--clean-distfiles-all[delete stale distfiles without prompting]" \
+  "----clean-packages[offer to delete stale packages]" \
+  "----clean-packages-all[delete stale packages without prompting]" \
   "--check-depends[cross-check and update dependency information for all ports]" \
   "--check-port-dbdir[check for stale entries in /var/db/ports]" \
   "--list-origins[list directories from /usr/ports for root and leaf ports]" \