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; }

-pm_pkg_delete_s   () { $PM_SU_CMD /usr/sbin/pkg_delete $*; }

+pm_pkg_delete_s   () { 

+		$PM_SU_CMD /usr/sbin/pkg_delete $*;

+	else

+	fi

+}

 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; }

 	pattern=`globstrip $1`

-	glob_dirs=`find $pdb -maxdepth 1 -type d -name ${pattern}\*`

+		glob_dirs=`find $pdb -maxdepth 1 -type d -name ${pattern}\*`

+	else

+	fi

 	case "$glob_dirs" in

 	# Match a newline in multiple responses from find

 	esac

 	unset glob_dirs

 origin_from_pdb () {

 	local o

+	else

+	fi

 	case "$1" in bsdpan-*) return 3 ;; esac

 	o)	REPLACE_ORIGIN=oopt ;;

 	p)	fail 'The -p option has been deprecated' ;;

 	r)	PM_URB=ropt

 		if [ -d "$pdb/$OPTARG" ]; then

 			glob_dirs=$OPTARG

 		else

 		fi

 		unset INDEXFILE INDEXDIR

-		PM_INDEX_PORTS=`pkg_version -Ivl\< $PM_INDEX | cut -f1 -d\<`

+			pkg_version="pkg_version"

+		else

