From owner-svn-src-user@FreeBSD.ORG Fri Dec 18 01:05:42 2009 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 5125C106566C; Fri, 18 Dec 2009 01:05:42 +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 278108FC19; Fri, 18 Dec 2009 01:05:42 +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 nBI15geC066817; Fri, 18 Dec 2009 01:05:42 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBI15gRE066814; Fri, 18 Dec 2009 01:05:42 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <200912180105.nBI15gRE066814@svn.freebsd.org> From: Doug Barton <dougb@FreeBSD.org> Date: Fri, 18 Dec 2009 01:05:42 +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: r200660 - 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" <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: Fri, 18 Dec 2009 01:05:42 -0000 Author: dougb Date: Fri Dec 18 01:05:41 2009 New Revision: 200660 URL: http://svn.freebsd.org/changeset/base/200660 Log: Make it easier to include the --packages-build and/or --delete-build-only options in a portmaster rc file by setting the PM_BUILD_ONLY_LIST variable (which is used by both options) in the script if either of the two options is detected. Update the example rc file in the man page accordingly. Modified: user/dougb/portmaster/portmaster user/dougb/portmaster/portmaster.8 Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Fri Dec 18 00:54:14 2009 (r200659) +++ user/dougb/portmaster/portmaster Fri Dec 18 01:05:41 2009 (r200660) @@ -423,8 +423,7 @@ for var in "$@" ; do --packages-build) packages_init build unset PM_PACKAGES PM_PACKAGES_BUILD=pmp_build - PM_BUILD_ONLY_LIST=pm_bol - export PM_PACKAGES_BUILD PM_BUILD_ONLY_LIST ;; + export PM_PACKAGES_BUILD ;; --packages-if-newer) packages_init newer PM_PACKAGES_NEWER=pmp_newer export PM_PACKAGES_NEWER ;; @@ -434,8 +433,7 @@ for var in "$@" ; do export LOCAL_PACKAGEDIR ;; -[A-Za-z0-9]*) newopts="$newopts $var" ;; --delete-build-only) PM_DEL_BUILD_ONLY=pm_dbo - PM_BUILD_ONLY_LIST=pm_bol - export PM_DEL_BUILD_ONLY PM_BUILD_ONLY_LIST ;; + export PM_DEL_BUILD_ONLY ;; --help) usage 0 ;; --version) version ; exit 0 ;; --clean-distfiles) CLEAN_DISTFILES=clean_distfiles ;; @@ -451,6 +449,11 @@ for var in "$@" ; do esac done +if [ -n "$PM_PACKAGES_BUILD" -o -n "$PM_DEL_BUILD_ONLY" ]; then + PM_BUILD_ONLY_LIST=pm_bol + export PM_BUILD_ONLY_LIST +fi + set -- $newopts unset var newopts Modified: user/dougb/portmaster/portmaster.8 ============================================================================== --- user/dougb/portmaster/portmaster.8 Fri Dec 18 00:54:14 2009 (r200659) +++ user/dougb/portmaster/portmaster.8 Fri Dec 18 01:05:41 2009 (r200660) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 2, 2009 +.Dd December 3, 2009 .Dt PORTMASTER 8 .Os .Sh NAME @@ -582,11 +582,9 @@ along with their related options. # # Install packages for build-only dependencies (--packages-build) # PM_PACKAGES_BUILD=pmp_build -# PM_BUILD_ONLY_LIST=pm_bol # # Delete build-only dependencies when finished (--delete-build-only) # PM_DEL_BUILD_ONLY=pm_dbo -# PM_BUILD_ONLY_LIST=pm_bol # # Use packages if they are newer than installed (--packages-newer) # PM_PACKAGES=newer