marcusmerge

--- marcusmerge.orig	2013-02-23 11:03:38.173065799 +0100
+++ marcusmerge	2013-02-23 11:04:49.895063170 +0100
@@ -50,12 +50,13 @@
 			# If you prefer upgrading your port tree using
 			# "make update" (requires a correct setup in
 			# /etc/make.conf)
+PKGVERSION_CMD="/usr/sbin/pkg"
+PKGVERSION_ARGS="version -l \<"
+			# If you prefer using legacy pkg_* tools change CMD
+			# to "/usr/sbin/pkg_version" and ARGS to "-l \<"

 # You do not have to change anything beyond this line.

-PKGVERSION_CMD="/usr/sbin/pkg_version"
-PKGVERSION_ARGS="-l \<"
-
 CVSUP_CMD="/usr/bin/csup"
 FETCH_CMD="/usr/bin/fetch"
 FETCH_ARGS="-4 -q"