--- ports-mgmt/portmaster/Makefile	(revision 437670)
+++ ports-mgmt/portmaster/Makefile	(working copy)
@@ -2,6 +2,7 @@ 
 
 PORTNAME=	portmaster
 PORTVERSION=	3.17.10
+PORTREVISION=	1
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	LOCAL/bdrewery/${PORTNAME}/ \
 		http://mirror.shatow.net/freebsd/${PORTNAME}/ \
--- ports-mgmt/portmaster/files/patch-portmaster	(revision 437670)
+++ ports-mgmt/portmaster/files/patch-portmaster	(working copy)
@@ -1,6 +1,56 @@ 
---- portmaster.orig	2016-02-05 22:36:56 UTC
+--- portmaster.orig	2017-02-03 22:10:23 UTC
 +++ portmaster
-@@ -1239,7 +1239,8 @@ all_pkgs_by_origin () {
+@@ -404,6 +404,24 @@ if [ "$$" -eq "$PM_PARENT_PID" ]; then
+ 	[ -n "$use_pkgng" ] && export use_pkgng
+ fi
+ 
++# Fn names map
++if [ -z "$use_pkgng" ]; then
++	pkg_list="/usr/sbin/pkg_info -q -L"
++	pkg_version="/usr/sbin/pkg_version"
++	pkg_add="/usr/sbin/pkg_add --no-deps "
++	pkg_create="/usr/sbin/pkg_create -b"
++	pkg_delete="/usr/sbin/pkg_delete"
++	pkg_ext="tbz"
++else
++	pkg_list="/usr/local/sbin/pkg query %Fp"
++	pkg_version="/usr/local/sbin/pkg version"
++	pkg_add="/usr/local/sbin/pkg add --accept-missing "
++	pkg_create="/usr/local/sbin/pkg create "
++	pkg_delete="/usr/local/sbin/pkg delete"
++	pkg_ext="txz"
++fi
++
++
+ usage () {
+ 	local pd pdb port_dbdir
+ 
+@@ -838,12 +856,6 @@ if [ "$$" -eq "$PM_PARENT_PID" ]; then
+ 	    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
+-			unset PM_PACKAGES PM_PACKAGES_BUILD PM_PACKAGES_LOCAL PM_PACKAGES_NEWER PM_ALWAYS_FETCH PM_DELETE_PACKAGES
+-			echo "===>>> Package installation support cannot be used with pkgng yet,"
+-			echo "       it will be disabled"
+-			echo ''
+-		fi
+ 		[ `/sbin/sysctl -n kern.osreldate 2>/dev/null` -lt 600400 ] &&
+ 			fail Package installation support requires FreeBSD 6.4 or newer
+ 	fi
+@@ -910,11 +922,6 @@ if [ "$$" -eq "$PM_PARENT_PID" ]; then
+ 		fi
+ 		unset INDEXFILE INDEXDIR
+ 
+-		if [ -z "$use_pkgng" ]; then
+-			pkg_version="pkg_version"
+-		else
+-			pkg_version="pkg version"
+-		fi
+ 		PM_INDEX_PORTS=`$pkg_version -Ivl\< $PM_INDEX | cut -f1 -d\<`
+ 		export PM_INDEX_PORTS
+ 
+@@ -1242,7 +1249,8 @@ all_pkgs_by_origin () {
  			echo $iport $origin
  		done
  	else
@@ -10,7 +60,7 @@ 
  	fi
  	return
  }
-@@ -1644,42 +1645,21 @@ if [ -n "$CHECK_PORT_DBDIR" ]; then
+@@ -1647,42 +1655,21 @@ if [ -n "$CHECK_PORT_DBDIR" ]; then
  	unique_list=':'
  
  	echo "===>>> Building list of installed port names"; echo ''
@@ -67,3 +117,231 @@ 
  
  	echo "===>>> Checking $port_dbdir"
  
+@@ -1826,12 +1813,6 @@ check_for_updates () {
+ 				unset port_ver
+ 			fi
+ 		else
+-			local pkg_version
+-			if [ -z "$use_pkgng" ]; then
+-				pkg_version="pkg_version"
+-			else
+-				pkg_version="pkg version"
+-			fi
+ 			case `$pkg_version -t $iport $port_ver` in
+ 			\<)	do_update=upd_lt ;;
+ 			=)	;;	# Can be reached if same version with different options
+@@ -1912,12 +1893,6 @@ pm_pkg_create () {
+ 	fi
+ 
+ 	pm_cd $pkgdir || fail "Cannot cd into $pkgdir to create a package"
+-	local pkg_create
+-	if [ -z "$use_pkgng" ]; then
+-		pkg_create="pkg_create -b"
+-	else
+-		pkg_create="pkg create "
+-	fi
+ 	if $PM_SU_CMD $pkg_create $2; then
+ 		if [ "$1" = "$pbu" ]; then
+ 			if [ -n "$BACKUP" ]; then
+@@ -1935,7 +1910,7 @@ pm_pkg_create () {
+ 				pm_cd_pd $portdir
+ 				latest_link=`pm_make -V LATEST_LINK`
+ 				cd ${1}/Latest
+-				$PM_SU_CMD ln -sf ../All/$pkg ${latest_link}.tbz
++				$PM_SU_CMD ln -sf ../All/$pkg ${latest_link}.${pkg_ext}
+ 			fi
+ 
+ 			cd ${1}/${portdir%/*}
+@@ -2310,11 +2285,6 @@ if [ -n "$EXPUNGE" ]; then
+ 	[ -n "$BACKUP" ] && { init_packages ; pm_pkg_create $pbu $EXPUNGE; }
+ 	[ -z "$DONT_SCRUB_DISTFILES" ] && delete_all_distfiles $origin
+ 
+-	if [ -z "$use_pkgng" ]; then
+-		pkg_delete="pkg_delete"
+-	else
+-		pkg_delete="pkg delete"
+-	fi
+ 	echo "===>>> Running $pkg_delete -f $EXPUNGE"
+ 	pm_pkg_delete_s $EXPUNGE || fail "$pkg_delete failed"
+ 
+@@ -2355,10 +2325,8 @@ if [ -n "$CLEAN_STALE" ]; then
+ 
+ 		if [ -z "$use_pkgng" ]; then
+ 			echo '' ; pkg_info $iport
+-			pkg_delete="pkg_delete"
+ 		else
+ 			echo '' ; pkg info -f $iport
+-			pkg_delete="pkg delete"
+ 		fi
+ 
+ 		get_answer_yn n "\t===>>> ${iport} is no longer depended on, delete"
+@@ -2532,12 +2500,6 @@ update_build_l () {
+ 
+ 	find_new_port $origin
+ 
+-	local pkg_version
+-	if [ -z "$use_pkgng" ]; then
+-		pkg_version="pkg_version"
+-	else
+-		pkg_version="pkg version"
+-	fi
+ 	case `$pkg_version -t $iport $new_port 2>/dev/null` in
+ 	\<)	build_l="${build_l}\tUpgrade $iport to $new_port\n" ;;
+ 	=)	build_l="${build_l}\tRe-install $iport\n" ;;
+@@ -3746,7 +3708,7 @@ fetch_package () {
+ 	fi
+ 
+ 	if [ -z "$PM_ALWAYS_FETCH" ]; then
+-		if [ -r "${ppd}/${1}.tbz" ]; then
++		if [ -r "${ppd}/${1}.${pkg_ext}" ]; then
+ 			pm_v "===>>> Package exists, skipping fetch"
+ 			return 0
+ 		else
+@@ -3754,7 +3716,7 @@ fetch_package () {
+ 		fi
+ 	else
+ 		do_fetch=do_fetch_always_fetch
+-		pm_unlink_s ${ppd}/${1}.tbz
++		pm_unlink_s ${ppd}/${1}.${pkg_ext}
+ 	fi
+ 
+ 	if [ -n "$do_fetch" ]; then
+@@ -3766,10 +3728,10 @@ fetch_package () {
+ 			fi
+ 		fi
+ 
+-		pm_sv Fetching ${1}.tbz
+-		if ! $PM_SU_CMD fetch $FETCH_ARGS -o $ppd ${sitepath}${1}.tbz 2>/dev/null; then
+-			pm_unlink_s ${ppd}/${1}.tbz
+-			$PM_SU_CMD fetch $FETCH_ARGS -o $ppd ${sitepath}${1}.tbz 2>/dev/null
++		pm_sv Fetching ${1}.${pkg_ext}
++		if ! $PM_SU_CMD fetch $FETCH_ARGS -o $ppd ${sitepath}${1}.${pkg_ext} 2>/dev/null; then
++			pm_unlink_s ${ppd}/${1}.${pkg_ext}
++			$PM_SU_CMD fetch $FETCH_ARGS -o $ppd ${sitepath}${1}.${pkg_ext} 2>/dev/null
+ 		fi
+ 	fi
+ }
+@@ -3783,6 +3745,8 @@ fetch_package () {
+ 				release=packages-${release%-RELEASE*}-release ;;
+ 		9\.0-CURRENT*)	release=packages-9-current ;;
+ 		10\.0-CURRENT*)	release=packages-10-current ;;
++		11\.0-CURRENT*)	release=packages-11-current ;;
++		12\.0-CURRENT*)	release=packages-12-current ;;
+ 		*RC[0-9]*)	release=${release%-RC[0-9]}
+ 				release=packages-${release}-release ;;
+ 		*BETA[0-9]*)	release=${release%-BETA[0-9]}
+@@ -3802,15 +3766,17 @@ fetch_package () {
+ 	echo "===>>> Checking package repository for latest available version"
+ 
+ 	if [ -n "$LOCAL_PACKAGEDIR" ]; then
+-		if [ -r "${LOCAL_PACKAGEDIR}/All/${new_port}.tbz" ]; then
+-			local_package=${LOCAL_PACKAGEDIR}/All/${new_port}.tbz
++		echo "===>>> ...checking: ${LOCAL_PACKAGEDIR}/All/${new_port}.${pkg_ext}"
++		if [ -r "${LOCAL_PACKAGEDIR}/All/${new_port}.${pkg_ext}" ]; then
++			local_package=${LOCAL_PACKAGEDIR}/All/${new_port}.${pkg_ext}
+ 			latest_pv=${local_package##*/}
+ 		fi
+ 		if [ -z "$latest_pv" -a -z "$PM_INDEX_ONLY" ]; then
+ 			s=`pm_make -V LATEST_LINK`
+-			if [ -r "${LOCAL_PACKAGEDIR}/Latest/${s}.tbz" ]; then
+-				local_package=${LOCAL_PACKAGEDIR}/Latest/${s}.tbz
+-				latest_pv=`readlink ${LOCAL_PACKAGEDIR}/Latest/${s}.tbz`
++			echo "===>>> ...checking: ${LOCAL_PACKAGEDIR}/Latest/${s}.${pkg_ext}"
++			if [ -r "${LOCAL_PACKAGEDIR}/Latest/${s}.${pkg_ext}" ]; then
++				local_package=${LOCAL_PACKAGEDIR}/Latest/${s}.${pkg_ext}
++				latest_pv=`readlink ${LOCAL_PACKAGEDIR}/Latest/${s}.${pkg_ext}`
+ 				latest_pv=${latest_pv##*/}
+ 			else
+ 				pm_v "===>>> No local package for ${new_port}, attempting fetch"
+@@ -3873,7 +3839,7 @@ fetch_package () {
+ 		fi
+ 	else
+ 		latest_pv=${latest_pv#*href=\"}
+-		latest_pv=${latest_pv%%\.tbz*}
++		latest_pv=${latest_pv%%\.${pkg_ext}*}
+ 	fi
+ 
+ notnewer () {
+@@ -3888,11 +3854,6 @@ notnewer () {
+ 		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
+-			if [ -z "$use_pkgng" ]; then
+-				pkg_version="pkg_version"
+-			else
+-				pkg_version="pkg version"
+-			fi
+ 			case `$pkg_version -t $upg_port $latest_pv` in
+ 			\<)	use_package=up_newer
+ 				pm_v "===>>> Available package ($latest_pv)"
+@@ -3909,11 +3870,7 @@ notnewer () {
+ 			pm_v "===>>> There is a package available ($latest_pv)"
+ 		fi
+ 	elif [ -n "$latest_pv" ]; then
+-		if [ -z "$use_pkgng" ]; then
+-			pkg_version="pkg_version"
+-		else
+-			pkg_version="pkg version"
+-		fi
++		echo "       $pkg_version -t $new_port $latest_pv"
+ 		case `$pkg_version -t $new_port $latest_pv` in
+ 		\<)	# Could happen if ports tree is out of date
+ 			use_package=up_old_tree
+@@ -4002,7 +3959,7 @@ if [ -z "$use_package" ]; then
+ 	eval pm_make -DNO_DEPENDS stage $port_log_args || fail "make stage failed for $portdir"
+ else
+ 	[ -z "$local_package" ] && {
+-		fetch_package $latest_pv || fail "Fetch for ${latest_pv}.tbz failed"; }
++		fetch_package $latest_pv || fail "Fetch for ${latest_pv}.${pkg_ext} failed"; }
+ fi
+ 
+ # Ignore if no old port exists, or -F
+@@ -4019,12 +3976,7 @@ if [ -n "$upg_port" -o -n "$ro_upg_port"
+ 		    grep -v ^$LOCALBASE_COMPAT > $pm_mktemp_file
+ 
+ 		unset temp
+-		if [ -z "$use_pkgng" ]; then
+-			pkglist="pkg_info -q -L"
+-		else
+-			pkglist="pkg query %Fp"
+-		fi
+-		for file in `$pkglist $UPGRADE_PORT |
++		for file in `$pkg_list $UPGRADE_PORT |
+ 		    sort - $pm_mktemp_file | uniq -d`; do
+ 			temp="${temp}$file "
+ 		done
+@@ -4137,14 +4089,14 @@ if [ -z "$use_package" ]; then
+ else
+ 	[ -n "$local_package" ] && ppd=${LOCAL_PACKAGEDIR}/All
+ 
+-	echo "===>>> Installing package"
+-	if $PM_SU_CMD pkg_add --no-deps --force ${ppd}/${latest_pv}.tbz; then
++	echo "===>>> Installing package from: ${ppd}/${latest_pv}.${pkg_ext}"
++	if $PM_SU_CMD $pkg_add --force ${ppd}/${latest_pv}.${pkg_ext}; then
+ 		if [ -n "$PM_DELETE_PACKAGES" ]; then
+-			pm_v "===>>> Deleting ${latest_pv}.tbz"
+-			pm_unlink_s ${ppd}/${latest_pv}.tbz
++			pm_v "===>>> Deleting ${latest_pv}.${pkg_ext}"
++			pm_unlink_s ${ppd}/${latest_pv}.${pkg_ext}
+ 		fi
+ 	else
+-		install_failed ${latest_pv}.tbz
++		install_failed ${latest_pv}.${pkg_ext}
+ 	fi
+ fi
+ 
+@@ -4188,12 +4140,7 @@ echo ''
+ temp=`find $LOCALBASE_COMPAT -type d -empty 2>/dev/null`
+ if [ -z "$temp" ] && [ -d "$LOCALBASE_COMPAT" ]; then
+ 	unset files
+-	if [ -z "$use_pkgng" ]; then
+-		pkglist="pkg_info -q -L"
+-	else
+-		pkglist="pkg query %Fp"
+-	fi
+-	for file in `$pkglist $new_port`; do
++	for file in `$pkg_list $new_port`; do
+ 		[ -f "${LOCALBASE_COMPAT}/${file##*/}" ] &&
+ 			files="${files}${LOCALBASE_COMPAT}/${file##*/} "
+ 	done
+