- Update to 3.2.1

PR:		95234
Submitted by:	maintainer

3 files changed, 23 insertions, 19 deletions

diff --git a/www/zope3/Makefile b/www/zope3/Makefile
index 79b62d04bdf5..93db772179fa 100644
--- a/www/zope3/Makefile
+++ b/www/zope3/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	zope
-PORTVERSION=	3.2.0
+PORTVERSION=	3.2.1
 CATEGORIES=	www python zope
-MASTER_SITES=	http://www.zope.org/Products/Zope3/${PORTVERSION}final/
+MASTER_SITES=	http://www.zope.org/Products/Zope3/${PORTVERSION}/
 DISTNAME=	Zope-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 DIST_SUBDIR=	zope
@@ -30,11 +30,12 @@ SZOPEBASEDIR?=		${WEBBASEDIR}/Zope3
 
 # Do not change anything below this line.
 
-ZOPEBASEDIR=		${PREFIX}/${SZOPEBASEDIR}
+ZOPEBASEDIR=	${PREFIX}/${SZOPEBASEDIR}
 
-ALL_TARGET=
+ALL_TARGET=	# empty
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--prefix=${ZOPEBASEDIR} --force
+CONFIGURE_ARGS=	--force --prefix=${ZOPEBASEDIR} \
+		--with-python=${PYTHON_CMD}
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 PLIST_SUB=	ZOPEBASEDIR=${SZOPEBASEDIR}
@@ -43,12 +44,11 @@ SUB_LIST=	ZOPEBASEDIR=${ZOPEBASEDIR}
 
 post-patch:
 .for i in zdaemon zope
-	${RM} -f ${WRKSRC}/Zope/zopeskel/etc/${i}.conf.in.orig
+	@${RM} -f ${WRKSRC}/Zope/zopeskel/etc/${i}.conf.in.orig
 .endfor
 
 post-install:
-	${FIND} ${ZOPEBASEDIR} -type f -print0 | ${XARGS} -0 -- ${CHMOD} a-w
-
+	@${FIND} ${ZOPEBASEDIR} -type f -print0 | ${XARGS} -0 -- ${CHMOD} a-w
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
 
diff --git a/www/zope3/distinfo b/www/zope3/distinfo
index 0a41f35639af..1399492b0d4d 100644
--- a/www/zope3/distinfo
+++ b/www/zope3/distinfo
@@ -1,3 +1,3 @@
-MD5 (zope/Zope-3.2.0.tgz) = dbbb708281ebcf7186aa7aa3ee46844c
-SHA256 (zope/Zope-3.2.0.tgz) = 21d6ad3ad3ec4c1d9ca754fbe0f7c8b550799eb5fe027e86fbb4a17ae319cbff
-SIZE (zope/Zope-3.2.0.tgz) = 6566282
+MD5 (zope/Zope-3.2.1.tgz) = becbc5aba9573c46cf5820ab12720d1d
+SHA256 (zope/Zope-3.2.1.tgz) = 8431984af75054e4ddfe45bf708924240f8b6b02220cd84d090138413ac82341
+SIZE (zope/Zope-3.2.1.tgz) = 6532373
diff --git a/www/zope3/pkg-plist b/www/zope3/pkg-plist
index c168c93639d8..be2261744980 100644
--- a/www/zope3/pkg-plist
+++ b/www/zope3/pkg-plist
@@ -110,6 +110,9 @@
 %%ZOPEBASEDIR%%/lib/python/ClientCookie/_urllib2_support.py
 %%ZOPEBASEDIR%%/lib/python/ClientCookie/_urllib2_support.pyc
 %%ZOPEBASEDIR%%/lib/python/ClientCookie/_urllib2_support.pyo
+%%ZOPEBASEDIR%%/lib/python/ClientForm.py
+%%ZOPEBASEDIR%%/lib/python/ClientForm.pyc
+%%ZOPEBASEDIR%%/lib/python/ClientForm.pyo
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/Eval.py
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/Eval.pyc
 %%ZOPEBASEDIR%%/lib/python/RestrictedPython/Eval.pyo
@@ -1045,6 +1048,9 @@
 %%ZOPEBASEDIR%%/lib/python/persistent/wref.py
 %%ZOPEBASEDIR%%/lib/python/persistent/wref.pyc
 %%ZOPEBASEDIR%%/lib/python/persistent/wref.pyo
+%%ZOPEBASEDIR%%/lib/python/pullparser.py
+%%ZOPEBASEDIR%%/lib/python/pullparser.pyc
+%%ZOPEBASEDIR%%/lib/python/pullparser.pyo
 %%ZOPEBASEDIR%%/lib/python/pytz/LICENSE.txt
 %%ZOPEBASEDIR%%/lib/python/pytz/README.txt
 %%ZOPEBASEDIR%%/lib/python/pytz/__init__.py
@@ -8740,7 +8746,6 @@
 %%ZOPEBASEDIR%%/lib/python/zope/app/utility/vocabulary.py
 %%ZOPEBASEDIR%%/lib/python/zope/app/utility/vocabulary.pyc
 %%ZOPEBASEDIR%%/lib/python/zope/app/utility/vocabulary.pyo
