- Update to 2.7.2

- Add special pkg-message to package to help with installation from package

PR:		ports/69476
Submitted by:	HAYASHI Yasushi <yasi@yasi.to>,
		Gerhard Schmidt <estartu@augusta.de> (maintainer)

6 files changed, 59 insertions, 13 deletions

diff --git a/www/zope/Makefile b/www/zope/Makefile
index 0ca20d100d99..3d316c47ff12 100644
--- a/www/zope/Makefile
+++ b/www/zope/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	zope
-PORTVERSION=	2.7.1
+PORTVERSION=	2.7.2
 CATEGORIES=	www python zope
-MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/${PORTVERSION}/
-DISTNAME=	Zope-${PORTVERSION}
+MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/
+DISTNAME=	Zope-${PORTVERSION}-0
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	estartu@augusta.de
@@ -21,7 +21,6 @@ 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.
@@ -75,6 +74,7 @@ post-install:
 		${FILESDIR}/zope.sh > ${PREFIX}/etc/rc.d/zope.sh
 	@${CHMOD} ${BINMODE} ${PREFIX}/etc/rc.d/zope.sh
 	@${MKDIR} ${ZOPEBASEDIR}/Products
+	@${CP} ${FILESDIR}/Products_00readme-freebsd.txt ${ZOPEBASEDIR}/Products/00readme-freebsd.txt
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
 
@@ -86,5 +86,10 @@ instance:
 	@${CHOWN} ${ZOPE_USER} ${ZOPEINSTANCEDIR}/var
 	@${CHOWN} ${ZOPE_USER} ${ZOPEINSTANCEDIR}/log
 	@${SED} ${CONFIG_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} ${FILESDIR}/instance_message
+	@${RM} -f ${ZOPEBASEDIR}/bin/copyzopeskel.pyc
+
+pre-package:
+	@${SED} ${CONFIG_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} < ${FILESDIR}/pkg-message.package.in \
+		> ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/www/zope/distinfo b/www/zope/distinfo
index adb251366969..b4cbd18aa6eb 100644
--- a/www/zope/distinfo
+++ b/www/zope/distinfo
@@ -1,2 +1,2 @@
-MD5 (zope/Zope-2.7.1.tgz) = ae9d4bb3f7220dfffb6e91b42503b16c
-SIZE (zope/Zope-2.7.1.tgz) = 2754949
+MD5 (zope/Zope-2.7.2-0.tgz) = 08b3c4a119aa1ded2e7b1b3d5bc45425
+SIZE (zope/Zope-2.7.2-0.tgz) = 2754459
diff --git a/www/zope/files/Products_00readme-freebsd.txt b/www/zope/files/Products_00readme-freebsd.txt
new file mode 100644
index 000000000000..2eaab03ee0fb
--- /dev/null
+++ b/www/zope/files/Products_00readme-freebsd.txt
@@ -0,0 +1,2 @@
+This directory is used for install Zope products via ports/package.
+All products in here are enabled on all Zope instances.
diff --git a/www/zope/files/pkg-message.in b/www/zope/files/pkg-message.in
index 3d35ab56b353..30e5737acdee 100644
--- a/www/zope/files/pkg-message.in
+++ b/www/zope/files/pkg-message.in
@@ -15,6 +15,9 @@ ZOPEINSTANCENAME	Default name for a new Zope instance
 If you want have multiple Zope you should run 
 make instance INSTANCENAME=<somename>
 
+The Instancefiles created by make instance will not be remove when the
+port is deinstalled. You'll have to delete them yourself.
+
 **********************************************************************
 ****** ATTENTION ***** ATTENTION ***** ATTENTION ***** ATTENTION *****
 
