  
  	echo "===>>> Checking $port_dbdir"
  
-@@ -1570,7 +1698,7 @@
+@@ -1570,7 +1709,7 @@
  
  	if [ -z "$do_update" -a -z "$skip" -a -z "$PM_INDEX_ONLY" ] && [ -d "$pd/$origin" ]; then
  		if ! pm_cd $pd/$origin; then
 -			if [ -e "$pdb/$iport/+IGNOREME" ]; then
-+			if [ -z "$use_pkgng" -a -e "$pdb/$iport/+IGNOREME" ]; then
++			if [ -e "$pdb/$iport/+IGNOREME" ] && ( [ -z "$use_pkgng" ] || pkg info -e $iport ); then
  				echo "	===>>> Warning: Unable to cd to $pd/$origin"
  				echo "	===>>> Continuing due to $pdb/$iport/+IGNOREME"
  				echo ''
-@@ -1587,7 +1715,7 @@
+@@ -1587,13 +1726,13 @@
  
  		# If the port has moved and no +IGNOREME, we have to update it
  		if [ -n "$moved_npd" ]; then
 -			if [ ! -e "$pdb/$iport/+IGNOREME" ]; then
-+			if [ -n "$use_pkgng" -o ! -e "$pdb/$iport/+IGNOREME" ]; then
- 				do_update=do_update_moved
- 			else
+-				do_update=do_update_moved
+-			else
++			if [ -e "$pdb/$iport/+IGNOREME" ] && ( [ -z "$use_pkgng" ] || pkg info -e $iport ); then
  				echo "	===>>> Continuing due to $pdb/$iport/+IGNOREME"
-@@ -1610,14 +1738,20 @@
+ 				echo ''
+ 				CUR_DEPS="${CUR_DEPS}${iport}:${origin}:"
+ 				return 0
++			else
++				do_update=do_update_moved
+ 			fi
+ 		fi
+ 	fi
+@@ -1610,14 +1749,20 @@
  				unset port_ver
  			fi
  		else

 	if [ -n "$deplist" ]; then
 		echo "===>>> Warning: Ports with dependencies on ${EXPUNGE}:"
 		for dep in $deplist; do
@@ -2048,7 +2196,8 @@
 		done
 		get_answer_yn n "\n\t===>>> Delete this dependency data"
 		case "$?" in

 
 	echo '' ; echo "===>>> Running ${0##*/} -s $ARGS"
 	exec $0 -s $ARGS
@@ -2069,13 +2235,22 @@
 if [ -n "$CLEAN_STALE" ]; then
 	[ -z "$no_del_list" ] && export no_del_list=':'
 
