3 files changed, 23 insertions, 17 deletions

diff --git a/www/zope211/Makefile b/www/zope211/Makefile
index 77dda74c3708..00797d9e0c66 100644
--- a/www/zope211/Makefile
+++ b/www/zope211/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	zope211
-PORTVERSION=	2.11.6
+PORTVERSION=	2.11.8
 CATEGORIES=	www python zope
-MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/
+MASTER_SITES=	http://old.zope.org/Products/Zope/${PORTVERSION}/
 DISTNAME=	Zope-${PORTVERSION}-final
 EXTRACT_SUFX=	.tgz
 DIST_SUBDIR=	zope
@@ -51,7 +51,7 @@ ISBATCH=	""
 .endif
 
 post-patch:
-	@${FIND} ${WRKSRC} -name '*.orig' -print0 | ${XARGS} -0 -- ${RM}
+	@${FIND} ${WRKSRC} -name '*.orig' -delete
 	@${REINPLACE_CMD} \
 		-e 's,^\(ACCEPTABLE="\).*"$$,\1${PYTHON_PORTVERSION}",g' \
 		-e 's,^\(TARGET="\).*"$$,\1${PYTHON_PORTVERSION}",g' \
@@ -64,9 +64,6 @@ 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
@@ -75,6 +72,8 @@ post-install:
 	${INSTALL_DATA} ${FILESDIR}/Products_00readme-freebsd.txt \
 		${ZOPEBASEDIR}/Products/00readme-freebsd.txt
 
+	-@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${ZOPEBASEDIR}/
+
 .for d in lib bin doc skel Products
 	${FIND} ${ZOPEBASEDIR}/$d -type f -print0 | ${XARGS} -0 -- ${CHMOD} a-w+r
 .endfor
diff --git a/www/zope211/distinfo b/www/zope211/distinfo
index 194cfbe14fdd..be07963ca8e0 100644
--- a/www/zope211/distinfo
+++ b/www/zope211/distinfo
@@ -1,2 +1,2 @@
-SHA256 (zope/Zope-2.11.6-final.tgz) = 4ee4de673fd8fef26a0cc624e4e21099bf43bdb42cf3c1c6d5fc6457c0133395
-SIZE (zope/Zope-2.11.6-final.tgz) = 7364722
+SHA256 (zope/Zope-2.11.8-final.tgz) = cdae1f71f8164901bec15d53a11cbedd17731dbb3c00963665a2aaebc44cad26 
+SIZE (zope/Zope-2.11.8-final.tgz) = 7335479
diff --git a/www/zope211/pkg-plist b/www/zope211/pkg-plist
index 579c5f74758c..027ba7e8207e 100644
--- a/www/zope211/pkg-plist
+++ b/www/zope211/pkg-plist
@@ -738,6 +738,7 @@
 %%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/export.xml
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/mime.types-1
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/mime.types-2
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/test.gif
@@ -2848,6 +2849,8 @@
 %%ZOPEBASEDIR%%/lib/python/ZEO/tests/multi.py
 %%ZOPEBASEDIR%%/lib/python/ZEO/tests/multi.pyc
 %%ZOPEBASEDIR%%/lib/python/ZEO/tests/registerDB.test
+%%ZOPEBASEDIR%%/lib/python/ZEO/tests/servertesting.py
+%%ZOPEBASEDIR%%/lib/python/ZEO/tests/servertesting.pyc
 %%ZOPEBASEDIR%%/lib/python/ZEO/tests/speed.py
 %%ZOPEBASEDIR%%/lib/python/ZEO/tests/speed.pyc
 %%ZOPEBASEDIR%%/lib/python/ZEO/tests/stress.py
@@ -2864,6 +2867,8 @@
 %%ZOPEBASEDIR%%/lib/python/ZEO/tests/testTransactionBuffer.pyc
 %%ZOPEBASEDIR%%/lib/python/ZEO/tests/testZEO.py
 %%ZOPEBASEDIR%%/lib/python/ZEO/tests/testZEO.pyc
