From owner-svn-src-user@FreeBSD.ORG Mon Jan 3 06:56:44 2011 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 A7CD2106564A; Mon, 3 Jan 2011 06:56:44 +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 18F028FC1E; Mon, 3 Jan 2011 06:56:44 +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 p036uhjO078019; Mon, 3 Jan 2011 06:56:43 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p036uh9W078016; Mon, 3 Jan 2011 06:56:43 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201101030656.p036uh9W078016@svn.freebsd.org> From: Doug Barton Date: Mon, 3 Jan 2011 06:56:43 +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: r216916 - in 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 " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Jan 2011 06:56:44 -0000 Author: dougb Date: Mon Jan 3 06:56:43 2011 New Revision: 216916 URL: http://svn.freebsd.org/changeset/base/216916 Log: Add support and documentation for the PT_NO_INSTALL_PACKAGE make variable which will cause a port to always be compiled, instead of being installed from a package. It cannot be used in combination with the --packages-only option. Modified: user/dougb/portmaster/files/portmaster.8 user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/files/portmaster.8 ============================================================================== --- user/dougb/portmaster/files/portmaster.8 Mon Jan 3 06:40:39 2011 (r216915) +++ user/dougb/portmaster/files/portmaster.8 Mon Jan 3 06:56:43 2011 (r216916) @@ -589,7 +589,7 @@ file so that the dependencies match. .Pp If you wish to customize your build environment on a per-port basis you might want to take a look at -.Pa ports/ports-mgmt/portconf +.Pa /usr/ports/ports-mgmt/portconf .Pp To log actions taken by .Nm @@ -618,6 +618,21 @@ In situations where the user is ABSOLUTE that lack of a backup package should not be a fatal error .Ev PM_IGNORE_FAILED_BACKUP_PACKAGE can be defined to any value in the rc file. +.Pp +For those who wish to be sure that specific ports are always +compiled instead of being installed from packages the +.Ev PT_NO_INSTALL_PACKAGE +variable can be defined in the +.Xr make 1 +environment, perhaps in +.Pa /usr/local/etc/ports.conf +if using +.Pa /usr/ports/ports-mgmt/portconf , +or in +.Pa /etc/make.conf . +This setting is not compatible with the +.Fl PP/--packages-only +option. .Sh FILES .Bl -tag -width "1234" -compact .It Pa /usr/local/etc/portmaster.rc Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Mon Jan 3 06:40:39 2011 (r216915) +++ user/dougb/portmaster/portmaster Mon Jan 3 06:56:43 2011 (r216916) @@ -3239,6 +3239,21 @@ fi [ -n "$PM_REQ_BY_SKIP_PARENT" ] && urb_final if [ -n "$PM_PACKAGES" -o "$PM_PACKAGES_BUILD" = doing_build_only_dep ]; then + case `pm_make_b -V PT_NO_INSTALL_PACKAGE` in + '') pm_package_time=yes ;; + *) if [ "$PM_PACKAGES" = 'only' ]; then + echo "===>>> The -PP/--packages-only option was specified, but" + echo " PT_NO_INSTALL_PACKAGE is defined for $portdir" + fail These 2 options are mutually exclusive + fi + echo "===>>> PT_NO_INSTALL_PACKAGE is set, building port" + echo '' ;; + esac +fi + +if [ -n "$pm_package_time" ]; then + unset pm_package_time + fetch_package () { local do_fetch @@ -3430,7 +3445,7 @@ notnewer () { echo '' fi fi -fi # [ -n "$PM_PACKAGES" -o "$PM_PACKAGES_BUILD" = doing_build_only_dep ] +fi # [ -n "$pm_package_time" ] if [ -z "$use_package" ]; then if [ -n "$PM_PACKAGES" ]; then