Update zope29 to 2.9.8 (Zope 2.9.8) with new framework.

  Zope 2.9.8 (2007/07/05)

   Bugs fixed

      - updated to ZODB 3.6.3

      - updated to Zope 3.2.3 codebase

      - Collector #1306: Missing acquisition context on local roles screen.

      - The REQUEST no longer accepts holds after it has been closed.

      - Collector #2153: Supporting unquoted cookies with spaces.

      - Collector #2295: Comments in PythonScripts could lead to syntax
        errors

      - Collector #2307: ObjectCopiedEvent not dispatched to sublocations.

      - Fixed ZClass test breakage due to non-pickleability of
        'zope.interface.Implements'

        N.B.: updated 'zope.interface' package to Zope 3.2 branch;
              should be pinned to a tag or a release before releasing
              2.9.8).

      - Collector #2260: fixed a bug in Examples.zexp

      - Collector #2321: Skip trusted proxies when extracting the client IP
        address from the request.

      - Collector #2318: Allow override of zopectl's control socket in
        zope.conf

      - Collector #2316: correctly unpack DateTimeIndex dates when browsing the
        index.

      - Collector #1866: a 304 HTTP status should not have a content length.

      - Collector #2300: delimit *all* HTTP Response headers with CRLF.

  Zope 2.9.7 (2007/03/25)

   Bugs fixed

      - Protected various security mutators with a new postonly decorator.
        The decorator limits method publishing to POST requests only, and
        is a backport from Zope 2.11's requestmethod decorator factory.

      - Collector #2298: webdav.Resource.COPY and webdav.Resource.MOVE did
        not send the expected copy/move events.

      - Collector #2296: Fixed import of ZClass products, broken by removal
        of BBB support for pasting objects whose meta_type info was
        permission-free.

      - Collector #2294: Protected DOS-able ControlPanel methods with the
        same 'requestmethod' wrapper.

      - Collector #2294: Protected various security mutators with a new
        'postonly' decorator.  The decorator limits method publishing to
        POST requests only, and is a backport from Zope 2.11's requestmethod
        decorator factory.

      - Collector #2288: @ and + should not be quoted when forming
        request URLs in BaseRequest and HTTPRequest

      - Undeprectated 'zLOG' package, which is going to remain a
        backward-compatibility shim for the Python logger.

      - Collector #2263: 'field2ulines' did not convert empty string
        correctly.

      - Reverted backward-incompatible fix for Collector #2191.

      - added Python 2.4.4 as optimal Python version to 'configure'


  Zope 2.9.6 (2006-11-22)

   Bugs fixed

      - Collector #2191: extended DateTime parser for better support
        to the ISO8601 specification.

      - Reworking of _cached_result in Shared.DC.ZRDB.DA.DA:

        - fixed KeyError reported in Collector #2212

        - fixed two memory leaks that occurred under high load

        - fixed broken cache keys for people using the obscure
          Shared.DC.ZRDB.DA.DA.connection_hook

        - fixed incorrect cache ordering resulting in newer results
          being dumped when the cache became too large.

      - Collector #2237: 'make' doesn't tell you to run 'make inplace'
        before running 'make instance'.

      - Collector #2235: A number of ZCatalog methods were doing boolean
        evaluation of objects that implemented __len__ instead of checking
        them against None. Replaced a number of "if not obj" with
        "if obj is None".

      - Collector #2218: fixed wrong logger argument in OFS/Cache.py

      - Collector #2205: fixed wrong logger argument in ZRDB/Connection.py

      - Collector #2208: rewriting/setting the 'charset' part of the
        content-type HTTP header will be done only for 'text/*'

      - Collector #2206: Set PYTHONPATH to include existing PYTHONPATH
        in skel/bin/zopectl.in and skel/bin/runzope.in

  Zope 2.9.5 (2006/10/03)

   Bugs fixed

      - Call setDefaultSkin on new requests created as the result of
        ConflictError retries.

      - Collector #2189: Fix logging of errors during product refresh.

      - Collector #2185: Log username for FCGI requests.

      - Collector #2152: Fixed MailHost documentation; simple_send does not
        process or validate its arguments in any way.

      - Collector #2175: ZTUtils.make_hidden_input did not escape double-quotes.

      - Collector #1907: Moved 'alt' property from File to Image.

      - Collector #1983: Specifying session-resolution-seconds >= 1200 caused
        Zope startup to fail.

      - Collector #2169: webdav.Resource.COPY did not send ObjectClonedEvent.

      - Updated Five to bugfix release 1.3.7.

      - Collector #2157: Expose name of broken class in SystemError raised
        from '__getstate__' of a broken instance.

      - Usage of 'urljoin' in 'webdav.davcmds' could lead to wrongly
        constructed urls.

      - Collector #2155: Fix wrong parameter being passed to
        logger's error() method, with tests.

      - Collector #2178: Fix ZopeTestCase doctest support for layers

      - included Zope 3.2.2

