  			echo "       or a port directory from $pd"
  			echo ''
  			echo "       $ro_opd does not seem to be installed,"
-@@ -3525,7 +3742,12 @@
+@@ -3117,7 +3334,8 @@
+ fi
+ [ -z "$upg_port" -a -z "$REPLACE_ORIGIN" ] && upg_port=`iport_from_origin ${portdir}`
+ 
+-if [ -e "$pdb/$upg_port/+IGNOREME" ]; then
++#TODO?
++if [ -z "$use_pkgng" -a -e "$pdb/$upg_port/+IGNOREME" ]; then
+ 	# 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
+@@ -3525,7 +3743,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

 		    sort - $ldconfig_out | uniq -d`; do
 			temp="${temp}$file "
 		done
@@ -3743,29 +3975,32 @@
 	fi
 fi
 

 		[ -f "${LOCALBASE_COMPAT}/${file##*/}" ] &&
 			files="${files}${LOCALBASE_COMPAT}/${file##*/} "
 	done
@@ -3844,7 +4085,8 @@
 	/bin/unlink $dist_list_temp ; unset ds dist_list_temp
 fi
 
