--- portmaster.orig	2012-01-31 03:17:17.681285114 +0100

 			 unset -v PM_URB_LIST;

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

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

+		$PM_SU_CMD /usr/sbin/pkg_delete $*;

+	else

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

 	pattern=`globstrip $1`

-	glob_dirs=`find $pdb -maxdepth 1 -type d -name ${pattern}\*`

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

+	else

+		glob_dirs=`pkg query -g "%n-%v" ${pattern}\*`

+	fi

 	esac

 	unset glob_dirs

 origin_from_pdb () {

 	local o

+		o=`grep -m1 '@comment ORIGIN:' $pdb/$1/+CONTENTS 2>/dev/null` && {

+			echo ${o#@comment ORIGIN:}; return 0; }

+	else

+	fi

 	case "$1" in bsdpan-*) return 3 ;; esac

 	o)	REPLACE_ORIGIN=oopt ;;

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

 	r)	PM_URB=ropt

-		if [ -d "$pdb/$OPTARG" ]; then

 			glob_dirs=$OPTARG

 		else

 			find_glob_dirs $OPTARG

 			case $? in

-			1)	fail "$pdb/$OPTARG does not exist" ;;

 			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

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

+			echo "===>>> Package installation support cannot be used with pkgng yet,"

+			echo "       it will be disabled"

+			echo ''

 		[ `/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

 }

 check_dependency_files () {

 	# Global: grep_deps

 	local origin iport ro_opd

 	fi

 }

 update_contents () {

 	local IFS delete contents origin n_port old_origin iport new_cont

 	local o_seen line d_missing d_origin d_iport prev_line answer

 	echo '############' > $DI_FILES		# Make the file > 0 bytes

 	echo "===>>> Gathering distinfo list for installed ports"

 	echo ''

 	# Tell safe_exit that we are done

 	pm_unlink ${DI_FILES}-e

 }

 ports_by_category () {

 }

 delete_empty_dist_subdirs () {

 	esac

 }

 	if [ -e "$pdb/$1/+REQUIRED_BY" ]; then

 		sort $pdb/$1/+REQUIRED_BY | cmp -s $grep_deps - || do_update=do_update

 	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

-			if [ -e "$pdb/$iport/+IGNOREME" ]; 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

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

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

 				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"

-			[ -e "$pdb/$iport/+IGNOREME" ] &&

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

 			pm_cd_pd $origin && check_state

 			num_updates=$(( $num_updates + 1 ))

 	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

-	if [ ! -d "$pdb/$EXPUNGE" ]; then

-		1)	fail "No such directory/port: $pdb/$EXPUNGE" ;;

 	fi

 	origin=`origin_from_pdb $EXPUNGE`

 	if [ -n "$deplist" ]; then

 		echo "===>>> Warning: Ports with dependencies on ${EXPUNGE}:"

 		for dep in $deplist; do

 		done

 		get_answer_yn n "\n\t===>>> Delete this dependency data"

 		case "$?" in

-		0)	for f in $deplist; do

+			for f in $deplist; do

 				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; delete_dist_list; }

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

 	exec $0 -s $ARGS

 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

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

+		find_stale_ports="find $pdb -type f -name \+REQUIRED_BY -empty"

+	else

 		if [ -n "$deplist" ]; then

 			echo ''

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

 			continue

 		fi

 		esac

 	done

 	exit 0

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

 				fail "Cannot cd to $d_port"

 			fi

 			for glob in $conflicts; do

 				if [ -n "$confl_p" ]; then

 					confl_p=${confl_p%% *}

 					echo ''

 		done

 		for dep in $build_only_dl_g; do

 		done

 		build_only_dl_g=" `uniquify_list $temp_bodlg` "

 	echo ''

 	for origin in $PM_URB_ORIGINS; do

+				PM_URB_LIST="${PM_URB_LIST} ${req_by}"

+			done

+		else

+				case " $PM_URB_IPORTS" in *" $req_by "*) continue ;; esac

+				PM_URB_LIST="${PM_URB_LIST} ${req_by}"

+		fi

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

-		*)	if [ -d "$pdb/$port" ]; then

 				worklist_temp="$worklist_temp $port"

 			else

 				find_glob_dirs $port

 				*)	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/} ;;

 	*/*)	portdir=$argv ;;

 	\.)	portdir=${PWD##*/ports/} ;; # Not always $pd, could be symlink

-	*)	[ -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` ;;

-	*)	if [ -d "$pdb/$arg2" ]; then

 			ro_upg_port=$arg2

 		else

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

 	unset arg2

 	if [ -z "$ro_upg_port" ]; then

+			fi

 			echo "       or a port directory from $pd"

 			echo ''

 fi

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

-if [ -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

 		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 > $ldconfig_out

 		unset temp

 		    sort - $ldconfig_out | uniq -d`; do

 			temp="${temp}$file "

 		done

 	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

 		[ -f "${LOCALBASE_COMPAT}/${file##*/}" ] &&

 			files="${files}${LOCALBASE_COMPAT}/${file##*/} "

 	done

 	/bin/unlink $dist_list_temp ; unset ds dist_list_temp

 fi

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

+# pkgng does not need this

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

 		echo "===>>> Updating dependencies for $new_port to match installed versions"

 		update_contents $pdb/$new_port/+CONTENTS

 	echo ''

 fi

 fi

 if [ -n "$upg_port" ]; then