ports/52038: Unbreak + Upgrade www/zope

[Miguel Mendez]

>Number:         52038
>Category:       ports
>Synopsis:       Unbreak + Upgrade www/zope
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat May 10 15:10:09 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Miguel Mendez
>Release:        FreeBSD 5.1-BETA i386
>Organization:
>Environment:


System: FreeBSD isengard.energyhq.es.eu.org 5.1-BETA FreeBSD 5.1-BETA #0: Sat May 10 19:56:35 CEST 2003     root at isengard.energyhq.es.eu.org:/usr/obj/usr/src/sys/ISENGARD i386  


>Description:


Fix bento build, update to 1.6.1


>How-To-Repeat:





>Fix:


--- zope.diff begins here ---
diff -ruN zope.old/Makefile zope/Makefile
--- zope.old/Makefile	Wed May  7 02:12:29 2003
+++ zope/Makefile	Sun May 11 00:03:42 2003
@@ -6,23 +6,21 @@
 #
 
 PORTNAME=	zope
-PORTVERSION=	2.6.0
-PORTREVISION=	1
+PORTVERSION=	2.6.1
 CATEGORIES=	www python zope
 MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/
 DISTNAME=	Zope-${PORTVERSION}-src
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	freebsd-ports at FreeBSD.org
-COMMENT=	An object-based web application platform with DB access, WebDAV, & more
-
-BROKEN=		"Does not compile"
+COMMENT=	An object-based web application platform
 
 USE_PYTHON=	yes
-PYTHON_VERSION=	python2.1
+PYTHON_VERSION=	python2.2
 
 DIST_SUBDIR=	zope
 
+INSTALLS_SHLIB=	yes
 # Note: the notes that follow reflect the decisions of prior maintainers
 # of this port. IOW, don't blame me if you don't like the way it's done.
 # Exceptions to this are marked as such.
@@ -47,11 +45,14 @@
 CGIBINDIR=	${PREFIX}/${SCGIBINDIR}
 APACHE_CONFDIR=	${PREFIX}/${SAPACHE_CONFDIR}
 
+UNAME_R!=uname -r
+
 PLIST_SUB=	ZOPEBASEDIR=${SZOPEBASEDIR} \
 		CGIBINDIR=${SCGIBINDIR} \
 		APACHE_CONFDIR=${SAPACHE_CONFDIR} \
 		VERSION=${PORTVERSION} \
-		WEBBASEDIR=${WEBBASEDIR}
+		WEBBASEDIR=${WEBBASEDIR} \
+		OSNAME=${UNAME_R}-${ARCH}
 
 # Force the cgi-bin dir or link to exist.
 # If we have to create it, call it -dist to emphasize that the port
diff -ruN zope.old/distinfo zope/distinfo
--- zope.old/distinfo	Sun Jan 12 18:48:19 2003
+++ zope/distinfo	Sat May 10 22:11:03 2003
@@ -1 +1 @@
-MD5 (zope/Zope-2.6.0-src.tgz) = a0bb91ca1df775aebfc8ff8c46afa3a9
+MD5 (zope/Zope-2.6.1-src.tgz) = a17f36b86b6e489797d8e52f1ba48efe
diff -ruN zope.old/pkg-plist zope/pkg-plist
--- zope.old/pkg-plist	Sun Jan 12 18:48:19 2003
+++ zope/pkg-plist	Sun May 11 00:02:34 2003
@@ -6,6 +6,25 @@
 %%ZOPEBASEDIR%%/Extensions/README.txt
 %%ZOPEBASEDIR%%/LICENSE.txt
 %%ZOPEBASEDIR%%/README.txt
