Date: Sat, 15 Oct 2005 10:59:29 +0200 From: "Filippo Natali" <filippo.natali@gmail.com> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/87476: [PATCH] Mk/bsd.python.mk: allow to choose Zope version in Products ports Message-ID: <1129366769.0@ulby.hq.netwing.it> Resent-Message-ID: <200510150900.j9F90UW6073356@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 87476
>Category: ports
>Synopsis: [PATCH] Mk/bsd.python.mk: allow to choose Zope version in Products ports
>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: Sat Oct 15 09:00:30 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Filippo Natali
>Release: FreeBSD 6.0-RC1 amd64
>Organization:
Netwing
>Environment:
System: FreeBSD 6.0-RC1 #2: Mon Oct 10 10:42:03 CEST 2005
filippo@ulby.hq.netwing.it:/usr/obj/usr/src/sys/GENERIC
>Description:
Allow users to choose which Zope version when installing a Zope Product from ports. If a port Makefile contains USE_ZOPE it will depend from www/zope, but when WITH_ZOPE28 is defined it will depend from www/zope28.
The right python dependency (2.3 for Zope 2.7 and 2.4 for 2.8) will be also set.
>How-To-Repeat:
>Fix:
--- bsd.python.mk-20051015.diff begins here ---
--- /usr/ports/Mk/bsd.python.mk Sun Oct 2 16:31:39 2005
+++ bsd.python.mk Sat Oct 15 10:55:14 2005
@@ -143,12 +143,18 @@
# ZOPEPRODUCTDIR - directory, where products for zope can be
# found. Note that USE_ZOPE require python2.3
#
+# WITH_ZOPE28: Allows to select Zope 2.8 instead of Zope 2.7
+#
_PYTHON_PORTBRANCH= 2.4
_PYTHON_ALLBRANCHES= 2.4 2.3 2.2 2.1 2.5 # preferred first
.if defined(USE_ZOPE)
-PYTHON_VERSION= python2.3
+. if defined(WITH_ZOPE28)
+PYTHON_VERSION= python2.4
+. else
+PYTHON_VERSION= python2.3
+. endif
.endif
.if defined(PYTHON_VERSION)
@@ -320,7 +326,11 @@
# Zope specific variables
.if defined(USE_ZOPE)
-SZOPEBASEDIR?= www/Zope
+. if defined (WITH_ZOPE28)
+SZOPEBASEDIR?= www/Zope28
+. else
+SZOPEBASEDIR?= www/Zope
+. endif
ZOPEBASEDIR?= ${PREFIX}/${SZOPEBASEDIR}
ZOPEPRODUCTDIR?= Products
.endif
@@ -348,7 +358,11 @@
.endif # ${PYTHON_NO_DEPENDS} == "NO"
.if defined(USE_ZOPE)
-RUN_DEPENDS+= ${ZOPEBASEDIR}/skel/bin/zopectl.in:${PORTSDIR}/www/zope
+. if defined(WITH_ZOPE28)
+RUN_DEPENDS+= ${ZOPEBASEDIR}/skel/bin/zopectl.in:${PORTSDIR}/www/zope28
+. else
+RUN_DEPENDS+= ${ZOPEBASEDIR}/skel/bin/zopectl.in:${PORTSDIR}/www/zope
+. endif
.endif
# set $PREFIX as Python's one
--- bsd.python.mk-20051015.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1129366769.0>