Date: Fri, 2 Jan 2004 20:24:54 -0500 (EST) From: Tim Middleton <x@vex.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: filippo@widestore.net Subject: ports/60845: [PATCH] www/plone: depend on Formulator port rather than bundled Message-ID: <20040103012454.BF508B838@bee.vii.net> Resent-Message-ID: <200401030130.i031U8fT013426@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 60845
>Category: ports
>Synopsis: [PATCH] www/plone: depend on Formulator port rather than bundled
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Jan 02 17:30:08 PST 2004
>Closed-Date:
>Last-Modified:
>Originator: Tim Middleton
>Release: FreeBSD 5.2-CURRENT i386
>Organization:
The Cain Gang Ltd
>Environment:
System: FreeBSD bee.vii.net 5.2-CURRENT FreeBSD 5.2-CURRENT #0: Thu Dec 18 05:25:18 EST 2003
>Description:
Ignore the Formulator bundled with plone; add dependancy to use the
Formulator port. This fixes ports/54096.
>How-To-Repeat:
>Fix:
--- plone-1.0.5_1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/www/plone/Makefile,v
retrieving revision 1.6
diff -c -u -r1.6 Makefile
--- Makefile 26 Sep 2003 07:31:34 -0000 1.6
+++ Makefile 3 Jan 2004 01:21:59 -0000
@@ -7,8 +7,9 @@
PORTNAME= plone
PORTVERSION= 1.0.5
+PORTREVISION= 1
CATEGORIES= www zope
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= plone
DISTNAME= CMFPlone1.0.5
DIST_SUBDIR= zope
@@ -16,22 +17,23 @@
MAINTAINER= filippo@widestore.net
COMMENT= A user friendly implementation of the CMF written on top of ZOPE
-RUN_DEPENDS= ${LOCALBASE}/${SZOPEBASEDIR}/lib/python/Products/CMFDefault/__init__.py:${PORTSDIR}/www/zope-cmf13
+RUN_DEPENDS= ${LOCALBASE}/${SZOPEBASEDIR}/lib/python/Products/CMFDefault/__init__.py:${PORTSDIR}/www/zope-cmf13 \
+ ${ZOPEBASEDIR}/${ZOPEPRODUCTDIR}/Formulator/__init__.py:${PORTSDIR}/www/zope-formulator
USE_PYTHON= yes
USE_ZOPE= yes
PYTHON_VERSION= python2.1
WRKSRC= ${WRKDIR}/CMFPlone-1.0.5
-MODULES= CMFPlone DCWorkflow Formulator i18n
+MODULES= CMFPlone DCWorkflow i18n
# You can change this in the environment if you like.
-SZOPEBASEDIR?= www/Zope
+SZOPEBASEDIR?= www/Zope
# Don't change these
-ZOPEBASEDIR= ${PREFIX}/${SZOPEBASEDIR}
+ZOPEBASEDIR= ${PREFIX}/${SZOPEBASEDIR}
ZOPEPRODUCTNAME=
-ZOPEPRODUCTDIR= lib/python/Products
+ZOPEPRODUCTDIR= lib/python/Products
PLIST_SUB= ZOPEBASEDIR=${SZOPEBASEDIR}
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/plone/pkg-plist,v
retrieving revision 1.4
diff -c -u -r1.4 pkg-plist
--- pkg-plist 26 Sep 2003 07:31:34 -0000 1.4
+++ pkg-plist 3 Jan 2004 01:22:05 -0000
@@ -619,117 +619,6 @@
%%ZOPEBASEDIR%%/lib/python/Products/DCWorkflow/utils.py
%%ZOPEBASEDIR%%/lib/python/Products/DCWorkflow/utils.pyc
%%ZOPEBASEDIR%%/lib/python/Products/DCWorkflow/version.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/CREDITS.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/DummyField.py
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/DummyField.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/Errors.py
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/Errors.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/FSForm.py
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/FSForm.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/Field.py
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/Field.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/FieldHelpTopic.py
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/FieldHelpTopic.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/FieldRegistry.py
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/FieldRegistry.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/Form.py
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/Form.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/FormToXML.py
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/FormToXML.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/HISTORY.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/HelperFields.py
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/HelperFields.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/INSTALL.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/LICENSE.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/ListTextAreaField.py
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/ListTextAreaField.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/MethodField.py
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/MethodField.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/PatternChecker.py
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/PatternChecker.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/README.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/StandardFields.py
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/StandardFields.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/TALESField.py
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/TALESField.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/TODO.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/Validator.py
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/Validator.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/Widget.py
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/Widget.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/XMLObjects.py
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/XMLObjects.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/XMLToForm.py
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/XMLToForm.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/__init__.py
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/__init__.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/dtml/FieldHelpTopic.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/dtml/fieldAdd.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/dtml/fieldEdit.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/dtml/fieldListHeader.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/dtml/fieldMessages.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/dtml/fieldOverride.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/dtml/fieldTales.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/dtml/fieldTest.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/dtml/formAdd.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/dtml/formOrder.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/dtml/formSettings.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/dtml/formTest.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/dtml/formXML.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/help/BasicForm.py
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/help/BasicForm.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/help/Field.py
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/help/Field.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/help/Form.py
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/help/Form.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/help/ZMIForm.py
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/help/ZMIForm.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/help/dogfood.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/help/fieldEdit.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/help/fieldMessages.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/help/fieldOverride.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/help/fieldTales.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/help/fieldTest.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/help/formContents.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/help/formOrder.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/help/formSettings.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/help/formTest.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/help/formXML.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/help/formulator_howto.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/help/formulator_motto.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/tests/README.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/tests/__init__.py
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/tests/__init__.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/tests/test_Form.py
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/tests/test_Form.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/tests/test_all.py
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/tests/test_all.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/tests/test_serialize.py
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/tests/test_serialize.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/tests/test_validators.py
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/tests/test_validators.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/version.txt
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/www/BasicField.gif
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/www/CheckBoxField.gif
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/www/DateTimeField.gif
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/www/EmailField.gif
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/www/FileField.gif
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/www/FloatField.gif
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/www/Form.gif
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/www/IntegerField.gif
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/www/LinesField.gif
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/www/LinkField.gif
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/www/ListField.gif
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/www/MethodField.gif
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/www/MultiCheckBoxField.gif
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/www/MultiListField.gif
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/www/MultipleListField.gif
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/www/PasswordField.gif
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/www/PatternField.gif
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/www/RadioField.gif
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/www/RangedIntegerField.gif
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/www/StringField.gif
-%%ZOPEBASEDIR%%/lib/python/Products/Formulator/www/TextAreaField.gif
%%ZOPEBASEDIR%%/lib/python/Products/i18n/.cvsignore
%%ZOPEBASEDIR%%/lib/python/Products/i18n/ChangeLog
%%ZOPEBASEDIR%%/lib/python/Products/i18n/__init__.py
@@ -768,11 +657,6 @@
%%ZOPEBASEDIR%%/lib/python/Products/i18n/plone-zh.po
%%ZOPEBASEDIR%%/lib/python/Products/i18n/plone.pot
@dirrm %%ZOPEBASEDIR%%/lib/python/Products/i18n
-@dirrm %%ZOPEBASEDIR%%/lib/python/Products/Formulator/www
-@dirrm %%ZOPEBASEDIR%%/lib/python/Products/Formulator/tests
-@dirrm %%ZOPEBASEDIR%%/lib/python/Products/Formulator/help
-@dirrm %%ZOPEBASEDIR%%/lib/python/Products/Formulator/dtml
-@dirrm %%ZOPEBASEDIR%%/lib/python/Products/Formulator
@dirrm %%ZOPEBASEDIR%%/lib/python/Products/DCWorkflow/tests
@dirrm %%ZOPEBASEDIR%%/lib/python/Products/DCWorkflow/images
@dirrm %%ZOPEBASEDIR%%/lib/python/Products/DCWorkflow/help
--- plone-1.0.5_1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040103012454.BF508B838>