--- portmaster.sh.in.orig

+++ portmaster.sh.in

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

 version () {

 }

 			if [ -n "$files" ]; then

 				pm_sv Deleting \'install complete\' flags

 				pm_find_s $pdb -type f -name PM_UPGRADE_DONE_FLAG -delete

 			fi

 		fi

 		if [ -z "$BACKUP" -a -z "$NO_BACKUP" -a -n "$NB_DELETE" ]; then

 		fi

 		: ${PAGER:='less -e'}

 		echo "===>>> Done displaying pkg-message files" ; echo '' ) | $PAGER ;;

 	esac

 	if [ -n "$build_deps_il" ]; then

 		echo "===>>> Deleting installed build-only dependencies"

 		cd

 		echo ''

 	fi

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

 	[ -z "$port_dbdir" ] &&

 		port_dbdir=`pm_make_b -f/usr/share/mk/bsd.port.mk -V PORT_DBDIR 2>/dev/null`

 	[ -n "$port_dbdir" ] && export port_dbdir

 fi

 usage () {

 	pattern=`globstrip $1`

 	esac

 	unset glob_dirs

 origin_from_pdb () {

 	local o

 		echo '' >&2

 	fi

 	return 1

 	o)	REPLACE_ORIGIN=oopt ;;

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

 	r)	PM_URB=ropt

 			2)	fail 'The argument to -r must match only one port' ;;

 			esac

 		fi

 	    fail 'The -[ar] options are not compatible with other updates'

 	if [ -n "$PM_PACKAGES" -o -n "$PM_PACKAGES_BUILD" ]; then

 		[ `/sbin/sysctl -n kern.osreldate 2>/dev/null` -lt 600400 ] &&

 			fail Package installation support requires FreeBSD 6.4 or newer

 	fi

 		fi

 		unset INDEXFILE INDEXDIR

 		export PM_INDEX_PORTS

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

 iport_from_origin () {

 	local sn dir

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

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

 	done

 }

 	# Global: grep_deps

 	local origin iport ro_opd

 	fi

 }

 update_contents () {

+	[ -n "$use_pkgng" ] && return

 	local o_seen line d_missing d_origin d_iport prev_line answer

 	for l in `grep "^$sf|" $pd/MOVED`; do

 		case "$l" in

 		${sf}\|\|*) [ -n "$iport" ] || iport=`iport_from_origin $sf`

 				if [ -n "$PM_VERBOSE" ]; then

 					echo ''

 					echo "	===>>> The $sf port has been deleted"

 		echo ''

 		[ -n "$iport" ] || iport=`iport_from_origin $sf`

 	fi

 	return 0

 }

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

+			[ -d $pkg ] || continue

