Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 163e389
Fix typos in portmaster
Baptiste Daroussin committed 14 years ago
commit 163e3897f3d95b523a17cf4f7cb633730605c7bd
parent 349c3cd
1 file changed +12 -11
modified ports/portmaster.patch
@@ -146,7 +146,7 @@ Index: portmaster
+	else

+		for pkg in `pkg info -qa`; do

+			origin=`origin_from_pdb $pkg` || continue
- 
+			if [ ! -d "$pdf/${origin}" ]; then
+ 
+			if [ ! -d "$pd/${origin}" ]; then

+				find_moved_port $origin $pkg nonfatal >/dev/null

+				[ -n "$moved_npd" ] || continue

+				origin=$moved_npd
@@ -158,7 +158,7 @@ Index: portmaster
+				distinfo="${origin}/distinfo"

+			else

+				pm_cd $origin || continue
- 
+				distinfo=`pm_maje -V DISTINFO_FILE`
+ 
+				distinfo=`pm_make -V DISTINFO_FILE`

+				[ -n "$distinfo" ] || fail "No DISTINFO_FILE in $origin"

+			fi

+
@@ -174,7 +174,7 @@ Index: portmaster
 	# Tell safe_exit that we are done

 	pm_unlink ${DI_FILES}-e

 	sed -i -e 1s/############/%%%%%%%%%%%%/ $DI_FILES
- 
@@ -1192,22 +1248,44 @@
+ 
@@ -1192,22 +1248,45 @@

 	local pkg

 	pm_v "===>>> Sorting ports by category"
@@ -208,7 +208,7 @@ Index: portmaster
+		local nb_dep

+		for pkg in `pkg info -qa`; do

+			nb_rdep=`pkg info -qr $pkg | wc -l`
- 
+			nb_dep=`pkg info -qr $pkg | wc -l`
+ 
+			nb_dep=`pkg info -qd $pkg | wc -l`

+			if [ $nb_rdep -gt 0 ]; then

+				if [ $nb_dep -gt 0 ]; then

+					branches="$branches ${pkg}"
@@ -221,7 +221,8 @@ Index: portmaster
+				if [ $nb_dep -gt 0 ]; then

+					leaves="$leaves ${pkg}"

+				else
- 
+					roots="$root ${pkg}"
+ 
+					pkg info -e $pkg || continue
+ 
+					roots="$roots ${pkg}"

+				fi

 			fi

-		fi
@@ -231,7 +232,7 @@ Index: portmaster
 }

 

 delete_empty_dist_subdirs () {
- 
@@ -1600,14 +1678,19 @@
+ 
@@ -1600,14 +1679,19 @@

 				unset port_ver

 			fi

 		else
@@ -253,7 +254,7 @@ Index: portmaster
 			esac

 

 			[ -z "$do_update" ] && {
- 
@@ -2224,7 +2307,12 @@
+ 
@@ -2224,7 +2308,12 @@

 			fail "No entry for $origin in $PM_INDEX"

 	fi
@@ -267,7 +268,7 @@ Index: portmaster
 	\<)	build_l="${build_l}\tUpgrade $iport to $new_port\n" ;;

 	=)	build_l="${build_l}\tRe-install $iport\n" ;;

 	\>)	build_l="${build_l}\tDowngrade $iport to $new_port\n" ;;
- 
@@ -2982,7 +3070,12 @@
+ 
@@ -2982,7 +3071,12 @@

 	/*)	echo '' ; no_valid_port ;;

 	*/*)	portdir=$argv ;;

 	\.)	portdir=${PWD##*/ports/} ;; # Not always $pd, could be symlink
@@ -281,7 +282,7 @@ Index: portmaster
 	esac

 

 	if [ -z "$portdir" -a -z "$upg_port" ]; then
- 
@@ -3015,11 +3108,20 @@
+ 
@@ -3015,11 +3109,20 @@

 

 	case "$arg2" in

 	*/*)	ro_opd=$arg2 ; ro_upg_port=`iport_from_origin $ro_opd` ;;
@@ -306,7 +307,7 @@ Index: portmaster
 		fi

 		[ -n "$ro_upg_port" ] && ro_opd=`origin_from_pdb $ro_upg_port`

 	esac
- 
@@ -3510,7 +3612,12 @@
+ 
@@ -3510,7 +3613,12 @@

 		pm_v "===>>> Available package ($latest_pv) matches the current version"

 	elif [ -n "$latest_pv" -a -n "$PM_PACKAGES_NEWER" ]; then

 		if [ -n "$upg_port" ]; then
@@ -320,7 +321,7 @@ Index: portmaster
 			\<)	use_package=up_newer

 				pm_v "===>>> Available package ($latest_pv)"

 				pm_v "       is newer than installed ($upg_port)" ;;
- 
@@ -3526,7 +3633,12 @@
+ 
@@ -3526,7 +3634,12 @@

 			pm_v "===>>> There is a package available ($latest_pv)"

 		fi

 	elif [ -n "$latest_pv" ]; then