Update to 1.10.3. Also fix PR#6884, and move base directory from

${PREFIX}/zope to ${PREFIX}/lib/zope

Changes in 1.10.3:

Features Added:
- A new flag attribute, only, of the DTML with tag prunes the DTML
  namespace to only the namespace created with the with tag.
- A new flag attribute, reverse, of the DTML in tag which will reverse
  the order of the items iterated over.
- A new flag attribute, reverse, of the DTML tree tag which will reverse
  the order of the items iterated over.
- Added contributed support for encoding options in the SendMail tag and
  MailHost send method.

Bugs Fixed:
- A significant memory leak, introduced in 1.10.0 has been plugged.  This
  is the main reason for this release.
- Construction, upload, and edit methods did not consistently support
  either string or file data.  This caused really weird behavior when file
  upload was used with out includeing the ":string" suffix in the argument
  name when doing a file upload.
- This bug was previously (and incorrectly) reported as a
  ZPublisher.Client problem.
- Errors in ExternalMethods were masked by bugs in error reporting logic.
  The bugs were made far more effective by Python 1.5.1.
- Bug in sqlvar tag where the combination of type=nb and optional would
  not behave as expected.
- Databases (or export files) created in binary distributions were not
  usable in source distributions due to cPickle limitations in stock
  Python 1.5.1.  We now link/copy the cPickle extension to BoboPOS to make
  sure that it uses the latest version.
- Broken products seemed to remain broken (were shown as broken in the
  control panel products area) even after problems were corrected.

5 files changed, 27 insertions, 23 deletions

diff --git a/www/zope/Makefile b/www/zope/Makefile
index a040736a9b1..09dc1d55ada 100644
--- a/www/zope/Makefile
+++ b/www/zope/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 1999/04/16 06:27:41 tsarna Exp $
+# $NetBSD: Makefile,v 1.8 1999/06/19 22:48:23 tsarna Exp $
 #
 
-DISTNAME=	Zope-1.10.2-src
-PKGNAME=	zope-1.10.2
+DISTNAME=	Zope-1.10.3-src
+PKGNAME=	zope-1.10.3
 CATEGORIES=	www
-MASTER_SITES=   http://www.zope.org/Download/Releases/Zope-1.10.2/
+MASTER_SITES=   http://www.zope.org/Download/Releases/Zope-1.10.3/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	tsarna@netbsd.org
@@ -14,7 +14,7 @@ DEPENDS+=	python-1.5.2:../../lang/python
 
 PLIST_SRC=	${WRKDIR}/.PLIST_SRC
 
-ZOPEDIR=	${PREFIX}/zope
+ZOPEDIR=	${PREFIX}/lib/zope
 
 do-configure:
 	${SED} -e "s,@PREFIX@,${PREFIX}," \
@@ -29,11 +29,13 @@ do-install:
 	${PREFIX}/bin/python \
 		${PREFIX}/lib/python1.5/compileall.py ${ZOPEDIR}
 	chmod -R a+rX ${ZOPEDIR}
