From c7651500a041b224f401ba85fc192aac6ad83c1c Mon Sep 17 00:00:00 2001 From: Martin Wilke Date: Sat, 31 May 2008 23:01:14 +0000 Subject: - Update to 1.11.3 PR: 121673 Submitted by: TAOKA Fumiyoshi Approved by: maintainer timeout --- www/zope-formulator/Makefile | 5 ++++- www/zope-formulator/distinfo | 6 +++--- www/zope-formulator/files/patch-FSForm.py | 22 ++++++++++++++++++++++ www/zope-formulator/pkg-plist | 2 ++ 4 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 www/zope-formulator/files/patch-FSForm.py diff --git a/www/zope-formulator/Makefile b/www/zope-formulator/Makefile index dc51ac7b921c..1104fdd36639 100644 --- a/www/zope-formulator/Makefile +++ b/www/zope-formulator/Makefile @@ -6,7 +6,7 @@ # PORTNAME= formulator -PORTVERSION= 1.11.1 +PORTVERSION= 1.11.3 CATEGORIES= www zope MASTER_SITES= http://www.infrae.com/download/Formulator/${PORTVERSION}/ PKGNAMEPREFIX= zope- @@ -24,6 +24,9 @@ ZOPEPRODUCTNAME= Formulator WRKSRC= ${WRKDIR}/${ZOPEPRODUCTNAME} +post-patch: + @${FIND} ${WRKSRC} -name '*.orig' -delete + do-build: @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC} diff --git a/www/zope-formulator/distinfo b/www/zope-formulator/distinfo index 4394634a0f98..89043638b264 100644 --- a/www/zope-formulator/distinfo +++ b/www/zope-formulator/distinfo @@ -1,3 +1,3 @@ -MD5 (zope/Formulator-1.11.1.tgz) = c50bc1997ed8a4509ffcf75b7d1a495e -SHA256 (zope/Formulator-1.11.1.tgz) = 7846fb5219a508bebb4740b473844ebc7d17c88c5a06be754b4b6e05c314c0bf -SIZE (zope/Formulator-1.11.1.tgz) = 90111 +MD5 (zope/Formulator-1.11.3.tgz) = 59206403a29953fa33d5dce829101ab5 +SHA256 (zope/Formulator-1.11.3.tgz) = 90c3717f1b157bc456fe176ad7b61d25c10f9f4dda7b8ff14317d58fd9fb3954 +SIZE (zope/Formulator-1.11.3.tgz) = 92767 diff --git a/www/zope-formulator/files/patch-FSForm.py b/www/zope-formulator/files/patch-FSForm.py new file mode 100644 index 000000000000..119855f7a1ad --- /dev/null +++ b/www/zope-formulator/files/patch-FSForm.py @@ -0,0 +1,22 @@ +--- FSForm.py.orig 2003-09-25 23:08:33.000000000 +0900 ++++ FSForm.py 2008-03-13 07:13:15.000000000 +0900 +@@ -5,10 +5,17 @@ + import Products.FileSystemSite + except ImportError: + # use CMF product +- from Products.CMFCore.CMFCorePermissions import View ++ try: ++ from Products.CMFCore.permissions import View ++ except ImportError: # older CMF ++ from Products.CMFCore.CMFCorePermissions import View + from Products.CMFCore.FSObject import FSObject + from Products.CMFCore.DirectoryView import registerFileExtension,\ +- registerMetaType, expandpath ++ registerMetaType ++ try: ++ from Products.CMFCore.utils import expandpath ++ except ImportError: ++ from Products.CMFCore.DirectoryView import expandpath + else: + # use FileSystemSite product + from Products.FileSystemSite.Permissions import View diff --git a/www/zope-formulator/pkg-plist b/www/zope-formulator/pkg-plist index 4ed2efda1c69..3f4114464541 100644 --- a/www/zope-formulator/pkg-plist +++ b/www/zope-formulator/pkg-plist @@ -101,6 +101,8 @@ %%ZOPEPRODUCTDIR%%/Formulator/tests/__init__.pyc %%ZOPEPRODUCTDIR%%/Formulator/tests/framework.py %%ZOPEPRODUCTDIR%%/Formulator/tests/framework.pyc +%%ZOPEPRODUCTDIR%%/Formulator/tests/layer.py +%%ZOPEPRODUCTDIR%%/Formulator/tests/layer.pyc %%ZOPEPRODUCTDIR%%/Formulator/tests/runalltests.py %%ZOPEPRODUCTDIR%%/Formulator/tests/runalltests.pyc %%ZOPEPRODUCTDIR%%/Formulator/tests/test_Form.py -- cgit v1.2.3