svn commit: r200660 - user/dougb/portmaster

[Doug Barton]

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