1 files changed, 53 insertions, 49 deletions

diff --git a/www/zope29/Makefile b/www/zope29/Makefile
index c91fc9b2b65..2ada53a2543 100644
--- a/www/zope29/Makefile
+++ b/www/zope29/Makefile
@@ -1,75 +1,79 @@
-# $NetBSD: Makefile,v 1.12 2007/07/04 20:55:06 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2007/12/18 15:31:12 taca Exp $
 # FreeBSD Id: ports/www/zope29/Makefile,v 1.86 2006/08/03 15:53:04 garga Exp
 
-DISTNAME=	Zope-${VER}-final
-PKGNAME=	zope-${VER}
-PKGREVISION=	4
+DISTNAME=	Zope-${ZOPE29_VERSION}-final
+PKGNAME=	${ZOPE_PKG_PREFIX}-${ZOPE29_VERSION}
 CATEGORIES=	www python
-MASTER_SITES=	http://www.zope.org/Products/Zope/${VER}/
+MASTER_SITES=	http://www.zope.org/Products/Zope/${ZOPE29_VERSION}/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.zope.org/
 COMMENT=	Zope, the Z Object Publishing Environment
 
-DEPENDS+=	${PYPKGPREFIX}-xml-[0-9]*:../../textproc/py-xml
+PYTHON_VERSIONS_ACCEPTED=	24
+ZOPE_VERSION=			29
 
-PYTHON_VERSIONS_ACCEPTED=   24
-RCD_SCRIPTS=	${PKGBASE}29 zeo29
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS=	--prefix=${ZOPE_DIR} --with-python=${PYTHONBIN} --quiet
+BUILD_TARGET=	build version_txt
+MAKE_FILE=	makefile
+PRIVILEGED_STAGES+=	clean
+
+PKG_GROUPS_VARS+=	ZOPE_GROUP
+PKG_USERS_VARS+=	ZOPE_USER
 
-VER=		2.9.4
-DIST_SUBDIR=	${PKGBASE}29-20070321
-HOTFIXES=	Hotfix_20070320
+PKG_GROUPS=	${ZOPE_GROUP}
+PKG_USERS=	${ZOPE_USER}:${ZOPE_GROUP}
+RCD_SCRIPTS=	zope${ZOPE_VERSION} zeo${ZOPE_VERSION}
 
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
-.for f in ${HOTFIXES}
-DISTFILES+=		${f}.tgz
-SITES.${f}.tgz= \
-	http://www.zope.org/Products/Zope/Hotfix-2007-03-20/Hotfix-20070320/
-.endfor
+FILES_SUBST+=	RCVAR_SUFFIX=${RCVAR_SUFFIX} VER=${ZOPE29_VERSION}
+MESSAGE_SUBST+=	RCVAR_SUFFIX=${RCVAR_SUFFIX} ZOPE_VERSION=${ZOPE_VERSION}
 
-# Change these, if you like, via the environment.
-ZOPE_USER?=		www
-WEBBASEDIR?=		www
-SZOPEBASEDIR?=		${WEBBASEDIR}/Zope29
+SUBST_CLASSES+=		param
+SUBST_STAGE.param=	pre-configure
+SUBST_FILES.param+=	skel/etc/zope.conf.in utilities/mkzopeinstance.py
+SUBST_SED.param+=  -e "s|@ZOPE_PRODUCTS_DIR@|${ZOPE_PRODUCTS_DIR}|g"
+SUBST_SED.param+=	-e "s|@ZOPE_USER@|${ZOPE_USER}|g"
+SUBST_SED.param+=	-e "s|@ZOPE_GROUP@|${ZOPE_GROUP}|g"
+SUBST_MESSAGE.param=	Fixing some parameters in files.
 
