5 files changed, 96 insertions, 140 deletions

diff --git a/www/zope210/Makefile b/www/zope210/Makefile
index 767dfdb28f62..b9d96ca2994c 100644
--- a/www/zope210/Makefile
+++ b/www/zope210/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	zope210
-PORTVERSION=	2.10.3
+PORTVERSION=	2.10.4
 CATEGORIES=	www python zope
 MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/
 DISTNAME=	Zope-${PORTVERSION}-final
@@ -17,7 +17,7 @@ MAINTAINER=	yasi@yasi.to
 COMMENT=	An object-based web application platform
 
 USE_PYTHON=	2.4
-USE_RC_SUBR=	${PORTNAME}.sh zeo210.sh
+USE_RC_SUBR=	${PORTNAME} zeo210
 
 # 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.
@@ -27,6 +27,7 @@ USE_RC_SUBR=	${PORTNAME}.sh zeo210.sh
 ZOPE_USER?=		www
 WEBBASEDIR?=		www
 SZOPEBASEDIR?=		${WEBBASEDIR}/Zope210
+USE_GETTEXT=	yes
 
 # Do not change anything below this line.
 
@@ -79,10 +80,12 @@ post-install:
 		${ZOPEBASEDIR}/skel/etc/zope.conf.sample.in
 
 	${MKDIR} ${ZOPEBASEDIR}/Products
-	${CP} ${FILESDIR}/Products_00readme-freebsd.txt \
+	${INSTALL_DATA} ${FILESDIR}/Products_00readme-freebsd.txt \
 		${ZOPEBASEDIR}/Products/00readme-freebsd.txt
 
-	${FIND} ${ZOPEBASEDIR} -type f -print0 | ${XARGS} -0 -- ${CHMOD} a-w+r
+.for d in lib bin doc skel Products
+	${FIND} ${ZOPEBASEDIR}/$d -type f -print0 | ${XARGS} -0 -- ${CHMOD} a-w+r
+.endfor
 
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
@@ -109,6 +112,6 @@ zeo:
 	@${CAT} ${WRKDIR}/zeo_message
 
 pre-package:
