diff -uNr --exclude CVS zope-formulator.orig/Makefile zope-formulator/Makefile --- zope-formulator.orig/Makefile 2006-02-08 05:47:13.000000000 +0900 +++ zope-formulator/Makefile 2008-03-13 07:15:21.000000000 +0900 @@ -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 @@ WRKSRC= ${WRKDIR}/${ZOPEPRODUCTNAME} +post-patch: + @${FIND} ${WRKSRC} -name '*.orig' -delete + do-build: @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC} diff -uNr --exclude CVS zope-formulator.orig/distinfo zope-formulator/distinfo --- zope-formulator.orig/distinfo 2006-02-08 05:47:13.000000000 +0900 +++ zope-formulator/distinfo 2008-03-13 06:05:59.000000000 +0900 @@ -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 -uNr --exclude CVS zope-formulator.orig/files/patch-FSForm.py zope-formulator/files/patch-FSForm.py --- zope-formulator.orig/files/patch-FSForm.py 1970-01-01 09:00:00.000000000 +0900 +++ zope-formulator/files/patch-FSForm.py 2008-03-13 07:13:20.000000000 +0900 @@ -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 -uNr --exclude CVS zope-formulator.orig/pkg-plist zope-formulator/pkg-plist --- zope-formulator.orig/pkg-plist 2006-02-08 05:47:13.000000000 +0900 +++ zope-formulator/pkg-plist 2008-03-14 03:53:24.000000000 +0900 @@ -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