-# Do not change anything below this line.
+REPLACE_PYTHON+=	test.py lib/python/Zope2/Startup/zopectl.py \
+			lib/python/zdaemon/zdctl.py lib/python/zdaemon/zdrun.py
+REPLACE_PYTHON_DIRS+=	${WRKSRC}/lib/python/ZConfig/scripts ${WRKSRC}/utilities
 
-PKG_USERS_VARS+=	ZOPE_USER
+.include "../../mk/bsd.prefs.mk"
 
-.if defined(INSTANCENAME)
-ZOPEINSTANCENAME=	${INSTANCENAME}
+.if ${OPSYS} == "FreeBSD"
+RCVAR_SUFFIX=	_enable
+.else
+RCVAR_SUFFIX=	# empty
 .endif
 
-ZOPEBASEDIR=		${PREFIX}/${SZOPEBASEDIR}
-ZOPEINSTANCEBASE?=	${PREFIX}/${SZOPEBASEDIR}
-ZOPEINSTANCEDIR?=	${ZOPEINSTANCEBASE}/${ZOPEINSTANCENAME}
-
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--prefix=${ZOPEBASEDIR} --with-python=${PYTHONBIN}
+OWN_DIRS+=	${ZOPE_PRODUCTS_DIR}
 
-BUILD_TARGET=	build
-MAKE_FILE=	makefile
+post-patch:
+	${CP} ${FILESDIR}/sitecustomize.py ${WRKSRC}/lib/python
+	${FIND} ${WRKSRC}/doc ${WRKSRC}/lib ${WRKSRC}/skel/import \
+		-type f -print0 | ${XARGS} -0 -- ${CHMOD} -x
 
-PLIST_SUBST=	ZOPEBASEDIR=${SZOPEBASEDIR}
-MESSAGE_SUBST+=	ZOPEBASEDIR=${ZOPEBASEDIR}
-MESSAGE_SUBST+=	ZOPE_USER=${ZOPE_USER}
-MESSAGE_SUBST+=	ZOPEINSTANCEDIR=${ZOPEINSTANCEDIR}
+post-build:
+	cd ${WRKSRC}; ${PY_COMPILE_ALL} .
 
-post-patch:
+pre-install:
 	${FIND} ${WRKSRC} -name '*.orig' -print0 | ${XARGS} -0 -- ${RM}
 
 post-install:
-	${MV} ${ZOPEBASEDIR}/skel/etc/zope.conf.in \
-		${ZOPEBASEDIR}/skel/etc/zope.conf.sample.in
-	${MKDIR} ${ZOPEBASEDIR}/Products
-.for d in ${HOTFIXES}
-	cd ${WRKDIR}; ${PAX} -rw ${d} ${ZOPEBASEDIR}/lib/python/Products
-.endfor
-	${FIND} ${ZOPEBASEDIR} -type f -print0 | ${XARGS} -0 -- ${CHMOD} a-w
-
-pre-package:
-	${CP} ${WRKDIR}/package-pkg-message ${PKGMESSAGE}
-
+	${INSTALL_DATA_DIR} ${ZOPE_DOC_DIR}/zeo
+	${INSTALL_DATA_DIR} ${ZOPE_DOC_DIR}/zope
+	cd ${WRKSRC}/doc/ZEO; ${PAX} -rw *.txt ${ZOPE_DOC_DIR}/zeo
+	cd ${WRKSRC}/doc; ${PAX} -rw *.txt ${ZOPE_DOC_DIR}/zope
+	${FIND} ${ZOPE_DIR} ${ZOPE_DOC_DIR} -type f -print0 \
+		| ${XARGS} -0 -- ${CHMOD} a-w+r
+	${FIND} ${ZOPE_DIR} -type f -name '*.pyc' -print0 | \
+		${XARGS} -0 -- ${CHMOD} a-x
+
+.include "../../www/zope/replace.mk"
+.include "../../www/zope/zopeversion.mk"
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"