diff --git a/www/zope/files/pkg-message.package.in b/www/zope/files/pkg-message.package.in
new file mode 100644
index 000000000000..61059991c698
--- /dev/null
+++ b/www/zope/files/pkg-message.package.in
@@ -0,0 +1,36 @@
+**********************************************************************
+
+Zope 2.7 Successfull installed.
+
+To create an instance of Zope please run 
+%%ZOPEBASEDIR%%/bin/mkzopeinstance.py -d <INSTANCEDIR>
+
+<INSTANCEDIR> is the directory where the instance files should 
+              be installed. This can be %%ZOPEBASEDIR%%
+
+Command-line options to 'mkzopeinstance' are available, and can be 
+investigated by running 'mkzopeinstance.py --help'.
+
+The Instancefiles created by mkzopeinstance.py will not be remove 
+when the package is deinstalled. You`ll have to delete them yourself. 
+
+If Zope should get started automatically when the system starts, 
+please add the following lines to /etc/rc.conf
+
+zope_enable="YES"
+zope_instances="<INSTANCEDIR>" 
+
+If there is already a zope_instances entry please add 
+<INSTANCEDIR> separated by a space. 
+
+
+**********************************************************************
+****** 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/zope/pkg-plist b/www/zope/pkg-plist
index 0df558279272..e3571af37007 100644
--- a/www/zope/pkg-plist
+++ b/www/zope/pkg-plist
@@ -1,9 +1,9 @@
 etc/rc.d/zope.sh
+%%ZOPEBASEDIR%%/Products/00readme-freebsd.txt
 %%ZOPEBASEDIR%%/bin/README.txt
 %%ZOPEBASEDIR%%/bin/check_catalog.py
 %%ZOPEBASEDIR%%/bin/compilezpy.py
 %%ZOPEBASEDIR%%/bin/copyzopeskel.py
-@exec rm -f %%ZOPEBASEDIR%%/bin/copyzopeskel.pyc
 %%ZOPEBASEDIR%%/bin/decompilezpy.py
 %%ZOPEBASEDIR%%/bin/load_site.py
 %%ZOPEBASEDIR%%/bin/mkzeoinstance.py
@@ -1432,6 +1432,8 @@ etc/rc.d/zope.sh
 %%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/tests/testLazySequences.py
+%%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/tests/testLazySequences.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/version.txt
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/www/Vocabulary.gif
 %%ZOPEBASEDIR%%/lib/python/Products/ZCatalog/www/ZCatalog.gif
@@ -1786,8 +1788,6 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/TAL/DummyEngine.py
 %%ZOPEBASEDIR%%/lib/python/TAL/DummyEngine.pyc
 %%ZOPEBASEDIR%%/lib/python/TAL/HISTORY.txt
-%%ZOPEBASEDIR%%/lib/python/TAL/HTMLParser.py
-%%ZOPEBASEDIR%%/lib/python/TAL/HTMLParser.pyc
 %%ZOPEBASEDIR%%/lib/python/TAL/HTMLTALParser.py
 %%ZOPEBASEDIR%%/lib/python/TAL/HTMLTALParser.pyc
 %%ZOPEBASEDIR%%/lib/python/TAL/ITALES.py
@@ -1883,6 +1883,7 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/TAL/tests/input/test20.html
 %%ZOPEBASEDIR%%/lib/python/TAL/tests/input/test29.html
 %%ZOPEBASEDIR%%/lib/python/TAL/tests/input/test34.html
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/input/test36.html
 %%ZOPEBASEDIR%%/lib/python/TAL/tests/input/test_failed_attr_translation.html
 %%ZOPEBASEDIR%%/lib/python/TAL/tests/input/test_metal1.html
 %%ZOPEBASEDIR%%/lib/python/TAL/tests/input/test_metal2.html
@@ -1927,6 +1928,7 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/TAL/tests/output/test20.html
 %%ZOPEBASEDIR%%/lib/python/TAL/tests/output/test29.html
 %%ZOPEBASEDIR%%/lib/python/TAL/tests/output/test34.html
+%%ZOPEBASEDIR%%/lib/python/TAL/tests/output/test36.html
 %%ZOPEBASEDIR%%/lib/python/TAL/tests/output/test_failed_attr_translation.html
 %%ZOPEBASEDIR%%/lib/python/TAL/tests/output/test_metal1.html
 %%ZOPEBASEDIR%%/lib/python/TAL/tests/output/test_metal2.html
@@ -1939,8 +1941,6 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/TAL/tests/run.pyc
 %%ZOPEBASEDIR%%/lib/python/TAL/tests/test_files.py
 %%ZOPEBASEDIR%%/lib/python/TAL/tests/test_files.pyc
-%%ZOPEBASEDIR%%/lib/python/TAL/tests/test_htmlparser.py
-%%ZOPEBASEDIR%%/lib/python/TAL/tests/test_htmlparser.pyc
 %%ZOPEBASEDIR%%/lib/python/TAL/tests/test_htmltalparser.py
 %%ZOPEBASEDIR%%/lib/python/TAL/tests/test_htmltalparser.pyc
 %%ZOPEBASEDIR%%/lib/python/TAL/tests/test_sourcepos.py
@@ -2670,6 +2670,8 @@ etc/rc.d/zope.sh
 %%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/roman.py
+%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/roman.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
@@ -2680,8 +2682,6 @@ etc/rc.d/zope.sh
 %%ZOPEBASEDIR%%/lib/python/docutils/readers/pep.pyc
 %%ZOPEBASEDIR%%/lib/python/docutils/readers/standalone.py
 %%ZOPEBASEDIR%%/lib/python/docutils/readers/standalone.pyc
-%%ZOPEBASEDIR%%/lib/python/docutils/roman.py
-%%ZOPEBASEDIR%%/lib/python/docutils/roman.pyc
 %%ZOPEBASEDIR%%/lib/python/docutils/statemachine.py
 %%ZOPEBASEDIR%%/lib/python/docutils/statemachine.pyc
 %%ZOPEBASEDIR%%/lib/python/docutils/transforms/__init__.py