+%%ZOPEBASEDIR%%/lib/python/BTrees/tests/test_check.py
+%%ZOPEBASEDIR%%/lib/python/BTrees/check.py
+%%ZOPEBASEDIR%%/lib/python/BTrees/check.pyc
+%%ZOPEBASEDIR%%/lib/python/ZopeUndo/tests/__init__.py
+%%ZOPEBASEDIR%%/lib/python/ZopeUndo/tests/testPrefix.py
+%%ZOPEBASEDIR%%/lib/python/ZopeUndo/Prefix.py
+%%ZOPEBASEDIR%%/lib/python/ZopeUndo/__init__.py
+%%ZOPEBASEDIR%%/lib/python/ZopeUndo/Prefix.pyc
+%%ZOPEBASEDIR%%/lib/python/ZopeUndo/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/Signals/SignalHandler.py
+%%ZOPEBASEDIR%%/lib/python/Signals/SignalHandler.pyc
+%%ZOPEBASEDIR%%/lib/python/Zope/App/ClassFactory.py
+%%ZOPEBASEDIR%%/lib/python/Zope/App/__init__.py
+%%ZOPEBASEDIR%%/lib/python/Zope/App/startup.py
+%%ZOPEBASEDIR%%/lib/python/Zope/App/ClassFactory.pyc
+%%ZOPEBASEDIR%%/lib/python/Zope/App/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/Zope/App/startup.pyc
+%%ZOPEBASEDIR%%/lib/python/Lifetime.py
+%%ZOPEBASEDIR%%/lib/python/Lifetime.pyc
 %%ZOPEBASEDIR%%/ZServer/DebugLogger.py
 %%ZOPEBASEDIR%%/ZServer/DebugLogger.pyc
 %%ZOPEBASEDIR%%/ZServer/FCGIServer.py
@@ -2457,6 +2476,45 @@
 %%ZOPEBASEDIR%%/z2.pyc
 %%ZOPEBASEDIR%%/zpasswd.py
 %%ZOPEBASEDIR%%/zpasswd.pyc
+%%ZOPEBASEDIR%%/lib/python/build/temp.freebsd-%%OSNAME%%-2.2/cAccessControl.o
+%%ZOPEBASEDIR%%/lib/python/build/temp.freebsd-%%OSNAME%%-2.2/_OOBTree.o
+%%ZOPEBASEDIR%%/lib/python/build/temp.freebsd-%%OSNAME%%-2.2/_OIBTree.o
+%%ZOPEBASEDIR%%/lib/python/build/temp.freebsd-%%OSNAME%%-2.2/_IIBTree.o
+%%ZOPEBASEDIR%%/lib/python/build/temp.freebsd-%%OSNAME%%-2.2/_IOBTree.o
+%%ZOPEBASEDIR%%/lib/python/build/temp.freebsd-%%OSNAME%%-2.2/_fsBTree.o
+%%ZOPEBASEDIR%%/lib/python/build/temp.freebsd-%%OSNAME%%-2.2/BTree.o
+%%ZOPEBASEDIR%%/lib/python/build/temp.freebsd-%%OSNAME%%-2.2/IIBTree.o
+%%ZOPEBASEDIR%%/lib/python/build/temp.freebsd-%%OSNAME%%-2.2/IOBTree.o
+%%ZOPEBASEDIR%%/lib/python/build/temp.freebsd-%%OSNAME%%-2.2/OIBTree.o
+%%ZOPEBASEDIR%%/lib/python/build/temp.freebsd-%%OSNAME%%-2.2/intSet.o
+%%ZOPEBASEDIR%%/lib/python/build/temp.freebsd-%%OSNAME%%-2.2/cDocumentTemplate.o
+%%ZOPEBASEDIR%%/lib/python/build/temp.freebsd-%%OSNAME%%-2.2/ExtensionClass.o
+%%ZOPEBASEDIR%%/lib/python/build/temp.freebsd-%%OSNAME%%-2.2/Acquisition.o
+%%ZOPEBASEDIR%%/lib/python/build/temp.freebsd-%%OSNAME%%-2.2/MethodObject.o
+%%ZOPEBASEDIR%%/lib/python/build/temp.freebsd-%%OSNAME%%-2.2/MultiMapping.o
+%%ZOPEBASEDIR%%/lib/python/build/temp.freebsd-%%OSNAME%%-2.2/ThreadLock.o
+%%ZOPEBASEDIR%%/lib/python/build/temp.freebsd-%%OSNAME%%-2.2/Missing.o
+%%ZOPEBASEDIR%%/lib/python/build/temp.freebsd-%%OSNAME%%-2.2/Sync.o
+%%ZOPEBASEDIR%%/lib/python/build/temp.freebsd-%%OSNAME%%-2.2/Record.o
+%%ZOPEBASEDIR%%/lib/python/build/temp.freebsd-%%OSNAME%%-2.2/ComputedAttribute.o
+%%ZOPEBASEDIR%%/lib/python/build/temp.freebsd-%%OSNAME%%-2.2/Splitter.o
+%%ZOPEBASEDIR%%/lib/python/build/temp.freebsd-%%OSNAME%%-2.2/xmlparse.o
+%%ZOPEBASEDIR%%/lib/python/build/temp.freebsd-%%OSNAME%%-2.2/hashtable.o
+%%ZOPEBASEDIR%%/lib/python/build/temp.freebsd-%%OSNAME%%-2.2/xmlrole.o
+%%ZOPEBASEDIR%%/lib/python/build/temp.freebsd-%%OSNAME%%-2.2/xmltok.o
+%%ZOPEBASEDIR%%/lib/python/build/temp.freebsd-%%OSNAME%%-2.2/dcpyexpat.o
+%%ZOPEBASEDIR%%/lib/python/build/temp.freebsd-%%OSNAME%%-2.2/cPersistence.o
+%%ZOPEBASEDIR%%/lib/python/build/temp.freebsd-%%OSNAME%%-2.2/cPickleCache.o
+%%ZOPEBASEDIR%%/lib/python/build/temp.freebsd-%%OSNAME%%-2.2/TimeStamp.o
+%%ZOPEBASEDIR%%/lib/python/build/temp.freebsd-%%OSNAME%%-2.2/coptimizations.o
+%%ZOPEBASEDIR%%/lib/python/build/temp.freebsd-%%OSNAME%%-2.2/winlock.o
+%%ZOPEBASEDIR%%/lib/python/build/temp.freebsd-%%OSNAME%%-2.2/initgroups.o
+%%ZOPEBASEDIR%%/lib/python/build/temp.freebsd-%%OSNAME%%-2.2/ZopeSplitter.o
+%%ZOPEBASEDIR%%/lib/python/build/temp.freebsd-%%OSNAME%%-2.2/ISO_8859_1_Splitter.o
+%%ZOPEBASEDIR%%/lib/python/build/temp.freebsd-%%OSNAME%%-2.2/UnicodeSplitter.o
+%%ZOPEBASEDIR%%/lib/python/build/temp.freebsd-%%OSNAME%%-2.2/stopper.o
+%%ZOPEBASEDIR%%/lib/python/build/temp.freebsd-%%OSNAME%%-2.2/okascore.o
+%%ZOPEBASEDIR%%/Makefile
 %%CGIBINDIR%%/Zope.cgi
 %%CGIBINDIR%%/pcgi-wrapper
 @unexec rm -f %D/%%ZOPEBASEDIR%%/inituser
