- Unbreak package builds by fixing packing lists to respect the

  recent change of ZOPEPRODUCTDIR.
- Bump PORTREVISION because files are moved to new ZOPEPRODUCTDIR.

Spotted by:	kris
Approved by:	marcus (portmgr)

2 files changed, 26 insertions, 32 deletions

diff --git a/www/znavigator/Makefile b/www/znavigator/Makefile
index bdef999..ec1d68c 100644
--- a/www/znavigator/Makefile
+++ b/www/znavigator/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	znavigator
 PORTVERSION=	2.00
+PORTREVISION=	1
 CATEGORIES=	www zope
 MASTER_SITES=	http://www.zope.org/Members/jonas/ZNavigator/
 DISTNAME=	${ZOPEPRODUCTNAME}-${PORTVERSION}
@@ -15,24 +16,17 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A Zope product to simplify the construction of navigation bars
 
-RUN_DEPENDS=	${ZOPEBASEDIR}/skel/bin/zopectl.in:${PORTSDIR}/www/zope
-
+USE_PYTHON=	YES
+USE_ZOPE=	YES
 NO_BUILD=	YES
-
-# You can change this in the environment if you like.
-SZOPEBASEDIR?=		www/Zope
+WRKSRC=		${WRKDIR}/lib/python
 
 # Don't change these
-ZOPEBASEDIR=		${PREFIX}/${SZOPEBASEDIR}
 ZOPEPRODUCTNAME=	ZNavigator
-ZOPEPRODUCTDIR=		lib/python/Products
-
-ZOPEPRODUCTSRC=		${WRKDIR}/${ZOPEPRODUCTDIR}/${ZOPEPRODUCTNAME}
+ZOPEPRODUCTSRC=		${WRKSRC}/${ZOPEPRODUCTDIR}/${ZOPEPRODUCTNAME}
 
 PKGMESSAGE=	${WRKDIR}/.pkg-message
 
-PLIST_SUB=	ZOPEBASEDIR=${SZOPEBASEDIR}
-
 do-install:
 	@${MKDIR} ${ZOPEBASEDIR}/${ZOPEPRODUCTDIR}/${ZOPEPRODUCTNAME}/
 	@${CP} -Rf ${ZOPEPRODUCTSRC}/* \
diff --git a/www/znavigator/pkg-plist b/www/znavigator/pkg-plist
index b75913d..161aac9 100644
--- a/www/znavigator/pkg-plist
+++ b/www/znavigator/pkg-plist
@@ -1,22 +1,22 @@
 %%ZOPEBASEDIR%%/import/navigator_demo.zexp
-%%ZOPEBASEDIR%%/lib/python/Products/ZNavigator/addNavigator.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/ZNavigator/addNavItem.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/ZNavigator/ChangeLog
-%%ZOPEBASEDIR%%/lib/python/Products/ZNavigator/COPYING
-%%ZOPEBASEDIR%%/lib/python/Products/ZNavigator/helpNavigator.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/ZNavigator/helpNavItem.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/ZNavigator/navitem.gif
-%%ZOPEBASEDIR%%/lib/python/Products/ZNavigator/__init__.py
-%%ZOPEBASEDIR%%/lib/python/Products/ZNavigator/INSTALL
-%%ZOPEBASEDIR%%/lib/python/Products/ZNavigator/manageNavigator.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/ZNavigator/manageNavItem.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/ZNavigator/miscPropertyForm.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/ZNavigator/navigator.gif
-%%ZOPEBASEDIR%%/lib/python/Products/ZNavigator/README
-%%ZOPEBASEDIR%%/lib/python/Products/ZNavigator/render.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/ZNavigator/version.txt
-%%ZOPEBASEDIR%%/lib/python/Products/ZNavigator/ZNavigator.py
-%%ZOPEBASEDIR%%/lib/python/Products/ZNavigator/demo/navigator_demo.zexp
-@unexec rm %D/%%ZOPEBASEDIR%%/lib/python/Products/ZNavigator/*.pyc 2> /dev/null || /usr/bin/true
-@unexec rmdir %D/%%ZOPEBASEDIR%%/lib/python/Products/ZNavigator/demo
-@unexec rmdir %D/%%ZOPEBASEDIR%%/lib/python/Products/ZNavigator
+%%ZOPEPRODUCTDIR%%/ZNavigator/addNavigator.dtml
+%%ZOPEPRODUCTDIR%%/ZNavigator/addNavItem.dtml
+%%ZOPEPRODUCTDIR%%/ZNavigator/ChangeLog
+%%ZOPEPRODUCTDIR%%/ZNavigator/COPYING
+%%ZOPEPRODUCTDIR%%/ZNavigator/helpNavigator.dtml
+%%ZOPEPRODUCTDIR%%/ZNavigator/helpNavItem.dtml
+%%ZOPEPRODUCTDIR%%/ZNavigator/navitem.gif
+%%ZOPEPRODUCTDIR%%/ZNavigator/__init__.py
+%%ZOPEPRODUCTDIR%%/ZNavigator/INSTALL
+%%ZOPEPRODUCTDIR%%/ZNavigator/manageNavigator.dtml
+%%ZOPEPRODUCTDIR%%/ZNavigator/manageNavItem.dtml
+%%ZOPEPRODUCTDIR%%/ZNavigator/miscPropertyForm.dtml
+%%ZOPEPRODUCTDIR%%/ZNavigator/navigator.gif
+%%ZOPEPRODUCTDIR%%/ZNavigator/README
+%%ZOPEPRODUCTDIR%%/ZNavigator/render.dtml
+%%ZOPEPRODUCTDIR%%/ZNavigator/version.txt
+%%ZOPEPRODUCTDIR%%/ZNavigator/ZNavigator.py
+%%ZOPEPRODUCTDIR%%/ZNavigator/demo/navigator_demo.zexp
+@unexec rm %D/%%ZOPEPRODUCTDIR%%/ZNavigator/*.py[co] 2> /dev/null || /usr/bin/true
+@unexec rmdir %D/%%ZOPEPRODUCTDIR%%/ZNavigator/demo
+@unexec rmdir %D/%%ZOPEPRODUCTDIR%%/ZNavigator