--- ./portshaker.subr.in	2014-04-17 17:05:24.000000000 +1000
+++ ./portshaker.subr.in	2014-04-17 21:26:35.000000000 +1000
@@ -39,11 +39,12 @@ 
 PB="${PB:=/usr/local/tinderbox}"
 TC="${TC:=${PB}/tc}"
 
-# Use pkg(8) if WITH_PKGNG is defined in make.conf
-if [ -f "/etc/make.conf" ]; then
+# Use pkg(8) if main package system or WITH_PKGNG defined in make.conf
+if [ -z `/usr/bin/whereis -q -b pkg_version` ]; then
+    PKG_VERSION="pkg version"
+elif [ -f "/etc/make.conf" ]; then
     case `make -f "/etc/make.conf" -V WITH_PKGNG` in
-    [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
-	PKG_VERSION="pkg version"
+    	[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1) PKG_VERSION="pkg version" ;;
     esac
 fi
 PKG_VERSION="${PKG_VERSION:=pkg_version}"