-	${CP} ${WRKDIR}/package-pkg-message ${PKGMESSAGE}
+	${INSTALL_DATA} ${WRKDIR}/package-pkg-message ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/www/zope210/distinfo b/www/zope210/distinfo
index 41c1278dacd8..4ab7fc3fd1d4 100644
--- a/www/zope210/distinfo
+++ b/www/zope210/distinfo
@@ -1,3 +1,3 @@
-MD5 (zope/Zope-2.10.3-final.tgz) = 60cedefc1589cdb2dd91e6e85f31b9b7
-SHA256 (zope/Zope-2.10.3-final.tgz) = 79233c797c77edf447f1903c93a2accbb227b3af2159a99d731607aa2e274350
-SIZE (zope/Zope-2.10.3-final.tgz) = 7094367
+MD5 (zope/Zope-2.10.4-final.tgz) = 07dde81bdfe42ca00f73912b3d73e0ec
+SHA256 (zope/Zope-2.10.4-final.tgz) = 5d0174e3a1c84f2ccef5fb0979c041eeea0e2fda8f21b35a37b1a382870ff89f
+SIZE (zope/Zope-2.10.4-final.tgz) = 7231146
diff --git a/www/zope210/files/zeo210.sh.in b/www/zope210/files/zeo210.sh.in
deleted file mode 100644
index aeed161ba7a3..000000000000
--- a/www/zope210/files/zeo210.sh.in
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/sh
-#
-# Startup script for Zeo server.
-#
-# $FreeBSD$
-#
-
-# PROVIDE: zeo210
-# REQUIRE: DAEMON
-# BEFORE: zope210
-
-# Define these zeo210_* variables in one of these files:
-#       /etc/rc.conf
-#       /etc/rc.conf.local
-#       /etc/rc.conf.d/zeo210
-#
-# zeo210_enable : bool
-#   Enable Zeo ("YES") or not ("NO", the default).
-#
-# zeo210_instances : list
-#   List of dirs with Zeo's instances ("" by default).
-#
-
-. %%RC_SUBR%%
-
-name="zeo210"
-rcvar=`set_rcvar`
-
-zeo210ctl () {
-    for instance in $zeo210_instances; do
-	if [ -d ${instance} ]; then
-	    echo -n "  Zeo instance ${instance} -> "
-	    ${instance}/bin/zeoctl "$1"
-	fi
-    done
-}
-
-zeo210_start () {
-    echo "Starting Zeo 2.10:"
-    zeo210ctl "start"
-}
-
-zeo210_stop () {
-    echo "Stopping Zeo 2.10:"
-    zeo210ctl "stop"
-}
-
-zeo210_restart () {
-    echo "Restarting Zeo 2.10:"
-    zeo210ctl "restart"
-}
-
-  start_cmd="zeo210_start"
-   stop_cmd="zeo210_stop"
-restart_cmd="zeo210_restart"
-
-load_rc_config $name
-
-: ${zeo210_enable="NO"}
-: ${zeo210_instances=""}
-
-cmd="$1"
-[ $# -gt 0 ] && shift
-[ -n  "$*" ] && zeo210_instances="$*"
-
-run_rc_command "${cmd}"
diff --git a/www/zope210/files/zope210.sh.in b/www/zope210/files/zope210.sh.in
deleted file mode 100644
index daba77525c7e..000000000000
--- a/www/zope210/files/zope210.sh.in
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/sh
-#
-# Startup script for Zope server.
-#
-# $FreeBSD$
-#
-
-# PROVIDE: zope210
-# REQUIRE: DAEMON
-
-# Define these zope210_* variables in one of these files:
-#       /etc/rc.conf
-#       /etc/rc.conf.local
-#       /etc/rc.conf.d/zope210
-#
-# zope210_enable : bool
-#   Enable Zope ("YES") or not ("NO", the default).
-#
-# zope210_instances : list
-#   List of dirs with Zope's instances ("" by default).
-#
-
-. %%RC_SUBR%%
-
-name="zope210"
-rcvar=`set_rcvar`
-
-zope210ctl () {
-    for instance in $zope210_instances; do
-	if [ -d ${instance} ]; then
-	    echo -n "  Zope instance ${instance} -> "
-	    ${instance}/bin/zopectl "$1"
-	fi
-    done
-}
-
-zope210_start () {
-    echo "Starting Zope 2.10:"
-    zope210ctl "start"
-}
-
-zope210_stop () {
-    echo "Stopping Zope 2.10:"
-    zope210ctl "stop"
-}
-
-zope210_restart () {
-    echo "Restarting Zope 2.10:"
-    zope210ctl "restart"
-}
-
-  start_cmd="zope210_start"
-   stop_cmd="zope210_stop"
-restart_cmd="zope210_restart"
-
-load_rc_config $name
-
-: ${zope210_enable="NO"}
-: ${zope210_instances=""}
-
-cmd="$1"
-[ $# -gt 0 ] && shift
-[ -n  "$*" ] && zope210_instances="$*"
-
-run_rc_command "${cmd}"
diff --git a/www/zope210/pkg-plist b/www/zope210/pkg-plist
index 46d6d5df1b41..17d859f2a6a1 100644
--- a/www/zope210/pkg-plist
+++ b/www/zope210/pkg-plist
@@ -721,7 +721,6 @@
 %%ZOPEBASEDIR%%/lib/python/OFS/subscribers.pyc
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/__init__.py
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/__init__.pyc
-%%ZOPEBASEDIR%%/lib/python/OFS/tests/events.zcml
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/mime.types-1
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/mime.types-2
 %%ZOPEBASEDIR%%/lib/python/OFS/tests/test.gif
@@ -907,6 +906,7 @@
 %%ZOPEBASEDIR%%/lib/python/Products/Five/browser/tests/resource.txt
 %%ZOPEBASEDIR%%/lib/python/Products/Five/browser/tests/resource.zcml
 %%ZOPEBASEDIR%%/lib/python/Products/Five/browser/tests/resource_ftest.txt
+%%ZOPEBASEDIR%%/lib/python/Products/Five/browser/tests/resource_subdir/resource.html
 %%ZOPEBASEDIR%%/lib/python/Products/Five/browser/tests/resource_subdir/resource.txt
 %%ZOPEBASEDIR%%/lib/python/Products/Five/browser/tests/seagull.pt
 %%ZOPEBASEDIR%%/lib/python/Products/Five/browser/tests/security.pt
@@ -2608,6 +2608,8 @@
 %%ZOPEBASEDIR%%/lib/python/Testing/ZopeTestCase/testZODBCompat.pyc
 %%ZOPEBASEDIR%%/lib/python/Testing/ZopeTestCase/testZopeTestCase.py
 %%ZOPEBASEDIR%%/lib/python/Testing/ZopeTestCase/testZopeTestCase.pyc
+%%ZOPEBASEDIR%%/lib/python/Testing/ZopeTestCase/testpackage/__init__.py
+%%ZOPEBASEDIR%%/lib/python/Testing/ZopeTestCase/testpackage/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Testing/ZopeTestCase/tests.py
 %%ZOPEBASEDIR%%/lib/python/Testing/ZopeTestCase/tests.pyc
 %%ZOPEBASEDIR%%/lib/python/Testing/ZopeTestCase/threadutils.py
@@ -2633,6 +2635,8 @@
 %%ZOPEBASEDIR%%/lib/python/Testing/ZopeTestCase/zopedoctest/testFunctionalDocTest.pyc
 %%ZOPEBASEDIR%%/lib/python/Testing/ZopeTestCase/zopedoctest/testLayerExtraction.py
 %%ZOPEBASEDIR%%/lib/python/Testing/ZopeTestCase/zopedoctest/testLayerExtraction.pyc
+%%ZOPEBASEDIR%%/lib/python/Testing/ZopeTestCase/zopedoctest/testPackageAsProduct.py
+%%ZOPEBASEDIR%%/lib/python/Testing/ZopeTestCase/zopedoctest/testPackageAsProduct.pyc
 %%ZOPEBASEDIR%%/lib/python/Testing/ZopeTestCase/zopedoctest/testWarningsTest.py
 %%ZOPEBASEDIR%%/lib/python/Testing/ZopeTestCase/zopedoctest/testWarningsTest.pyc
 %%ZOPEBASEDIR%%/lib/python/Testing/ZopeTestCase/zopedoctest/testZopeDocTest.py
@@ -2859,6 +2863,33 @@
 %%ZOPEBASEDIR%%/lib/python/ZEO/runzeo.py
 %%ZOPEBASEDIR%%/lib/python/ZEO/runzeo.pyc
 %%ZOPEBASEDIR%%/lib/python/ZEO/schema.xml
+%%ZOPEBASEDIR%%/lib/python/ZEO/scripts/README.txt
+%%ZOPEBASEDIR%%/lib/python/ZEO/scripts/__init__.py
+%%ZOPEBASEDIR%%/lib/python/ZEO/scripts/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/ZEO/scripts/manual_tests/testzeopack.py
+%%ZOPEBASEDIR%%/lib/python/ZEO/scripts/manual_tests/testzeopack.pyc
+%%ZOPEBASEDIR%%/lib/python/ZEO/scripts/mkzeoinst.py
+%%ZOPEBASEDIR%%/lib/python/ZEO/scripts/mkzeoinst.pyc
+%%ZOPEBASEDIR%%/lib/python/ZEO/scripts/parsezeolog.py
+%%ZOPEBASEDIR%%/lib/python/ZEO/scripts/parsezeolog.pyc
+%%ZOPEBASEDIR%%/lib/python/ZEO/scripts/runzeo.py
+%%ZOPEBASEDIR%%/lib/python/ZEO/scripts/runzeo.pyc
+%%ZOPEBASEDIR%%/lib/python/ZEO/scripts/timeout.py
+%%ZOPEBASEDIR%%/lib/python/ZEO/scripts/timeout.pyc
+%%ZOPEBASEDIR%%/lib/python/ZEO/scripts/zeoctl.py
+%%ZOPEBASEDIR%%/lib/python/ZEO/scripts/zeoctl.pyc
+%%ZOPEBASEDIR%%/lib/python/ZEO/scripts/zeopack.py
+%%ZOPEBASEDIR%%/lib/python/ZEO/scripts/zeopack.pyc
+%%ZOPEBASEDIR%%/lib/python/ZEO/scripts/zeopasswd.py
+%%ZOPEBASEDIR%%/lib/python/ZEO/scripts/zeopasswd.pyc
+%%ZOPEBASEDIR%%/lib/python/ZEO/scripts/zeoqueue.py
+%%ZOPEBASEDIR%%/lib/python/ZEO/scripts/zeoqueue.pyc
+%%ZOPEBASEDIR%%/lib/python/ZEO/scripts/zeoreplay.py
+%%ZOPEBASEDIR%%/lib/python/ZEO/scripts/zeoreplay.pyc
+%%ZOPEBASEDIR%%/lib/python/ZEO/scripts/zeoserverlog.py
+%%ZOPEBASEDIR%%/lib/python/ZEO/scripts/zeoserverlog.pyc
+%%ZOPEBASEDIR%%/lib/python/ZEO/scripts/zeoup.py
+%%ZOPEBASEDIR%%/lib/python/ZEO/scripts/zeoup.pyc
 %%ZOPEBASEDIR%%/lib/python/ZEO/tests/Cache.py
 %%ZOPEBASEDIR%%/lib/python/ZEO/tests/Cache.pyc
 %%ZOPEBASEDIR%%/lib/python/ZEO/tests/CommitLockTests.py
@@ -2994,6 +3025,46 @@
 %%ZOPEBASEDIR%%/lib/python/ZODB/persistentclass.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/persistentclass.pyc
 %%ZOPEBASEDIR%%/lib/python/ZODB/persistentclass.txt
+%%ZOPEBASEDIR%%/lib/python/ZODB/scripts/README.txt
+%%ZOPEBASEDIR%%/lib/python/ZODB/scripts/__init__.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/scripts/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/scripts/analyze.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/scripts/analyze.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/scripts/checkbtrees.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/scripts/checkbtrees.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/scripts/fsdump.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/scripts/fsdump.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/scripts/fsoids.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/scripts/fsoids.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/scripts/fsrefs.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/scripts/fsrefs.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/scripts/fsstats.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/scripts/fsstats.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/scripts/fstail.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/scripts/fstail.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/scripts/fstest.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/scripts/fstest.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/scripts/manual_tests/test-checker.fs
+%%ZOPEBASEDIR%%/lib/python/ZODB/scripts/manual_tests/testfstest.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/scripts/manual_tests/testfstest.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/scripts/manual_tests/testrepozo.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/scripts/manual_tests/testrepozo.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/scripts/manual_tests/testzeopack.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/scripts/manual_tests/testzeopack.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/scripts/migrate.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/scripts/migrate.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/scripts/netspace.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/scripts/netspace.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/scripts/repozo.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/scripts/repozo.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/scripts/simul.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/scripts/simul.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/scripts/space.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/scripts/space.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/scripts/stats.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/scripts/stats.pyc
+%%ZOPEBASEDIR%%/lib/python/ZODB/scripts/zodbload.py
+%%ZOPEBASEDIR%%/lib/python/ZODB/scripts/zodbload.pyc
 %%ZOPEBASEDIR%%/lib/python/ZODB/serialize.py
 %%ZOPEBASEDIR%%/lib/python/ZODB/serialize.pyc
 %%ZOPEBASEDIR%%/lib/python/ZODB/storage.xml
@@ -5563,6 +5634,8 @@
 %%ZOPEBASEDIR%%/lib/python/zope/app/component/tests/test_registration.pyc
 %%ZOPEBASEDIR%%/lib/python/zope/app/component/tests/test_site.py
 %%ZOPEBASEDIR%%/lib/python/zope/app/component/tests/test_site.pyc
+%%ZOPEBASEDIR%%/lib/python/zope/app/component/tests/test_vocabulary.py
+%%ZOPEBASEDIR%%/lib/python/zope/app/component/tests/test_vocabulary.pyc
 %%ZOPEBASEDIR%%/lib/python/zope/app/component/tests/views.py
 %%ZOPEBASEDIR%%/lib/python/zope/app/component/tests/views.pyc
 %%ZOPEBASEDIR%%/lib/python/zope/app/component/vocabulary.py
@@ -6182,6 +6255,8 @@
 %%ZOPEBASEDIR%%/lib/python/zope/app/interface/tests/test_vocabulary.pyc
 %%ZOPEBASEDIR%%/lib/python/zope/app/interface/vocabulary.py
 %%ZOPEBASEDIR%%/lib/python/zope/app/interface/vocabulary.pyc
+%%ZOPEBASEDIR%%/lib/python/zope/app/interface/wref.py
+%%ZOPEBASEDIR%%/lib/python/zope/app/interface/wref.pyc
 %%ZOPEBASEDIR%%/lib/python/zope/app/intid/__init__.py
 %%ZOPEBASEDIR%%/lib/python/zope/app/intid/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/zope/app/intid/browser/__init__.py
@@ -6854,6 +6929,10 @@
 %%ZOPEBASEDIR%%/lib/python/zope/app/site/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/zope/app/site/tests/__init__.py
 %%ZOPEBASEDIR%%/lib/python/zope/app/site/tests/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/zope/app/site/tests/placefulsetup.py
+%%ZOPEBASEDIR%%/lib/python/zope/app/site/tests/placefulsetup.pyc
+%%ZOPEBASEDIR%%/lib/python/zope/app/site/tests/test_deprecation.py
+%%ZOPEBASEDIR%%/lib/python/zope/app/site/tests/test_deprecation.pyc
 %%ZOPEBASEDIR%%/lib/python/zope/app/size/__init__.py
 %%ZOPEBASEDIR%%/lib/python/zope/app/size/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/zope/app/size/interfaces.py
@@ -9697,6 +9776,7 @@
 @dirrm %%ZOPEBASEDIR%%/lib/python/TreeDisplay
 @dirrm %%ZOPEBASEDIR%%/lib/python/Acquisition
 @dirrm %%ZOPEBASEDIR%%/lib/python/Testing/ZopeTestCase/zopedoctest
+@dirrm %%ZOPEBASEDIR%%/lib/python/Testing/ZopeTestCase/testpackage
 @dirrm %%ZOPEBASEDIR%%/lib/python/Testing/ZopeTestCase/doc
 @dirrm %%ZOPEBASEDIR%%/lib/python/Testing/ZopeTestCase
 @dirrm %%ZOPEBASEDIR%%/lib/python/Testing/tests
@@ -9814,10 +9894,14 @@
 @dirrm %%ZOPEBASEDIR%%/lib/python/zodbcode
 @dirrm %%ZOPEBASEDIR%%/lib/python/MethodObject
 @dirrm %%ZOPEBASEDIR%%/lib/python/ZEO/tests
+@dirrm %%ZOPEBASEDIR%%/lib/python/ZEO/scripts/manual_tests
+@dirrm %%ZOPEBASEDIR%%/lib/python/ZEO/scripts
 @dirrm %%ZOPEBASEDIR%%/lib/python/ZEO/zrpc
 @dirrm %%ZOPEBASEDIR%%/lib/python/ZEO/auth
 @dirrm %%ZOPEBASEDIR%%/lib/python/ZEO
 @dirrm %%ZOPEBASEDIR%%/lib/python/ZODB/tests
+@dirrm %%ZOPEBASEDIR%%/lib/python/ZODB/scripts/manual_tests
+@dirrm %%ZOPEBASEDIR%%/lib/python/ZODB/scripts
 @dirrm %%ZOPEBASEDIR%%/lib/python/ZODB/FileStorage
 @dirrm %%ZOPEBASEDIR%%/lib/python/ZODB
 @dirrm %%ZOPEBASEDIR%%/lib/python/persistent/tests