diff options
38 files changed, 402 insertions, 252 deletions
diff --git a/www/zope/Makefile b/www/zope/Makefile index 2b6c9a615d60..0ca20d100d99 100644 --- a/www/zope/Makefile +++ b/www/zope/Makefile @@ -6,8 +6,7 @@ # PORTNAME= zope -PORTVERSION= 2.7.0 -PORTREVISION= 1 +PORTVERSION= 2.7.1 CATEGORIES= www python zope MASTER_SITES= http://www.zope.org/Products/Zope/${PORTVERSION}/${PORTVERSION}/ DISTNAME= Zope-${PORTVERSION} @@ -22,6 +21,7 @@ USE_PYTHON= yes USE_RC_SUBR= yes USE_REINPLACE= yes DIST_SUBDIR= zope +WRKSRC= ${WRKDIR}/${DISTNAME}-0 # 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. @@ -55,6 +55,7 @@ RC_SCRIPTS_SUB= PREFIX=${PREFIX} \ CONFIG_SUB= ZOPEBASEDIR=${ZOPEBASEDIR} \ ZOPE_USER=${ZOPE_USER} \ ZOPEINSTANCEDIR=${ZOPEINSTANCEDIR} +PKGMESSAGE= ${WRKDIR}/pkg-message .if defined(BATCH) ISBATCH= -u admin:test123 @@ -68,11 +69,14 @@ post-patch: post-install: @${MV} ${ZOPEBASEDIR}/skel/etc/zope.conf.in ${ZOPEBASEDIR}/skel/etc/zope.conf.sample.in - @${SED} ${CONFIG_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} pkg-message + @${SED} ${CONFIG_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} < ${FILESDIR}/pkg-message.in \ + > ${PKGMESSAGE} @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ ${FILESDIR}/zope.sh > ${PREFIX}/etc/rc.d/zope.sh @${CHMOD} ${BINMODE} ${PREFIX}/etc/rc.d/zope.sh @${MKDIR} ${ZOPEBASEDIR}/Products + @${CAT} ${PKGMESSAGE} + @${ECHO_MSG} instance: @${ZOPEBASEDIR}/bin/mkzopeinstance.py -d ${ZOPEINSTANCEDIR} ${ISBATCH} diff --git a/www/zope/distinfo b/www/zope/distinfo index de2d51bcec75..adb251366969 100644 --- a/www/zope/distinfo +++ b/www/zope/distinfo @@ -1,2 +1,2 @@ -MD5 (zope/Zope-2.7.0.tgz) = f733cd97f32411d43d372ac61eed98f4 -SIZE (zope/Zope-2.7.0.tgz) = 2733236 +MD5 (zope/Zope-2.7.1.tgz) = ae9d4bb3f7220dfffb6e91b42503b16c +SIZE (zope/Zope-2.7.1.tgz) = 2754949 diff --git a/www/zope/files/patch-lib-python-zdaemon-zdctl.py b/www/zope/files/patch-lib-python-zdaemon-zdctl.py deleted file mode 100644 index 0bdc23957476..000000000000 --- a/www/zope/files/patch-lib-python-zdaemon-zdctl.py +++ /dev/null @@ -1,14 +0,0 @@ ---- lib/python/zdaemon/zdctl.py.orig Fri Oct 24 23:32:59 2003 -+++ lib/python/zdaemon/zdctl.py Fri Apr 2 01:55:59 2004 -@@ -208,9 +208,9 @@ - args += self._get_override("-z", "directory") - args.extend(self.options.program) - if self.options.daemon: -- flag = os.P_WAIT -- else: - flag = os.P_NOWAIT -+ else: -+ flag = os.P_WAIT - os.spawnvp(flag, args[0], args) - elif not self.zd_pid: - self.send_action("start") diff --git a/www/zope211/pkg-message b/www/zope/files/pkg-message.in index 5de2678098b7..3d35ab56b353 100644 --- a/www/zope211/pkg-message +++ b/www/zope/files/pkg-message.in @@ -25,4 +25,3 @@ to %%ZOPEBASEDIR%%/Products. You might have to add the following lines to your zope.conf products %%ZOPEBASEDIR%%/Products products $INSTANCE/Products - diff --git a/www/zope/files/zope.sh b/www/zope/files/zope.sh index 3ee194350404..d60b3c172c8f 100644 --- a/www/zope/files/zope.sh +++ b/www/zope/files/zope.sh @@ -1,7 +1,7 @@ #!/bin/sh # Start or stop zope -# $FreeBSD: /tmp/pcvs/ports/www/zope/files/Attic/zope.sh,v 1.2 2004-04-20 14:29:26 perky Exp $ +# $FreeBSD: /tmp/pcvs/ports/www/zope/files/Attic/zope.sh,v 1.3 2004-07-02 20:41:00 thierry Exp $ # PROVIDE: zope # REQUIRE: DAEMON @@ -18,7 +18,7 @@ prefix=%%PREFIX%% # DO NOT CHANGE THESE DEFAULT VALUES HERE # zope_enable=${zope_enable:-"NO"} # Enable gkrellmd -zope_instances=${zope_instances:-""} # List of instancehome dirs +zope_instances=${zope_instances:-""} # List of instancehome dirs . %%RC_SUBR%% @@ -47,7 +47,7 @@ if checkyesno zope_enable; then do if [ -r ${instance}/etc/${name}.conf -a -x ${instance}/bin/zopectl ]; then echo -n " Instance ${instance} -> " - ${instance}/bin/zopectl $1 + ${instance}/bin/zopectl $1 fi done fi diff --git a/www/zope/pkg-plist b/www/zope/pkg-plist index 1e61c51cfdc0..0df558279272 100644 --- a/www/zope/pkg-plist +++ b/www/zope/pkg-plist @@ -10,7 +10,7 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/bin/mkzopeinstance.py %%ZOPEBASEDIR%%/bin/python %%ZOPEBASEDIR%%/bin/requestprofiler.py -%%ZOPEBASEDIR%%/bin/testrunner.py +%%ZOPEBASEDIR%%/bin/test.py %%ZOPEBASEDIR%%/bin/zpasswd.py %%ZOPEBASEDIR%%/doc/CHANGES.txt %%ZOPEBASEDIR%%/doc/CREDITS.txt @@ -28,11 +28,6 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/doc/UNITTEST.txt %%ZOPEBASEDIR%%/doc/WEBSERVER.txt %%ZOPEBASEDIR%%/doc/ZODB.txt -%%ZOPEBASEDIR%%/doc/changenotes/010516-2.4-unicode.stx -%%ZOPEBASEDIR%%/doc/changenotes/010529-2.4-dropinindex.stx -%%ZOPEBASEDIR%%/doc/changenotes/010529-2.4-exreg.stx -%%ZOPEBASEDIR%%/doc/changenotes/010529-2.4-pluggableindex.stx -%%ZOPEBASEDIR%%/doc/changenotes/010620-2.4-btreeconflict.stx %%ZOPEBASEDIR%%/doc/zconfig/schema.dtd %%ZOPEBASEDIR%%/doc/zconfig/zconfig.pdf %%ZOPEBASEDIR%%/import/Examples.zexp @@ -224,6 +219,14 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/App/special_dtml.pyc %%ZOPEBASEDIR%%/lib/python/App/tar.py %%ZOPEBASEDIR%%/lib/python/App/tar.pyc +%%ZOPEBASEDIR%%/lib/python/App/tests/__init__.py +%%ZOPEBASEDIR%%/lib/python/App/tests/__init__.pyc +%%ZOPEBASEDIR%%/lib/python/App/tests/test_cachemanager.py +%%ZOPEBASEDIR%%/lib/python/App/tests/test_cachemanager.pyc +%%ZOPEBASEDIR%%/lib/python/App/tests/test_setConfiguration.py +%%ZOPEBASEDIR%%/lib/python/App/tests/test_setConfiguration.pyc +%%ZOPEBASEDIR%%/lib/python/App/tests/test_version_txt.py +%%ZOPEBASEDIR%%/lib/python/App/tests/test_version_txt.pyc %%ZOPEBASEDIR%%/lib/python/App/version_txt.py %%ZOPEBASEDIR%%/lib/python/App/version_txt.pyc %%ZOPEBASEDIR%%/lib/python/App/www/CacheManager_icon.gif @@ -627,12 +630,17 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/OFS/tests/__init__.pyc %%ZOPEBASEDIR%%/lib/python/OFS/tests/mime.types-1 %%ZOPEBASEDIR%%/lib/python/OFS/tests/mime.types-2 +%%ZOPEBASEDIR%%/lib/python/OFS/tests/test.gif %%ZOPEBASEDIR%%/lib/python/OFS/tests/testAppInitializer.py %%ZOPEBASEDIR%%/lib/python/OFS/tests/testAppInitializer.pyc %%ZOPEBASEDIR%%/lib/python/OFS/tests/testContentTypes.py %%ZOPEBASEDIR%%/lib/python/OFS/tests/testContentTypes.pyc %%ZOPEBASEDIR%%/lib/python/OFS/tests/testCopySupport.py %%ZOPEBASEDIR%%/lib/python/OFS/tests/testCopySupport.pyc +%%ZOPEBASEDIR%%/lib/python/OFS/tests/testFileAndImage.py +%%ZOPEBASEDIR%%/lib/python/OFS/tests/testFileAndImage.pyc +%%ZOPEBASEDIR%%/lib/python/OFS/tests/testObjectManager.py +%%ZOPEBASEDIR%%/lib/python/OFS/tests/testObjectManager.pyc %%ZOPEBASEDIR%%/lib/python/OFS/tests/testOrderSupport.py %%ZOPEBASEDIR%%/lib/python/OFS/tests/testOrderSupport.pyc %%ZOPEBASEDIR%%/lib/python/OFS/tests/testOrderedFolder.py @@ -951,6 +959,8 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testHTMLTests.pyc %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testTALES.py %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testTALES.pyc +%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testZopePageTemplate.py +%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testZopePageTemplate.pyc %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/test_ptfile.py %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/test_ptfile.pyc %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/util.py @@ -1118,6 +1128,7 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/class.__name__.ps %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/complex_print.ps %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/fibonacci.ps +%%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/filepath.ps %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/for_loop.ps %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/global_is_declaration.ps %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/mutate_literals.ps @@ -1233,6 +1244,8 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/Products/TemporaryFolder/patchfs.py %%ZOPEBASEDIR%%/lib/python/Products/TemporaryFolder/patchfs.pyc %%ZOPEBASEDIR%%/lib/python/Products/TemporaryFolder/www/tempfolder.gif +%%ZOPEBASEDIR%%/lib/python/Products/Transience/Fake.py +%%ZOPEBASEDIR%%/lib/python/Products/Transience/Fake.pyc %%ZOPEBASEDIR%%/lib/python/Products/Transience/HowTransienceWorks.stx %%ZOPEBASEDIR%%/lib/python/Products/Transience/Transience.py %%ZOPEBASEDIR%%/lib/python/Products/Transience/Transience.pyc @@ -1415,6 +1428,8 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/unittest_patched.py %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/__init__.py %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/__init__.pyc +%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testBrains.py +%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testBrains.pyc %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testCatalog.py %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testCatalog.pyc %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/version.txt @@ -2329,6 +2344,8 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPRequest.pyc %%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPResponse.py %%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPResponse.pyc +%%ZOPEBASEDIR%%/lib/python/ZPublisher/Iterators.py +%%ZOPEBASEDIR%%/lib/python/ZPublisher/Iterators.pyc %%ZOPEBASEDIR%%/lib/python/ZPublisher/Publish.py %%ZOPEBASEDIR%%/lib/python/ZPublisher/Publish.pyc %%ZOPEBASEDIR%%/lib/python/ZPublisher/Request.py @@ -2543,6 +2560,14 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/Zope/Startup/options.pyc %%ZOPEBASEDIR%%/lib/python/Zope/Startup/run.py %%ZOPEBASEDIR%%/lib/python/Zope/Startup/run.pyc +%%ZOPEBASEDIR%%/lib/python/Zope/Startup/tests/__init__.py +%%ZOPEBASEDIR%%/lib/python/Zope/Startup/tests/__init__.pyc +%%ZOPEBASEDIR%%/lib/python/Zope/Startup/tests/testStarter.py +%%ZOPEBASEDIR%%/lib/python/Zope/Startup/tests/testStarter.pyc +%%ZOPEBASEDIR%%/lib/python/Zope/Startup/tests/test_schema.py +%%ZOPEBASEDIR%%/lib/python/Zope/Startup/tests/test_schema.pyc +%%ZOPEBASEDIR%%/lib/python/Zope/Startup/tests/test_warnfilter.py +%%ZOPEBASEDIR%%/lib/python/Zope/Startup/tests/test_warnfilter.pyc %%ZOPEBASEDIR%%/lib/python/Zope/Startup/warnfilter.py %%ZOPEBASEDIR%%/lib/python/Zope/Startup/warnfilter.pyc %%ZOPEBASEDIR%%/lib/python/Zope/Startup/warnfilter.xml @@ -2563,6 +2588,8 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/docutils/__init__.pyc %%ZOPEBASEDIR%%/lib/python/docutils/core.py %%ZOPEBASEDIR%%/lib/python/docutils/core.pyc +%%ZOPEBASEDIR%%/lib/python/docutils/examples.py +%%ZOPEBASEDIR%%/lib/python/docutils/examples.pyc %%ZOPEBASEDIR%%/lib/python/docutils/frontend.py %%ZOPEBASEDIR%%/lib/python/docutils/frontend.pyc %%ZOPEBASEDIR%%/lib/python/docutils/io.py @@ -2571,6 +2598,8 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/docutils/languages/__init__.pyc %%ZOPEBASEDIR%%/lib/python/docutils/languages/af.py %%ZOPEBASEDIR%%/lib/python/docutils/languages/af.pyc +%%ZOPEBASEDIR%%/lib/python/docutils/languages/cs.py +%%ZOPEBASEDIR%%/lib/python/docutils/languages/cs.pyc %%ZOPEBASEDIR%%/lib/python/docutils/languages/de.py %%ZOPEBASEDIR%%/lib/python/docutils/languages/de.pyc %%ZOPEBASEDIR%%/lib/python/docutils/languages/en.py @@ -2583,6 +2612,8 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/docutils/languages/fr.pyc %%ZOPEBASEDIR%%/lib/python/docutils/languages/it.py %%ZOPEBASEDIR%%/lib/python/docutils/languages/it.pyc +%%ZOPEBASEDIR%%/lib/python/docutils/languages/pt_br.py +%%ZOPEBASEDIR%%/lib/python/docutils/languages/pt_br.pyc %%ZOPEBASEDIR%%/lib/python/docutils/languages/ru.py %%ZOPEBASEDIR%%/lib/python/docutils/languages/ru.pyc %%ZOPEBASEDIR%%/lib/python/docutils/languages/sk.py @@ -2615,6 +2646,8 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/__init__.pyc %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/af.py %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/af.pyc +%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/cs.py +%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/cs.pyc %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/de.py %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/de.pyc %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/en.py @@ -2627,12 +2660,16 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/fr.pyc %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/it.py %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/it.pyc +%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/pt_br.py +%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/pt_br.pyc %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/ru.py %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/ru.pyc %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/sk.py %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/sk.pyc %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/sv.py %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/sv.pyc +%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/roles.py +%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/roles.pyc %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/states.py %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/states.pyc %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/tableparser.py @@ -2688,8 +2725,6 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/reStructuredText/README.txt %%ZOPEBASEDIR%%/lib/python/reStructuredText/__init__.py %%ZOPEBASEDIR%%/lib/python/reStructuredText/__init__.pyc -%%ZOPEBASEDIR%%/lib/python/reStructuredText/html4zope.py -%%ZOPEBASEDIR%%/lib/python/reStructuredText/html4zope.pyc %%ZOPEBASEDIR%%/lib/python/reStructuredText/reStructuredText.txt %%ZOPEBASEDIR%%/lib/python/tempstorage/TemporaryStorage.py %%ZOPEBASEDIR%%/lib/python/tempstorage/TemporaryStorage.pyc @@ -2828,6 +2863,7 @@ etc/rc.d/zope.sh @dirrm %%ZOPEBASEDIR%%/lib/python/docutils @dirrm %%ZOPEBASEDIR%%/lib/python/ZopeUndo/tests @dirrm %%ZOPEBASEDIR%%/lib/python/ZopeUndo +@dirrm %%ZOPEBASEDIR%%/lib/python/Zope/Startup/tests @dirrm %%ZOPEBASEDIR%%/lib/python/Zope/Startup/nt @dirrm %%ZOPEBASEDIR%%/lib/python/Zope/Startup/misc @dirrm %%ZOPEBASEDIR%%/lib/python/Zope/Startup @@ -3030,6 +3066,7 @@ etc/rc.d/zope.sh @dirrm %%ZOPEBASEDIR%%/lib/python/BDBStorage/tests @dirrm %%ZOPEBASEDIR%%/lib/python/BDBStorage @dirrm %%ZOPEBASEDIR%%/lib/python/App/www +@dirrm %%ZOPEBASEDIR%%/lib/python/App/tests @dirrm %%ZOPEBASEDIR%%/lib/python/App/dtml @dirrm %%ZOPEBASEDIR%%/lib/python/App @dirrm %%ZOPEBASEDIR%%/lib/python/AccessControl/www @@ -3045,10 +3082,9 @@ etc/rc.d/zope.sh @dirrm %%ZOPEBASEDIR%%/lib/python/AccessControl @dirrm %%ZOPEBASEDIR%%/lib/python @dirrm %%ZOPEBASEDIR%%/lib -@dirrm %%ZOPEBASEDIR%%/Products @dirrm %%ZOPEBASEDIR%%/import @dirrm %%ZOPEBASEDIR%%/doc/zconfig -@dirrm %%ZOPEBASEDIR%%/doc/changenotes @dirrm %%ZOPEBASEDIR%%/doc @dirrm %%ZOPEBASEDIR%%/bin +@dirrm %%ZOPEBASEDIR%%/Products @dirrm %%ZOPEBASEDIR%% diff --git a/www/zope210/Makefile b/www/zope210/Makefile index 2b6c9a615d60..0ca20d100d99 100644 --- a/www/zope210/Makefile +++ b/www/zope210/Makefile @@ -6,8 +6,7 @@ # PORTNAME= zope -PORTVERSION= 2.7.0 -PORTREVISION= 1 +PORTVERSION= 2.7.1 CATEGORIES= www python zope MASTER_SITES= http://www.zope.org/Products/Zope/${PORTVERSION}/${PORTVERSION}/ DISTNAME= Zope-${PORTVERSION} @@ -22,6 +21,7 @@ USE_PYTHON= yes USE_RC_SUBR= yes USE_REINPLACE= yes DIST_SUBDIR= zope +WRKSRC= ${WRKDIR}/${DISTNAME}-0 # 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. @@ -55,6 +55,7 @@ RC_SCRIPTS_SUB= PREFIX=${PREFIX} \ CONFIG_SUB= ZOPEBASEDIR=${ZOPEBASEDIR} \ ZOPE_USER=${ZOPE_USER} \ ZOPEINSTANCEDIR=${ZOPEINSTANCEDIR} +PKGMESSAGE= ${WRKDIR}/pkg-message .if defined(BATCH) ISBATCH= -u admin:test123 @@ -68,11 +69,14 @@ post-patch: post-install: @${MV} ${ZOPEBASEDIR}/skel/etc/zope.conf.in ${ZOPEBASEDIR}/skel/etc/zope.conf.sample.in - @${SED} ${CONFIG_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} pkg-message + @${SED} ${CONFIG_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} < ${FILESDIR}/pkg-message.in \ + > ${PKGMESSAGE} @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ ${FILESDIR}/zope.sh > ${PREFIX}/etc/rc.d/zope.sh @${CHMOD} ${BINMODE} ${PREFIX}/etc/rc.d/zope.sh @${MKDIR} ${ZOPEBASEDIR}/Products + @${CAT} ${PKGMESSAGE} + @${ECHO_MSG} instance: @${ZOPEBASEDIR}/bin/mkzopeinstance.py -d ${ZOPEINSTANCEDIR} ${ISBATCH} diff --git a/www/zope210/distinfo b/www/zope210/distinfo index de2d51bcec75..adb251366969 100644 --- a/www/zope210/distinfo +++ b/www/zope210/distinfo @@ -1,2 +1,2 @@ -MD5 (zope/Zope-2.7.0.tgz) = f733cd97f32411d43d372ac61eed98f4 -SIZE (zope/Zope-2.7.0.tgz) = 2733236 +MD5 (zope/Zope-2.7.1.tgz) = ae9d4bb3f7220dfffb6e91b42503b16c +SIZE (zope/Zope-2.7.1.tgz) = 2754949 diff --git a/www/zope210/files/patch-lib-python-zdaemon-zdctl.py b/www/zope210/files/patch-lib-python-zdaemon-zdctl.py deleted file mode 100644 index 0bdc23957476..000000000000 --- a/www/zope210/files/patch-lib-python-zdaemon-zdctl.py +++ /dev/null @@ -1,14 +0,0 @@ ---- lib/python/zdaemon/zdctl.py.orig Fri Oct 24 23:32:59 2003 -+++ lib/python/zdaemon/zdctl.py Fri Apr 2 01:55:59 2004 -@@ -208,9 +208,9 @@ - args += self._get_override("-z", "directory") - args.extend(self.options.program) - if self.options.daemon: -- flag = os.P_WAIT -- else: - flag = os.P_NOWAIT -+ else: -+ flag = os.P_WAIT - os.spawnvp(flag, args[0], args) - elif not self.zd_pid: - self.send_action("start") diff --git a/www/zope/pkg-message b/www/zope210/files/pkg-message.in index 5de2678098b7..3d35ab56b353 100644 --- a/www/zope/pkg-message +++ b/www/zope210/files/pkg-message.in @@ -25,4 +25,3 @@ to %%ZOPEBASEDIR%%/Products. You might have to add the following lines to your zope.conf products %%ZOPEBASEDIR%%/Products products $INSTANCE/Products - diff --git a/www/zope210/files/zope.sh b/www/zope210/files/zope.sh index 370a5f077360..f63e48793a73 100644 --- a/www/zope210/files/zope.sh +++ b/www/zope210/files/zope.sh @@ -1,7 +1,7 @@ #!/bin/sh # Start or stop zope -# $FreeBSD: /tmp/pcvs/ports/www/zope210/files/Attic/zope.sh,v 1.2 2004-04-20 14:29:26 perky Exp $ +# $FreeBSD: /tmp/pcvs/ports/www/zope210/files/Attic/zope.sh,v 1.3 2004-07-02 20:41:00 thierry Exp $ # PROVIDE: zope # REQUIRE: DAEMON @@ -18,7 +18,7 @@ prefix=%%PREFIX%% # DO NOT CHANGE THESE DEFAULT VALUES HERE # zope_enable=${zope_enable:-"NO"} # Enable gkrellmd -zope_instances=${zope_instances:-""} # List of instancehome dirs +zope_instances=${zope_instances:-""} # List of instancehome dirs . %%RC_SUBR%% @@ -47,7 +47,7 @@ if checkyesno zope_enable; then do if [ -r ${instance}/etc/${name}.conf -a -x ${instance}/bin/zopectl ]; then echo -n " Instance ${instance} -> " - ${instance}/bin/zopectl $1 + ${instance}/bin/zopectl $1 fi done fi diff --git a/www/zope210/pkg-plist b/www/zope210/pkg-plist index 1e61c51cfdc0..0df558279272 100644 --- a/www/zope210/pkg-plist +++ b/www/zope210/pkg-plist @@ -10,7 +10,7 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/bin/mkzopeinstance.py %%ZOPEBASEDIR%%/bin/python %%ZOPEBASEDIR%%/bin/requestprofiler.py -%%ZOPEBASEDIR%%/bin/testrunner.py +%%ZOPEBASEDIR%%/bin/test.py %%ZOPEBASEDIR%%/bin/zpasswd.py %%ZOPEBASEDIR%%/doc/CHANGES.txt %%ZOPEBASEDIR%%/doc/CREDITS.txt @@ -28,11 +28,6 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/doc/UNITTEST.txt %%ZOPEBASEDIR%%/doc/WEBSERVER.txt %%ZOPEBASEDIR%%/doc/ZODB.txt -%%ZOPEBASEDIR%%/doc/changenotes/010516-2.4-unicode.stx -%%ZOPEBASEDIR%%/doc/changenotes/010529-2.4-dropinindex.stx -%%ZOPEBASEDIR%%/doc/changenotes/010529-2.4-exreg.stx -%%ZOPEBASEDIR%%/doc/changenotes/010529-2.4-pluggableindex.stx -%%ZOPEBASEDIR%%/doc/changenotes/010620-2.4-btreeconflict.stx %%ZOPEBASEDIR%%/doc/zconfig/schema.dtd %%ZOPEBASEDIR%%/doc/zconfig/zconfig.pdf %%ZOPEBASEDIR%%/import/Examples.zexp @@ -224,6 +219,14 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/App/special_dtml.pyc %%ZOPEBASEDIR%%/lib/python/App/tar.py %%ZOPEBASEDIR%%/lib/python/App/tar.pyc +%%ZOPEBASEDIR%%/lib/python/App/tests/__init__.py +%%ZOPEBASEDIR%%/lib/python/App/tests/__init__.pyc +%%ZOPEBASEDIR%%/lib/python/App/tests/test_cachemanager.py +%%ZOPEBASEDIR%%/lib/python/App/tests/test_cachemanager.pyc +%%ZOPEBASEDIR%%/lib/python/App/tests/test_setConfiguration.py +%%ZOPEBASEDIR%%/lib/python/App/tests/test_setConfiguration.pyc +%%ZOPEBASEDIR%%/lib/python/App/tests/test_version_txt.py +%%ZOPEBASEDIR%%/lib/python/App/tests/test_version_txt.pyc %%ZOPEBASEDIR%%/lib/python/App/version_txt.py %%ZOPEBASEDIR%%/lib/python/App/version_txt.pyc %%ZOPEBASEDIR%%/lib/python/App/www/CacheManager_icon.gif @@ -627,12 +630,17 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/OFS/tests/__init__.pyc %%ZOPEBASEDIR%%/lib/python/OFS/tests/mime.types-1 %%ZOPEBASEDIR%%/lib/python/OFS/tests/mime.types-2 +%%ZOPEBASEDIR%%/lib/python/OFS/tests/test.gif %%ZOPEBASEDIR%%/lib/python/OFS/tests/testAppInitializer.py %%ZOPEBASEDIR%%/lib/python/OFS/tests/testAppInitializer.pyc %%ZOPEBASEDIR%%/lib/python/OFS/tests/testContentTypes.py %%ZOPEBASEDIR%%/lib/python/OFS/tests/testContentTypes.pyc %%ZOPEBASEDIR%%/lib/python/OFS/tests/testCopySupport.py %%ZOPEBASEDIR%%/lib/python/OFS/tests/testCopySupport.pyc +%%ZOPEBASEDIR%%/lib/python/OFS/tests/testFileAndImage.py +%%ZOPEBASEDIR%%/lib/python/OFS/tests/testFileAndImage.pyc +%%ZOPEBASEDIR%%/lib/python/OFS/tests/testObjectManager.py +%%ZOPEBASEDIR%%/lib/python/OFS/tests/testObjectManager.pyc %%ZOPEBASEDIR%%/lib/python/OFS/tests/testOrderSupport.py %%ZOPEBASEDIR%%/lib/python/OFS/tests/testOrderSupport.pyc %%ZOPEBASEDIR%%/lib/python/OFS/tests/testOrderedFolder.py @@ -951,6 +959,8 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testHTMLTests.pyc %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testTALES.py %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testTALES.pyc +%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testZopePageTemplate.py +%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testZopePageTemplate.pyc %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/test_ptfile.py %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/test_ptfile.pyc %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/util.py @@ -1118,6 +1128,7 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/class.__name__.ps %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/complex_print.ps %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/fibonacci.ps +%%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/filepath.ps %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/for_loop.ps %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/global_is_declaration.ps %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/mutate_literals.ps @@ -1233,6 +1244,8 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/Products/TemporaryFolder/patchfs.py %%ZOPEBASEDIR%%/lib/python/Products/TemporaryFolder/patchfs.pyc %%ZOPEBASEDIR%%/lib/python/Products/TemporaryFolder/www/tempfolder.gif +%%ZOPEBASEDIR%%/lib/python/Products/Transience/Fake.py +%%ZOPEBASEDIR%%/lib/python/Products/Transience/Fake.pyc %%ZOPEBASEDIR%%/lib/python/Products/Transience/HowTransienceWorks.stx %%ZOPEBASEDIR%%/lib/python/Products/Transience/Transience.py %%ZOPEBASEDIR%%/lib/python/Products/Transience/Transience.pyc @@ -1415,6 +1428,8 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/unittest_patched.py %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/__init__.py %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/__init__.pyc +%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testBrains.py +%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testBrains.pyc %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testCatalog.py %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testCatalog.pyc %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/version.txt @@ -2329,6 +2344,8 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPRequest.pyc %%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPResponse.py %%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPResponse.pyc +%%ZOPEBASEDIR%%/lib/python/ZPublisher/Iterators.py +%%ZOPEBASEDIR%%/lib/python/ZPublisher/Iterators.pyc %%ZOPEBASEDIR%%/lib/python/ZPublisher/Publish.py %%ZOPEBASEDIR%%/lib/python/ZPublisher/Publish.pyc %%ZOPEBASEDIR%%/lib/python/ZPublisher/Request.py @@ -2543,6 +2560,14 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/Zope/Startup/options.pyc %%ZOPEBASEDIR%%/lib/python/Zope/Startup/run.py %%ZOPEBASEDIR%%/lib/python/Zope/Startup/run.pyc +%%ZOPEBASEDIR%%/lib/python/Zope/Startup/tests/__init__.py +%%ZOPEBASEDIR%%/lib/python/Zope/Startup/tests/__init__.pyc +%%ZOPEBASEDIR%%/lib/python/Zope/Startup/tests/testStarter.py +%%ZOPEBASEDIR%%/lib/python/Zope/Startup/tests/testStarter.pyc +%%ZOPEBASEDIR%%/lib/python/Zope/Startup/tests/test_schema.py +%%ZOPEBASEDIR%%/lib/python/Zope/Startup/tests/test_schema.pyc +%%ZOPEBASEDIR%%/lib/python/Zope/Startup/tests/test_warnfilter.py +%%ZOPEBASEDIR%%/lib/python/Zope/Startup/tests/test_warnfilter.pyc %%ZOPEBASEDIR%%/lib/python/Zope/Startup/warnfilter.py %%ZOPEBASEDIR%%/lib/python/Zope/Startup/warnfilter.pyc %%ZOPEBASEDIR%%/lib/python/Zope/Startup/warnfilter.xml @@ -2563,6 +2588,8 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/docutils/__init__.pyc %%ZOPEBASEDIR%%/lib/python/docutils/core.py %%ZOPEBASEDIR%%/lib/python/docutils/core.pyc +%%ZOPEBASEDIR%%/lib/python/docutils/examples.py +%%ZOPEBASEDIR%%/lib/python/docutils/examples.pyc %%ZOPEBASEDIR%%/lib/python/docutils/frontend.py %%ZOPEBASEDIR%%/lib/python/docutils/frontend.pyc %%ZOPEBASEDIR%%/lib/python/docutils/io.py @@ -2571,6 +2598,8 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/docutils/languages/__init__.pyc %%ZOPEBASEDIR%%/lib/python/docutils/languages/af.py %%ZOPEBASEDIR%%/lib/python/docutils/languages/af.pyc +%%ZOPEBASEDIR%%/lib/python/docutils/languages/cs.py +%%ZOPEBASEDIR%%/lib/python/docutils/languages/cs.pyc %%ZOPEBASEDIR%%/lib/python/docutils/languages/de.py %%ZOPEBASEDIR%%/lib/python/docutils/languages/de.pyc %%ZOPEBASEDIR%%/lib/python/docutils/languages/en.py @@ -2583,6 +2612,8 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/docutils/languages/fr.pyc %%ZOPEBASEDIR%%/lib/python/docutils/languages/it.py %%ZOPEBASEDIR%%/lib/python/docutils/languages/it.pyc +%%ZOPEBASEDIR%%/lib/python/docutils/languages/pt_br.py +%%ZOPEBASEDIR%%/lib/python/docutils/languages/pt_br.pyc %%ZOPEBASEDIR%%/lib/python/docutils/languages/ru.py %%ZOPEBASEDIR%%/lib/python/docutils/languages/ru.pyc %%ZOPEBASEDIR%%/lib/python/docutils/languages/sk.py @@ -2615,6 +2646,8 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/__init__.pyc %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/af.py %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/af.pyc +%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/cs.py +%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/cs.pyc %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/de.py %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/de.pyc %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/en.py @@ -2627,12 +2660,16 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/fr.pyc %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/it.py %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/it.pyc +%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/pt_br.py +%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/pt_br.pyc %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/ru.py %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/ru.pyc %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/sk.py %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/sk.pyc %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/sv.py %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/sv.pyc +%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/roles.py +%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/roles.pyc %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/states.py %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/states.pyc %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/tableparser.py @@ -2688,8 +2725,6 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/reStructuredText/README.txt %%ZOPEBASEDIR%%/lib/python/reStructuredText/__init__.py %%ZOPEBASEDIR%%/lib/python/reStructuredText/__init__.pyc -%%ZOPEBASEDIR%%/lib/python/reStructuredText/html4zope.py -%%ZOPEBASEDIR%%/lib/python/reStructuredText/html4zope.pyc %%ZOPEBASEDIR%%/lib/python/reStructuredText/reStructuredText.txt %%ZOPEBASEDIR%%/lib/python/tempstorage/TemporaryStorage.py %%ZOPEBASEDIR%%/lib/python/tempstorage/TemporaryStorage.pyc @@ -2828,6 +2863,7 @@ etc/rc.d/zope.sh @dirrm %%ZOPEBASEDIR%%/lib/python/docutils @dirrm %%ZOPEBASEDIR%%/lib/python/ZopeUndo/tests @dirrm %%ZOPEBASEDIR%%/lib/python/ZopeUndo +@dirrm %%ZOPEBASEDIR%%/lib/python/Zope/Startup/tests @dirrm %%ZOPEBASEDIR%%/lib/python/Zope/Startup/nt @dirrm %%ZOPEBASEDIR%%/lib/python/Zope/Startup/misc @dirrm %%ZOPEBASEDIR%%/lib/python/Zope/Startup @@ -3030,6 +3066,7 @@ etc/rc.d/zope.sh @dirrm %%ZOPEBASEDIR%%/lib/python/BDBStorage/tests @dirrm %%ZOPEBASEDIR%%/lib/python/BDBStorage @dirrm %%ZOPEBASEDIR%%/lib/python/App/www +@dirrm %%ZOPEBASEDIR%%/lib/python/App/tests @dirrm %%ZOPEBASEDIR%%/lib/python/App/dtml @dirrm %%ZOPEBASEDIR%%/lib/python/App @dirrm %%ZOPEBASEDIR%%/lib/python/AccessControl/www @@ -3045,10 +3082,9 @@ etc/rc.d/zope.sh @dirrm %%ZOPEBASEDIR%%/lib/python/AccessControl @dirrm %%ZOPEBASEDIR%%/lib/python @dirrm %%ZOPEBASEDIR%%/lib -@dirrm %%ZOPEBASEDIR%%/Products @dirrm %%ZOPEBASEDIR%%/import @dirrm %%ZOPEBASEDIR%%/doc/zconfig -@dirrm %%ZOPEBASEDIR%%/doc/changenotes @dirrm %%ZOPEBASEDIR%%/doc @dirrm %%ZOPEBASEDIR%%/bin +@dirrm %%ZOPEBASEDIR%%/Products @dirrm %%ZOPEBASEDIR%% diff --git a/www/zope211/Makefile b/www/zope211/Makefile index 2b6c9a615d60..0ca20d100d99 100644 --- a/www/zope211/Makefile +++ b/www/zope211/Makefile @@ -6,8 +6,7 @@ # PORTNAME= zope -PORTVERSION= 2.7.0 -PORTREVISION= 1 +PORTVERSION= 2.7.1 CATEGORIES= www python zope MASTER_SITES= http://www.zope.org/Products/Zope/${PORTVERSION}/${PORTVERSION}/ DISTNAME= Zope-${PORTVERSION} @@ -22,6 +21,7 @@ USE_PYTHON= yes USE_RC_SUBR= yes USE_REINPLACE= yes DIST_SUBDIR= zope +WRKSRC= ${WRKDIR}/${DISTNAME}-0 # 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. @@ -55,6 +55,7 @@ RC_SCRIPTS_SUB= PREFIX=${PREFIX} \ CONFIG_SUB= ZOPEBASEDIR=${ZOPEBASEDIR} \ ZOPE_USER=${ZOPE_USER} \ ZOPEINSTANCEDIR=${ZOPEINSTANCEDIR} +PKGMESSAGE= ${WRKDIR}/pkg-message .if defined(BATCH) ISBATCH= -u admin:test123 @@ -68,11 +69,14 @@ post-patch: post-install: @${MV} ${ZOPEBASEDIR}/skel/etc/zope.conf.in ${ZOPEBASEDIR}/skel/etc/zope.conf.sample.in - @${SED} ${CONFIG_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} pkg-message + @${SED} ${CONFIG_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} < ${FILESDIR}/pkg-message.in \ + > ${PKGMESSAGE} @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ ${FILESDIR}/zope.sh > ${PREFIX}/etc/rc.d/zope.sh @${CHMOD} ${BINMODE} ${PREFIX}/etc/rc.d/zope.sh @${MKDIR} ${ZOPEBASEDIR}/Products + @${CAT} ${PKGMESSAGE} + @${ECHO_MSG} instance: @${ZOPEBASEDIR}/bin/mkzopeinstance.py -d ${ZOPEINSTANCEDIR} ${ISBATCH} diff --git a/www/zope211/distinfo b/www/zope211/distinfo index de2d51bcec75..adb251366969 100644 --- a/www/zope211/distinfo +++ b/www/zope211/distinfo @@ -1,2 +1,2 @@ -MD5 (zope/Zope-2.7.0.tgz) = f733cd97f32411d43d372ac61eed98f4 -SIZE (zope/Zope-2.7.0.tgz) = 2733236 +MD5 (zope/Zope-2.7.1.tgz) = ae9d4bb3f7220dfffb6e91b42503b16c +SIZE (zope/Zope-2.7.1.tgz) = 2754949 diff --git a/www/zope211/files/patch-lib-python-zdaemon-zdctl.py b/www/zope211/files/patch-lib-python-zdaemon-zdctl.py deleted file mode 100644 index 0bdc23957476..000000000000 --- a/www/zope211/files/patch-lib-python-zdaemon-zdctl.py +++ /dev/null @@ -1,14 +0,0 @@ ---- lib/python/zdaemon/zdctl.py.orig Fri Oct 24 23:32:59 2003 -+++ lib/python/zdaemon/zdctl.py Fri Apr 2 01:55:59 2004 -@@ -208,9 +208,9 @@ - args += self._get_override("-z", "directory") - args.extend(self.options.program) - if self.options.daemon: -- flag = os.P_WAIT -- else: - flag = os.P_NOWAIT -+ else: -+ flag = os.P_WAIT - os.spawnvp(flag, args[0], args) - elif not self.zd_pid: - self.send_action("start") diff --git a/www/zope213/pkg-message b/www/zope211/files/pkg-message.in index 5de2678098b7..3d35ab56b353 100644 --- a/www/zope213/pkg-message +++ b/www/zope211/files/pkg-message.in @@ -25,4 +25,3 @@ to %%ZOPEBASEDIR%%/Products. You might have to add the following lines to your zope.conf products %%ZOPEBASEDIR%%/Products products $INSTANCE/Products - diff --git a/www/zope211/files/zope.sh b/www/zope211/files/zope.sh index 9240d84d7eb2..55693a2b3f34 100644 --- a/www/zope211/files/zope.sh +++ b/www/zope211/files/zope.sh @@ -1,7 +1,7 @@ #!/bin/sh # Start or stop zope -# $FreeBSD: /tmp/pcvs/ports/www/zope211/files/Attic/zope.sh,v 1.2 2004-04-20 14:29:26 perky Exp $ +# $FreeBSD: /tmp/pcvs/ports/www/zope211/files/Attic/zope.sh,v 1.3 2004-07-02 20:41:00 thierry Exp $ # PROVIDE: zope # REQUIRE: DAEMON @@ -18,7 +18,7 @@ prefix=%%PREFIX%% # DO NOT CHANGE THESE DEFAULT VALUES HERE # zope_enable=${zope_enable:-"NO"} # Enable gkrellmd -zope_instances=${zope_instances:-""} # List of instancehome dirs +zope_instances=${zope_instances:-""} # List of instancehome dirs . %%RC_SUBR%% @@ -47,7 +47,7 @@ if checkyesno zope_enable; then do if [ -r ${instance}/etc/${name}.conf -a -x ${instance}/bin/zopectl ]; then echo -n " Instance ${instance} -> " - ${instance}/bin/zopectl $1 + ${instance}/bin/zopectl $1 fi done fi diff --git a/www/zope211/pkg-plist b/www/zope211/pkg-plist index 1e61c51cfdc0..0df558279272 100644 --- a/www/zope211/pkg-plist +++ b/www/zope211/pkg-plist @@ -10,7 +10,7 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/bin/mkzopeinstance.py %%ZOPEBASEDIR%%/bin/python %%ZOPEBASEDIR%%/bin/requestprofiler.py -%%ZOPEBASEDIR%%/bin/testrunner.py +%%ZOPEBASEDIR%%/bin/test.py %%ZOPEBASEDIR%%/bin/zpasswd.py %%ZOPEBASEDIR%%/doc/CHANGES.txt %%ZOPEBASEDIR%%/doc/CREDITS.txt @@ -28,11 +28,6 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/doc/UNITTEST.txt %%ZOPEBASEDIR%%/doc/WEBSERVER.txt %%ZOPEBASEDIR%%/doc/ZODB.txt -%%ZOPEBASEDIR%%/doc/changenotes/010516-2.4-unicode.stx -%%ZOPEBASEDIR%%/doc/changenotes/010529-2.4-dropinindex.stx -%%ZOPEBASEDIR%%/doc/changenotes/010529-2.4-exreg.stx -%%ZOPEBASEDIR%%/doc/changenotes/010529-2.4-pluggableindex.stx -%%ZOPEBASEDIR%%/doc/changenotes/010620-2.4-btreeconflict.stx %%ZOPEBASEDIR%%/doc/zconfig/schema.dtd %%ZOPEBASEDIR%%/doc/zconfig/zconfig.pdf %%ZOPEBASEDIR%%/import/Examples.zexp @@ -224,6 +219,14 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/App/special_dtml.pyc %%ZOPEBASEDIR%%/lib/python/App/tar.py %%ZOPEBASEDIR%%/lib/python/App/tar.pyc +%%ZOPEBASEDIR%%/lib/python/App/tests/__init__.py +%%ZOPEBASEDIR%%/lib/python/App/tests/__init__.pyc +%%ZOPEBASEDIR%%/lib/python/App/tests/test_cachemanager.py +%%ZOPEBASEDIR%%/lib/python/App/tests/test_cachemanager.pyc +%%ZOPEBASEDIR%%/lib/python/App/tests/test_setConfiguration.py +%%ZOPEBASEDIR%%/lib/python/App/tests/test_setConfiguration.pyc +%%ZOPEBASEDIR%%/lib/python/App/tests/test_version_txt.py +%%ZOPEBASEDIR%%/lib/python/App/tests/test_version_txt.pyc %%ZOPEBASEDIR%%/lib/python/App/version_txt.py %%ZOPEBASEDIR%%/lib/python/App/version_txt.pyc %%ZOPEBASEDIR%%/lib/python/App/www/CacheManager_icon.gif @@ -627,12 +630,17 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/OFS/tests/__init__.pyc %%ZOPEBASEDIR%%/lib/python/OFS/tests/mime.types-1 %%ZOPEBASEDIR%%/lib/python/OFS/tests/mime.types-2 +%%ZOPEBASEDIR%%/lib/python/OFS/tests/test.gif %%ZOPEBASEDIR%%/lib/python/OFS/tests/testAppInitializer.py %%ZOPEBASEDIR%%/lib/python/OFS/tests/testAppInitializer.pyc %%ZOPEBASEDIR%%/lib/python/OFS/tests/testContentTypes.py %%ZOPEBASEDIR%%/lib/python/OFS/tests/testContentTypes.pyc %%ZOPEBASEDIR%%/lib/python/OFS/tests/testCopySupport.py %%ZOPEBASEDIR%%/lib/python/OFS/tests/testCopySupport.pyc +%%ZOPEBASEDIR%%/lib/python/OFS/tests/testFileAndImage.py +%%ZOPEBASEDIR%%/lib/python/OFS/tests/testFileAndImage.pyc +%%ZOPEBASEDIR%%/lib/python/OFS/tests/testObjectManager.py +%%ZOPEBASEDIR%%/lib/python/OFS/tests/testObjectManager.pyc %%ZOPEBASEDIR%%/lib/python/OFS/tests/testOrderSupport.py %%ZOPEBASEDIR%%/lib/python/OFS/tests/testOrderSupport.pyc %%ZOPEBASEDIR%%/lib/python/OFS/tests/testOrderedFolder.py @@ -951,6 +959,8 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testHTMLTests.pyc %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testTALES.py %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testTALES.pyc +%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testZopePageTemplate.py +%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testZopePageTemplate.pyc %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/test_ptfile.py %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/test_ptfile.pyc %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/util.py @@ -1118,6 +1128,7 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/class.__name__.ps %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/complex_print.ps %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/fibonacci.ps +%%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/filepath.ps %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/for_loop.ps %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/global_is_declaration.ps %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/mutate_literals.ps @@ -1233,6 +1244,8 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/Products/TemporaryFolder/patchfs.py %%ZOPEBASEDIR%%/lib/python/Products/TemporaryFolder/patchfs.pyc %%ZOPEBASEDIR%%/lib/python/Products/TemporaryFolder/www/tempfolder.gif +%%ZOPEBASEDIR%%/lib/python/Products/Transience/Fake.py +%%ZOPEBASEDIR%%/lib/python/Products/Transience/Fake.pyc %%ZOPEBASEDIR%%/lib/python/Products/Transience/HowTransienceWorks.stx %%ZOPEBASEDIR%%/lib/python/Products/Transience/Transience.py %%ZOPEBASEDIR%%/lib/python/Products/Transience/Transience.pyc @@ -1415,6 +1428,8 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/unittest_patched.py %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/__init__.py %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/__init__.pyc +%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testBrains.py +%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testBrains.pyc %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testCatalog.py %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testCatalog.pyc %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/version.txt @@ -2329,6 +2344,8 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPRequest.pyc %%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPResponse.py %%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPResponse.pyc +%%ZOPEBASEDIR%%/lib/python/ZPublisher/Iterators.py +%%ZOPEBASEDIR%%/lib/python/ZPublisher/Iterators.pyc %%ZOPEBASEDIR%%/lib/python/ZPublisher/Publish.py %%ZOPEBASEDIR%%/lib/python/ZPublisher/Publish.pyc %%ZOPEBASEDIR%%/lib/python/ZPublisher/Request.py @@ -2543,6 +2560,14 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/Zope/Startup/options.pyc %%ZOPEBASEDIR%%/lib/python/Zope/Startup/run.py %%ZOPEBASEDIR%%/lib/python/Zope/Startup/run.pyc +%%ZOPEBASEDIR%%/lib/python/Zope/Startup/tests/__init__.py +%%ZOPEBASEDIR%%/lib/python/Zope/Startup/tests/__init__.pyc +%%ZOPEBASEDIR%%/lib/python/Zope/Startup/tests/testStarter.py +%%ZOPEBASEDIR%%/lib/python/Zope/Startup/tests/testStarter.pyc +%%ZOPEBASEDIR%%/lib/python/Zope/Startup/tests/test_schema.py +%%ZOPEBASEDIR%%/lib/python/Zope/Startup/tests/test_schema.pyc +%%ZOPEBASEDIR%%/lib/python/Zope/Startup/tests/test_warnfilter.py +%%ZOPEBASEDIR%%/lib/python/Zope/Startup/tests/test_warnfilter.pyc %%ZOPEBASEDIR%%/lib/python/Zope/Startup/warnfilter.py %%ZOPEBASEDIR%%/lib/python/Zope/Startup/warnfilter.pyc %%ZOPEBASEDIR%%/lib/python/Zope/Startup/warnfilter.xml @@ -2563,6 +2588,8 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/docutils/__init__.pyc %%ZOPEBASEDIR%%/lib/python/docutils/core.py %%ZOPEBASEDIR%%/lib/python/docutils/core.pyc +%%ZOPEBASEDIR%%/lib/python/docutils/examples.py +%%ZOPEBASEDIR%%/lib/python/docutils/examples.pyc %%ZOPEBASEDIR%%/lib/python/docutils/frontend.py %%ZOPEBASEDIR%%/lib/python/docutils/frontend.pyc %%ZOPEBASEDIR%%/lib/python/docutils/io.py @@ -2571,6 +2598,8 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/docutils/languages/__init__.pyc %%ZOPEBASEDIR%%/lib/python/docutils/languages/af.py %%ZOPEBASEDIR%%/lib/python/docutils/languages/af.pyc +%%ZOPEBASEDIR%%/lib/python/docutils/languages/cs.py +%%ZOPEBASEDIR%%/lib/python/docutils/languages/cs.pyc %%ZOPEBASEDIR%%/lib/python/docutils/languages/de.py %%ZOPEBASEDIR%%/lib/python/docutils/languages/de.pyc %%ZOPEBASEDIR%%/lib/python/docutils/languages/en.py @@ -2583,6 +2612,8 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/docutils/languages/fr.pyc %%ZOPEBASEDIR%%/lib/python/docutils/languages/it.py %%ZOPEBASEDIR%%/lib/python/docutils/languages/it.pyc +%%ZOPEBASEDIR%%/lib/python/docutils/languages/pt_br.py +%%ZOPEBASEDIR%%/lib/python/docutils/languages/pt_br.pyc %%ZOPEBASEDIR%%/lib/python/docutils/languages/ru.py %%ZOPEBASEDIR%%/lib/python/docutils/languages/ru.pyc %%ZOPEBASEDIR%%/lib/python/docutils/languages/sk.py @@ -2615,6 +2646,8 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/__init__.pyc %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/af.py %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/af.pyc +%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/cs.py +%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/cs.pyc %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/de.py %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/de.pyc %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/en.py @@ -2627,12 +2660,16 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/fr.pyc %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/it.py %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/it.pyc +%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/pt_br.py +%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/pt_br.pyc %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/ru.py %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/ru.pyc %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/sk.py %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/sk.pyc %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/sv.py %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/sv.pyc +%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/roles.py +%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/roles.pyc %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/states.py %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/states.pyc %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/tableparser.py @@ -2688,8 +2725,6 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/reStructuredText/README.txt %%ZOPEBASEDIR%%/lib/python/reStructuredText/__init__.py %%ZOPEBASEDIR%%/lib/python/reStructuredText/__init__.pyc -%%ZOPEBASEDIR%%/lib/python/reStructuredText/html4zope.py -%%ZOPEBASEDIR%%/lib/python/reStructuredText/html4zope.pyc %%ZOPEBASEDIR%%/lib/python/reStructuredText/reStructuredText.txt %%ZOPEBASEDIR%%/lib/python/tempstorage/TemporaryStorage.py %%ZOPEBASEDIR%%/lib/python/tempstorage/TemporaryStorage.pyc @@ -2828,6 +2863,7 @@ etc/rc.d/zope.sh @dirrm %%ZOPEBASEDIR%%/lib/python/docutils @dirrm %%ZOPEBASEDIR%%/lib/python/ZopeUndo/tests @dirrm %%ZOPEBASEDIR%%/lib/python/ZopeUndo +@dirrm %%ZOPEBASEDIR%%/lib/python/Zope/Startup/tests @dirrm %%ZOPEBASEDIR%%/lib/python/Zope/Startup/nt @dirrm %%ZOPEBASEDIR%%/lib/python/Zope/Startup/misc @dirrm %%ZOPEBASEDIR%%/lib/python/Zope/Startup @@ -3030,6 +3066,7 @@ etc/rc.d/zope.sh @dirrm %%ZOPEBASEDIR%%/lib/python/BDBStorage/tests @dirrm %%ZOPEBASEDIR%%/lib/python/BDBStorage @dirrm %%ZOPEBASEDIR%%/lib/python/App/www +@dirrm %%ZOPEBASEDIR%%/lib/python/App/tests @dirrm %%ZOPEBASEDIR%%/lib/python/App/dtml @dirrm %%ZOPEBASEDIR%%/lib/python/App @dirrm %%ZOPEBASEDIR%%/lib/python/AccessControl/www @@ -3045,10 +3082,9 @@ etc/rc.d/zope.sh @dirrm %%ZOPEBASEDIR%%/lib/python/AccessControl @dirrm %%ZOPEBASEDIR%%/lib/python @dirrm %%ZOPEBASEDIR%%/lib -@dirrm %%ZOPEBASEDIR%%/Products @dirrm %%ZOPEBASEDIR%%/import @dirrm %%ZOPEBASEDIR%%/doc/zconfig -@dirrm %%ZOPEBASEDIR%%/doc/changenotes @dirrm %%ZOPEBASEDIR%%/doc @dirrm %%ZOPEBASEDIR%%/bin +@dirrm %%ZOPEBASEDIR%%/Products @dirrm %%ZOPEBASEDIR%% diff --git a/www/zope213/Makefile b/www/zope213/Makefile index 2b6c9a615d60..0ca20d100d99 100644 --- a/www/zope213/Makefile +++ b/www/zope213/Makefile @@ -6,8 +6,7 @@ # PORTNAME= zope -PORTVERSION= 2.7.0 -PORTREVISION= 1 +PORTVERSION= 2.7.1 CATEGORIES= www python zope MASTER_SITES= http://www.zope.org/Products/Zope/${PORTVERSION}/${PORTVERSION}/ DISTNAME= Zope-${PORTVERSION} @@ -22,6 +21,7 @@ USE_PYTHON= yes USE_RC_SUBR= yes USE_REINPLACE= yes DIST_SUBDIR= zope +WRKSRC= ${WRKDIR}/${DISTNAME}-0 # 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. @@ -55,6 +55,7 @@ RC_SCRIPTS_SUB= PREFIX=${PREFIX} \ CONFIG_SUB= ZOPEBASEDIR=${ZOPEBASEDIR} \ ZOPE_USER=${ZOPE_USER} \ ZOPEINSTANCEDIR=${ZOPEINSTANCEDIR} +PKGMESSAGE= ${WRKDIR}/pkg-message .if defined(BATCH) ISBATCH= -u admin:test123 @@ -68,11 +69,14 @@ post-patch: post-install: @${MV} ${ZOPEBASEDIR}/skel/etc/zope.conf.in ${ZOPEBASEDIR}/skel/etc/zope.conf.sample.in - @${SED} ${CONFIG_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} pkg-message + @${SED} ${CONFIG_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} < ${FILESDIR}/pkg-message.in \ + > ${PKGMESSAGE} @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ ${FILESDIR}/zope.sh > ${PREFIX}/etc/rc.d/zope.sh @${CHMOD} ${BINMODE} ${PREFIX}/etc/rc.d/zope.sh @${MKDIR} ${ZOPEBASEDIR}/Products + @${CAT} ${PKGMESSAGE} + @${ECHO_MSG} instance: @${ZOPEBASEDIR}/bin/mkzopeinstance.py -d ${ZOPEINSTANCEDIR} ${ISBATCH} diff --git a/www/zope213/distinfo b/www/zope213/distinfo index de2d51bcec75..adb251366969 100644 --- a/www/zope213/distinfo +++ b/www/zope213/distinfo @@ -1,2 +1,2 @@ -MD5 (zope/Zope-2.7.0.tgz) = f733cd97f32411d43d372ac61eed98f4 -SIZE (zope/Zope-2.7.0.tgz) = 2733236 +MD5 (zope/Zope-2.7.1.tgz) = ae9d4bb3f7220dfffb6e91b42503b16c +SIZE (zope/Zope-2.7.1.tgz) = 2754949 diff --git a/www/zope213/files/patch-lib-python-zdaemon-zdctl.py b/www/zope213/files/patch-lib-python-zdaemon-zdctl.py deleted file mode 100644 index 0bdc23957476..000000000000 --- a/www/zope213/files/patch-lib-python-zdaemon-zdctl.py +++ /dev/null @@ -1,14 +0,0 @@ ---- lib/python/zdaemon/zdctl.py.orig Fri Oct 24 23:32:59 2003 -+++ lib/python/zdaemon/zdctl.py Fri Apr 2 01:55:59 2004 -@@ -208,9 +208,9 @@ - args += self._get_override("-z", "directory") - args.extend(self.options.program) - if self.options.daemon: -- flag = os.P_WAIT -- else: - flag = os.P_NOWAIT -+ else: -+ flag = os.P_WAIT - os.spawnvp(flag, args[0], args) - elif not self.zd_pid: - self.send_action("start") diff --git a/www/zope210/pkg-message b/www/zope213/files/pkg-message.in index 5de2678098b7..3d35ab56b353 100644 --- a/www/zope210/pkg-message +++ b/www/zope213/files/pkg-message.in @@ -25,4 +25,3 @@ to %%ZOPEBASEDIR%%/Products. You might have to add the following lines to your zope.conf products %%ZOPEBASEDIR%%/Products products $INSTANCE/Products - diff --git a/www/zope213/files/zope.sh b/www/zope213/files/zope.sh index 293333a0fd6f..3ae2588b6fc2 100644 --- a/www/zope213/files/zope.sh +++ b/www/zope213/files/zope.sh @@ -1,7 +1,7 @@ #!/bin/sh # Start or stop zope -# $FreeBSD: /tmp/pcvs/ports/www/zope213/files/Attic/zope.sh,v 1.2 2004-04-20 14:29:26 perky Exp $ +# $FreeBSD: /tmp/pcvs/ports/www/zope213/files/Attic/zope.sh,v 1.3 2004-07-02 20:41:00 thierry Exp $ # PROVIDE: zope # REQUIRE: DAEMON @@ -18,7 +18,7 @@ prefix=%%PREFIX%% # DO NOT CHANGE THESE DEFAULT VALUES HERE # zope_enable=${zope_enable:-"NO"} # Enable gkrellmd -zope_instances=${zope_instances:-""} # List of instancehome dirs +zope_instances=${zope_instances:-""} # List of instancehome dirs . %%RC_SUBR%% @@ -47,7 +47,7 @@ if checkyesno zope_enable; then do if [ -r ${instance}/etc/${name}.conf -a -x ${instance}/bin/zopectl ]; then echo -n " Instance ${instance} -> " - ${instance}/bin/zopectl $1 + ${instance}/bin/zopectl $1 fi done fi diff --git a/www/zope213/pkg-plist b/www/zope213/pkg-plist index 1e61c51cfdc0..0df558279272 100644 --- a/www/zope213/pkg-plist +++ b/www/zope213/pkg-plist @@ -10,7 +10,7 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/bin/mkzopeinstance.py %%ZOPEBASEDIR%%/bin/python %%ZOPEBASEDIR%%/bin/requestprofiler.py -%%ZOPEBASEDIR%%/bin/testrunner.py +%%ZOPEBASEDIR%%/bin/test.py %%ZOPEBASEDIR%%/bin/zpasswd.py %%ZOPEBASEDIR%%/doc/CHANGES.txt %%ZOPEBASEDIR%%/doc/CREDITS.txt @@ -28,11 +28,6 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/doc/UNITTEST.txt %%ZOPEBASEDIR%%/doc/WEBSERVER.txt %%ZOPEBASEDIR%%/doc/ZODB.txt -%%ZOPEBASEDIR%%/doc/changenotes/010516-2.4-unicode.stx -%%ZOPEBASEDIR%%/doc/changenotes/010529-2.4-dropinindex.stx -%%ZOPEBASEDIR%%/doc/changenotes/010529-2.4-exreg.stx -%%ZOPEBASEDIR%%/doc/changenotes/010529-2.4-pluggableindex.stx -%%ZOPEBASEDIR%%/doc/changenotes/010620-2.4-btreeconflict.stx %%ZOPEBASEDIR%%/doc/zconfig/schema.dtd %%ZOPEBASEDIR%%/doc/zconfig/zconfig.pdf %%ZOPEBASEDIR%%/import/Examples.zexp @@ -224,6 +219,14 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/App/special_dtml.pyc %%ZOPEBASEDIR%%/lib/python/App/tar.py %%ZOPEBASEDIR%%/lib/python/App/tar.pyc +%%ZOPEBASEDIR%%/lib/python/App/tests/__init__.py +%%ZOPEBASEDIR%%/lib/python/App/tests/__init__.pyc +%%ZOPEBASEDIR%%/lib/python/App/tests/test_cachemanager.py +%%ZOPEBASEDIR%%/lib/python/App/tests/test_cachemanager.pyc +%%ZOPEBASEDIR%%/lib/python/App/tests/test_setConfiguration.py +%%ZOPEBASEDIR%%/lib/python/App/tests/test_setConfiguration.pyc +%%ZOPEBASEDIR%%/lib/python/App/tests/test_version_txt.py +%%ZOPEBASEDIR%%/lib/python/App/tests/test_version_txt.pyc %%ZOPEBASEDIR%%/lib/python/App/version_txt.py %%ZOPEBASEDIR%%/lib/python/App/version_txt.pyc %%ZOPEBASEDIR%%/lib/python/App/www/CacheManager_icon.gif @@ -627,12 +630,17 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/OFS/tests/__init__.pyc %%ZOPEBASEDIR%%/lib/python/OFS/tests/mime.types-1 %%ZOPEBASEDIR%%/lib/python/OFS/tests/mime.types-2 +%%ZOPEBASEDIR%%/lib/python/OFS/tests/test.gif %%ZOPEBASEDIR%%/lib/python/OFS/tests/testAppInitializer.py %%ZOPEBASEDIR%%/lib/python/OFS/tests/testAppInitializer.pyc %%ZOPEBASEDIR%%/lib/python/OFS/tests/testContentTypes.py %%ZOPEBASEDIR%%/lib/python/OFS/tests/testContentTypes.pyc %%ZOPEBASEDIR%%/lib/python/OFS/tests/testCopySupport.py %%ZOPEBASEDIR%%/lib/python/OFS/tests/testCopySupport.pyc +%%ZOPEBASEDIR%%/lib/python/OFS/tests/testFileAndImage.py +%%ZOPEBASEDIR%%/lib/python/OFS/tests/testFileAndImage.pyc +%%ZOPEBASEDIR%%/lib/python/OFS/tests/testObjectManager.py +%%ZOPEBASEDIR%%/lib/python/OFS/tests/testObjectManager.pyc %%ZOPEBASEDIR%%/lib/python/OFS/tests/testOrderSupport.py %%ZOPEBASEDIR%%/lib/python/OFS/tests/testOrderSupport.pyc %%ZOPEBASEDIR%%/lib/python/OFS/tests/testOrderedFolder.py @@ -951,6 +959,8 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testHTMLTests.pyc %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testTALES.py %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testTALES.pyc +%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testZopePageTemplate.py +%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testZopePageTemplate.pyc %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/test_ptfile.py %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/test_ptfile.pyc %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/util.py @@ -1118,6 +1128,7 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/class.__name__.ps %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/complex_print.ps %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/fibonacci.ps +%%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/filepath.ps %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/for_loop.ps %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/global_is_declaration.ps %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/mutate_literals.ps @@ -1233,6 +1244,8 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/Products/TemporaryFolder/patchfs.py %%ZOPEBASEDIR%%/lib/python/Products/TemporaryFolder/patchfs.pyc %%ZOPEBASEDIR%%/lib/python/Products/TemporaryFolder/www/tempfolder.gif +%%ZOPEBASEDIR%%/lib/python/Products/Transience/Fake.py +%%ZOPEBASEDIR%%/lib/python/Products/Transience/Fake.pyc %%ZOPEBASEDIR%%/lib/python/Products/Transience/HowTransienceWorks.stx %%ZOPEBASEDIR%%/lib/python/Products/Transience/Transience.py %%ZOPEBASEDIR%%/lib/python/Products/Transience/Transience.pyc @@ -1415,6 +1428,8 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/unittest_patched.py %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/__init__.py %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/__init__.pyc +%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testBrains.py +%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testBrains.pyc %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testCatalog.py %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testCatalog.pyc %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/version.txt @@ -2329,6 +2344,8 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPRequest.pyc %%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPResponse.py %%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPResponse.pyc +%%ZOPEBASEDIR%%/lib/python/ZPublisher/Iterators.py +%%ZOPEBASEDIR%%/lib/python/ZPublisher/Iterators.pyc %%ZOPEBASEDIR%%/lib/python/ZPublisher/Publish.py %%ZOPEBASEDIR%%/lib/python/ZPublisher/Publish.pyc %%ZOPEBASEDIR%%/lib/python/ZPublisher/Request.py @@ -2543,6 +2560,14 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/Zope/Startup/options.pyc %%ZOPEBASEDIR%%/lib/python/Zope/Startup/run.py %%ZOPEBASEDIR%%/lib/python/Zope/Startup/run.pyc +%%ZOPEBASEDIR%%/lib/python/Zope/Startup/tests/__init__.py +%%ZOPEBASEDIR%%/lib/python/Zope/Startup/tests/__init__.pyc +%%ZOPEBASEDIR%%/lib/python/Zope/Startup/tests/testStarter.py +%%ZOPEBASEDIR%%/lib/python/Zope/Startup/tests/testStarter.pyc +%%ZOPEBASEDIR%%/lib/python/Zope/Startup/tests/test_schema.py +%%ZOPEBASEDIR%%/lib/python/Zope/Startup/tests/test_schema.pyc +%%ZOPEBASEDIR%%/lib/python/Zope/Startup/tests/test_warnfilter.py +%%ZOPEBASEDIR%%/lib/python/Zope/Startup/tests/test_warnfilter.pyc %%ZOPEBASEDIR%%/lib/python/Zope/Startup/warnfilter.py %%ZOPEBASEDIR%%/lib/python/Zope/Startup/warnfilter.pyc %%ZOPEBASEDIR%%/lib/python/Zope/Startup/warnfilter.xml @@ -2563,6 +2588,8 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/docutils/__init__.pyc %%ZOPEBASEDIR%%/lib/python/docutils/core.py %%ZOPEBASEDIR%%/lib/python/docutils/core.pyc +%%ZOPEBASEDIR%%/lib/python/docutils/examples.py +%%ZOPEBASEDIR%%/lib/python/docutils/examples.pyc %%ZOPEBASEDIR%%/lib/python/docutils/frontend.py %%ZOPEBASEDIR%%/lib/python/docutils/frontend.pyc %%ZOPEBASEDIR%%/lib/python/docutils/io.py @@ -2571,6 +2598,8 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/docutils/languages/__init__.pyc %%ZOPEBASEDIR%%/lib/python/docutils/languages/af.py %%ZOPEBASEDIR%%/lib/python/docutils/languages/af.pyc +%%ZOPEBASEDIR%%/lib/python/docutils/languages/cs.py +%%ZOPEBASEDIR%%/lib/python/docutils/languages/cs.pyc %%ZOPEBASEDIR%%/lib/python/docutils/languages/de.py %%ZOPEBASEDIR%%/lib/python/docutils/languages/de.pyc %%ZOPEBASEDIR%%/lib/python/docutils/languages/en.py @@ -2583,6 +2612,8 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/docutils/languages/fr.pyc %%ZOPEBASEDIR%%/lib/python/docutils/languages/it.py %%ZOPEBASEDIR%%/lib/python/docutils/languages/it.pyc +%%ZOPEBASEDIR%%/lib/python/docutils/languages/pt_br.py +%%ZOPEBASEDIR%%/lib/python/docutils/languages/pt_br.pyc %%ZOPEBASEDIR%%/lib/python/docutils/languages/ru.py %%ZOPEBASEDIR%%/lib/python/docutils/languages/ru.pyc %%ZOPEBASEDIR%%/lib/python/docutils/languages/sk.py @@ -2615,6 +2646,8 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/__init__.pyc %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/af.py %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/af.pyc +%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/cs.py +%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/cs.pyc %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/de.py %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/de.pyc %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/en.py @@ -2627,12 +2660,16 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/fr.pyc %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/it.py %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/it.pyc +%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/pt_br.py +%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/pt_br.pyc %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/ru.py %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/ru.pyc %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/sk.py %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/sk.pyc %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/sv.py %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/sv.pyc +%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/roles.py +%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/roles.pyc %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/states.py %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/states.pyc %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/tableparser.py @@ -2688,8 +2725,6 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/reStructuredText/README.txt %%ZOPEBASEDIR%%/lib/python/reStructuredText/__init__.py %%ZOPEBASEDIR%%/lib/python/reStructuredText/__init__.pyc -%%ZOPEBASEDIR%%/lib/python/reStructuredText/html4zope.py -%%ZOPEBASEDIR%%/lib/python/reStructuredText/html4zope.pyc %%ZOPEBASEDIR%%/lib/python/reStructuredText/reStructuredText.txt %%ZOPEBASEDIR%%/lib/python/tempstorage/TemporaryStorage.py %%ZOPEBASEDIR%%/lib/python/tempstorage/TemporaryStorage.pyc @@ -2828,6 +2863,7 @@ etc/rc.d/zope.sh @dirrm %%ZOPEBASEDIR%%/lib/python/docutils @dirrm %%ZOPEBASEDIR%%/lib/python/ZopeUndo/tests @dirrm %%ZOPEBASEDIR%%/lib/python/ZopeUndo +@dirrm %%ZOPEBASEDIR%%/lib/python/Zope/Startup/tests @dirrm %%ZOPEBASEDIR%%/lib/python/Zope/Startup/nt @dirrm %%ZOPEBASEDIR%%/lib/python/Zope/Startup/misc @dirrm %%ZOPEBASEDIR%%/lib/python/Zope/Startup @@ -3030,6 +3066,7 @@ etc/rc.d/zope.sh @dirrm %%ZOPEBASEDIR%%/lib/python/BDBStorage/tests @dirrm %%ZOPEBASEDIR%%/lib/python/BDBStorage @dirrm %%ZOPEBASEDIR%%/lib/python/App/www +@dirrm %%ZOPEBASEDIR%%/lib/python/App/tests @dirrm %%ZOPEBASEDIR%%/lib/python/App/dtml @dirrm %%ZOPEBASEDIR%%/lib/python/App @dirrm %%ZOPEBASEDIR%%/lib/python/AccessControl/www @@ -3045,10 +3082,9 @@ etc/rc.d/zope.sh @dirrm %%ZOPEBASEDIR%%/lib/python/AccessControl @dirrm %%ZOPEBASEDIR%%/lib/python @dirrm %%ZOPEBASEDIR%%/lib -@dirrm %%ZOPEBASEDIR%%/Products @dirrm %%ZOPEBASEDIR%%/import @dirrm %%ZOPEBASEDIR%%/doc/zconfig -@dirrm %%ZOPEBASEDIR%%/doc/changenotes @dirrm %%ZOPEBASEDIR%%/doc @dirrm %%ZOPEBASEDIR%%/bin +@dirrm %%ZOPEBASEDIR%%/Products @dirrm %%ZOPEBASEDIR%% diff --git a/www/zope28/Makefile b/www/zope28/Makefile index 2b6c9a615d60..0ca20d100d99 100644 --- a/www/zope28/Makefile +++ b/www/zope28/Makefile @@ -6,8 +6,7 @@ # PORTNAME= zope -PORTVERSION= 2.7.0 -PORTREVISION= 1 +PORTVERSION= 2.7.1 CATEGORIES= www python zope MASTER_SITES= http://www.zope.org/Products/Zope/${PORTVERSION}/${PORTVERSION}/ DISTNAME= Zope-${PORTVERSION} @@ -22,6 +21,7 @@ USE_PYTHON= yes USE_RC_SUBR= yes USE_REINPLACE= yes DIST_SUBDIR= zope +WRKSRC= ${WRKDIR}/${DISTNAME}-0 # 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. @@ -55,6 +55,7 @@ RC_SCRIPTS_SUB= PREFIX=${PREFIX} \ CONFIG_SUB= ZOPEBASEDIR=${ZOPEBASEDIR} \ ZOPE_USER=${ZOPE_USER} \ ZOPEINSTANCEDIR=${ZOPEINSTANCEDIR} +PKGMESSAGE= ${WRKDIR}/pkg-message .if defined(BATCH) ISBATCH= -u admin:test123 @@ -68,11 +69,14 @@ post-patch: post-install: @${MV} ${ZOPEBASEDIR}/skel/etc/zope.conf.in ${ZOPEBASEDIR}/skel/etc/zope.conf.sample.in - @${SED} ${CONFIG_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} pkg-message + @${SED} ${CONFIG_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} < ${FILESDIR}/pkg-message.in \ + > ${PKGMESSAGE} @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ ${FILESDIR}/zope.sh > ${PREFIX}/etc/rc.d/zope.sh @${CHMOD} ${BINMODE} ${PREFIX}/etc/rc.d/zope.sh @${MKDIR} ${ZOPEBASEDIR}/Products + @${CAT} ${PKGMESSAGE} + @${ECHO_MSG} instance: @${ZOPEBASEDIR}/bin/mkzopeinstance.py -d ${ZOPEINSTANCEDIR} ${ISBATCH} diff --git a/www/zope28/distinfo b/www/zope28/distinfo index de2d51bcec75..adb251366969 100644 --- a/www/zope28/distinfo +++ b/www/zope28/distinfo @@ -1,2 +1,2 @@ -MD5 (zope/Zope-2.7.0.tgz) = f733cd97f32411d43d372ac61eed98f4 -SIZE (zope/Zope-2.7.0.tgz) = 2733236 +MD5 (zope/Zope-2.7.1.tgz) = ae9d4bb3f7220dfffb6e91b42503b16c +SIZE (zope/Zope-2.7.1.tgz) = 2754949 diff --git a/www/zope28/files/patch-lib-python-zdaemon-zdctl.py b/www/zope28/files/patch-lib-python-zdaemon-zdctl.py deleted file mode 100644 index 0bdc23957476..000000000000 --- a/www/zope28/files/patch-lib-python-zdaemon-zdctl.py +++ /dev/null @@ -1,14 +0,0 @@ ---- lib/python/zdaemon/zdctl.py.orig Fri Oct 24 23:32:59 2003 -+++ lib/python/zdaemon/zdctl.py Fri Apr 2 01:55:59 2004 -@@ -208,9 +208,9 @@ - args += self._get_override("-z", "directory") - args.extend(self.options.program) - if self.options.daemon: -- flag = os.P_WAIT -- else: - flag = os.P_NOWAIT -+ else: -+ flag = os.P_WAIT - os.spawnvp(flag, args[0], args) - elif not self.zd_pid: - self.send_action("start") diff --git a/www/zope28/files/pkg-message.in b/www/zope28/files/pkg-message.in new file mode 100644 index 000000000000..3d35ab56b353 --- /dev/null +++ b/www/zope28/files/pkg-message.in @@ -0,0 +1,27 @@ +********************************************************************** + +Zope 2.7 Successfull installed. + +To create an instance of Zope please run +make instance + +You can set the following Variables in /etc/make.conf + +ZOPEINSTANCEBASE Directory where Zope instance should go + (default: %%ZOPEBASEDIR%%) +ZOPEINSTANCENAME Default name for a new Zope instance + (default: none) + +If you want have multiple Zope you should run +make instance INSTANCENAME=<somename> + +********************************************************************** +****** ATTENTION ***** ATTENTION ***** ATTENTION ***** ATTENTION ***** + +The default installation directory for Zope Products has changed from +%%ZOPEBASEDIR%%/lib/python/Products +to %%ZOPEBASEDIR%%/Products. + +You might have to add the following lines to your zope.conf +products %%ZOPEBASEDIR%%/Products +products $INSTANCE/Products diff --git a/www/zope28/files/zope.sh b/www/zope28/files/zope.sh index 5613b6431c7d..d4f4e4cd6815 100644 --- a/www/zope28/files/zope.sh +++ b/www/zope28/files/zope.sh @@ -1,7 +1,7 @@ #!/bin/sh # Start or stop zope -# $FreeBSD: /tmp/pcvs/ports/www/zope28/files/Attic/zope.sh,v 1.2 2004-04-20 14:29:26 perky Exp $ +# $FreeBSD: /tmp/pcvs/ports/www/zope28/files/Attic/zope.sh,v 1.3 2004-07-02 20:41:00 thierry Exp $ # PROVIDE: zope # REQUIRE: DAEMON @@ -18,7 +18,7 @@ prefix=%%PREFIX%% # DO NOT CHANGE THESE DEFAULT VALUES HERE # zope_enable=${zope_enable:-"NO"} # Enable gkrellmd -zope_instances=${zope_instances:-""} # List of instancehome dirs +zope_instances=${zope_instances:-""} # List of instancehome dirs . %%RC_SUBR%% @@ -47,7 +47,7 @@ if checkyesno zope_enable; then do if [ -r ${instance}/etc/${name}.conf -a -x ${instance}/bin/zopectl ]; then echo -n " Instance ${instance} -> " - ${instance}/bin/zopectl $1 + ${instance}/bin/zopectl $1 fi done fi diff --git a/www/zope28/pkg-message b/www/zope28/pkg-message deleted file mode 100644 index 5de2678098b7..000000000000 --- a/www/zope28/pkg-message +++ /dev/null @@ -1,28 +0,0 @@ -********************************************************************** - -Zope 2.7 Successfull installed. - -To create an instance of Zope please run -make instance - -You can set the following Variables in /etc/make.conf - -ZOPEINSTANCEBASE Directory where Zope instance should go - (default: %%ZOPEBASEDIR%%) -ZOPEINSTANCENAME Default name for a new Zope instance - (default: none) - -If you want have multiple Zope you should run -make instance INSTANCENAME=<somename> - -********************************************************************** -****** ATTENTION ***** ATTENTION ***** ATTENTION ***** ATTENTION ***** - -The default installation directory for Zope Products has changed from -%%ZOPEBASEDIR%%/lib/python/Products -to %%ZOPEBASEDIR%%/Products. - -You might have to add the following lines to your zope.conf -products %%ZOPEBASEDIR%%/Products -products $INSTANCE/Products - diff --git a/www/zope28/pkg-plist b/www/zope28/pkg-plist index 1e61c51cfdc0..0df558279272 100644 --- a/www/zope28/pkg-plist +++ b/www/zope28/pkg-plist @@ -10,7 +10,7 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/bin/mkzopeinstance.py %%ZOPEBASEDIR%%/bin/python %%ZOPEBASEDIR%%/bin/requestprofiler.py -%%ZOPEBASEDIR%%/bin/testrunner.py +%%ZOPEBASEDIR%%/bin/test.py %%ZOPEBASEDIR%%/bin/zpasswd.py %%ZOPEBASEDIR%%/doc/CHANGES.txt %%ZOPEBASEDIR%%/doc/CREDITS.txt @@ -28,11 +28,6 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/doc/UNITTEST.txt %%ZOPEBASEDIR%%/doc/WEBSERVER.txt %%ZOPEBASEDIR%%/doc/ZODB.txt -%%ZOPEBASEDIR%%/doc/changenotes/010516-2.4-unicode.stx -%%ZOPEBASEDIR%%/doc/changenotes/010529-2.4-dropinindex.stx -%%ZOPEBASEDIR%%/doc/changenotes/010529-2.4-exreg.stx -%%ZOPEBASEDIR%%/doc/changenotes/010529-2.4-pluggableindex.stx -%%ZOPEBASEDIR%%/doc/changenotes/010620-2.4-btreeconflict.stx %%ZOPEBASEDIR%%/doc/zconfig/schema.dtd %%ZOPEBASEDIR%%/doc/zconfig/zconfig.pdf %%ZOPEBASEDIR%%/import/Examples.zexp @@ -224,6 +219,14 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/App/special_dtml.pyc %%ZOPEBASEDIR%%/lib/python/App/tar.py %%ZOPEBASEDIR%%/lib/python/App/tar.pyc +%%ZOPEBASEDIR%%/lib/python/App/tests/__init__.py +%%ZOPEBASEDIR%%/lib/python/App/tests/__init__.pyc +%%ZOPEBASEDIR%%/lib/python/App/tests/test_cachemanager.py +%%ZOPEBASEDIR%%/lib/python/App/tests/test_cachemanager.pyc +%%ZOPEBASEDIR%%/lib/python/App/tests/test_setConfiguration.py +%%ZOPEBASEDIR%%/lib/python/App/tests/test_setConfiguration.pyc +%%ZOPEBASEDIR%%/lib/python/App/tests/test_version_txt.py +%%ZOPEBASEDIR%%/lib/python/App/tests/test_version_txt.pyc %%ZOPEBASEDIR%%/lib/python/App/version_txt.py %%ZOPEBASEDIR%%/lib/python/App/version_txt.pyc %%ZOPEBASEDIR%%/lib/python/App/www/CacheManager_icon.gif @@ -627,12 +630,17 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/OFS/tests/__init__.pyc %%ZOPEBASEDIR%%/lib/python/OFS/tests/mime.types-1 %%ZOPEBASEDIR%%/lib/python/OFS/tests/mime.types-2 +%%ZOPEBASEDIR%%/lib/python/OFS/tests/test.gif %%ZOPEBASEDIR%%/lib/python/OFS/tests/testAppInitializer.py %%ZOPEBASEDIR%%/lib/python/OFS/tests/testAppInitializer.pyc %%ZOPEBASEDIR%%/lib/python/OFS/tests/testContentTypes.py %%ZOPEBASEDIR%%/lib/python/OFS/tests/testContentTypes.pyc %%ZOPEBASEDIR%%/lib/python/OFS/tests/testCopySupport.py %%ZOPEBASEDIR%%/lib/python/OFS/tests/testCopySupport.pyc +%%ZOPEBASEDIR%%/lib/python/OFS/tests/testFileAndImage.py +%%ZOPEBASEDIR%%/lib/python/OFS/tests/testFileAndImage.pyc +%%ZOPEBASEDIR%%/lib/python/OFS/tests/testObjectManager.py +%%ZOPEBASEDIR%%/lib/python/OFS/tests/testObjectManager.pyc %%ZOPEBASEDIR%%/lib/python/OFS/tests/testOrderSupport.py %%ZOPEBASEDIR%%/lib/python/OFS/tests/testOrderSupport.pyc %%ZOPEBASEDIR%%/lib/python/OFS/tests/testOrderedFolder.py @@ -951,6 +959,8 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testHTMLTests.pyc %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testTALES.py %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testTALES.pyc +%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testZopePageTemplate.py +%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testZopePageTemplate.pyc %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/test_ptfile.py %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/test_ptfile.pyc %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/util.py @@ -1118,6 +1128,7 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/class.__name__.ps %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/complex_print.ps %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/fibonacci.ps +%%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/filepath.ps %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/for_loop.ps %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/global_is_declaration.ps %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/mutate_literals.ps @@ -1233,6 +1244,8 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/Products/TemporaryFolder/patchfs.py %%ZOPEBASEDIR%%/lib/python/Products/TemporaryFolder/patchfs.pyc %%ZOPEBASEDIR%%/lib/python/Products/TemporaryFolder/www/tempfolder.gif +%%ZOPEBASEDIR%%/lib/python/Products/Transience/Fake.py +%%ZOPEBASEDIR%%/lib/python/Products/Transience/Fake.pyc %%ZOPEBASEDIR%%/lib/python/Products/Transience/HowTransienceWorks.stx %%ZOPEBASEDIR%%/lib/python/Products/Transience/Transience.py %%ZOPEBASEDIR%%/lib/python/Products/Transience/Transience.pyc @@ -1415,6 +1428,8 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/unittest_patched.py %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/__init__.py %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/__init__.pyc +%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testBrains.py +%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testBrains.pyc %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testCatalog.py %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testCatalog.pyc %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/version.txt @@ -2329,6 +2344,8 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPRequest.pyc %%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPResponse.py %%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPResponse.pyc +%%ZOPEBASEDIR%%/lib/python/ZPublisher/Iterators.py +%%ZOPEBASEDIR%%/lib/python/ZPublisher/Iterators.pyc %%ZOPEBASEDIR%%/lib/python/ZPublisher/Publish.py %%ZOPEBASEDIR%%/lib/python/ZPublisher/Publish.pyc %%ZOPEBASEDIR%%/lib/python/ZPublisher/Request.py @@ -2543,6 +2560,14 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/Zope/Startup/options.pyc %%ZOPEBASEDIR%%/lib/python/Zope/Startup/run.py %%ZOPEBASEDIR%%/lib/python/Zope/Startup/run.pyc +%%ZOPEBASEDIR%%/lib/python/Zope/Startup/tests/__init__.py +%%ZOPEBASEDIR%%/lib/python/Zope/Startup/tests/__init__.pyc +%%ZOPEBASEDIR%%/lib/python/Zope/Startup/tests/testStarter.py +%%ZOPEBASEDIR%%/lib/python/Zope/Startup/tests/testStarter.pyc +%%ZOPEBASEDIR%%/lib/python/Zope/Startup/tests/test_schema.py +%%ZOPEBASEDIR%%/lib/python/Zope/Startup/tests/test_schema.pyc +%%ZOPEBASEDIR%%/lib/python/Zope/Startup/tests/test_warnfilter.py +%%ZOPEBASEDIR%%/lib/python/Zope/Startup/tests/test_warnfilter.pyc %%ZOPEBASEDIR%%/lib/python/Zope/Startup/warnfilter.py %%ZOPEBASEDIR%%/lib/python/Zope/Startup/warnfilter.pyc %%ZOPEBASEDIR%%/lib/python/Zope/Startup/warnfilter.xml @@ -2563,6 +2588,8 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/docutils/__init__.pyc %%ZOPEBASEDIR%%/lib/python/docutils/core.py %%ZOPEBASEDIR%%/lib/python/docutils/core.pyc +%%ZOPEBASEDIR%%/lib/python/docutils/examples.py +%%ZOPEBASEDIR%%/lib/python/docutils/examples.pyc %%ZOPEBASEDIR%%/lib/python/docutils/frontend.py %%ZOPEBASEDIR%%/lib/python/docutils/frontend.pyc %%ZOPEBASEDIR%%/lib/python/docutils/io.py @@ -2571,6 +2598,8 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/docutils/languages/__init__.pyc %%ZOPEBASEDIR%%/lib/python/docutils/languages/af.py %%ZOPEBASEDIR%%/lib/python/docutils/languages/af.pyc +%%ZOPEBASEDIR%%/lib/python/docutils/languages/cs.py +%%ZOPEBASEDIR%%/lib/python/docutils/languages/cs.pyc %%ZOPEBASEDIR%%/lib/python/docutils/languages/de.py %%ZOPEBASEDIR%%/lib/python/docutils/languages/de.pyc %%ZOPEBASEDIR%%/lib/python/docutils/languages/en.py @@ -2583,6 +2612,8 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/docutils/languages/fr.pyc %%ZOPEBASEDIR%%/lib/python/docutils/languages/it.py %%ZOPEBASEDIR%%/lib/python/docutils/languages/it.pyc +%%ZOPEBASEDIR%%/lib/python/docutils/languages/pt_br.py +%%ZOPEBASEDIR%%/lib/python/docutils/languages/pt_br.pyc %%ZOPEBASEDIR%%/lib/python/docutils/languages/ru.py %%ZOPEBASEDIR%%/lib/python/docutils/languages/ru.pyc %%ZOPEBASEDIR%%/lib/python/docutils/languages/sk.py @@ -2615,6 +2646,8 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/__init__.pyc %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/af.py %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/af.pyc +%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/cs.py +%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/cs.pyc %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/de.py %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/de.pyc %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/en.py @@ -2627,12 +2660,16 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/fr.pyc %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/it.py %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/it.pyc +%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/pt_br.py +%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/pt_br.pyc %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/ru.py %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/ru.pyc %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/sk.py %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/sk.pyc %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/sv.py %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/sv.pyc +%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/roles.py +%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/roles.pyc %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/states.py %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/states.pyc %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/tableparser.py @@ -2688,8 +2725,6 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/reStructuredText/README.txt %%ZOPEBASEDIR%%/lib/python/reStructuredText/__init__.py %%ZOPEBASEDIR%%/lib/python/reStructuredText/__init__.pyc -%%ZOPEBASEDIR%%/lib/python/reStructuredText/html4zope.py -%%ZOPEBASEDIR%%/lib/python/reStructuredText/html4zope.pyc %%ZOPEBASEDIR%%/lib/python/reStructuredText/reStructuredText.txt %%ZOPEBASEDIR%%/lib/python/tempstorage/TemporaryStorage.py %%ZOPEBASEDIR%%/lib/python/tempstorage/TemporaryStorage.pyc @@ -2828,6 +2863,7 @@ etc/rc.d/zope.sh @dirrm %%ZOPEBASEDIR%%/lib/python/docutils @dirrm %%ZOPEBASEDIR%%/lib/python/ZopeUndo/tests @dirrm %%ZOPEBASEDIR%%/lib/python/ZopeUndo +@dirrm %%ZOPEBASEDIR%%/lib/python/Zope/Startup/tests @dirrm %%ZOPEBASEDIR%%/lib/python/Zope/Startup/nt @dirrm %%ZOPEBASEDIR%%/lib/python/Zope/Startup/misc @dirrm %%ZOPEBASEDIR%%/lib/python/Zope/Startup @@ -3030,6 +3066,7 @@ etc/rc.d/zope.sh @dirrm %%ZOPEBASEDIR%%/lib/python/BDBStorage/tests @dirrm %%ZOPEBASEDIR%%/lib/python/BDBStorage @dirrm %%ZOPEBASEDIR%%/lib/python/App/www +@dirrm %%ZOPEBASEDIR%%/lib/python/App/tests @dirrm %%ZOPEBASEDIR%%/lib/python/App/dtml @dirrm %%ZOPEBASEDIR%%/lib/python/App @dirrm %%ZOPEBASEDIR%%/lib/python/AccessControl/www @@ -3045,10 +3082,9 @@ etc/rc.d/zope.sh @dirrm %%ZOPEBASEDIR%%/lib/python/AccessControl @dirrm %%ZOPEBASEDIR%%/lib/python @dirrm %%ZOPEBASEDIR%%/lib -@dirrm %%ZOPEBASEDIR%%/Products @dirrm %%ZOPEBASEDIR%%/import @dirrm %%ZOPEBASEDIR%%/doc/zconfig -@dirrm %%ZOPEBASEDIR%%/doc/changenotes @dirrm %%ZOPEBASEDIR%%/doc @dirrm %%ZOPEBASEDIR%%/bin +@dirrm %%ZOPEBASEDIR%%/Products @dirrm %%ZOPEBASEDIR%% diff --git a/www/zope29/Makefile b/www/zope29/Makefile index 2b6c9a615d60..0ca20d100d99 100644 --- a/www/zope29/Makefile +++ b/www/zope29/Makefile @@ -6,8 +6,7 @@ # PORTNAME= zope -PORTVERSION= 2.7.0 -PORTREVISION= 1 +PORTVERSION= 2.7.1 CATEGORIES= www python zope MASTER_SITES= http://www.zope.org/Products/Zope/${PORTVERSION}/${PORTVERSION}/ DISTNAME= Zope-${PORTVERSION} @@ -22,6 +21,7 @@ USE_PYTHON= yes USE_RC_SUBR= yes USE_REINPLACE= yes DIST_SUBDIR= zope +WRKSRC= ${WRKDIR}/${DISTNAME}-0 # 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. @@ -55,6 +55,7 @@ RC_SCRIPTS_SUB= PREFIX=${PREFIX} \ CONFIG_SUB= ZOPEBASEDIR=${ZOPEBASEDIR} \ ZOPE_USER=${ZOPE_USER} \ ZOPEINSTANCEDIR=${ZOPEINSTANCEDIR} +PKGMESSAGE= ${WRKDIR}/pkg-message .if defined(BATCH) ISBATCH= -u admin:test123 @@ -68,11 +69,14 @@ post-patch: post-install: @${MV} ${ZOPEBASEDIR}/skel/etc/zope.conf.in ${ZOPEBASEDIR}/skel/etc/zope.conf.sample.in - @${SED} ${CONFIG_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} pkg-message + @${SED} ${CONFIG_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} < ${FILESDIR}/pkg-message.in \ + > ${PKGMESSAGE} @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ ${FILESDIR}/zope.sh > ${PREFIX}/etc/rc.d/zope.sh @${CHMOD} ${BINMODE} ${PREFIX}/etc/rc.d/zope.sh @${MKDIR} ${ZOPEBASEDIR}/Products + @${CAT} ${PKGMESSAGE} + @${ECHO_MSG} instance: @${ZOPEBASEDIR}/bin/mkzopeinstance.py -d ${ZOPEINSTANCEDIR} ${ISBATCH} diff --git a/www/zope29/distinfo b/www/zope29/distinfo index de2d51bcec75..adb251366969 100644 --- a/www/zope29/distinfo +++ b/www/zope29/distinfo @@ -1,2 +1,2 @@ -MD5 (zope/Zope-2.7.0.tgz) = f733cd97f32411d43d372ac61eed98f4 -SIZE (zope/Zope-2.7.0.tgz) = 2733236 +MD5 (zope/Zope-2.7.1.tgz) = ae9d4bb3f7220dfffb6e91b42503b16c +SIZE (zope/Zope-2.7.1.tgz) = 2754949 diff --git a/www/zope29/files/patch-lib-python-zdaemon-zdctl.py b/www/zope29/files/patch-lib-python-zdaemon-zdctl.py deleted file mode 100644 index 0bdc23957476..000000000000 --- a/www/zope29/files/patch-lib-python-zdaemon-zdctl.py +++ /dev/null @@ -1,14 +0,0 @@ ---- lib/python/zdaemon/zdctl.py.orig Fri Oct 24 23:32:59 2003 -+++ lib/python/zdaemon/zdctl.py Fri Apr 2 01:55:59 2004 -@@ -208,9 +208,9 @@ - args += self._get_override("-z", "directory") - args.extend(self.options.program) - if self.options.daemon: -- flag = os.P_WAIT -- else: - flag = os.P_NOWAIT -+ else: -+ flag = os.P_WAIT - os.spawnvp(flag, args[0], args) - elif not self.zd_pid: - self.send_action("start") diff --git a/www/zope29/files/pkg-message.in b/www/zope29/files/pkg-message.in new file mode 100644 index 000000000000..3d35ab56b353 --- /dev/null +++ b/www/zope29/files/pkg-message.in @@ -0,0 +1,27 @@ +********************************************************************** + +Zope 2.7 Successfull installed. + +To create an instance of Zope please run +make instance + +You can set the following Variables in /etc/make.conf + +ZOPEINSTANCEBASE Directory where Zope instance should go + (default: %%ZOPEBASEDIR%%) +ZOPEINSTANCENAME Default name for a new Zope instance + (default: none) + +If you want have multiple Zope you should run +make instance INSTANCENAME=<somename> + +********************************************************************** +****** ATTENTION ***** ATTENTION ***** ATTENTION ***** ATTENTION ***** + +The default installation directory for Zope Products has changed from +%%ZOPEBASEDIR%%/lib/python/Products +to %%ZOPEBASEDIR%%/Products. + +You might have to add the following lines to your zope.conf +products %%ZOPEBASEDIR%%/Products +products $INSTANCE/Products diff --git a/www/zope29/files/zope.sh b/www/zope29/files/zope.sh index 9a34e19150c7..68dd8848a533 100644 --- a/www/zope29/files/zope.sh +++ b/www/zope29/files/zope.sh @@ -1,7 +1,7 @@ #!/bin/sh # Start or stop zope -# $FreeBSD: /tmp/pcvs/ports/www/zope29/files/Attic/zope.sh,v 1.2 2004-04-20 14:29:26 perky Exp $ +# $FreeBSD: /tmp/pcvs/ports/www/zope29/files/Attic/zope.sh,v 1.3 2004-07-02 20:41:00 thierry Exp $ # PROVIDE: zope # REQUIRE: DAEMON @@ -18,7 +18,7 @@ prefix=%%PREFIX%% # DO NOT CHANGE THESE DEFAULT VALUES HERE # zope_enable=${zope_enable:-"NO"} # Enable gkrellmd -zope_instances=${zope_instances:-""} # List of instancehome dirs +zope_instances=${zope_instances:-""} # List of instancehome dirs . %%RC_SUBR%% @@ -47,7 +47,7 @@ if checkyesno zope_enable; then do if [ -r ${instance}/etc/${name}.conf -a -x ${instance}/bin/zopectl ]; then echo -n " Instance ${instance} -> " - ${instance}/bin/zopectl $1 + ${instance}/bin/zopectl $1 fi done fi diff --git a/www/zope29/pkg-message b/www/zope29/pkg-message deleted file mode 100644 index 5de2678098b7..000000000000 --- a/www/zope29/pkg-message +++ /dev/null @@ -1,28 +0,0 @@ -********************************************************************** - -Zope 2.7 Successfull installed. - -To create an instance of Zope please run -make instance - -You can set the following Variables in /etc/make.conf - -ZOPEINSTANCEBASE Directory where Zope instance should go - (default: %%ZOPEBASEDIR%%) -ZOPEINSTANCENAME Default name for a new Zope instance - (default: none) - -If you want have multiple Zope you should run -make instance INSTANCENAME=<somename> - -********************************************************************** -****** ATTENTION ***** ATTENTION ***** ATTENTION ***** ATTENTION ***** - -The default installation directory for Zope Products has changed from -%%ZOPEBASEDIR%%/lib/python/Products -to %%ZOPEBASEDIR%%/Products. - -You might have to add the following lines to your zope.conf -products %%ZOPEBASEDIR%%/Products -products $INSTANCE/Products - diff --git a/www/zope29/pkg-plist b/www/zope29/pkg-plist index 1e61c51cfdc0..0df558279272 100644 --- a/www/zope29/pkg-plist +++ b/www/zope29/pkg-plist @@ -10,7 +10,7 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/bin/mkzopeinstance.py %%ZOPEBASEDIR%%/bin/python %%ZOPEBASEDIR%%/bin/requestprofiler.py -%%ZOPEBASEDIR%%/bin/testrunner.py +%%ZOPEBASEDIR%%/bin/test.py %%ZOPEBASEDIR%%/bin/zpasswd.py %%ZOPEBASEDIR%%/doc/CHANGES.txt %%ZOPEBASEDIR%%/doc/CREDITS.txt @@ -28,11 +28,6 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/doc/UNITTEST.txt %%ZOPEBASEDIR%%/doc/WEBSERVER.txt %%ZOPEBASEDIR%%/doc/ZODB.txt -%%ZOPEBASEDIR%%/doc/changenotes/010516-2.4-unicode.stx -%%ZOPEBASEDIR%%/doc/changenotes/010529-2.4-dropinindex.stx -%%ZOPEBASEDIR%%/doc/changenotes/010529-2.4-exreg.stx -%%ZOPEBASEDIR%%/doc/changenotes/010529-2.4-pluggableindex.stx -%%ZOPEBASEDIR%%/doc/changenotes/010620-2.4-btreeconflict.stx %%ZOPEBASEDIR%%/doc/zconfig/schema.dtd %%ZOPEBASEDIR%%/doc/zconfig/zconfig.pdf %%ZOPEBASEDIR%%/import/Examples.zexp @@ -224,6 +219,14 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/App/special_dtml.pyc %%ZOPEBASEDIR%%/lib/python/App/tar.py %%ZOPEBASEDIR%%/lib/python/App/tar.pyc +%%ZOPEBASEDIR%%/lib/python/App/tests/__init__.py +%%ZOPEBASEDIR%%/lib/python/App/tests/__init__.pyc +%%ZOPEBASEDIR%%/lib/python/App/tests/test_cachemanager.py +%%ZOPEBASEDIR%%/lib/python/App/tests/test_cachemanager.pyc +%%ZOPEBASEDIR%%/lib/python/App/tests/test_setConfiguration.py +%%ZOPEBASEDIR%%/lib/python/App/tests/test_setConfiguration.pyc +%%ZOPEBASEDIR%%/lib/python/App/tests/test_version_txt.py +%%ZOPEBASEDIR%%/lib/python/App/tests/test_version_txt.pyc %%ZOPEBASEDIR%%/lib/python/App/version_txt.py %%ZOPEBASEDIR%%/lib/python/App/version_txt.pyc %%ZOPEBASEDIR%%/lib/python/App/www/CacheManager_icon.gif @@ -627,12 +630,17 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/OFS/tests/__init__.pyc %%ZOPEBASEDIR%%/lib/python/OFS/tests/mime.types-1 %%ZOPEBASEDIR%%/lib/python/OFS/tests/mime.types-2 +%%ZOPEBASEDIR%%/lib/python/OFS/tests/test.gif %%ZOPEBASEDIR%%/lib/python/OFS/tests/testAppInitializer.py %%ZOPEBASEDIR%%/lib/python/OFS/tests/testAppInitializer.pyc %%ZOPEBASEDIR%%/lib/python/OFS/tests/testContentTypes.py %%ZOPEBASEDIR%%/lib/python/OFS/tests/testContentTypes.pyc %%ZOPEBASEDIR%%/lib/python/OFS/tests/testCopySupport.py %%ZOPEBASEDIR%%/lib/python/OFS/tests/testCopySupport.pyc +%%ZOPEBASEDIR%%/lib/python/OFS/tests/testFileAndImage.py +%%ZOPEBASEDIR%%/lib/python/OFS/tests/testFileAndImage.pyc +%%ZOPEBASEDIR%%/lib/python/OFS/tests/testObjectManager.py +%%ZOPEBASEDIR%%/lib/python/OFS/tests/testObjectManager.pyc %%ZOPEBASEDIR%%/lib/python/OFS/tests/testOrderSupport.py %%ZOPEBASEDIR%%/lib/python/OFS/tests/testOrderSupport.pyc %%ZOPEBASEDIR%%/lib/python/OFS/tests/testOrderedFolder.py @@ -951,6 +959,8 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testHTMLTests.pyc %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testTALES.py %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testTALES.pyc +%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testZopePageTemplate.py +%%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/testZopePageTemplate.pyc %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/test_ptfile.py %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/test_ptfile.pyc %%ZOPEBASEDIR%%/lib/python/Products/PageTemplates/tests/util.py @@ -1118,6 +1128,7 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/class.__name__.ps %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/complex_print.ps %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/fibonacci.ps +%%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/filepath.ps %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/for_loop.ps %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/global_is_declaration.ps %%ZOPEBASEDIR%%/lib/python/Products/PythonScripts/tests/tscripts/mutate_literals.ps @@ -1233,6 +1244,8 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/Products/TemporaryFolder/patchfs.py %%ZOPEBASEDIR%%/lib/python/Products/TemporaryFolder/patchfs.pyc %%ZOPEBASEDIR%%/lib/python/Products/TemporaryFolder/www/tempfolder.gif +%%ZOPEBASEDIR%%/lib/python/Products/Transience/Fake.py +%%ZOPEBASEDIR%%/lib/python/Products/Transience/Fake.pyc %%ZOPEBASEDIR%%/lib/python/Products/Transience/HowTransienceWorks.stx %%ZOPEBASEDIR%%/lib/python/Products/Transience/Transience.py %%ZOPEBASEDIR%%/lib/python/Products/Transience/Transience.pyc @@ -1415,6 +1428,8 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/regressiontests/unittest_patched.py %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/__init__.py %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/__init__.pyc +%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testBrains.py +%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testBrains.pyc %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testCatalog.py %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testCatalog.pyc %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/version.txt @@ -2329,6 +2344,8 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPRequest.pyc %%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPResponse.py %%ZOPEBASEDIR%%/lib/python/ZPublisher/HTTPResponse.pyc +%%ZOPEBASEDIR%%/lib/python/ZPublisher/Iterators.py +%%ZOPEBASEDIR%%/lib/python/ZPublisher/Iterators.pyc %%ZOPEBASEDIR%%/lib/python/ZPublisher/Publish.py %%ZOPEBASEDIR%%/lib/python/ZPublisher/Publish.pyc %%ZOPEBASEDIR%%/lib/python/ZPublisher/Request.py @@ -2543,6 +2560,14 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/Zope/Startup/options.pyc %%ZOPEBASEDIR%%/lib/python/Zope/Startup/run.py %%ZOPEBASEDIR%%/lib/python/Zope/Startup/run.pyc +%%ZOPEBASEDIR%%/lib/python/Zope/Startup/tests/__init__.py +%%ZOPEBASEDIR%%/lib/python/Zope/Startup/tests/__init__.pyc +%%ZOPEBASEDIR%%/lib/python/Zope/Startup/tests/testStarter.py +%%ZOPEBASEDIR%%/lib/python/Zope/Startup/tests/testStarter.pyc +%%ZOPEBASEDIR%%/lib/python/Zope/Startup/tests/test_schema.py +%%ZOPEBASEDIR%%/lib/python/Zope/Startup/tests/test_schema.pyc +%%ZOPEBASEDIR%%/lib/python/Zope/Startup/tests/test_warnfilter.py +%%ZOPEBASEDIR%%/lib/python/Zope/Startup/tests/test_warnfilter.pyc %%ZOPEBASEDIR%%/lib/python/Zope/Startup/warnfilter.py %%ZOPEBASEDIR%%/lib/python/Zope/Startup/warnfilter.pyc %%ZOPEBASEDIR%%/lib/python/Zope/Startup/warnfilter.xml @@ -2563,6 +2588,8 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/docutils/__init__.pyc %%ZOPEBASEDIR%%/lib/python/docutils/core.py %%ZOPEBASEDIR%%/lib/python/docutils/core.pyc +%%ZOPEBASEDIR%%/lib/python/docutils/examples.py +%%ZOPEBASEDIR%%/lib/python/docutils/examples.pyc %%ZOPEBASEDIR%%/lib/python/docutils/frontend.py %%ZOPEBASEDIR%%/lib/python/docutils/frontend.pyc %%ZOPEBASEDIR%%/lib/python/docutils/io.py @@ -2571,6 +2598,8 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/docutils/languages/__init__.pyc %%ZOPEBASEDIR%%/lib/python/docutils/languages/af.py %%ZOPEBASEDIR%%/lib/python/docutils/languages/af.pyc +%%ZOPEBASEDIR%%/lib/python/docutils/languages/cs.py +%%ZOPEBASEDIR%%/lib/python/docutils/languages/cs.pyc %%ZOPEBASEDIR%%/lib/python/docutils/languages/de.py %%ZOPEBASEDIR%%/lib/python/docutils/languages/de.pyc %%ZOPEBASEDIR%%/lib/python/docutils/languages/en.py @@ -2583,6 +2612,8 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/docutils/languages/fr.pyc %%ZOPEBASEDIR%%/lib/python/docutils/languages/it.py %%ZOPEBASEDIR%%/lib/python/docutils/languages/it.pyc +%%ZOPEBASEDIR%%/lib/python/docutils/languages/pt_br.py +%%ZOPEBASEDIR%%/lib/python/docutils/languages/pt_br.pyc %%ZOPEBASEDIR%%/lib/python/docutils/languages/ru.py %%ZOPEBASEDIR%%/lib/python/docutils/languages/ru.pyc %%ZOPEBASEDIR%%/lib/python/docutils/languages/sk.py @@ -2615,6 +2646,8 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/__init__.pyc %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/af.py %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/af.pyc +%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/cs.py +%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/cs.pyc %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/de.py %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/de.pyc %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/en.py @@ -2627,12 +2660,16 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/fr.pyc %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/it.py %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/it.pyc +%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/pt_br.py +%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/pt_br.pyc %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/ru.py %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/ru.pyc %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/sk.py %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/sk.pyc %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/sv.py %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/sv.pyc +%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/roles.py +%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/roles.pyc %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/states.py %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/states.pyc %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/tableparser.py @@ -2688,8 +2725,6 @@ etc/rc.d/zope.sh %%ZOPEBASEDIR%%/lib/python/reStructuredText/README.txt %%ZOPEBASEDIR%%/lib/python/reStructuredText/__init__.py %%ZOPEBASEDIR%%/lib/python/reStructuredText/__init__.pyc -%%ZOPEBASEDIR%%/lib/python/reStructuredText/html4zope.py -%%ZOPEBASEDIR%%/lib/python/reStructuredText/html4zope.pyc %%ZOPEBASEDIR%%/lib/python/reStructuredText/reStructuredText.txt %%ZOPEBASEDIR%%/lib/python/tempstorage/TemporaryStorage.py %%ZOPEBASEDIR%%/lib/python/tempstorage/TemporaryStorage.pyc @@ -2828,6 +2863,7 @@ etc/rc.d/zope.sh @dirrm %%ZOPEBASEDIR%%/lib/python/docutils @dirrm %%ZOPEBASEDIR%%/lib/python/ZopeUndo/tests @dirrm %%ZOPEBASEDIR%%/lib/python/ZopeUndo +@dirrm %%ZOPEBASEDIR%%/lib/python/Zope/Startup/tests @dirrm %%ZOPEBASEDIR%%/lib/python/Zope/Startup/nt @dirrm %%ZOPEBASEDIR%%/lib/python/Zope/Startup/misc @dirrm %%ZOPEBASEDIR%%/lib/python/Zope/Startup @@ -3030,6 +3066,7 @@ etc/rc.d/zope.sh @dirrm %%ZOPEBASEDIR%%/lib/python/BDBStorage/tests @dirrm %%ZOPEBASEDIR%%/lib/python/BDBStorage @dirrm %%ZOPEBASEDIR%%/lib/python/App/www +@dirrm %%ZOPEBASEDIR%%/lib/python/App/tests @dirrm %%ZOPEBASEDIR%%/lib/python/App/dtml @dirrm %%ZOPEBASEDIR%%/lib/python/App @dirrm %%ZOPEBASEDIR%%/lib/python/AccessControl/www @@ -3045,10 +3082,9 @@ etc/rc.d/zope.sh @dirrm %%ZOPEBASEDIR%%/lib/python/AccessControl @dirrm %%ZOPEBASEDIR%%/lib/python @dirrm %%ZOPEBASEDIR%%/lib -@dirrm %%ZOPEBASEDIR%%/Products @dirrm %%ZOPEBASEDIR%%/import @dirrm %%ZOPEBASEDIR%%/doc/zconfig -@dirrm %%ZOPEBASEDIR%%/doc/changenotes @dirrm %%ZOPEBASEDIR%%/doc @dirrm %%ZOPEBASEDIR%%/bin +@dirrm %%ZOPEBASEDIR%%/Products @dirrm %%ZOPEBASEDIR%% |