Radish alpha
H
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Update for portmaster-3.13
Matthew Seaman committed 13 years ago
commit ec75f1586a9b51618b7644e15ab2d3ae3c7a8fe6
parent 2afbf4f
1 file changed +107 -93
modified ports/patch-portmaster-pkgng
@@ -7,9 +7,9 @@ $FreeBSD$
 #=============== Begin functions we always want to have ===============
 
 version () {
-
-	echo '' ; echo "===>>> Version 3.12.2"
-
+	echo '' ; echo "===>>> Version 3.12.2  (pkgng patch 1.1)"
-
 	#svn='$FreeBSD: user/dougb/portmaster/portmaster 237588 2012-06-26 01:32:58Z dougb $'
+
-	echo '' ; echo "===>>> Version 3.13"
+
+	echo '' ; echo "===>>> Version 3.13 (pkgng patch 1.2)"
+
 	#svn='$FreeBSD: user/dougb/portmaster/portmaster 238195 2012-07-07 10:13:20Z dougb $'
 }
 
@@ -136,6 +136,8 @@
@@ -21,7 +21,7 @@ $FreeBSD$
 			fi
 		fi
 		if [ -z "$BACKUP" -a -z "$NO_BACKUP" -a -n "$NB_DELETE" ]; then
-
@@ -187,9 +189,14 @@
+
@@ -189,9 +191,14 @@
 		fi
 
 		: ${PAGER:='less -e'}
@@ -39,7 +39,7 @@ $FreeBSD$
 		echo "===>>> Done displaying pkg-message files" ; echo '' ) | $PAGER ;;
 	esac
 
-
@@ -233,10 +240,14 @@
+
@@ -234,10 +241,14 @@
 	if [ -n "$build_deps_il" ]; then
 		echo "===>>> Deleting installed build-only dependencies"
 		cd
@@ -58,7 +58,7 @@ $FreeBSD$
 		echo ''
 	fi
 
-
@@ -324,7 +335,13 @@
+
@@ -325,7 +336,13 @@
 			 unset -v PM_URB_LIST;
 			 $PM_SU_CMD /usr/bin/nice /usr/bin/make $PM_MAKE_ARGS $*; ); }
 pm_mkdir_s        () { $PM_SU_CMD /bin/mkdir -p $1; }
@@ -73,7 +73,7 @@ $FreeBSD$
 pm_rm_s           () { $PM_SU_CMD /bin/rm $*; }
 pm_rmdir_s        () { $PM_SU_CMD /bin/rmdir $*; }
 pm_unlink_s       () { [ -e "$1" ] && $PM_SU_CMD /bin/unlink $1; }
-
@@ -372,6 +389,10 @@
+
@@ -373,6 +390,10 @@
 	[ -z "$port_dbdir" ] &&
 		port_dbdir=`pm_make_b -f/usr/share/mk/bsd.port.mk -V PORT_DBDIR 2>/dev/null`
 	[ -n "$port_dbdir" ] && export port_dbdir
@@ -84,7 +84,7 @@ $FreeBSD$
 fi
 
 usage () {
-
@@ -528,12 +549,17 @@
+
@@ -529,12 +550,17 @@
 
 	pattern=`globstrip $1`
 
@@ -104,7 +104,7 @@ $FreeBSD$
 	esac
 
 	unset glob_dirs
-
@@ -543,20 +569,35 @@
+
@@ -544,20 +570,35 @@
 origin_from_pdb () {
 	local o
 
@@ -145,7 +145,7 @@ $FreeBSD$
 		echo '' >&2
 	fi
 	return 1
-
@@ -698,12 +739,17 @@
+
@@ -699,12 +740,17 @@
 	o)	REPLACE_ORIGIN=oopt ;;
 	p)	fail 'The -p option has been deprecated' ;;
 	r)	PM_URB=ropt
@@ -165,7 +165,7 @@ $FreeBSD$
 			2)	fail 'The argument to -r must match only one port' ;;
 			esac
 		fi
-
@@ -785,6 +831,12 @@
+
@@ -786,6 +832,12 @@
 	    fail 'The -[ar] options are not compatible with other updates'
 
 	if [ -n "$PM_PACKAGES" -o -n "$PM_PACKAGES_BUILD" ]; then
