3 files changed, 46 insertions, 18 deletions

diff --git a/www/zope29/Makefile b/www/zope29/Makefile
index d884d7864aa7..2cced07c35e7 100644
--- a/www/zope29/Makefile
+++ b/www/zope29/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	zope29
-PORTVERSION=	2.9.7
-PORTREVISION=	1
+PORTVERSION=	2.9.9
 CATEGORIES=	www python zope
 MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/
 DISTNAME=	Zope-${PORTVERSION}-final
@@ -19,19 +18,11 @@ COMMENT=	An object-based web application platform
 
 USE_PYTHON=	2.4
 USE_RC_SUBR=	${PORTNAME}.sh zeo29.sh
-LATEST_LINK=	zope29
 
-# Note: the notes that follow reflect the decisions of prior maintainers
-# of this port. IOW, don't blame me if you don't like the way it's done.
-# Exceptions to this are marked as such.
-
-# Change these, if you like, via the environment.
 ZOPE_USER?=		www
 WEBBASEDIR?=		www
 SZOPEBASEDIR?=		${WEBBASEDIR}/Zope29
 
-# Do not change anything below this line.
-
 .if defined(INSTANCENAME)
 ZOPEINSTANCENAME=	${INSTANCENAME}
 .endif
@@ -73,12 +64,15 @@ post-configure:
 		-e 's,^.*LN.*PYTHON.*$$,,g' \
 		${WRKSRC}/${MAKEFILE}
 
+post-build:
+	-@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/
+
 post-install:
 	${MV} ${ZOPEBASEDIR}/skel/etc/zope.conf.in \
 		${ZOPEBASEDIR}/skel/etc/zope.conf.sample.in
 
 	${MKDIR} ${ZOPEBASEDIR}/Products
-	${CP} ${FILESDIR}/Products_00readme-freebsd.txt \
+	${INSTALL_DATA} ${FILESDIR}/Products_00readme-freebsd.txt \
 		${ZOPEBASEDIR}/Products/00readme-freebsd.txt
 
 .for d in lib bin doc skel Products
@@ -110,6 +104,6 @@ zeo:
 	@${CAT} ${WRKDIR}/zeo_message
 
 pre-package:
-	${CP} ${WRKDIR}/package-pkg-message ${PKGMESSAGE}
+	${INSTALL_DATA} ${WRKDIR}/package-pkg-message ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/www/zope29/distinfo b/www/zope29/distinfo
index 63d72a36606e..511859c51c2e 100644
--- a/www/zope29/distinfo
+++ b/www/zope29/distinfo
@@ -1,3 +1,3 @@
-MD5 (zope/Zope-2.9.7-final.tgz) = f7d900c00fe95d4cce0bc5854bc842b4
-SHA256 (zope/Zope-2.9.7-final.tgz) = 736a5a883e0ed5c57787ae33b71878761ce9abf6184b30fdb1585985b167e617
-SIZE (zope/Zope-2.9.7-final.tgz) = 6945646
+MD5 (zope/Zope-2.9.9-final.tgz) = 438a854e5cf8f34689ccf4792c2364eb
+SHA256 (zope/Zope-2.9.9-final.tgz) = d608258b712daa02e627ccc8d61313410d4927e0eb3b3f3b5d65fe4e080adbee
+SIZE (zope/Zope-2.9.9-final.tgz) = 7052458
diff --git a/www/zope29/pkg-plist b/www/zope29/pkg-plist
index b0bb06951621..2c8d3159c427 100644
--- a/www/zope29/pkg-plist
+++ b/www/zope29/pkg-plist
@@ -1,34 +1,63 @@
 %%ZOPEBASEDIR%%/Products/00readme-freebsd.txt
 %%ZOPEBASEDIR%%/bin/README.txt
 %%ZOPEBASEDIR%%/bin/analyze.py
+%%ZOPEBASEDIR%%/bin/analyze.pyc
 %%ZOPEBASEDIR%%/bin/check_catalog.py
+%%ZOPEBASEDIR%%/bin/check_catalog.pyc
 %%ZOPEBASEDIR%%/bin/checkbtrees.py