+%%ZOPEBASEDIR%%/lib/python/ZEO/tests/testZEO2.py
+%%ZOPEBASEDIR%%/lib/python/ZEO/tests/testZEO2.pyc
 %%ZOPEBASEDIR%%/lib/python/ZEO/tests/testZEOOptions.py
 %%ZOPEBASEDIR%%/lib/python/ZEO/tests/testZEOOptions.pyc
 %%ZOPEBASEDIR%%/lib/python/ZEO/tests/test_cache.py
@@ -2871,10 +2876,6 @@
 %%ZOPEBASEDIR%%/lib/python/ZEO/tests/zeo-fan-out.test
 %%ZOPEBASEDIR%%/lib/python/ZEO/tests/zeoserver.py
 %%ZOPEBASEDIR%%/lib/python/ZEO/tests/zeoserver.pyc
-%%ZOPEBASEDIR%%/lib/python/ZEO/tests/testZEO2.py
-%%ZOPEBASEDIR%%/lib/python/ZEO/tests/testZEO2.pyc
-%%ZOPEBASEDIR%%/lib/python/ZEO/tests/servertesting.py
-%%ZOPEBASEDIR%%/lib/python/ZEO/tests/servertesting.pyc
 %%ZOPEBASEDIR%%/lib/python/ZEO/util.py
 %%ZOPEBASEDIR%%/lib/python/ZEO/util.pyc
 %%ZOPEBASEDIR%%/lib/python/ZEO/version.txt
@@ -3013,13 +3014,13 @@
 %%ZOPEBASEDIR%%/lib/python/ZODB/scripts/space.pyc
 %%ZOPEBASEDIR%%/lib/python/ZODB/scripts/stats.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/scripts/stats.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/scripts/strip_versions.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/scripts/strip_versions.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/scripts/strip_versions.test
 %%ZOPEBASEDIR%%/lib/python/ZODB/scripts/tests.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/scripts/tests.pyc
 %%ZOPEBASEDIR%%/lib/python/ZODB/scripts/zodbload.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/scripts/zodbload.pyc
-%%ZOPEBASEDIR%%/lib/python/ZODB/scripts/strip_versions.py
-%%ZOPEBASEDIR%%/lib/python/ZODB/scripts/strip_versions.pyc
-%%ZOPEBASEDIR%%/lib/python/ZODB/scripts/strip_versions.test
 %%ZOPEBASEDIR%%/lib/python/ZODB/serialize.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/serialize.pyc
 %%ZOPEBASEDIR%%/lib/python/ZODB/storage.xml
@@ -3936,6 +3937,7 @@
 %%ZOPEBASEDIR%%/lib/python/pytz/zoneinfo/America/Manaus
 %%ZOPEBASEDIR%%/lib/python/pytz/zoneinfo/America/Marigot
 %%ZOPEBASEDIR%%/lib/python/pytz/zoneinfo/America/Martinique
+%%ZOPEBASEDIR%%/lib/python/pytz/zoneinfo/America/Matamoros
 %%ZOPEBASEDIR%%/lib/python/pytz/zoneinfo/America/Mazatlan
 %%ZOPEBASEDIR%%/lib/python/pytz/zoneinfo/America/Mendoza
 %%ZOPEBASEDIR%%/lib/python/pytz/zoneinfo/America/Menominee
@@ -3954,6 +3956,7 @@
 %%ZOPEBASEDIR%%/lib/python/pytz/zoneinfo/America/Noronha
 %%ZOPEBASEDIR%%/lib/python/pytz/zoneinfo/America/North_Dakota/Center
 %%ZOPEBASEDIR%%/lib/python/pytz/zoneinfo/America/North_Dakota/New_Salem
+%%ZOPEBASEDIR%%/lib/python/pytz/zoneinfo/America/Ojinaga
 %%ZOPEBASEDIR%%/lib/python/pytz/zoneinfo/America/Panama
 %%ZOPEBASEDIR%%/lib/python/pytz/zoneinfo/America/Pangnirtung
 %%ZOPEBASEDIR%%/lib/python/pytz/zoneinfo/America/Paramaribo
