mergemaster

--- marcusmerge.orig	2013-02-23 10:33:45.069064985 +0100
+++ marcusmerge	2013-02-23 10:35:03.666064175 +0100
@@ -29,12 +29,12 @@

 # These variables are overrideable in /usr/local/etc/${SCRIPTNAME}.cfg.

-SRCDIR=${MARCUSMERGE_SRCDIR:=""}
+SRCDIR=${MARCUSMERGE_SRCDIR:="/root/marcuscom"}
 			# The path to the MarcusCom ports without the trailing
 			# module name (i.e. without the trailing /ports).
 DESTDIR=${MARCUSMERGE_DESTDIR:="/usr/ports"}
 			# The path to the official ports collection.
-VERBOSE=${MARCUSMERGE_VERBOSE:="no"}
+VERBOSE=${MARCUSMERGE_VERBOSE:="yes"}
 			# If you want verbose output.
 SUPFILE=${MARCUSMERGE_SUPFILE:=""}
 			# The path your ports-supfile (default: auto).
@@ -53,8 +53,8 @@

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

-PKGVERSION_CMD="/usr/sbin/pkg_version"
-PKGVERSION_ARGS="-l \<"
+PKGVERSION_CMD="/usr/sbin/pkg"
+PKGVERSION_ARGS="version -l \<"

 CVSUP_CMD="/usr/bin/csup"
 FETCH_CMD="/usr/bin/fetch"