  
  	echo '' ; echo "===>>> Running ${0##*/} -s $ARGS"
  	exec $0 -s $ARGS
-@@ -2069,13 +2235,22 @@
+@@ -2069,13 +2235,21 @@
  if [ -n "$CLEAN_STALE" ]; then
  	[ -z "$no_del_list" ] && export no_del_list=':'
  
 -	for file in `find $pdb -type f -name \+REQUIRED_BY -empty` ; do
-+	#TODO: to be replaced by pkg autoremove?
 +	if [ -z "$use_pkgng" ]; then
 +		find_stale_ports="find $pdb -type f -name \+REQUIRED_BY -empty"
 +	else

 			echo "       or a port directory from $pd"
 			echo ''
 			echo "       $ro_opd does not seem to be installed,"
@@ -3117,7 +3356,7 @@
 fi
 [ -z "$upg_port" -a -z "$REPLACE_ORIGIN" ] && upg_port=`iport_from_origin ${portdir}`
 

 	\<)	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" ;;
@@ -2466,7 +2656,11 @@
 				fail "Cannot cd to $d_port"
 			fi
 			for glob in $conflicts; do