@@ -3970,6 +3973,7 @@
 %%ZOPEBASEDIR%%/lib/python/pytz/zoneinfo/America/Resolute
 %%ZOPEBASEDIR%%/lib/python/pytz/zoneinfo/America/Rio_Branco
 %%ZOPEBASEDIR%%/lib/python/pytz/zoneinfo/America/Rosario
+%%ZOPEBASEDIR%%/lib/python/pytz/zoneinfo/America/Santa_Isabel
 %%ZOPEBASEDIR%%/lib/python/pytz/zoneinfo/America/Santarem
 %%ZOPEBASEDIR%%/lib/python/pytz/zoneinfo/America/Santiago
 %%ZOPEBASEDIR%%/lib/python/pytz/zoneinfo/America/Santo_Domingo
@@ -4046,6 +4050,7 @@
 %%ZOPEBASEDIR%%/lib/python/pytz/zoneinfo/Asia/Kamchatka
 %%ZOPEBASEDIR%%/lib/python/pytz/zoneinfo/Asia/Karachi
 %%ZOPEBASEDIR%%/lib/python/pytz/zoneinfo/Asia/Kashgar
+%%ZOPEBASEDIR%%/lib/python/pytz/zoneinfo/Asia/Kathmandu
 %%ZOPEBASEDIR%%/lib/python/pytz/zoneinfo/Asia/Katmandu
 %%ZOPEBASEDIR%%/lib/python/pytz/zoneinfo/Asia/Kolkata
 %%ZOPEBASEDIR%%/lib/python/pytz/zoneinfo/Asia/Krasnoyarsk
@@ -4059,6 +4064,7 @@
 %%ZOPEBASEDIR%%/lib/python/pytz/zoneinfo/Asia/Manila
 %%ZOPEBASEDIR%%/lib/python/pytz/zoneinfo/Asia/Muscat
 %%ZOPEBASEDIR%%/lib/python/pytz/zoneinfo/Asia/Nicosia
+%%ZOPEBASEDIR%%/lib/python/pytz/zoneinfo/Asia/Novokuznetsk
 %%ZOPEBASEDIR%%/lib/python/pytz/zoneinfo/Asia/Novosibirsk
 %%ZOPEBASEDIR%%/lib/python/pytz/zoneinfo/Asia/Omsk
 %%ZOPEBASEDIR%%/lib/python/pytz/zoneinfo/Asia/Oral
@@ -8889,6 +8895,7 @@
 %%ZOPEBASEDIR%%/skel/lib/python/README.txt.in
 %%ZOPEBASEDIR%%/skel/log/README.txt
 %%ZOPEBASEDIR%%/skel/var/README.txt
+@exec /bin/mkdir -p %D/%%ZOPEBASEDIR%%/skel/etc/package-includes
 @dirrm %%ZOPEBASEDIR%%/skel/var
 @dirrm %%ZOPEBASEDIR%%/skel/log
 @dirrm %%ZOPEBASEDIR%%/skel/lib/python
@@ -9581,9 +9588,9 @@
 @dirrm %%ZOPEBASEDIR%%/lib/python/AccessControl/securitySuite
 @dirrm %%ZOPEBASEDIR%%/lib/python/AccessControl/dtml
 @dirrm %%ZOPEBASEDIR%%/lib/python/AccessControl
+@dirrmtry %%ZOPEBASEDIR%%/lib/python
+@dirrmtry %%ZOPEBASEDIR%%/lib
 @dirrm %%ZOPEBASEDIR%%/doc
 @dirrm %%ZOPEBASEDIR%%/bin
 @dirrmtry %%ZOPEBASEDIR%%/Products
-@dirrmtry %%ZOPEBASEDIR%%/lib/python
-@dirrmtry %%ZOPEBASEDIR%%/lib
 @dirrmtry %%ZOPEBASEDIR%%