6 files changed, 38 insertions, 25 deletions

diff --git a/www/zope210/Makefile b/www/zope210/Makefile
index 1d4272ab20ac..5afe61ed50e5 100644
--- a/www/zope210/Makefile
+++ b/www/zope210/Makefile
@@ -6,10 +6,11 @@
 #
 
 PORTNAME=	zope
-PORTVERSION=	2.9.1
+PORTVERSION=	2.9.2
 CATEGORIES=	www python zope
 MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/
 DISTNAME=	Zope-${PORTVERSION}
+EXTRACT_SUFX=	.tgz
 DIST_SUBDIR=	zope
 
 MAINTAINER=	yasi@yasi.to
@@ -58,8 +59,8 @@ ISBATCH=	""
 .endif
 
 post-patch:
-	${FIND} ${WRKSRC} -name '*.orig' -print0 | ${XARGS} -0 -- ${RM}
-	${REINPLACE_CMD} \
+	@${FIND} ${WRKSRC} -name '*.orig' -print0 | ${XARGS} -0 -- ${RM}
+	@${REINPLACE_CMD} \
 		-e 's,^\(ACCEPTABLE="\).*"$$,\1${PYTHON_PORTVERSION}",g' \
 		-e 's,^\(TARGET="\).*"$$,\1${PYTHON_PORTVERSION}",g' \
 		-e 's,^\(EXENAMES="\).*"$$,\1${PYTHON_VERSION}",g' \
diff --git a/www/zope210/distinfo b/www/zope210/distinfo
index eb4dfbc4b377..d72e0a552040 100644
--- a/www/zope210/distinfo
+++ b/www/zope210/distinfo
@@ -1,3 +1,3 @@
-MD5 (zope/Zope-2.9.1.tar.gz) = 75351b49800fa4a5da138bbb87258794
-SHA256 (zope/Zope-2.9.1.tar.gz) = 065a0488334eddffdfcf7a28e862eada26bbd43e1012c1d31fd56cd61bfd7d4c
-SIZE (zope/Zope-2.9.1.tar.gz) = 7945029
+MD5 (zope/Zope-2.9.2.tgz) = 4e88a6c7215568a55d8714226da23a19
+SHA256 (zope/Zope-2.9.2.tgz) = 7515a40396184cd82fd6a01d5b0e1fb79f009c5d35da8e59b8710c530e8e68b1
+SIZE (zope/Zope-2.9.2.tgz) = 7932648
diff --git a/www/zope210/files/patch-Dependencies-RestrictedPython b/www/zope210/files/patch-Dependencies-RestrictedPython
index adb188ec66ee..cbba1e6dd56d 100644
--- a/www/zope210/files/patch-Dependencies-RestrictedPython
+++ b/www/zope210/files/patch-Dependencies-RestrictedPython
@@ -1,5 +1,5 @@
---- Dependencies/RestrictedPython-Zope-2.9.1/RestrictedPython/tests/verify.py.orig	Sat Jan  7 21:07:51 2006
-+++ Dependencies/RestrictedPython-Zope-2.9.1/RestrictedPython/tests/verify.py	Sun Jan 15 13:43:23 2006
+--- Dependencies/RestrictedPython-Zope-2.9.2/RestrictedPython/tests/verify.py.orig	Sat Jan  7 21:07:51 2006
++++ Dependencies/RestrictedPython-Zope-2.9.2/RestrictedPython/tests/verify.py	Sun Jan 15 13:43:23 2006
 @@ -21,6 +21,7 @@
  function.
  """
diff --git a/www/zope210/files/patch-Dependencies-SiteAccess b/www/zope210/files/patch-Dependencies-SiteAccess
index 6505eea53a91..edf8b915b17c 100644
--- a/www/zope210/files/patch-Dependencies-SiteAccess
+++ b/www/zope210/files/patch-Dependencies-SiteAccess
@@ -1,5 +1,5 @@
---- Dependencies/Products-Zope-2.9.1/Products/SiteAccess/tests/testVirtualHostMonster.py.orig	Sat Jan  7 21:07:42 2006
-+++ Dependencies/Products-Zope-2.9.1/Products/SiteAccess/tests/testVirtualHostMonster.py	Sun Jan 15 13:39:37 2006
+--- Dependencies/Products-Zope-2.9.2/Products/SiteAccess/tests/testVirtualHostMonster.py.orig	Sat Jan  7 21:07:42 2006
++++ Dependencies/Products-Zope-2.9.2/Products/SiteAccess/tests/testVirtualHostMonster.py	Sun Jan 15 13:39:37 2006
 @@ -12,6 +12,7 @@
  
  from Testing.makerequest import makerequest
diff --git a/www/zope210/files/patch-Dependencies-StructuredText b/www/zope210/files/patch-Dependencies-StructuredText
index d88e162ccf6d..f5dc8017c645 100644
--- a/www/zope210/files/patch-Dependencies-StructuredText
+++ b/www/zope210/files/patch-Dependencies-StructuredText
@@ -1,5 +1,5 @@
---- Dependencies/StructuredText-Zope-2.9.1/StructuredText/DocumentWithImages.py.orig	Sat Jan  7 21:07:51 2006
-+++ Dependencies/StructuredText-Zope-2.9.1/StructuredText/DocumentWithImages.py	Sun Jan 15 10:23:46 2006
+--- Dependencies/StructuredText-Zope-2.9.2/StructuredText/DocumentWithImages.py.orig	Sat Jan  7 21:07:51 2006
++++ Dependencies/StructuredText-Zope-2.9.2/StructuredText/DocumentWithImages.py	Sun Jan 15 10:23:46 2006
 @@ -27,7 +27,7 @@
  
      def doc_img(
@@ -9,8 +9,8 @@
          ):
  
  
---- Dependencies/StructuredText-Zope-2.9.1/StructuredText/ST.py.orig	Sat Jan  7 21:07:51 2006
-+++ Dependencies/StructuredText-Zope-2.9.1/StructuredText/ST.py	Sun Jan 15 10:23:46 2006
+--- Dependencies/StructuredText-Zope-2.9.2/StructuredText/ST.py.orig	Sat Jan  7 21:07:51 2006
++++ Dependencies/StructuredText-Zope-2.9.2/StructuredText/ST.py	Sun Jan 15 10:23:46 2006
 @@ -116,6 +116,9 @@
      Structure => [paragraph,[sub-paragraphs]]
      """