@@ -178,7 +178,7 @@ $FreeBSD$
 		[ `/sbin/sysctl -n kern.osreldate 2>/dev/null` -lt 600400 ] &&
 			fail Package installation support requires FreeBSD 6.4 or newer
 	fi
-
@@ -851,7 +903,12 @@
+
@@ -852,7 +904,12 @@
 		fi
 		unset INDEXFILE INDEXDIR
 
@@ -192,7 +192,7 @@ $FreeBSD$
 		export PM_INDEX_PORTS
 
 		if [ -z "$pd" -o "$pd" != /usr/ports ]; then
-
@@ -908,6 +965,10 @@
+
@@ -909,6 +966,10 @@
 iport_from_origin () {
 	local sn dir
 
@@ -203,17 +203,17 @@ $FreeBSD$
 	sn=${1#*/} ; sn=${sn%-*} ; sn=${sn%%[0-9]*}
 
 	if ! dir=`grep -l "@comment ORIGIN:${1}$" $pdb/${sn}*/+CONTENTS 2>/dev/null`; then
-
@@ -936,7 +997,9 @@
+
@@ -937,7 +998,9 @@
 	done
 }
 
-
+# Useless with pkgng
+
+# Redundant with pkgng
 check_dependency_files () {
+	[ -n "$use_pkgng" ] && return
 	# Global: grep_deps
 	local origin iport ro_opd
 
-
@@ -1018,7 +1081,9 @@
+
@@ -1019,7 +1082,9 @@
 	fi
 }
 
@@ -223,7 +223,7 @@ $FreeBSD$
 	local IFS delete contents origin n_port old_origin iport new_cont
 	local o_seen line d_missing d_origin d_iport prev_line answer
 
-
@@ -1116,7 +1181,7 @@
+
@@ -1119,7 +1184,7 @@
 	for l in `grep "^$sf|" $pd/MOVED`; do
 		case "$l" in
 		${sf}\|\|*) [ -n "$iport" ] || iport=`iport_from_origin $sf`
@@ -232,7 +232,7 @@ $FreeBSD$
 				if [ -n "$PM_VERBOSE" ]; then
 					echo ''
 					echo "	===>>> The $sf port has been deleted"
-
@@ -1151,7 +1216,7 @@
+
@@ -1154,7 +1219,7 @@
 		echo ''
 
 		[ -n "$iport" ] || iport=`iport_from_origin $sf`
@@ -241,7 +241,7 @@ $FreeBSD$
 	fi
 	return 0
 }
-
@@ -1162,35 +1227,62 @@
+
@@ -1165,35 +1230,62 @@
 	echo '############' > $DI_FILES		# Make the file > 0 bytes
 	echo "===>>> Gathering distinfo list for installed ports"
 	echo ''
@@ -328,7 +328,7 @@ $FreeBSD$
 
 	# Tell safe_exit that we are done
 	pm_unlink ${DI_FILES}-e
-
@@ -1236,25 +1328,45 @@
+
@@ -1239,25 +1331,45 @@
 }
 
 ports_by_category () {
@@ -387,17 +387,26 @@ $FreeBSD$
 }
 
 delete_empty_dist_subdirs () {
-
@@ -1302,7 +1414,9 @@
+
@@ -1305,7 +1417,9 @@
 	esac
 }
 
