svn commit: r209091 - user/dougb/portmaster

Doug Barton dougb at FreeBSD.org
Sat Jun 12 06:00:48 UTC 2010


Author: dougb
Date: Sat Jun 12 06:00:48 2010
New Revision: 209091
URL: http://svn.freebsd.org/changeset/base/209091

Log:
  There is no reason for uniquify_list() to reverse the entries
  
  Add code to post_config() to make sure that things in the
  build_only_dl_g are not listed as run dependencies for something
  already installed.

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Sat Jun 12 05:22:55 2010	(r209090)
+++ user/dougb/portmaster/portmaster	Sat Jun 12 06:00:48 2010	(r209091)
@@ -2033,7 +2033,7 @@ uniquify_list () {
 	for item in "$@"; do
 		case "$temp_list" in
 		*" $item "*) ;;
-		*)	temp_list=" $item $temp_list" ;;
+		*)	temp_list=" $temp_list $item " ;;
 		esac
 	done
 
@@ -2314,7 +2314,7 @@ echo "       all of the above try adding
 	dep_of_deps=0
 
 	if [ -n "$PM_BUILD_ONLY_LIST" ]; then
-		local var real_rundep deplist dep
+		local var real_rundep deplist dep temp_bodlg
 
 		for var in $rundep_list ; do
 			real_rundep=no
@@ -2332,6 +2332,13 @@ echo "       all of the above try adding
 			eval unset $var ${var}_p
 		done
 
+		for dep in $build_only_dl_g; do
+			grep -q "@comment DEPORIGIN:${dep#$pd/}$" $pdb/*/+CONTENTS ||
+				temp_bodlg="$temp_bodlg $dep"
+		done
+
+		build_only_dl_g=" `uniquify_list $temp_bodlg` "
+
 		unset run_dl_g rundep_list
 		PM_BUILD_ONLY_LIST=pm_bol
 	fi


More information about the svn-src-user mailing list