+			pkg_version="pkg version"

 		export PM_INDEX_PORTS

 		if [ -z "$pd" -o "$pd" != /usr/ports ]; then

 iport_from_origin () {

 	local sn dir

+		pkg info -q ${1} || return 1

+		return

+	fi

 	sn=${1#*/} ; sn=${sn%-*} ; sn=${sn%%[0-9]*}

 	if ! dir=`grep -l "@comment ORIGIN:${1}$" $pdb/${sn}*/+CONTENTS 2>/dev/null`; then

 	done

 }

 check_dependency_files () {

 	# Global: grep_deps

 	local origin iport ro_opd

 	fi

 }

 update_contents () {

 	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

 	echo '############' > $DI_FILES		# Make the file > 0 bytes

 	echo "===>>> Gathering distinfo list for installed ports"

 	echo ''

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

+				origin=$moved_npd

+			fi

+			origin="${pd}/${origin}"

+			if [ -s "${origin}/distinfo" ]; then

+				distinfo="${origin}/distinfo"

+			else

+				distinfo=`pm_make -V DISTINFO_FILE`

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

+			fi

+			if [ -s "$distinfo" ]; then

+				grep '^SHA256 ' $distinfo | while read disc1 f disc2; do

+					f=${f#(} ; f=${f%)}

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

+				origin=$moved_npd

+			fi

+			if [ -s "${origin}/distinfo" ]; then

+				distinfo="${origin}/distinfo"

+			else

+				distinfo=`pm_make -V DISTINFO_FILE`

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

+			fi

+			if [ -s "$distinfo" ]; then

+				grep '^SHA256 ' $distinfo | while read disc1 f disc2; do

+					f=${f#(} ; f=${f%)}

 	# Tell safe_exit that we are done

 	pm_unlink ${DI_FILES}-e

 	pm_v "===>>> Sorting ports by category"

+				else

+				fi

+				else

+				fi

+		done

+	fi

 update_required_by () {

 	# Global: grep_deps

 	local do_update

 	if [ -e "$pdb/$1/+REQUIRED_BY" ]; then

 		sort $pdb/$1/+REQUIRED_BY | cmp -s $grep_deps - || do_update=do_update

 	init_packages_var

 	echo "===>>> Checking for stale packages"

-		origin=`tar -O -zxvf $package '+CONTENTS' 2>/dev/null | grep '@comment ORIGIN:'` ||

-			fail Empty origin in $package

-		origin=${origin#@comment ORIGIN:}

+			origin=`tar -O -zxvf $package '+CONTENTS' 2>/dev/null | grep '@comment ORIGIN:'` ||

+				fail Empty origin in $package

+			origin=${origin#@comment ORIGIN:}

+		fi

 		if [ -z "$PM_INDEX" ]; then

 			if [ -d "$pd/$origin" ]; then

 		fi

 		if [ -n "$port_ver" ]; then

+								pm_unlink_s $package ;;

+						esac

+					fi

+				fi

 				if [ ! -d "${pdb}/${pkg_dir}" ]; then

 					echo "	===>>> $pkg_dir is not installed"

 					echo "	===>>> Path: ${package}"

 fi	# [ -n "$CLEAN_PACKAGES" ]

 if [ -n "$CHECK_DEPENDS" ]; then

 	PM_VERBOSE=pmv_check_depends

 IFS='

 '

 fi

 if [ -n "$CHECK_PORT_DBDIR" ]; then

 	[ -d "$port_dbdir" ] ||

 		fail 'PORT_DBIR is empty, or the directory $port_dbdir does not exist'

 				unset port_ver

 			fi

 		else

-			case `pkg_version -t $iport $port_ver` in

+				pkg_version="pkg_version"

+			else

+				pkg_version="pkg version"

 			esac

 			[ -z "$do_update" ] && {

 	fi

 	pm_cd $pkgdir || fail "Cannot cd into $pkgdir to create a package"

-	if $PM_SU_CMD pkg_create -b $2; then

+	local pkg_create

+		pkg_create="pkg_create -b"

+	else

+		pkg_create="pkg create "

 		if [ "$1" = "$pbu" ]; then

 			if [ -n "$BACKUP" ]; then

 				echo "	===>>> Package saved to $1" ; echo ''

 	fi

 	origin=`origin_from_pdb $EXPUNGE`

-	deplist=`grep -l DEPORIGIN:$origin$ $pdb/*/+CONTENTS`

+		deplist=`grep -l DEPORIGIN:$origin$ $pdb/*/+CONTENTS`

+	fi

 	if [ -n "$deplist" ]; then

 		echo "===>>> Warning: Ports with dependencies on ${EXPUNGE}:"

 		for dep in $deplist; do

 		done

 		get_answer_yn n "\n\t===>>> Delete this dependency data"

 		case "$?" in

-		0)	for f in $deplist; do

+			for f in $deplist; do

 				update_contents delete $f $origin

 			done ;;

 		*)	exit 1 ;;

 		case "$no_del_list" in *:${iport}:*) continue ;; esac

 		origin=`origin_from_pdb $iport`

-		deplist=`grep -l DEPORIGIN:$origin$ $pdb/*/+CONTENTS`

+			deplist=`grep -l DEPORIGIN:$origin$ $pdb/*/+CONTENTS`

+		fi

 		if [ -n "$deplist" ]; then

 			echo ''

 			echo "===>>> Warning: Unrecorded dependencies on ${iport}:"

 			continue

 		fi

-		pkg_info $iport

+		if [ -z "$use_pkgng" ]; then

+			pkg_info $iport

+		else

+		fi

 		get_answer_yn n "\t===>>> ${iport} is no longer depended on, delete"

 		case "$?" in

 			fail "No entry for $origin in $PM_INDEX"

 	fi

-	case `pkg_version -t $iport $new_port 2>/dev/null` in

+		pkg_version="pkg_version"

+	else

+		pkg_version="pkg version"

 	\<)	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" ;;

 				fail "Cannot cd to $d_port"

 			fi

 			for glob in $conflicts; do

-				confl_p=`pkg_info -I $glob 2>/dev/null`

+					confl_p=`pkg_info -I $glob 2>/dev/null`

+				else

+				fi

 				if [ -n "$confl_p" ]; then

 					confl_p=${confl_p%% *}

 					echo ''

 		done

 		for dep in $build_only_dl_g; do

+				continue

+			fi

 			grep -q "@comment DEPORIGIN:${dep#$pd/}$" $pdb/*/+CONTENTS ||

 				temp_bodlg="$temp_bodlg $dep"

 		done

 	echo "===>>> Begin $verb ports that depend on $PM_URB_IPORTS"

 	echo ''

+	#TODO

 	for origin in $PM_URB_ORIGINS; do

+			for req_by in `pkg query "%rn-%rv" ${origin}`; do

+				PM_URB_LIST="${PM_URB_LIST} ${req_by}"

+			done

 		for req_by in `grep -l DEPORIGIN:${origin}$ $pdb/*/+CONTENTS`; do

 			req_by="${req_by%/+CONTENTS}"

 			req_by="${req_by##*/}"

 		*/*)	origin=$port ;;

 		*)	# If an installed version does not exist at this

 			# point it probably got updated as a dependency

-			if [ ! -d "$pdb/$port" ]; then

-				numports=$(( $numports - 1 ))

-				continue

+					numports=$(( $numports - 1 ))

+					continue

+				fi

+			else

+					numports=$(( $numports - 1 ))

+					continue

+				fi

 			fi

 			origin=`origin_from_pdb $port` ;;

 		esac

 	/*)	echo '' ; no_valid_port ;;

 	*/*)	portdir=$argv ;;

 	\.)	portdir=${PWD##*/ports/} ;; # Not always $pd, could be symlink

-	*)	[ -d "$pdb/$argv" ] && upg_port=$argv ;;

+			[ -d "$pdb/$argv" ] && upg_port=$argv

+		else

+		fi

+		;;

 	esac

 	if [ -z "$portdir" -a -z "$upg_port" ]; then

 	case "$arg2" in

 	*/*)	ro_opd=$arg2 ; ro_upg_port=`iport_from_origin $ro_opd` ;;

-	*)	if [ -d "$pdb/$arg2" ]; then

-			ro_upg_port=$arg2

+			if [ -d "$pdb/$arg2" ]; then

+				ro_upg_port=$arg2

+			else

 		else

-			find_glob_dirs $arg2 && ro_upg_port=${glob_dirs#$pdb/}

-			unset glob_dirs

+				ro_upg_port=$arg2

+			else

+				find_glob_dirs $arg2 && ro_upg_port=${glob_dirs}

 		fi

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

 	esac

 		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

-			case `pkg_version -t $upg_port $latest_pv` in

+				pkg_version="pkg_version"

+			else

+				pkg_version="pkg version"

 			\<)	use_package=up_newer

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

 				pm_v "       is newer than installed ($upg_port)" ;;

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

 		fi

 	elif [ -n "$latest_pv" ]; then

-		case `pkg_version -t $new_port $latest_pv` in

+			pkg_version="pkg_version"

+		else

+			pkg_version="pkg version"

 		\<)	# Could happen if ports tree is out of date

 			use_package=up_old_tree

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

 		    grep -v ^$LOCALBASE_COMPAT > $ldconfig_out

 		unset temp

-		for file in `pkg_info -q -L $UPGRADE_PORT |

+			pkglist="pkg_info -q -L"

+		else

+		fi

+		for file in `$pkglist $UPGRADE_PORT |

 		    sort - $ldconfig_out | uniq -d`; do

 			temp="${temp}$file "

 		done

 temp=`find $LOCALBASE_COMPAT -type d -empty 2>/dev/null`

 if [ -z "$temp" ] && [ -d "$LOCALBASE_COMPAT" ]; then

 	unset files

-	for file in `pkg_info -q -L $new_port`; do

+		pkglist="pkg_info -q -L"

+	else

+	fi

+	for file in `$pkglist $new_port`; do

 		[ -f "${LOCALBASE_COMPAT}/${file##*/}" ] &&

 			files="${files}${LOCALBASE_COMPAT}/${file##*/} "

 	done

 	/bin/unlink $dist_list_temp ; unset ds dist_list_temp

 fi

-if [ -n "$use_package" ]; then

+# pkgng does not need this

 	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

 	echo ''

 fi