-
+# Useless with pkgng
+
+# Redundant with pkgng
 update_required_by () {
+	[ -n "$use_pkgng" ] && /bin/unlink $grep_deps && unset grep_deps && return
-
 	# Global: grep_deps
+
 	# Global: needws
 	local do_update
 
-
@@ -1357,11 +1471,15 @@
+
@@ -1315,7 +1429,7 @@
+
 	else
+
 		do_update=do_update2
+
 	fi
+
-	if [ -n "$do_update" ]; then
+
+ 	if [ -n "$do_update" ]; then
+
 		pm_v "	===>>> Updating $1/+REQUIRED_BY"
+
 		needws=needws_urb
+
 		pm_install_s $grep_deps $pdb/$1/+REQUIRED_BY
+
@@ -1361,11 +1475,15 @@
 
 	echo "===>>> Checking for stale packages"
 	for package in `find $PACKAGES -type f | sort`; do
@@ -416,7 +425,7 @@ $FreeBSD$
 
 		if [ -z "$PM_INDEX" ]; then
 			if [ -d "$pd/$origin" ]; then
-
@@ -1377,16 +1495,28 @@
+
@@ -1381,16 +1499,28 @@
 		fi
 
 		if [ -n "$port_ver" ]; then
@@ -454,7 +463,7 @@ $FreeBSD$
 				fi
 				unset port_ver
 				continue
-
@@ -1397,10 +1527,18 @@
+
@@ -1401,10 +1531,18 @@
 
 			unset port_ver
 
@@ -476,7 +485,7 @@ $FreeBSD$
 			fi
 		fi
 
-
@@ -1439,6 +1577,10 @@
+
@@ -1443,6 +1581,10 @@
 fi	# [ -n "$CLEAN_PACKAGES" ]
 
 if [ -n "$CHECK_DEPENDS" ]; then
@@ -487,7 +496,7 @@ $FreeBSD$
 	PM_VERBOSE=pmv_check_depends
 IFS='
 '
-
@@ -1485,24 +1627,42 @@
+
@@ -1489,24 +1631,42 @@
 	unique_list=':'
 
 	echo "===>>> Building list of installed port names"; echo ''
@@ -545,7 +554,7 @@ $FreeBSD$
 
 	echo "===>>> Checking $port_dbdir"
 
-
@@ -1603,7 +1763,7 @@
+
@@ -1607,7 +1767,7 @@
 
 	if [ -z "$do_update" -a -z "$skip" -a -z "$PM_INDEX_ONLY" ] && [ -d "$pd/$origin" ]; then
 		if ! pm_cd $pd/$origin; then
@@ -554,7 +563,7 @@ $FreeBSD$
 				echo "	===>>> Warning: Unable to cd to $pd/$origin"
 				echo "	===>>> Continuing due to $pdb/$iport/+IGNOREME"
 				echo ''
-
@@ -1620,13 +1780,13 @@
+
@@ -1624,13 +1784,13 @@
 
 		# If the port has moved and no +IGNOREME, we have to update it
 		if [ -n "$moved_npd" ]; then
@@ -571,7 +580,7 @@ $FreeBSD$
 			fi
 		fi
 	fi
-
@@ -1643,14 +1803,20 @@
+
@@ -1647,14 +1807,20 @@
 				unset port_ver
 			fi
 		else
@@ -594,7 +603,7 @@ $FreeBSD$
 			esac
 
 			[ -z "$do_update" ] && {
-
@@ -1666,8 +1832,9 @@
+
@@ -1670,8 +1836,9 @@
 	if [ -n "$LIST_PLUS" ]; then
 		if [ -z "$moved_npd" ]; then
 			echo "	===>>> New version available: $port_ver"
@@ -605,7 +614,7 @@ $FreeBSD$
 			pm_cd_pd $origin && check_state
 			num_updates=$(( $num_updates + 1 ))
 		else
-
@@ -1722,7 +1889,13 @@
+
@@ -1726,7 +1893,13 @@
 	fi
 
 	pm_cd $pkgdir || fail "Cannot cd into $pkgdir to create a package"
@@ -620,7 +629,7 @@ $FreeBSD$
 		if [ "$1" = "$pbu" ]; then
 			if [ -n "$BACKUP" ]; then
 				echo "	===>>> Package saved to $1" ; echo ''
-
@@ -2061,10 +2234,14 @@
+
@@ -2080,10 +2253,14 @@
 fi
 
 if [ -n "$EXPUNGE" ]; then
@@ -637,7 +646,7 @@ $FreeBSD$
 		2)	echo "===>>> $EXPUNGE matched multiple ports"
 			fail "The -e option works with only one port at a time" ;;
 		0)	EXPUNGE=${glob_dirs#$pdb/}
-
@@ -2073,15 +2250,24 @@
+
@@ -2092,15 +2269,24 @@
 	fi
 
 	origin=`origin_from_pdb $EXPUNGE`
@@ -667,9 +676,9 @@ $FreeBSD$
 				update_contents delete $f $origin
 			done ;;
 		*)	exit 1 ;;