@@ -2466,6 +2524,8 @@
 @unexec rm -f %D/%%ZOPEBASEDIR%%/var/*.lock
 @unexec rmdir %D/%%ZOPEBASEDIR%%/var 2>/dev/null || true
 @unexec rmdir %D/%%CGIBINDIR%% 2>/dev/null || true
+ at dirrm %%ZOPEBASEDIR%%/lib/python/BTrees/tests
+ at dirrm %%ZOPEBASEDIR%%/lib/python/BTrees
 @dirrm %%ZOPEBASEDIR%%/utilities/ZODBTools/tests
 @dirrm %%ZOPEBASEDIR%%/utilities/ZODBTools
 @dirrm %%ZOPEBASEDIR%%/utilities
@@ -2475,6 +2535,8 @@
 @dirrm %%ZOPEBASEDIR%%/pcgi/MrCreosote
 @dirrm %%ZOPEBASEDIR%%/pcgi/Example
 @dirrm %%ZOPEBASEDIR%%/pcgi
+ at dirrm %%ZOPEBASEDIR%%/lib/python/build/temp.freebsd-%%OSNAME%%-2.2
+ at dirrm %%ZOPEBASEDIR%%/lib/python/build
 @dirrm %%ZOPEBASEDIR%%/lib/python/zdaemon/tests
 @dirrm %%ZOPEBASEDIR%%/lib/python/zdaemon
 @dirrm %%ZOPEBASEDIR%%/lib/python/zLOG/tests
@@ -2485,6 +2547,10 @@
 @dirrm %%ZOPEBASEDIR%%/lib/python/webdav/dtml
 @dirrm %%ZOPEBASEDIR%%/lib/python/webdav
 @dirrm %%ZOPEBASEDIR%%/lib/python/build
+ at dirrm %%ZOPEBASEDIR%%/lib/python/Zope
+ at dirrm %%ZOPEBASEDIR%%/lib/python/ZopeUndo/tests
+ at dirrm %%ZOPEBASEDIR%%/lib/python/ZopeUndo
+ at dirrm %%ZOPEBASEDIR%%/lib/python/Zope/App
 @dirrm %%ZOPEBASEDIR%%/lib/python/Zope
 @dirrm %%ZOPEBASEDIR%%/lib/python/ZTUtils/tests
 @dirrm %%ZOPEBASEDIR%%/lib/python/ZTUtils
--- zope.diff ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted: