Attachment #85464 for bug #121673

View | Details | Raw Unified | Return to bug 121673
Collapse All | Expand All

Lines 6-12 Link Here

(-)zope-formulator/Makefile (-1 / +4 lines)
6	#	6	#
7		7
8	PORTNAME= formulator	8	PORTNAME= formulator
9	PORTVERSION= 1.11.1	9	PORTVERSION= 1.11.3
10	CATEGORIES= www zope	10	CATEGORIES= www zope
11	MASTER_SITES= http://www.infrae.com/download/Formulator/${PORTVERSION}/	11	MASTER_SITES= http://www.infrae.com/download/Formulator/${PORTVERSION}/
12	PKGNAMEPREFIX= zope-	12	PKGNAMEPREFIX= zope-
Lines 24-29 Link Here
24		24
25	WRKSRC= ${WRKDIR}/${ZOPEPRODUCTNAME}	25	WRKSRC= ${WRKDIR}/${ZOPEPRODUCTNAME}
26		26
		27	post-patch:
		28	@${FIND} ${WRKSRC} -name '*.orig' -delete
		29
27	do-build:	30	do-build:
28	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}	31	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
29		32

Lines 1-3 Link Here

(-)zope-formulator/distinfo (-3 / +3 lines)
1	MD5 (zope/Formulator-1.11.1.tgz) = c50bc1997ed8a4509ffcf75b7d1a495e	1	MD5 (zope/Formulator-1.11.3.tgz) = 59206403a29953fa33d5dce829101ab5
2	SHA256 (zope/Formulator-1.11.1.tgz) = 7846fb5219a508bebb4740b473844ebc7d17c88c5a06be754b4b6e05c314c0bf	2	SHA256 (zope/Formulator-1.11.3.tgz) = 90c3717f1b157bc456fe176ad7b61d25c10f9f4dda7b8ff14317d58fd9fb3954
3	SIZE (zope/Formulator-1.11.1.tgz) = 90111	3	SIZE (zope/Formulator-1.11.3.tgz) = 92767




--- 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

Lines 101-106 Link Here

(-)zope-formulator/pkg-plist (+2 lines)
101	%%ZOPEPRODUCTDIR%%/Formulator/tests/__init__.pyc	101	%%ZOPEPRODUCTDIR%%/Formulator/tests/__init__.pyc
102	%%ZOPEPRODUCTDIR%%/Formulator/tests/framework.py	102	%%ZOPEPRODUCTDIR%%/Formulator/tests/framework.py
103	%%ZOPEPRODUCTDIR%%/Formulator/tests/framework.pyc	103	%%ZOPEPRODUCTDIR%%/Formulator/tests/framework.pyc
		104	%%ZOPEPRODUCTDIR%%/Formulator/tests/layer.py
		105	%%ZOPEPRODUCTDIR%%/Formulator/tests/layer.pyc
104	%%ZOPEPRODUCTDIR%%/Formulator/tests/runalltests.py	106	%%ZOPEPRODUCTDIR%%/Formulator/tests/runalltests.py
105	%%ZOPEPRODUCTDIR%%/Formulator/tests/runalltests.pyc	107	%%ZOPEPRODUCTDIR%%/Formulator/tests/runalltests.pyc
106	%%ZOPEPRODUCTDIR%%/Formulator/tests/test_Form.py	108	%%ZOPEPRODUCTDIR%%/Formulator/tests/test_Form.py

Return to bug 121673

Line 0 Link Here

(-)zope-formulator/files/patch-FSForm.py (+22 lines)
	1	--- FSForm.py.orig 2003-09-25 23:08:33.000000000 +0900
	2	+++ FSForm.py 2008-03-13 07:13:15.000000000 +0900
	3	@@ -5,10 +5,17 @@
	4	import Products.FileSystemSite
	5	except ImportError:
	6	# use CMF product
	7	- from Products.CMFCore.CMFCorePermissions import View
	8	+ try:
	9	+ from Products.CMFCore.permissions import View
	10	+ except ImportError: # older CMF
	11	+ from Products.CMFCore.CMFCorePermissions import View
	12	from Products.CMFCore.FSObject import FSObject
	13	from Products.CMFCore.DirectoryView import registerFileExtension,\
	14	- registerMetaType, expandpath
	15	+ registerMetaType
	16	+ try:
	17	+ from Products.CMFCore.utils import expandpath
	18	+ except ImportError:
	19	+ from Products.CMFCore.DirectoryView import expandpath
	20	else:
	21	# use FileSystemSite product
	22	from Products.FileSystemSite.Permissions import View