-
@@ -2091,8 +2277,13 @@
+
@@ -2110,8 +2296,13 @@
 	[ -n "$BACKUP" ] && { init_packages ; pm_pkg_create $pbu $EXPUNGE; }
-
 	[ -z "$DONT_SCRUB_DISTFILES" ] && { delete_all_distfiles $origin; delete_dist_list; }
+
 	[ -z "$DONT_SCRUB_DISTFILES" ] && delete_all_distfiles $origin
 
-	echo "===>>> Running pkg_delete -f $EXPUNGE"
-	pm_pkg_delete_s -f $EXPUNGE || fail 'pkg_delete failed'
@@ -683,7 +692,7 @@ $FreeBSD$
 
 	echo '' ; echo "===>>> Running ${0##*/} -s $ARGS"
 	exec $0 -s $ARGS
-
@@ -2102,13 +2293,21 @@
+
@@ -2121,13 +2312,21 @@
 if [ -n "$CLEAN_STALE" ]; then
 	[ -z "$no_del_list" ] && export no_del_list=':'
 
@@ -707,23 +716,23 @@ $FreeBSD$
 		if [ -n "$deplist" ]; then
 			echo ''
 			echo "===>>> Warning: Unrecorded dependencies on ${iport}:"
-
@@ -2121,22 +2320,32 @@
+
@@ -2140,22 +2339,32 @@
 			continue
 		fi
 
-
-		pkg_info $iport
+
-		echo '' ; pkg_info $iport
+		if [ -z "$use_pkgng" ]; then
-
+			pkg_info $iport
+
+			echo '' ; pkg_info $iport
+			pkg_delete="pkg_delete"
+		else
-
+			pkg info -f $iport
+
+			echo '' ; pkg info -f $iport
+			pkg_delete="pkg delete"
+		fi
 
 		get_answer_yn n "\t===>>> ${iport} is no longer depended on, delete"
 		case "$?" in
 		0)	[ -n "$BACKUP" ] && { init_packages ; pm_pkg_create $pbu $iport; }
-
 			[ -z "$DONT_SCRUB_DISTFILES" ] && { delete_all_distfiles $origin; delete_dist_list; }
+
 			[ -z "$DONT_SCRUB_DISTFILES" ] && delete_all_distfiles $origin
 
-			echo "===>>> Running pkg_delete -f $iport"
-			pm_pkg_delete_s -f $iport || fail 'pkg_delete failed'
@@ -748,7 +757,7 @@ $FreeBSD$
 		esac
 	done
 	exit 0
-
@@ -2159,7 +2368,7 @@
+
@@ -2178,7 +2387,7 @@
 	# to go out to the disk if we don't have to.
 	[ -z "$RESTART" ] && return 1
 
@@ -757,7 +766,7 @@ $FreeBSD$
 		return 1
 	else
 		already_done $1
-
@@ -2176,7 +2385,7 @@
+
@@ -2195,7 +2404,7 @@
 	case "$INTERACTIVE_YES" in *:${1}:*) return 0 ;; esac
 	case "$INTERACTIVE_NO" in *:${1}:*) return 1 ;; esac
 
@@ -766,7 +775,7 @@ $FreeBSD$
 		echo ''
 		echo "===>>> +IGNOREME file is present for $1"
 		echo ''
-
@@ -2281,7 +2490,13 @@
+
@@ -2307,7 +2516,13 @@
 			fail "No entry for $origin in $PM_INDEX"
 	fi
 
@@ -781,7 +790,7 @@ $FreeBSD$
 	\<)	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" ;;
-
@@ -2430,6 +2645,18 @@
+
@@ -2456,6 +2671,18 @@
 		rundeps=`gen_dep_list run-depends-list`
 
 		for dep in $d_port_list; do
@@ -800,7 +809,7 @@ $FreeBSD$
 			case "$rundeps" in
 			*" ${dep} "*|*${dep}*)
 				varname=`echo ${dep#$pd/} | sed 's#[-+/\.]#_#g'`
-
@@ -2499,7 +2726,11 @@
+
@@ -2525,7 +2752,11 @@
 				fail "Cannot cd to $d_port"
 			fi
 			for glob in $conflicts; do