-%%ZOPEBASEDIR%%/lib/python/zope/app/version.txt
 %%ZOPEBASEDIR%%/lib/python/zope/app/wsgi/README.txt
 %%ZOPEBASEDIR%%/lib/python/zope/app/wsgi/__init__.py
 %%ZOPEBASEDIR%%/lib/python/zope/app/wsgi/__init__.pyc
@@ -9151,6 +9156,9 @@
 %%ZOPEBASEDIR%%/lib/python/zope/formlib/interfaces.py
 %%ZOPEBASEDIR%%/lib/python/zope/formlib/interfaces.pyc
 %%ZOPEBASEDIR%%/lib/python/zope/formlib/interfaces.pyo
+%%ZOPEBASEDIR%%/lib/python/zope/formlib/locales/de/LC_MESSAGES/zope.formlib.mo
+%%ZOPEBASEDIR%%/lib/python/zope/formlib/locales/de/LC_MESSAGES/zope.formlib.po
+%%ZOPEBASEDIR%%/lib/python/zope/formlib/locales/zope.formlib.pot
 %%ZOPEBASEDIR%%/lib/python/zope/formlib/namedtemplate.py
 %%ZOPEBASEDIR%%/lib/python/zope/formlib/namedtemplate.pyc
 %%ZOPEBASEDIR%%/lib/python/zope/formlib/namedtemplate.pyo
@@ -10711,9 +10719,6 @@
 %%ZOPEBASEDIR%%/lib/python/zope/tales/tests/test_traverser.py
 %%ZOPEBASEDIR%%/lib/python/zope/tales/tests/test_traverser.pyc
 %%ZOPEBASEDIR%%/lib/python/zope/tales/tests/test_traverser.pyo
-%%ZOPEBASEDIR%%/lib/python/zope/testbrowser/ClientForm.py
-%%ZOPEBASEDIR%%/lib/python/zope/testbrowser/ClientForm.pyc
-%%ZOPEBASEDIR%%/lib/python/zope/testbrowser/ClientForm.pyo
 %%ZOPEBASEDIR%%/lib/python/zope/testbrowser/DEPENDENCIES.cfg
 %%ZOPEBASEDIR%%/lib/python/zope/testbrowser/README.txt
 %%ZOPEBASEDIR%%/lib/python/zope/testbrowser/SETUP.cfg
@@ -10743,9 +10748,6 @@
 %%ZOPEBASEDIR%%/lib/python/zope/testbrowser/interfaces.pyc
 %%ZOPEBASEDIR%%/lib/python/zope/testbrowser/interfaces.pyo
 %%ZOPEBASEDIR%%/lib/python/zope/testbrowser/over_the_wire.txt
-%%ZOPEBASEDIR%%/lib/python/zope/testbrowser/pullparser.py
-%%ZOPEBASEDIR%%/lib/python/zope/testbrowser/pullparser.pyc
-%%ZOPEBASEDIR%%/lib/python/zope/testbrowser/pullparser.pyo
 %%ZOPEBASEDIR%%/lib/python/zope/testbrowser/testing.py
 %%ZOPEBASEDIR%%/lib/python/zope/testbrowser/testing.pyc
 %%ZOPEBASEDIR%%/lib/python/zope/testbrowser/testing.pyo
@@ -11144,7 +11146,6 @@
 %%ZOPEBASEDIR%%/zopeskel/lib/python/README.txt.in
 %%ZOPEBASEDIR%%/zopeskel/log/README.txt
 %%ZOPEBASEDIR%%/zopeskel/var/README.txt
-
 @dirrm %%ZOPEBASEDIR%%/lib/python/zope/testing/testrunner-ex-pp-products/more
 @dirrm %%ZOPEBASEDIR%%/lib/python/zope/testing/testrunner-ex-pp-products
 @dirrm %%ZOPEBASEDIR%%/lib/python/zope/testing/testrunner-ex/sample1/sample11
@@ -11451,6 +11452,9 @@
 @dirrm %%ZOPEBASEDIR%%/lib/python/zope/configuration/tests/samplepackage
 @dirrm %%ZOPEBASEDIR%%/lib/python/zope/configuration/tests
 @dirrm %%ZOPEBASEDIR%%/lib/python/zope/configuration
+@dirrm %%ZOPEBASEDIR%%/lib/python/zope/formlib/locales/de/LC_MESSAGES
+@dirrm %%ZOPEBASEDIR%%/lib/python/zope/formlib/locales/de
+@dirrm %%ZOPEBASEDIR%%/lib/python/zope/formlib/locales
 @dirrm %%ZOPEBASEDIR%%/lib/python/zope/formlib
 @dirrm %%ZOPEBASEDIR%%/lib/python/zope/documenttemplate/untrusted
 @dirrm %%ZOPEBASEDIR%%/lib/python/zope/documenttemplate/tests