Add user-destdir support

3 files changed, 31 insertions, 9 deletions

diff --git a/www/zope211/Makefile b/www/zope211/Makefile
index a7dd0463217..247e1cdb8d0 100644
--- a/www/zope211/Makefile
+++ b/www/zope211/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2011/05/14 02:58:08 taca Exp $
+# $NetBSD: Makefile,v 1.7 2011/11/11 18:48:24 joerg Exp $
 #
 
 DISTNAME=	Zope-${ZOPE211_VERSION}-final
@@ -11,6 +11,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.zope.org/
 COMMENT=	Zope, the Z Object Publishing Environment
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	${PYPKGPREFIX}-expat>=0:../../textproc/py-expat
 
 PYTHON_VERSIONS_ACCEPTED=	24
@@ -21,6 +23,12 @@ CONFIGURE_ARGS=	--prefix=${ZOPE_DIR} --with-python=${PYTHONBIN} --quiet
 BUILD_TARGET=	build version_txt
 MAKE_FILE=	makefile
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${_USE_DESTDIR} != "no"
+INSTALL_MAKE_FLAGS=	INSTALL_FLAGS=--root=${DESTDIR:Q}
+.endif
+
 INSTALLATION_DIRS=	${ZOPE_DOC_DIR}/zeo ${ZOPE_DOC_DIR}/zope
 OWN_DIRS+=		${ZOPE_PRODUCTS_DIR}
 RCD_SCRIPTS=		zope${ZOPE_VERSION} zeo${ZOPE_VERSION}
@@ -74,15 +82,15 @@ post-build:
 
 pre-install:
 	${FIND} ${WRKSRC} \( -name '*.orig' -o -name svn-commit.tmp \) \
-		-print0 | ${XARGS} -0 -- ${RM}
+		-print | ${XARGS} -- ${RM}
 
 post-install:
-	cd ${WRKSRC}/doc/ZEO; pax -rw *.txt ${ZOPE_DOC_DIR}/zeo
-	cd ${WRKSRC}/doc; pax -rw *.txt ${ZOPE_DOC_DIR}/zope
-	${FIND} ${ZOPE_DIR} ${ZOPE_DOC_DIR} -type f -print0 \
-		| ${XARGS} -0 -- ${CHMOD} a-w+r
-	${FIND} ${ZOPE_DIR} -type f -name '*.pyc' -print0 | \
-		${XARGS} -0 -- ${CHMOD} a-x
+	cd ${WRKSRC}/doc/ZEO; pax -rw *.txt ${DESTDIR}${ZOPE_DOC_DIR}/zeo
+	cd ${WRKSRC}/doc; pax -rw *.txt ${DESTDIR}${ZOPE_DOC_DIR}/zope
+	${FIND} ${DESTDIR}${ZOPE_DIR} ${DESTDIR}${ZOPE_DOC_DIR} -type f -print \
+		| ${XARGS} -- ${CHMOD} a-w+r
+	${FIND} ${DESTDIR}${ZOPE_DIR} -type f -name '*.pyc' -print | \
+		${XARGS} -- ${CHMOD} a-x
 
 .include "../../www/zope/Makefile.common"
 .include "../../www/zope/replace.mk"
diff --git a/www/zope211/distinfo b/www/zope211/distinfo
index 0eb7bcb92c0..df90bf0dc96 100644
--- a/www/zope211/distinfo
+++ b/www/zope211/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2011/05/14 02:58:09 taca Exp $
+$NetBSD: distinfo,v 1.6 2011/11/11 18:48:24 joerg Exp $
 
 SHA1 (Zope-2.11.8-final.tgz) = 0d06b6c4842f00db7c4b900f9f3860e911276a46
 RMD160 (Zope-2.11.8-final.tgz) = 64cedf8576296fa1722af9bd17df5e074a8b2fce
@@ -12,4 +12,5 @@ SHA1 (patch-af) = 3b352c8bd6cc8f7360025d3d27267a0319cd6b17
 SHA1 (patch-ag) = dffc88b9d087e01bf853441c4a9064a9184a310f
 SHA1 (patch-ah) = 360c8f69e1f23a9f0dec666d509e03e4ef55d93b
 SHA1 (patch-ai) = 1b08b88cbd9e8950c1c24a85ddceff273a175892
+SHA1 (patch-inst-Makefile.in) = f0ab14a78fe2f19317eedc3e046f063c5df1ef8e
 SHA1 (patch-lib_python_mechanize___firefox3cookiejar.py) = 21e5350bf364b6df919251c08dfc66a72c356ac6
diff --git a/www/zope211/patches/patch-inst-Makefile.in b/www/zope211/patches/patch-inst-Makefile.in
new file mode 100644
index 00000000000..d5a2f1844c1
--- /dev/null
+++ b/www/zope211/patches/patch-inst-Makefile.in
@@ -0,0 +1,13 @@
+$NetBSD: patch-inst-Makefile.in,v 1.1 2011/11/11 18:48:24 joerg Exp $
+
+--- inst/Makefile.in.orig	2011-11-11 17:14:02.000000000 +0000
++++ inst/Makefile.in
+@@ -55,7 +54,7 @@ unbuild:
+ install: build version_txt
+ 	${PYTHON} "${BASE_DIR}/setup.py" ${DISTUTILS_OPTS} install \
+ 	   --home="${PREFIX}" ${BUILD_FLAGS} ${INSTALL_FLAGS}
+-	[ -f ${PREFIX}/bin/python ] || ${LN} ${PYTHON} ${PREFIX}/bin/python
++	[ -f ${DESTDIR}${PREFIX}/bin/python ] || ${LN} ${PYTHON} ${DESTDIR}${PREFIX}/bin/python
+ 	@echo
+ 	@echo Zope binaries installed successfully.
+ 	@echo Now run \'${PREFIX}/bin/mkzopeinstance.py\'