@@ -813,7 +822,7 @@ $FreeBSD$
 				if [ -n "$confl_p" ]; then
 					confl_p=${confl_p%% *}
 					d_port="$pd/`origin_from_pdb $confl_p`"
-
@@ -2639,7 +2870,11 @@
+
@@ -2665,7 +2896,11 @@
 		done
 
 		for dep in $build_only_dl_g; do
@@ -826,7 +835,7 @@ $FreeBSD$
 			[ -n "$PM_DEL_BUILD_ONLY" ] &&
 				iport_from_origin ${dep#$pd/} >/dev/null && continue
 			temp_bodlg="$temp_bodlg $dep"
-
@@ -2666,7 +2901,7 @@
+
@@ -2692,7 +2927,7 @@
 
 urb_update () {
 	# Global: PM_URB_UP
@@ -835,7 +844,7 @@ $FreeBSD$
 
 	verb=checking ; [ -n "$1" ] && verb=updating
 
-
@@ -2676,15 +2911,25 @@
+
@@ -2702,15 +2937,25 @@
 	echo ''
 
 	for origin in $PM_URB_ORIGINS; do
@@ -868,7 +877,7 @@ $FreeBSD$
 	done
 
 	if [ -n "$PM_URB_LIST" ]; then
-
@@ -2696,7 +2941,11 @@
+
@@ -2722,7 +2967,11 @@
 
 	for req_by in $PM_URB_LIST; do
 		# Probably not needed, but JIC
@@ -881,7 +890,7 @@ $FreeBSD$
 
 		pm_v "===>>> $req_by depends on $PM_URB_IPORTS"
 
-
@@ -2737,12 +2986,16 @@
+
@@ -2763,12 +3012,16 @@
 			else
 				fail "$pd/${port} does not exist"
 			fi ;;
@@ -900,7 +909,7 @@ $FreeBSD$
 				*)	local dir
 					for dir in $glob_dirs; do
 					worklist_temp="$worklist_temp ${dir#$pdb/}"
-
@@ -2850,9 +3103,16 @@
+
@@ -2876,9 +3129,16 @@
 		*/*)	origin=$port ;;
 		*)	# If an installed version does not exist at this
 			# point it probably got updated as a dependency
@@ -920,7 +929,7 @@ $FreeBSD$
 			fi
 			origin=`origin_from_pdb $port` ;;
 		esac
-
@@ -3076,11 +3336,16 @@
+
@@ -3102,11 +3362,16 @@
 	case "$argv" in
 	'')	echo '' ; no_valid_port ;;
 	$pd/*)	portdir=${argv#$pd/} ;;
@@ -939,7 +948,7 @@ $FreeBSD$
 	esac
 
 	if [ -z "$portdir" -a -z "$upg_port" ]; then
-
@@ -3113,7 +3378,7 @@
+
@@ -3139,7 +3404,7 @@
 
 	case "$arg2" in
 	*/*)	ro_opd=$arg2 ; ro_upg_port=`iport_from_origin $ro_opd` ;;
@@ -948,7 +957,7 @@ $FreeBSD$
 			ro_upg_port=$arg2
 		else
 			find_glob_dirs $arg2 && ro_upg_port=${glob_dirs#$pdb/}
-
@@ -3128,12 +3393,21 @@
+
@@ -3154,12 +3419,21 @@
 	unset arg2
 
 	if [ -z "$ro_upg_port" ]; then
@@ -973,7 +982,7 @@ $FreeBSD$
 			echo '       or listed as a dependency'
 			echo '' ; no_valid_port
 		fi
-
@@ -3165,7 +3439,7 @@
+
@@ -3191,7 +3465,7 @@
 fi
 [ -z "$upg_port" -a -z "$REPLACE_ORIGIN" ] && upg_port=`iport_from_origin ${portdir}`
 
@@ -982,7 +991,7 @@ $FreeBSD$
 	# Adding to CUR_DEPS means we will not get here in the build unless -G
 	if [ -z "$PM_BUILDING" ]; then
 		# Only need to prompt for this once if -ai
-
@@ -3562,7 +3836,12 @@
+
@@ -3587,7 +3861,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
@@ -996,7 +1005,7 @@ $FreeBSD$
 			\<)	use_package=up_newer
 				pm_v "===>>> Available package ($latest_pv)"
 				pm_v "       is newer than installed ($upg_port)" ;;
