Subject: www/zope25 needs update?
To: None <tech-pkg@netbsd.org>
From: Simon Gerraty <sjg@juniper.net>
List: tech-pkg
Date: 09/08/2004 16:23:04
Hi,

BTW I know there's a freeze on, so this is just FYI - besides I don't
know enough about zope to even consider committing this, but in case
it's useful...

With python23-pth installed I thought I'd look at zope, but 
www/zope25 (currently version 2.6.2 ;-) didn't support it, so I tried
the latest stable version 2.7.2.  The diff below represents the
changes I made - but:

1/ I wasn't sure how to represent the new dependency on
textproc/py-expat

2/ The content of Zope distribution is changed somewhat so I may not
have it all correct.

3/ On 1.6.2 at least, pth overflow's its stack on some of the examples:

2004-09-08T16:03:18 INFO(0) Zope Ready to handle requests
**Pth** STACK OVERFLOW: thread pid_t=0x8df3a00, name="main.child@1094684604=0x804e100"
Memory fault (core dumped) 

Loaded symbols for /opt/Zope-2.7/lib/python/BTrees/_fsBTree.so
#0  0x481b2b77 in __sigsuspend14 () from /usr/lib/libc.so.12
(gdb) bt
#0  0x481b2b77 in __sigsuspend14 () from /usr/lib/libc.so.12
#1  0x4813d179 in __pth_scheduler () from /usr/pkg/lib/libpthread.so.20
#2  0x4813ee64 in pth_spawn_trampoline () from /usr/pkg/lib/libpthread.so.20
#3  0x4813c3ad in pth_mctx_set_bootstrap () from /usr/pkg/lib/libpthread.so.20
#4  0x4813c321 in pth_mctx_set_trampoline () from /usr/pkg/lib/libpthread.so.20
#5  0x805efa0 in ?? ()
#6  0x1f in ?? ()
Cannot access memory at address 0x1f
(gdb) 

--sjg

Index: www/zope25/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/zope25/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- www/zope25/Makefile	23 May 2004 11:41:35 -0000	1.13
+++ www/zope25/Makefile	8 Sep 2004 23:18:13 -0000
@@ -1,10 +1,10 @@
 # $NetBSD: Makefile,v 1.13 2004/05/23 11:41:35 recht Exp $
 #
 
-DISTNAME=	Zope-2.6.2-src
-PKGNAME=	zope-2.6.2
+DISTNAME=	Zope-2.7.2-0
+PKGNAME=	zope-2.7.2
 CATEGORIES=	www
-MASTER_SITES=	http://www.zope.org/Products/Zope/2.6.2/
+MASTER_SITES=	http://www.zope.org/Products/Zope/2.7.2/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	tech-pkg@NetBSD.org
@@ -13,11 +13,11 @@ COMMENT=	Zope, the Z Object Publishing E
 
 DIST_SUBDIR=	zope
 
-PYTHON_VERSIONS_ACCEPTED=	21pth
+PYTHON_VERSIONS_ACCEPTED=	21pth 23pth
 USE_BUILDLINK3=	yes
 
 ZOPEDIR=	${PREFIX}/lib/zope
-ZOPEPY=		pcgi lib/python ZServer z2.py zpasswd.py
+ZOPEPY=		lib/python utilities/zpasswd.py
 ZOPEDATA=	Extensions doc import var inst utilities
 
 ZOPECREATE_SED=		"-e s|@@PYTHONBIN@@|${PYTHONBIN}|"
@@ -27,12 +27,10 @@ ZOPECREATE_SED+=	"-e s|@@ZOPE_HOME@@|${Z
 #	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHONBIN} w_pcgi.py)
 
 do-build:
-	(cd ${WRKSRC}/pcgi && ${SETENV} ${MAKE_ENV} ./configure && \
+	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./configure && \
 		${SETENV} ${MAKE_ENV} ${MAKE})
