Fix PLIST. Add user-destdir support

4 files changed, 36 insertions, 10 deletions

diff --git a/www/zope210/Makefile b/www/zope210/Makefile
index c5b27bb8300..385046fe3b9 100644
--- a/www/zope210/Makefile
+++ b/www/zope210/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2011/05/14 02:56:33 taca Exp $
+# $NetBSD: Makefile,v 1.11 2011/11/11 18:46:58 joerg Exp $
 # FreeBSD Id: ports/www/zope29/Makefile,v 1.86 2006/08/03 15:53:04 garga Exp
 
 DISTNAME=	Zope-${ZOPE210_VERSION}-final
 PKGNAME=	${ZOPE_PKG_PREFIX}-${ZOPE210_VERSION}
+PKGREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	http://www.zope.org/Products/Zope/${ZOPE210_VERSION}/
 EXTRACT_SUFX=	.tgz
@@ -11,6 +12,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.zope.org/
 COMMENT=	Zope ${ZOPE210_VERSION}, the Z Object Publishing Environment
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	${PYPKGPREFIX}-expat>=0:../../textproc/py-expat
 
 PYTHON_VERSIONS_ACCEPTED=	24
@@ -21,6 +24,12 @@ CONFIGURE_ARGS=	--prefix=${ZOPE_DIR} --with-python=${PYTHONBIN}
 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}
@@ -73,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/zope210/PLIST b/www/zope210/PLIST
index ec4d4af5428..0fa2ce8717f 100644
--- a/www/zope210/PLIST
+++ b/www/zope210/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2011/05/14 02:56:33 taca Exp $
+@comment $NetBSD: PLIST,v 1.6 2011/11/11 18:46:58 joerg Exp $
 ${ZOPE_DOC_BASE}/zeo/README.txt
 ${ZOPE_DOC_BASE}/zeo/ZopeREADME.txt
 ${ZOPE_DOC_BASE}/zeo/cache.txt
@@ -727,6 +727,7 @@ ${ZOPE_BASE}/lib/python/OFS/subscribers.py
 ${ZOPE_BASE}/lib/python/OFS/subscribers.pyc
 ${ZOPE_BASE}/lib/python/OFS/tests/__init__.py
 ${ZOPE_BASE}/lib/python/OFS/tests/__init__.pyc
+${ZOPE_BASE}/lib/python/OFS/tests/export.xml
 ${ZOPE_BASE}/lib/python/OFS/tests/mime.types-1
 ${ZOPE_BASE}/lib/python/OFS/tests/mime.types-2
 ${ZOPE_BASE}/lib/python/OFS/tests/test.gif
@@ -1851,6 +1852,8 @@ ${ZOPE_BASE}/lib/python/Products/TemporaryFolder/__init__.pyc
 ${ZOPE_BASE}/lib/python/Products/TemporaryFolder/dtml/addTemporaryFolder.dtml
 ${ZOPE_BASE}/lib/python/Products/TemporaryFolder/dtml/mountfail.dtml
 ${ZOPE_BASE}/lib/python/Products/TemporaryFolder/help/TemporaryFolder.stx
+${ZOPE_BASE}/lib/python/Products/TemporaryFolder/mount.py
+${ZOPE_BASE}/lib/python/Products/TemporaryFolder/mount.pyc
 ${ZOPE_BASE}/lib/python/Products/TemporaryFolder/patchfs.py
 ${ZOPE_BASE}/lib/python/Products/TemporaryFolder/patchfs.pyc
 ${ZOPE_BASE}/lib/python/Products/TemporaryFolder/www/tempfolder.gif
diff --git a/www/zope210/distinfo b/www/zope210/distinfo
index 0531bcd2d20..479f886291a 100644
--- a/www/zope210/distinfo
+++ b/www/zope210/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2011/05/14 02:56:33 taca Exp $
+$NetBSD: distinfo,v 1.6 2011/11/11 18:46:58 joerg Exp $
 
 SHA1 (Zope-2.10.13-final.tgz) = 8aca6366a35d94b1c9ed27c36c7df9999bb2ef88
 RMD160 (Zope-2.10.13-final.tgz) = 1ba39790ee768e10cf55fbc4587b9e41118cc33a
@@ -12,3 +12,4 @@ SHA1 (patch-af) = 3b352c8bd6cc8f7360025d3d27267a0319cd6b17
 SHA1 (patch-ag) = dffc88b9d087e01bf853441c4a9064a9184a310f
 SHA1 (patch-ah) = 360c8f69e1f23a9f0dec666d509e03e4ef55d93b
 SHA1 (patch-ai) = d7987483068b677aeab5ceb59dd8261e204065d7
+SHA1 (patch-inst-Makefile.in) = 7136a3474e4c765472dc80a74af0540d71267ba0
diff --git a/www/zope210/patches/patch-inst-Makefile.in b/www/zope210/patches/patch-inst-Makefile.in
new file mode 100644
index 00000000000..26e57ca2bfb
--- /dev/null
+++ b/www/zope210/patches/patch-inst-Makefile.in
@@ -0,0 +1,13 @@
+$NetBSD: patch-inst-Makefile.in,v 1.1 2011/11/11 18:46:58 joerg Exp $
+
+--- inst/Makefile.in.orig	2011-11-11 17:07:06.000000000 +0000
++++ inst/Makefile.in
+@@ -55,7 +55,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\'