-
@@ -3578,7 +3857,12 @@
+
@@ -3603,7 +3882,12 @@
 			pm_v "===>>> There is a package available ($latest_pv)"
 		fi
 	elif [ -n "$latest_pv" ]; then
@@ -1010,7 +1019,7 @@ $FreeBSD$
 		\<)	# Could happen if ports tree is out of date
 			use_package=up_old_tree
 			pm_v "===>>> Available package ($latest_pv)"
-
@@ -3677,7 +3961,12 @@
+
@@ -3702,7 +3986,12 @@
 		    grep -v ^$LOCALBASE_COMPAT > $ldconfig_out
 
 		unset temp
@@ -1024,7 +1033,7 @@ $FreeBSD$
 		    sort - $ldconfig_out | uniq -d`; do
 			temp="${temp}$file "
 		done
-
@@ -3700,6 +3989,7 @@
+
@@ -3725,6 +4014,7 @@
 
 	if [ -n "$REPLACE_ORIGIN" -a -n "$ro_upg_port" ]; then
 		# Delete any existing versions of the old port
@@ -1032,7 +1041,7 @@ $FreeBSD$
 		pm_sv "Running pkg_delete for $ro_upg_port"
 		pm_pkg_delete_s -f $ro_upg_port
 	fi
-
@@ -3719,6 +4009,8 @@
+
@@ -3744,6 +4034,8 @@
 			unset preserve_port files
 		esac
 
@@ -1041,7 +1050,7 @@ $FreeBSD$
 		pm_sv "Running pkg_delete for $upg_port"
 		pm_pkg_delete_s -f $upg_port
 	fi
-
@@ -3764,6 +4056,18 @@
+
@@ -3790,6 +4082,18 @@
 		unset port_log_args
 	fi
 
@@ -1060,7 +1069,7 @@ $FreeBSD$
 	# Defining NO_DEPENDS ensures that we will control the installation
 	# of the depends, not bsd.port.mk.
 	eval pm_make_s -DNO_DEPENDS install $port_log_args || install_failed $new_port
-
@@ -3781,29 +4085,31 @@
+
@@ -3807,29 +4111,31 @@
 	fi
 fi
 
@@ -1115,7 +1124,7 @@ $FreeBSD$
 if [ -n "$preserve_dir" ]; then
 	rmdir $preserve_dir 2>/dev/null
 	unset preserve_dir preserve_port_files
-
@@ -3819,14 +4125,19 @@
+
@@ -3845,14 +4151,19 @@
 temp=`find $LOCALBASE_COMPAT -type d -empty 2>/dev/null`
 if [ -z "$temp" ] && [ -d "$LOCALBASE_COMPAT" ]; then
 	unset files
@@ -1137,17 +1146,17 @@ $FreeBSD$
 		$PM_SU_CMD /etc/rc.d/ldconfig start > /dev/null
 	fi
 	unset temp file files
-
@@ -3882,7 +4193,8 @@
-
 	/bin/unlink $dist_list_temp ; unset ds dist_list_temp
+
@@ -3906,7 +4217,8 @@
+
 	/bin/unlink $dist_list_temp ; unset distinfo dist_list_temp file line
 fi
 
-if [ -n "$use_package" ]; then
+# pkgng does not need this
+if [ -z "$use_pkgng" -a -n "$use_package" ]; then
 	if grep -q DEPORIGIN $pdb/$new_port/+CONTENTS; then
-
 		echo "===>>> Updating dependencies for $new_port to match installed versions"
-
 		update_contents $pdb/$new_port/+CONTENTS
-
@@ -3904,7 +4216,7 @@
+
 		echo -e "===>>> Updating dependencies for $new_port to match installed versions\n"
+
 		update_contents $pdb/$new_port/+CONTENTS ; pm_v
+
@@ -3928,7 +4240,7 @@
 if [ -n "$MAKE_PACKAGE" ]; then
 	if [ -z "$use_package" ]; then
 		echo "===>>> Creating a package for new version $new_port"
@@ -1156,29 +1165,20 @@ $FreeBSD$
 		echo "	===>>> Package saved to $PACKAGES/All" ; echo ''
 	else
 		pm_pkg_create $PACKAGES $new_port
-
@@ -3917,27 +4229,34 @@
+
@@ -3941,29 +4253,37 @@
 	pm_v
 fi
 
-check_dependency_files $portdir $new_port
-if [ -s "$grep_deps" ]; then
-
-	echo "===>>> Updating dependency entry for $new_port in each dependent port"; pm_v
+
-	echo -e "===>>> Updating dependency entry for $new_port in each dependent port\n"
-	while read d_port; do
-		pm_v "===>>> $d_port"
-		dp_cont=$pdb/$d_port/+CONTENTS
-		[ -e "$dp_cont" ] || continue
-
+if [ -z $use_pkgng ]; then
-
+	check_dependency_files $portdir $new_port
-
+	if [ -s "$grep_deps" ]; then
-
+		echo "===>>> Updating dependency entry for $new_port in each dependent port"; pm_v
-
+		while read d_port; do
-
+			pm_v "===>>> $d_port"
-
+			dp_cont=$pdb/$d_port/+CONTENTS
-
+			[ -e "$dp_cont" ] || continue
-
 
-
-		if [ -n "$ro_opd" ]; then
-
-			grep -ql "DEPORIGIN:$ro_opd$" $dp_cont &&
-
-				update_contents $dp_cont $portdir $new_port $ro_opd
+
-
+
-		if [ -n "$ro_opd" ] && grep -ql "DEPORIGIN:$ro_opd$" $dp_cont; then
+
-			update_contents $dp_cont $portdir $new_port $ro_opd
-		fi
-		# Do this one last so it can get deleted as a duplicate
-		# if ro_opd is present.
@@ -1186,10 +1186,21 @@ $FreeBSD$
-			update_contents $dp_cont $portdir $new_port
-		fi
-	done < $grep_deps
-
-	unset d_port dp_cont do_update
-
+			if [ -n "$ro_opd" ]; then
-
+				grep -ql "DEPORIGIN:$ro_opd$" $dp_cont &&
-
+					update_contents $dp_cont $portdir $new_port $ro_opd
+
-	unset d_port dp_cont ; pm_v
+
-
+
-	update_required_by $new_port
+
-	[ -n "$needws" ] && { pm_v; unset needws; }
+
+if [ -z "$use_pkgng" ]; then
+
+	check_dependency_files $portdir $new_port
+
+	if [ -s "$grep_deps" ]; then
+
+		echo -e "===>>> Updating dependency entry for $new_port in each dependent port\n"
+
+		while read d_port; do
+
+			pm_v "===>>> $d_port"
+
+			dp_cont=$pdb/$d_port/+CONTENTS
+
+			[ -e "$dp_cont" ] || continue
+
+	
+
+			if [ -n "$ro_opd" ] && grep -ql "DEPORIGIN:$ro_opd$" $dp_cont; then
+
+				update_contents $dp_cont $portdir $new_port $ro_opd
+			fi
+			# Do this one last so it can get deleted as a duplicate
+			# if ro_opd is present.
@@ -1197,10 +1208,10 @@ $FreeBSD$
+				update_contents $dp_cont $portdir $new_port
+			fi
+		done < $grep_deps
-
+		unset d_port dp_cont do_update
-
 
-
-	update_required_by $new_port
+
+		unset d_port dp_cont ; pm_v
+
+	
+		update_required_by $new_port
+
+		[ -n "$needws" ] && { pm_v; unset needws; }
+	fi
+else
+	if [ -n "$ro_opd" ]; then
@@ -1209,8 +1220,11 @@ $FreeBSD$
+	fi
 fi
 
+
+
 if [ -n "$upg_port" ]; then
-
@@ -3955,13 +4274,15 @@
+
 	if [ ! "$upg_port" = "$new_port" ]; then
+
 		ilist="Upgrade of $upg_port to $new_port"
+
@@ -3979,13 +4299,15 @@
 fi
 
 INSTALLED_LIST="${INSTALLED_LIST}\t${ilist}\n"