Index: marcusmerge.sh.in =================================================================== RCS file: /space/cvs/marcuscom-cvs/portstools/marcusmerge.sh.in,v retrieving revision 1.64 diff -u -r1.64 marcusmerge.sh.in --- marcusmerge.sh.in 19 Oct 2007 04:03:09 -0000 1.64 +++ marcusmerge.sh.in 23 Feb 2013 16:08:08 -0000 @@ -53,8 +53,15 @@ # You do not have to change anything beyond this line. +PKGNG_USED= `make -f ${DESTDIR}/Mk/bsd.port.mk -V WITH_PKGNG` + +if [ "${PKGNG_USED}" = "yes" ]; then +PKGVERSION_CMD="${DESTDIR}/bin/pkg" +PKGVERSION_ARGS=" version -l \<" +else PKGVERSION_CMD="/usr/sbin/pkg_version" PKGVERSION_ARGS="-l \<" +fi CVSUP_CMD="/usr/bin/csup" FETCH_CMD="/usr/bin/fetch"