@@ -21,8 +21,8 @@
      currentlevel    = 0
      currentindent  = 0
      levels            = {0:0}
---- Dependencies/StructuredText-Zope-2.9.1/StructuredText/DocumentClass.py.orig	Sat Jan  7 21:07:51 2006
-+++ Dependencies/StructuredText-Zope-2.9.1/StructuredText/DocumentClass.py	Sun Jan 15 10:23:46 2006
+--- Dependencies/StructuredText-Zope-2.9.2/StructuredText/DocumentClass.py.orig	Sat Jan  7 21:07:51 2006
++++ Dependencies/StructuredText-Zope-2.9.2/StructuredText/DocumentClass.py	Sun Jan 15 10:23:46 2006
 @@ -786,7 +786,7 @@
  
      def doc_literal(
diff --git a/www/zope210/pkg-plist b/www/zope210/pkg-plist
index 89af674b9ab4..869aa06bd2a0 100644
--- a/www/zope210/pkg-plist
+++ b/www/zope210/pkg-plist
@@ -500,6 +500,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/ComputedAttribute/DEPENDENCIES.cfg
 %%ZOPEBASEDIR%%/lib/python/ComputedAttribute/SETUP.cfg
 %%ZOPEBASEDIR%%/lib/python/ComputedAttribute/_ComputedAttribute.so
@@ -1020,6 +1023,9 @@
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/testTraverse.py
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/testTraverse.pyc
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/testTraverse.pyo
+%%ZOPEBASEDIR%%/lib/python/OFS/tests/test_XMLExportImport.py
+%%ZOPEBASEDIR%%/lib/python/OFS/tests/test_XMLExportImport.pyc
+%%ZOPEBASEDIR%%/lib/python/OFS/tests/test_XMLExportImport.pyo
 %%ZOPEBASEDIR%%/lib/python/OFS/www/ControlPanel_icon.gif
 %%ZOPEBASEDIR%%/lib/python/OFS/www/Help_icon.gif
 %%ZOPEBASEDIR%%/lib/python/OFS/www/Properties_icon.gif
@@ -3256,6 +3262,9 @@
 %%ZOPEBASEDIR%%/lib/python/Testing/ZopeTestCase/interfaces.py
 %%ZOPEBASEDIR%%/lib/python/Testing/ZopeTestCase/interfaces.pyc
 %%ZOPEBASEDIR%%/lib/python/Testing/ZopeTestCase/interfaces.pyo
+%%ZOPEBASEDIR%%/lib/python/Testing/ZopeTestCase/placeless.py
+%%ZOPEBASEDIR%%/lib/python/Testing/ZopeTestCase/placeless.pyc
+%%ZOPEBASEDIR%%/lib/python/Testing/ZopeTestCase/placeless.pyo
 %%ZOPEBASEDIR%%/lib/python/Testing/ZopeTestCase/profiler.py
 %%ZOPEBASEDIR%%/lib/python/Testing/ZopeTestCase/profiler.pyc
 %%ZOPEBASEDIR%%/lib/python/Testing/ZopeTestCase/profiler.pyo
@@ -3274,6 +3283,9 @@
 %%ZOPEBASEDIR%%/lib/python/Testing/ZopeTestCase/testInterfaces.py
 %%ZOPEBASEDIR%%/lib/python/Testing/ZopeTestCase/testInterfaces.pyc
 %%ZOPEBASEDIR%%/lib/python/Testing/ZopeTestCase/testInterfaces.pyo
+%%ZOPEBASEDIR%%/lib/python/Testing/ZopeTestCase/testPlaceless.py
+%%ZOPEBASEDIR%%/lib/python/Testing/ZopeTestCase/testPlaceless.pyc
+%%ZOPEBASEDIR%%/lib/python/Testing/ZopeTestCase/testPlaceless.pyo
 %%ZOPEBASEDIR%%/lib/python/Testing/ZopeTestCase/testPortalTestCase.py
 %%ZOPEBASEDIR%%/lib/python/Testing/ZopeTestCase/testPortalTestCase.pyc
 %%ZOPEBASEDIR%%/lib/python/Testing/ZopeTestCase/testPortalTestCase.pyo
@@ -4703,6 +4715,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
@@ -9666,7 +9681,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
@@ -10061,6 +10075,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
@@ -11621,9 +11638,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
@@ -11653,9 +11667,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
@@ -12089,6 +12100,9 @@
 @dirrm %%ZOPEBASEDIR%%/lib/python/zope/i18n
 @dirrm %%ZOPEBASEDIR%%/lib/python/zope/hookable/tests
 @dirrm %%ZOPEBASEDIR%%/lib/python/zope/hookable
+@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/exceptions/tests
 @dirrm %%ZOPEBASEDIR%%/lib/python/zope/exceptions
@@ -12637,5 +12651,3 @@
 @dirrm %%ZOPEBASEDIR%%/bin
 @dirrm %%ZOPEBASEDIR%%/Products
 @dirrm %%ZOPEBASEDIR%%
-@dirrm share/nls/en_US.US-ASCII
-@dirrm share/nls/POSIX