From owner-svn-src-user@FreeBSD.ORG Mon Nov 9 18:06:38 2009 Return-Path: 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 3E3AC106568B; Mon, 9 Nov 2009 18:06:38 +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 14B938FC17; Mon, 9 Nov 2009 18:06:38 +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 nA9I6b54029320; Mon, 9 Nov 2009 18:06:37 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nA9I6bp6029316; Mon, 9 Nov 2009 18:06:37 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <200911091806.nA9I6bp6029316@svn.freebsd.org> From: Doug Barton Date: Mon, 9 Nov 2009 18:06:37 +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: r199094 - user/dougb/portmaster X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Nov 2009 18:06:38 -0000 Author: dougb Date: Mon Nov 9 18:06:37 2009 New Revision: 199094 URL: http://svn.freebsd.org/changeset/base/199094 Log: 1. Begin the process of decrementing the now-obsolete -p option 2. Document that +IGNOREME files only apply to installed ports 3. Document that if no port is installed -x runs vs. $origin Modified: user/dougb/portmaster/portmaster user/dougb/portmaster/portmaster.8 Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Mon Nov 9 17:47:49 2009 (r199093) +++ user/dougb/portmaster/portmaster Mon Nov 9 18:06:37 2009 (r199094) @@ -233,7 +233,6 @@ usage () { echo "${0##*/} [Common flags] Multiple full names/paths from $pdb|$pd" echo " and/or multiple globs from $pdb" echo '' - echo "${0##*/} [Common flags] -p " echo "${0##*/} [Common flags] . [Use in $pd/foo/bar to build that port]" echo '' echo "${0##*/} --show-work [-Gv] [-m ] " Modified: user/dougb/portmaster/portmaster.8 ============================================================================== --- user/dougb/portmaster/portmaster.8 Mon Nov 9 17:47:49 2009 (r199093) +++ user/dougb/portmaster/portmaster.8 Mon Nov 9 18:06:37 2009 (r199094) @@ -54,9 +54,6 @@ This is a change from pre-version-2.3 be and/or multiple globs from /var/db/pkg .Nm .Op Common Flags -.Fl p Ar port directory in /usr/ports -.Nm -.Op Common Flags . (Use in /usr/ports/foo/bar to build that port) .Nm .Fl -show-work @@ -306,8 +303,13 @@ any arguments to supply to .It Fl x avoid building or updating ports that match this pattern. Can be specified more than once. +If a port is not already installed the exclude pattern will +be run against the directory name from +.Pa /usr/ports . .It Fl p Ar port directory in /usr/ports -specify the full path to a port directory +specify the full path to a port directory. +This option is generally not necessary and may be +removed in future versions. .It Fl -show-work show what dependent ports are, and are not installed (implies .Fl t ) . @@ -478,11 +480,13 @@ along with their related options. .Ed .Pp .It Pa /var/db/pkg/*/+IGNOREME -If this file exists, several things will happen: +If this file exists for a port that is already installed, +several things will happen: .Bl -tag -width F1 -.It 1. The port will be ignored for all purposes, including -dependency updates, if there is no directory for it in -.Pa /usr/ports , +.It 1. The port will be ignored for all purposes. +This includes dependency updates even if there is no +directory for the port in +.Pa /usr/ports and there is no entry for it in .Pa /usr/ports/MOVED . If the