-	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
-		${PYTHONBIN} inst/build_extensions.py)
-	${SED} ${ZOPECREATE_SED} <${FILESDIR}/zope25-create \
-		>${WRKSRC}/zope25-create
+	${SED} ${ZOPECREATE_SED} < ${FILESDIR}/zope25-create \
+		> ${WRKSRC}/zope25-create
 
 #
 # Install code and prototype data. A real INSTANCE_HOME must be created
Index: www/zope25/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/www/zope25/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- www/zope25/distinfo	5 Dec 2003 17:07:02 -0000	1.4
+++ www/zope25/distinfo	8 Sep 2004 23:18:13 -0000
@@ -1,5 +1,6 @@
 $NetBSD: distinfo,v 1.4 2003/12/05 17:07:02 drochner Exp $
 
-SHA1 (zope/Zope-2.6.2-src.tgz) = 378a505eda04f843161dea449194996241278a98
-Size (zope/Zope-2.6.2-src.tgz) = 2347004 bytes
-SHA1 (patch-aa) = d1b047c5b8082e5efb67f02c1d1a4ba149a1ece6
+SHA1 (zope/Zope-2.7.2-0.tgz) = 8a38d8566874075b42057ff16eab74a80df268f0
+Size (zope/Zope-2.7.2-0.tgz) = 2754459 bytes
+SHA1 (patch-aa) = 533a67ba78d59edb1efe9db36d55308a94c837fa
+SHA1 (patch-ab) = dd45aebdba5071dc2d0784e5afdd8828da609075
Index: www/zope25/patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/www/zope25/patches/patch-aa,v
retrieving revision 1.1
diff -u -p -r1.1 patch-aa
--- www/zope25/patches/patch-aa	25 Jul 2003 13:07:08 -0000	1.1
+++ www/zope25/patches/patch-aa	8 Sep 2004 23:18:13 -0000
@@ -1,13 +1,11 @@
-$NetBSD: patch-aa,v 1.1 2003/07/25 13:07:08 drochner Exp $
-
---- lib/Components/initgroups/initgroups.c.orig	2003-07-25 14:52:06.000000000 +0200
-+++ lib/Components/initgroups/initgroups.c	2003-07-25 14:53:10.000000000 +0200
+--- lib/Components/initgroups/initgroups.c.orig	Fri May  7 03:47:59 2004
++++ lib/Components/initgroups/initgroups.c	Wed Sep  8 14:35:59 2004
 @@ -13,7 +13,7 @@
  
  #include "Python.h"
  
--#if defined(__unix__) || defined(unix)
-+#if defined(__unix__) || defined(unix) || defined(__NetBSD__)
+-#if defined(__unix__) || defined(unix) || defined(__MACH__) /* Mac OS X */
++#if defined(__unix__) || defined(unix) || defined(__NetBSD__) || defined(__MACH__) /* Mac OS X */
  
  #include <grp.h>
  #include <sys/types.h>
Index: www/zope25/patches/patch-ab
===================================================================
RCS file: www/zope25/patches/patch-ab
diff -N www/zope25/patches/patch-ab
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ www/zope25/patches/patch-ab	8 Sep 2004 23:18:13 -0000
@@ -0,0 +1,18 @@
+--- /var/obj/pkgsrc/www/zope25/work/Zope-2.7.2-0/configure.orig	Wed Sep  8 14:46:10 2004
++++ /var/obj/pkgsrc/www/zope25/work/Zope-2.7.2-0/configure	Wed Sep  8 14:48:29 2004
+@@ -13,13 +13,13 @@
+ 
+ # Place the optimal target version number for Zope (as returned by sys.version)
+ # below
+-TARGET="2.3.3"
++TARGET="2p3.4"
+ 
+ # Order a list of "acceptable" python version numbers (as returned by
+ # sys.version) below in "best" to "worst" order, not including the
+ # target version.  Up to six acceptable python versions are allowed.
+ # Do not include the target version number in this list!
+-ACCEPTABLE="2.3.4 2.3.2 2.3.1 2.3"
++ACCEPTABLE="2p3.4 2.3.2 2.3.1 2.3"
+ 
+ # provide the executable names for all the acceptable versions
+ # (and the target version) below