From 4974ea803bbf154158c1592ecc0fc6a6bf3e2fc0 Mon Sep 17 00:00:00 2001 From: Andrew Pantyukhin Date: Sat, 4 Nov 2006 10:23:31 +0000 Subject: [PATCH] - Fix bsd.port.mk patch PR: ports/104551 Submitted by: Robert Woolley --- .../files/patch-portmanager__patch-bsd.port.mk-0.3.6 | 11 +++++++++++ .../files/patch-portmanager__patch-bsd.port.mk-0.3.6 | 11 +++++++++++ 2 files changed, 22 insertions(+) create mode 100644 ports-mgmt/portmanager/files/patch-portmanager__patch-bsd.port.mk-0.3.6 create mode 100644 sysutils/portmanager/files/patch-portmanager__patch-bsd.port.mk-0.3.6 diff --git a/ports-mgmt/portmanager/files/patch-portmanager__patch-bsd.port.mk-0.3.6 b/ports-mgmt/portmanager/files/patch-portmanager__patch-bsd.port.mk-0.3.6 new file mode 100644 index 000000000000..3d5c3ee21245 --- /dev/null +++ b/ports-mgmt/portmanager/files/patch-portmanager__patch-bsd.port.mk-0.3.6 @@ -0,0 +1,11 @@ +--- ./portmanager/patch-bsd.port.mk-0.3.6.orig Sat Nov 4 13:20:22 2006 ++++ ./portmanager/patch-bsd.port.mk-0.3.6 Sat Nov 4 13:20:47 2006 +@@ -5,7 +5,7 @@ + .endif + .if !defined(PKG_ARGS) + -PKG_ARGS= -v -c -${COMMENT:Q} -d ${DESCR} -f ${TMPPLIST} -p ${PREFIX} -P "`cd ${.CURDIR} && ${MAKE} package-depends | ${GREP} -v -E ${PKG_IGNORE_DEPENDS} | ${SORT} -u`" ${EXTRA_PKG_ARGS} $${_LATE_PKG_ARGS} +-+PORTMANAGER= ${LOCALBASE}/bin/portmanager /${PKGORIGIN} package-depends +++PORTMANAGER= ${LOCALBASE}/bin/portmanager /${PKGORIGIN} package-depends | ${GREP} -v -E "^MGPMr" + +PKG_ARGS= -v -c -${COMMENT:Q} -d ${DESCR} -f ${TMPPLIST} -p ${PREFIX} -P "`cd ${.CURDIR} && ${PORTMANAGER} | ${GREP} -v -E ${PKG_IGNORE_DEPENDS} | ${SORT} -u`" ${EXTRA_PKG_ARGS} $${_LATE_PKG_ARGS} + +###PKG_ARGS= -v -c -${COMMENT:Q} -d ${DESCR} -f ${TMPPLIST} -p ${PREFIX} -P "`cd ${.CURDIR} && ${MAKE} package-depends | ${GREP} -v -E ${PKG_IGNORE_DEPENDS} | ${SORT} -u`" ${EXTRA_PKG_ARGS} $${_LATE_PKG_ARGS} + .if !defined(NO_MTREE) diff --git a/sysutils/portmanager/files/patch-portmanager__patch-bsd.port.mk-0.3.6 b/sysutils/portmanager/files/patch-portmanager__patch-bsd.port.mk-0.3.6 new file mode 100644 index 000000000000..3d5c3ee21245 --- /dev/null +++ b/sysutils/portmanager/files/patch-portmanager__patch-bsd.port.mk-0.3.6 @@ -0,0 +1,11 @@ +--- ./portmanager/patch-bsd.port.mk-0.3.6.orig Sat Nov 4 13:20:22 2006 ++++ ./portmanager/patch-bsd.port.mk-0.3.6 Sat Nov 4 13:20:47 2006 +@@ -5,7 +5,7 @@ + .endif + .if !defined(PKG_ARGS) + -PKG_ARGS= -v -c -${COMMENT:Q} -d ${DESCR} -f ${TMPPLIST} -p ${PREFIX} -P "`cd ${.CURDIR} && ${MAKE} package-depends | ${GREP} -v -E ${PKG_IGNORE_DEPENDS} | ${SORT} -u`" ${EXTRA_PKG_ARGS} $${_LATE_PKG_ARGS} +-+PORTMANAGER= ${LOCALBASE}/bin/portmanager /${PKGORIGIN} package-depends +++PORTMANAGER= ${LOCALBASE}/bin/portmanager /${PKGORIGIN} package-depends | ${GREP} -v -E "^MGPMr" + +PKG_ARGS= -v -c -${COMMENT:Q} -d ${DESCR} -f ${TMPPLIST} -p ${PREFIX} -P "`cd ${.CURDIR} && ${PORTMANAGER} | ${GREP} -v -E ${PKG_IGNORE_DEPENDS} | ${SORT} -u`" ${EXTRA_PKG_ARGS} $${_LATE_PKG_ARGS} + +###PKG_ARGS= -v -c -${COMMENT:Q} -d ${DESCR} -f ${TMPPLIST} -p ${PREFIX} -P "`cd ${.CURDIR} && ${MAKE} package-depends | ${GREP} -v -E ${PKG_IGNORE_DEPENDS} | ${SORT} -u`" ${EXTRA_PKG_ARGS} $${_LATE_PKG_ARGS} + .if !defined(NO_MTREE)