+%%ZOPEBASEDIR%%/bin/checkbtrees.pyc
 %%ZOPEBASEDIR%%/bin/compilezpy.py
+%%ZOPEBASEDIR%%/bin/compilezpy.pyc
 %%ZOPEBASEDIR%%/bin/copyzopeskel.py
+%%ZOPEBASEDIR%%/bin/copyzopeskel.pyc
 %%ZOPEBASEDIR%%/bin/decompilezpy.py
+%%ZOPEBASEDIR%%/bin/decompilezpy.pyc
 %%ZOPEBASEDIR%%/bin/fsdump.py
+%%ZOPEBASEDIR%%/bin/fsdump.pyc
 %%ZOPEBASEDIR%%/bin/fsrefs.py
+%%ZOPEBASEDIR%%/bin/fsrefs.pyc
 %%ZOPEBASEDIR%%/bin/fstail.py
+%%ZOPEBASEDIR%%/bin/fstail.pyc
 %%ZOPEBASEDIR%%/bin/fstest.py
+%%ZOPEBASEDIR%%/bin/fstest.pyc
 %%ZOPEBASEDIR%%/bin/load_site.py
+%%ZOPEBASEDIR%%/bin/load_site.pyc
 %%ZOPEBASEDIR%%/bin/migrate.py
+%%ZOPEBASEDIR%%/bin/migrate.pyc
 %%ZOPEBASEDIR%%/bin/mkzeoinstance.py
+%%ZOPEBASEDIR%%/bin/mkzeoinstance.pyc
 %%ZOPEBASEDIR%%/bin/mkzopeinstance.py
+%%ZOPEBASEDIR%%/bin/mkzopeinstance.pyc
 %%ZOPEBASEDIR%%/bin/netspace.py
+%%ZOPEBASEDIR%%/bin/netspace.pyc
 %%ZOPEBASEDIR%%/bin/parsezeolog.py
+%%ZOPEBASEDIR%%/bin/parsezeolog.pyc
 %%ZOPEBASEDIR%%/bin/reindex_catalog.py
+%%ZOPEBASEDIR%%/bin/reindex_catalog.pyc
 %%ZOPEBASEDIR%%/bin/repozo.py
+%%ZOPEBASEDIR%%/bin/repozo.pyc
 %%ZOPEBASEDIR%%/bin/requestprofiler.py
+%%ZOPEBASEDIR%%/bin/requestprofiler.pyc
 %%ZOPEBASEDIR%%/bin/space.py
+%%ZOPEBASEDIR%%/bin/space.pyc
 %%ZOPEBASEDIR%%/bin/test.py
+%%ZOPEBASEDIR%%/bin/test.pyc
 %%ZOPEBASEDIR%%/bin/timeout.py
+%%ZOPEBASEDIR%%/bin/timeout.pyc
 %%ZOPEBASEDIR%%/bin/zeopack.py
+%%ZOPEBASEDIR%%/bin/zeopack.pyc
 %%ZOPEBASEDIR%%/bin/zeoqueue.py
+%%ZOPEBASEDIR%%/bin/zeoqueue.pyc
 %%ZOPEBASEDIR%%/bin/zeoreplay.py
+%%ZOPEBASEDIR%%/bin/zeoreplay.pyc
 %%ZOPEBASEDIR%%/bin/zeoserverlog.py
+%%ZOPEBASEDIR%%/bin/zeoserverlog.pyc
 %%ZOPEBASEDIR%%/bin/zeoup.py
+%%ZOPEBASEDIR%%/bin/zeoup.pyc
 %%ZOPEBASEDIR%%/bin/zodbload.py
+%%ZOPEBASEDIR%%/bin/zodbload.pyc
 %%ZOPEBASEDIR%%/bin/zpasswd.py
+%%ZOPEBASEDIR%%/bin/zpasswd.pyc
 %%ZOPEBASEDIR%%/doc/CHANGES.txt
 %%ZOPEBASEDIR%%/doc/CREDITS.txt
 %%ZOPEBASEDIR%%/doc/DEBUGGING.txt
