2 files changed, 28 insertions, 35 deletions

diff --git a/www/zope-annotations/Makefile b/www/zope-annotations/Makefile
index dd56acb3a5c5..df8621b95689 100644
--- a/www/zope-annotations/Makefile
+++ b/www/zope-annotations/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	annotations
 PORTVERSION=	0.4.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www zope
 MASTER_SITES=	http://zope.org/Members/infrae/Annotations/Annotations-${PORTVERSION}/
 PKGNAMEPREFIX=	zope-
@@ -23,13 +23,6 @@ DIST_SUBDIR=	zope
 
 ZOPEPRODUCTNAME=Annotations
 
-# yes, some of us are running zope on python 2.3
-#PYTHON_VERSION=	python2.3
-
-# You can change this in the environment if you like.
-#SZOPEBASEDIR?=		www/Zope
-
-PLIST_SUB=	ZOPEBASEDIR=${SZOPEBASEDIR}
 WRKSRC=		${WRKDIR}/${ZOPEPRODUCTNAME}
 
 do-build:
diff --git a/www/zope-annotations/pkg-plist b/www/zope-annotations/pkg-plist
index 8a0f069fdcd5..189cdb9b9d04 100644
--- a/www/zope-annotations/pkg-plist
+++ b/www/zope-annotations/pkg-plist
@@ -1,27 +1,27 @@
-%%ZOPEBASEDIR%%/lib/python/Products/Annotations/AnnotationTool.py
-%%ZOPEBASEDIR%%/lib/python/Products/Annotations/AnnotationTool.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Annotations/CREDITS.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Annotations/Compatibility.py
-%%ZOPEBASEDIR%%/lib/python/Products/Annotations/Compatibility.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Annotations/Configuration.py
-%%ZOPEBASEDIR%%/lib/python/Products/Annotations/Configuration.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Annotations/Extensions/Install.py
-%%ZOPEBASEDIR%%/lib/python/Products/Annotations/Extensions/Install.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Annotations/Extensions/SilvaInstall.py
-%%ZOPEBASEDIR%%/lib/python/Products/Annotations/Extensions/SilvaInstall.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Annotations/Extensions/__init__.py
-%%ZOPEBASEDIR%%/lib/python/Products/Annotations/Extensions/__init__.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Annotations/HISTORY.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Annotations/INSTALL.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Annotations/LICENSE.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Annotations/README.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Annotations/__init__.py
-%%ZOPEBASEDIR%%/lib/python/Products/Annotations/__init__.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Annotations/helpers.py
-%%ZOPEBASEDIR%%/lib/python/Products/Annotations/helpers.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Annotations/homepage.html
-%%ZOPEBASEDIR%%/lib/python/Products/Annotations/version.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Annotations/www/annotations.png
-@dirrm %%ZOPEBASEDIR%%/lib/python/Products/Annotations/Extensions
-@dirrm %%ZOPEBASEDIR%%/lib/python/Products/Annotations/www
-@dirrm %%ZOPEBASEDIR%%/lib/python/Products/Annotations/
+%%ZOPEPRODUCTDIR%%/Annotations/AnnotationTool.py
+%%ZOPEPRODUCTDIR%%/Annotations/AnnotationTool.pyc
+%%ZOPEPRODUCTDIR%%/Annotations/CREDITS.txt
+%%ZOPEPRODUCTDIR%%/Annotations/Compatibility.py
+%%ZOPEPRODUCTDIR%%/Annotations/Compatibility.pyc
+%%ZOPEPRODUCTDIR%%/Annotations/Configuration.py
+%%ZOPEPRODUCTDIR%%/Annotations/Configuration.pyc
+%%ZOPEPRODUCTDIR%%/Annotations/Extensions/Install.py
+%%ZOPEPRODUCTDIR%%/Annotations/Extensions/Install.pyc
+%%ZOPEPRODUCTDIR%%/Annotations/Extensions/SilvaInstall.py
+%%ZOPEPRODUCTDIR%%/Annotations/Extensions/SilvaInstall.pyc
+%%ZOPEPRODUCTDIR%%/Annotations/Extensions/__init__.py
+%%ZOPEPRODUCTDIR%%/Annotations/Extensions/__init__.pyc
+%%ZOPEPRODUCTDIR%%/Annotations/HISTORY.txt
+%%ZOPEPRODUCTDIR%%/Annotations/INSTALL.txt
+%%ZOPEPRODUCTDIR%%/Annotations/LICENSE.txt
+%%ZOPEPRODUCTDIR%%/Annotations/README.txt
+%%ZOPEPRODUCTDIR%%/Annotations/__init__.py
+%%ZOPEPRODUCTDIR%%/Annotations/__init__.pyc
+%%ZOPEPRODUCTDIR%%/Annotations/helpers.py
+%%ZOPEPRODUCTDIR%%/Annotations/helpers.pyc
+%%ZOPEPRODUCTDIR%%/Annotations/homepage.html
+%%ZOPEPRODUCTDIR%%/Annotations/version.txt
+%%ZOPEPRODUCTDIR%%/Annotations/www/annotations.png
+@dirrm %%ZOPEPRODUCTDIR%%/Annotations/Extensions
+@dirrm %%ZOPEPRODUCTDIR%%/Annotations/www
+@dirrm %%ZOPEPRODUCTDIR%%/Annotations/