+			iport=${pkg#$pdb/}

+			origin=`origin_from_pdb $iport` || continue

+		done

+	else

+	fi

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

-	for pkg in $pdb/*; do

-		if [ -s "$pkg/+REQUIRED_BY" ]; then

-			if grep -ql '^@pkgdep ' $pkg/+CONTENTS 2>/dev/null; then

-				branches="$branches ${pkg#$pdb/}"

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

+		for pkg in $pdb/*; do

+			if [ -s "$pkg/+REQUIRED_BY" ]; then

+				if grep -ql '^@pkgdep ' $pkg/+CONTENTS 2>/dev/null; then

+					branches="$branches ${pkg#$pdb/}"

+				else

+					trunks="$trunks ${pkg#$pdb/}"

+				fi

 			else

+				if grep -ql '^@pkgdep ' $pkg/+CONTENTS 2>/dev/null; then

+					leaves="$leaves ${pkg#$pdb/}"

+				else

+					[ -d "$pkg" ] || continue

+					roots="$roots ${pkg#$pdb/}"

+				fi

 			fi

-		fi

-	done

+	fi

 }

 delete_empty_dist_subdirs () {

 	esac

 }

 	# Global: needws

 	local do_update

 	else

 		do_update=do_update2

 	fi

 		pm_v "	===>>> Updating $1/+REQUIRED_BY"

 		needws=needws_urb

 		pm_install_s $grep_deps $pdb/$1/+REQUIRED_BY

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

 	for package in `find $PACKAGES -type f | sort`; do

 		if [ -z "$PM_INDEX" ]; then

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

 		fi

 		if [ -n "$port_ver" ]; then

 				fi

 				unset port_ver

 				continue

 			unset port_ver

 			fi

 		fi

 fi	# [ -n "$CLEAN_PACKAGES" ]

 if [ -n "$CHECK_DEPENDS" ]; then

 	PM_VERBOSE=pmv_check_depends

 IFS='

 '

 	unique_list=':'

 	echo "===>>> Building list of installed port names"; echo ''

 	echo "===>>> Checking $port_dbdir"

 	if [ -z "$do_update" -a -z "$skip" -a -z "$PM_INDEX_ONLY" ] && [ -d "$pd/$origin" ]; then

 		if ! pm_cd $pd/$origin; then

 				echo "	===>>> Warning: Unable to cd to $pd/$origin"

 				echo "	===>>> Continuing due to $pdb/$iport/+IGNOREME"

 				echo ''

 		# If the port has moved and no +IGNOREME, we have to update it

 		if [ -n "$moved_npd" ]; then

 			fi

 		fi

 	fi

 				unset port_ver

 			fi

 		else

 			esac

 			[ -z "$do_update" ] && {

 	if [ -n "$LIST_PLUS" ]; then

 		if [ -z "$moved_npd" ]; then

 			echo "	===>>> New version available: $port_ver"

 			pm_cd_pd $origin && check_state

 			num_updates=$(( $num_updates + 1 ))

 		else

 	fi

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

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

 			if [ -n "$BACKUP" ]; then

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

 fi

 if [ -n "$EXPUNGE" ]; then

 		2)	echo "===>>> $EXPUNGE matched multiple ports"

 			fail "The -e option works with only one port at a time" ;;

 		0)	EXPUNGE=${glob_dirs#$pdb/}

 	fi

 	origin=`origin_from_pdb $EXPUNGE`

 				update_contents delete $f $origin

 			done ;;

 		*)	exit 1 ;;

 	[ -n "$BACKUP" ] && { init_packages ; pm_pkg_create $pbu $EXPUNGE; }

 	[ -z "$DONT_SCRUB_DISTFILES" ] && delete_all_distfiles $origin

 	echo '' ; echo "===>>> Running ${0##*/} -s $ARGS"

 	exec $0 -s $ARGS

 if [ -n "$CLEAN_STALE" ]; then

 	[ -z "$no_del_list" ] && export no_del_list=':'

 		if [ -n "$deplist" ]; then

 			echo ''

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

 			continue

 		fi

 		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 ''

 			fail "No entry for $origin in $PM_INDEX"

 	fi

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

 	verb=checking ; [ -n "$1" ] && verb=updating

 	echo ''

 	for origin in $PM_URB_ORIGINS; 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

 	'')	echo '' ; no_valid_port ;;

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

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

-if [ -e "$pdb/$upg_port/+IGNOREME" ]; then

+if [ -e "$pdb/$upg_port/+IGNOREME" ] && ( [ -z "$use_pkgng" ] || pkg info -e $upg_port ); then

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

 		unset temp

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

+			pkglist="pkg query %Fp"

+		fi

+		for file in `$pkglist $UPGRADE_PORT |

 			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

-	mv ${preserve_dir}/${file##*/} $file

-	oldmd5="MD5:`md5 -q $file`"

-

-	while read left right; do

-		case "$left" in

-		@cwd)		short_file="${file#${right}/}" ;;

-				fi ;;

-		esac

-		echo "$left $right"

-done

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

+	for file in $preserve_port_files; do

+		mv ${preserve_dir}/${file##*/} $file

+		oldmd5="MD5:`md5 -q $file`"

+	

+		while read left right; do

+			case "$left" in

+			@cwd)		short_file="${file#${right}/}" ;;

+					fi ;;

+			esac

+			echo "$left $right"

+	done

+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

 fi

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

 	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"