@@ -715,7 +744,6 @@
 %%ZOPEBASEDIR%%/lib/python/OFS/subscribers.pyc
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/__init__.py
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/__init__.pyc
-%%ZOPEBASEDIR%%/lib/python/OFS/tests/events.zcml
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/mime.types-1
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/mime.types-2
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/test.gif
@@ -889,6 +917,7 @@
 %%ZOPEBASEDIR%%/lib/python/Products/Five/browser/tests/resource.txt
 %%ZOPEBASEDIR%%/lib/python/Products/Five/browser/tests/resource.zcml
 %%ZOPEBASEDIR%%/lib/python/Products/Five/browser/tests/resource_ftest.txt
+%%ZOPEBASEDIR%%/lib/python/Products/Five/browser/tests/resource_subdir/resource.html
 %%ZOPEBASEDIR%%/lib/python/Products/Five/browser/tests/resource_subdir/resource.txt
 %%ZOPEBASEDIR%%/lib/python/Products/Five/browser/tests/seagull.pt
 %%ZOPEBASEDIR%%/lib/python/Products/Five/browser/tests/security.pt
@@ -5367,6 +5396,8 @@
 %%ZOPEBASEDIR%%/lib/python/zope/app/component/tests/test_registration.pyc
 %%ZOPEBASEDIR%%/lib/python/zope/app/component/tests/test_site.py
 %%ZOPEBASEDIR%%/lib/python/zope/app/component/tests/test_site.pyc
+%%ZOPEBASEDIR%%/lib/python/zope/app/component/tests/test_vocabulary.py
+%%ZOPEBASEDIR%%/lib/python/zope/app/component/tests/test_vocabulary.pyc
 %%ZOPEBASEDIR%%/lib/python/zope/app/component/tests/views.py
 %%ZOPEBASEDIR%%/lib/python/zope/app/component/tests/views.pyc
 %%ZOPEBASEDIR%%/lib/python/zope/app/component/vocabulary.py
@@ -5723,6 +5754,7 @@
 %%ZOPEBASEDIR%%/lib/python/zope/app/folder/configure.zcml
 %%ZOPEBASEDIR%%/lib/python/zope/app/folder/filerepresentation.py
 %%ZOPEBASEDIR%%/lib/python/zope/app/folder/filerepresentation.pyc
+%%ZOPEBASEDIR%%/lib/python/zope/app/folder/filerepresentation.txt
 %%ZOPEBASEDIR%%/lib/python/zope/app/folder/folder.py
 %%ZOPEBASEDIR%%/lib/python/zope/app/folder/folder.pyc
 %%ZOPEBASEDIR%%/lib/python/zope/app/folder/fssync/__init__.py
@@ -8640,6 +8672,8 @@
 %%ZOPEBASEDIR%%/lib/python/zope/testbrowser/testbrowser-ftesting.zcml
 %%ZOPEBASEDIR%%/lib/python/zope/testbrowser/testing.py
 %%ZOPEBASEDIR%%/lib/python/zope/testbrowser/testing.pyc
+%%ZOPEBASEDIR%%/lib/python/zope/testbrowser/tests.py
+%%ZOPEBASEDIR%%/lib/python/zope/testbrowser/tests.pyc
 %%ZOPEBASEDIR%%/lib/python/zope/testing/__init__.py
 %%ZOPEBASEDIR%%/lib/python/zope/testing/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/zope/testing/cleanup.py
@@ -9547,8 +9581,8 @@
 @dirrm %%ZOPEBASEDIR%%/lib/python/AccessControl/securitySuite
 @dirrm %%ZOPEBASEDIR%%/lib/python/AccessControl/dtml
 @dirrm %%ZOPEBASEDIR%%/lib/python/AccessControl
-@dirrm %%ZOPEBASEDIR%%/lib/python
-@dirrm %%ZOPEBASEDIR%%/lib
+@dirrmtry %%ZOPEBASEDIR%%/lib/python
+@dirrmtry %%ZOPEBASEDIR%%/lib
 @dirrm %%ZOPEBASEDIR%%/doc
 @dirrm %%ZOPEBASEDIR%%/bin
 @dirrmtry %%ZOPEBASEDIR%%/Products