#=============== Begin functions we always want to have ===============

 version () {

 }

@@ -134,6 +134,8 @@

 		esac

 	done

 	exit 0

 	# to go out to the disk if we don't have to.

 	[ -z "$RESTART" ] && return 1

 		return 1

 	else

 		already_done $1

 	case "$INTERACTIVE_YES" in *:${1}:*) return 0 ;; esac

 	case "$INTERACTIVE_NO" in *:${1}:*) return 1 ;; esac

 		echo ''

 		echo "===>>> +IGNOREME file is present for $1"

 		echo ''

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

+	local 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" ;;

 		rundeps=`gen_dep_list run-depends-list`

 		for dep in $d_port_list; do

 			case "$rundeps" in

 			*" ${dep} "*|*${dep}*)

 				varname=`echo ${dep#$pd/} | sed 's#[-+/\.]#_#g'`

 				fail "Cannot cd to $d_port"

 			fi

 			for glob in $conflicts; do

 				if [ -n "$confl_p" ]; then

 					confl_p=${confl_p%% *}

 					d_port="$pd/`origin_from_pdb $confl_p`"

 		done

 		for dep in $build_only_dl_g; do

 			[ -n "$PM_DEL_BUILD_ONLY" ] &&

 				iport_from_origin ${dep#$pd/} >/dev/null && continue

 			temp_bodlg="$temp_bodlg $dep"

 urb_update () {

 	# Global: PM_URB_UP

-	local verb origin req_by

+	local verb origin req_by req_by_o

 	for origin in $PM_URB_ORIGINS; do

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

 	done

 	if [ -n "$PM_URB_LIST" ]; then

 	for req_by in $PM_URB_LIST; do

 		# Probably not needed, but JIC

 		pm_v "===>>> $req_by depends on $PM_URB_IPORTS"

 			else

 				fail "$pd/${port} does not exist"

 			fi ;;

 				*)	local dir

 					for dir in $glob_dirs; do

 					worklist_temp="$worklist_temp ${dir#$pdb/}"

 		*/*)	origin=$port ;;

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

 			# point it probably got updated as a dependency

 			fi

 			origin=`origin_from_pdb $port` ;;

 		esac

 	case "$argv" in

 	$pd/*)	portdir=${argv#$pd/} ;;

-	$pdb/*)	upg_port=${argv#$pdb/} ;;

+	$pdb/*)	if [ -z "$use_pkgng" ]; then

+		fi ;;

 	/*)	echo '' ; no_valid_port ;;

 	*/*)	portdir=$argv ;;

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

 	esac

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

 	case "$arg2" in

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

 			ro_upg_port=$arg2

 		else

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

 	unset arg2

 	if [ -z "$ro_upg_port" ]; then

 			echo '       or listed as a dependency'

 			echo '' ; no_valid_port

 		fi

 fi

 [ -z "$upg_port" -a -z "$REPLACE_ORIGIN" ] && upg_port=`iport_from_origin ${portdir}`

 	# Adding to CUR_DEPS means we will not get here in the build

 	if [ -z "$PM_BUILDING" ]; then

 		# Only need to prompt for this once if -ai

 		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

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

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

 			use_package=up_old_tree

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

 		    grep -v ^$LOCALBASE_COMPAT > $pm_mktemp_file

 		unset temp

 		    sort - $pm_mktemp_file | uniq -d`; do

 			temp="${temp}$file "

 		done

 	if [ -n "$REPLACE_ORIGIN" -a -n "$ro_upg_port" ]; then

 		# Delete any existing versions of the old port

 		pm_sv "Running pkg_delete for $ro_upg_port"

 		pm_pkg_delete_s -f $ro_upg_port

 	fi

 			unset preserve_port files

 		esac

 		pm_sv "Running pkg_delete for $upg_port"

 		pm_pkg_delete_s -f $upg_port

 	fi

 		unset port_log_args

 	fi

 	# 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

 	fi

 fi

 if [ -n "$preserve_dir" ]; then

 	rmdir $preserve_dir 2>/dev/null

 	unset preserve_dir preserve_port_files

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

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

 	unset files

 		$PM_SU_CMD /etc/rc.d/ldconfig start > /dev/null

 	fi

 	unset temp file files

 	done

 	pm_sv "Installing $dist_list\n"

 	if grep -q DEPORIGIN $pdb/$new_port/+CONTENTS; then

 		echo -e "===>>> Updating dependencies for $new_port to match installed versions\n"

 		update_contents $pdb/$new_port/+CONTENTS ; pm_v

 if [ -n "$MAKE_PACKAGE" ]; then

 	if [ -z "$use_package" ]; then

 		echo "===>>> Creating a package for new version $new_port"

 		echo "	===>>> Package saved to $PACKAGES/All" ; echo ''

 	else

 		pm_pkg_create $PACKAGES $new_port

 	pm_v

 fi

 if [ -n "$upg_port" ]; then

 	if [ ! "$upg_port" = "$new_port" ]; then

 		ilist="Upgrade of $upg_port to $new_port"

 fi

 INSTALLED_LIST="${INSTALLED_LIST}\t${ilist}\n"