-	(cd ${PREFIX}; find zope -type f -print >>${PLIST_SRC})
-	(cd ${PREFIX}; find -d zope -type d -print | \
+	(cd ${PREFIX}; find lib/zope -type f -print >>${PLIST_SRC})
+	(cd ${PREFIX}; find -d lib/zope -type d -print | \
 	${SED} -e "s/^/@dirrm /" >>${PLIST_SRC})
 	${SED} -e "s,/usr/pkg,${PREFIX}," \
 		<${FILESDIR}/zope-install.py >${PREFIX}/sbin/zope-install
-	chmod 755 ${PREFIX}/sbin/zope-install
+	${SED} -e "s,/usr/pkg,${PREFIX}," \
+		<${FILESDIR}/zope-shutdown.py >${PREFIX}/sbin/zope-shutdown
+	chmod 755 ${PREFIX}/sbin/zope-install ${PREFIX}/sbin/zope-shutdown
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/zope/files/Makefile.in b/www/zope/files/Makefile.in
index e4f94245517..e6e44229de8 100644
--- a/www/zope/files/Makefile.in
+++ b/www/zope/files/Makefile.in
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.in,v 1.2 1999/04/20 18:06:06 tsarna Exp $
+# $NetBSD: Makefile.in,v 1.3 1999/06/19 22:48:23 tsarna Exp $
 
 all: all-pcgi all-lib all-dt all-bobopos all-search
 configure: config-pcgi config-lib config-dt config-bobopos config-search
@@ -11,6 +11,7 @@ all-pcgi:
 
 config-lib:
 	(cd lib/python; \
+	cp @PREFIX@/lib/python1.5/config/Makefile.pre.in . ; \
 	make -f Makefile.pre.in boot PYTHON=@PREFIX@/bin/python)
 
 all-lib:
@@ -18,6 +19,7 @@ all-lib:
 
 config-dt:
 	(cd lib/python/DocumentTemplate; \
+	cp @PREFIX@/lib/python1.5/config/Makefile.pre.in . ; \
 	make -f Makefile.pre.in boot PYTHON=python)
 
 all-dt:
@@ -25,6 +27,7 @@ all-dt:
 
 config-bobopos:
 	(cd lib/python/BoboPOS; \
+	cp @PREFIX@/lib/python1.5/config/Makefile.pre.in . ; \
 	make -f Makefile.pre.in boot PYTHON=python)
 
 all-bobopos:
@@ -33,6 +36,7 @@ all-bobopos:
 
 config-search:
 	(cd lib/python/SearchIndex; \
+	cp @PREFIX@/lib/python1.5/config/Makefile.pre.in . ; \
 	make -f Makefile.pre.in boot PYTHON=python)
 
 all-search:
diff --git a/www/zope/files/md5 b/www/zope/files/md5
index f8ec0db416b..89ddfaee371 100644
--- a/www/zope/files/md5
+++ b/www/zope/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.4 1999/04/16 06:27:41 tsarna Exp $
+$NetBSD: md5,v 1.5 1999/06/19 22:48:23 tsarna Exp $
 
-MD5 (Zope-1.10.2-src.tgz) = 2fc2a68414c3f21a368fc953468bb421
+MD5 (Zope-1.10.3-src.tgz) = 7fae8b874b5e497410adc2b36fe9183a
diff --git a/www/zope/files/zope-install.py b/www/zope/files/zope-install.py
index 0318dd7b998..ab05c9fd084 100755
--- a/www/zope/files/zope-install.py
+++ b/www/zope/files/zope-install.py
@@ -1,9 +1,8 @@
 #!/usr/pkg/bin/python
 #
-#	$NetBSD: zope-install.py,v 1.2 1999/01/09 20:49:27 kleink Exp $
-#	$Endicor$
+#	$NetBSD: zope-install.py,v 1.3 1999/06/19 22:48:23 tsarna Exp $
 #
-# Copyright (c) 1998 Endicor Technologies, Inc.
+# Copyright (c) 1998,1999 Endicor Technologies, Inc.
 # All rights reserved. Written by Ty Sarna <tsarna@endicor.com>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -11,10 +10,7 @@
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. The name of the author may not be used to endorse or promote products
+# 2. The name of the author may not be used to endorse or promote products
 #    derived from this software without specific prior written permission
 #
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
@@ -36,7 +32,7 @@ import sys, os, re, getopt, string
 prefix = "/usr/pkg"
 cgidir = prefix + "/libexec/cgi-bin"
 apconf = prefix + "/etc/httpd/httpd.conf"
-zopedir = prefix + "/zope"
+zopedir = prefix + "/lib/zope"
 zopevar = zopedir + "/var"
 zopedata = "/var/zope"
 
@@ -50,7 +46,7 @@ def usage():
     print '\t-u\tusername to run as, default to Apache\'s user'
     print '\t-g\tgroupname to run as, default to Apache\'s group'
     print '\t-d\tdirectory for instance, defaults to %s/instancename' % zopedata
-    print '\t-d\tdirectory for CGIs, defaults to %s' % cgidir
+    print '\t-c\tdirectory for CGIs, defaults to %s' % cgidir
     
     sys.exit(1)
 
@@ -110,7 +106,7 @@ def createfile(pretend, fname, contents):
         f.close()
             
 if __name__ == "__main__":
-    optlist, args = getopt.getopt(sys.argv[1:], 'np:u:g:d:')
+    optlist, args = getopt.getopt(sys.argv[1:], 'np:u:g:d:c:')
     if len(args) != 1:
         usage()
 
@@ -173,5 +169,5 @@ via http://yourwebserver/instance/
 
 RewriteEngine on
 RewriteCond %%{HTTP:Authorization}  ^(.*)
-RewriteRule ^/%(instance)s/(.*) %(cgidir)s/%(instance)s.cgi/$1  [e=HTTP_CGI_AUTHORIZATION:%%1,t=application/x-httpd-cgi,l]
+RewriteRule ^/%(instance)s($|/)(.*) %(cgidir)s/%(instance)s.cgi/$2  [e=HTTP_CGI_AUTHORIZATION:%%1,t=application/x-httpd-cgi,l]
 """ % vars())
diff --git a/www/zope/pkg/PLIST.pre b/www/zope/pkg/PLIST.pre
index e21ff998e05..d4a641e99e2 100644
--- a/www/zope/pkg/PLIST.pre
+++ b/www/zope/pkg/PLIST.pre
@@ -1,2 +1,4 @@
-@comment $NetBSD: PLIST.pre,v 1.1.1.1 1998/12/12 17:28:23 tsarna Exp $
+@comment $NetBSD: PLIST.pre,v 1.2 1999/06/19 22:48:23 tsarna Exp $
 sbin/zope-install
+sbin/zope-shutdown
+