Date: Wed, 7 Dec 2011 17:01:43 GMT From: Kirk Strauser <kirk@strauser.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/163112: Updates bsd.python.mk to support Zope 2.11, 2.13 Message-ID: <201112071701.pB7H1hwP028456@red.freebsd.org> Resent-Message-ID: <201112071710.pB7HA8Ll008946@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 163112
>Category: ports
>Synopsis: Updates bsd.python.mk to support Zope 2.11, 2.13
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed Dec 07 17:10:08 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Kirk Strauser
>Release:
>Organization:
Daycos
>Environment:
>Description:
ports/Mk/bsd.python.mk only supports Zope versions 2.7, 2.8, 2.9, 2.10, and 3.2. That's a problem because 2.7 is no longer in ports, 2.8-2.10 are deprecated, and it doesn't work with the newer, supported Zope 2.11 and 2.13 versions that *are* now in ports.
This patch removes the configuration for ZOPE_VERSION 2.7 and adds versions 2.11 and 2.13. It also changes ZOPE_PORTBRANCH (the default Zope version) to 2.11, which is the oldest non-deprecated version in ports.
I marked this as serious/medium because the remaining obsolete Zope ports are deprecated a month from now, and I'd hate to see a period after that when there's no supported version of Zope at all.
>How-To-Repeat:
>Fix:
--- /tmp/bsd.python.mk 2011-12-07 10:29:22.000000000 -0600
+++ bsd.python.mk 2011-12-07 10:46:17.215097980 -0600
@@ -203,8 +203,8 @@
_PYTHON_PORTBRANCH= 2.7
_PYTHON_ALLBRANCHES= 2.7 2.6 2.5 2.4 3.2 3.1 # preferred first
-_ZOPE_PORTBRANCH= 2.7
-_ZOPE_ALLBRANCHES= 2.7 2.8 2.9 2.10 3.2
+_ZOPE_PORTBRANCH= 2.11
+_ZOPE_ALLBRANCHES= 2.8 2.9 2.10 2.11 2.13 3.2
# Determine version number of Zope to use
@@ -534,6 +534,14 @@
SZOPEBASEDIR?= www/Zope3
ZOPE_PORTSDIR= ${PORTSDIR}/www/zope3
ZOPESKELDIR= ${ZOPEBASEDIR}/zopeskel
+.elif ${ZOPE_VERSION} == "2.13"
+SZOPEBASEDIR?= www/Zope213
+ZOPE_PORTSDIR= ${PORTSDIR}/www/zope213
+ZOPESKELDIR= ${ZOPEBASEDIR}/skel
+.elif ${ZOPE_VERSION} == "2.11"
+SZOPEBASEDIR?= www/Zope211
+ZOPE_PORTSDIR= ${PORTSDIR}/www/zope211
+ZOPESKELDIR= ${ZOPEBASEDIR}/skel
.elif ${ZOPE_VERSION} == "2.10"
SZOPEBASEDIR?= www/Zope210
ZOPE_PORTSDIR= ${PORTSDIR}/www/zope210
@@ -546,14 +554,10 @@
SZOPEBASEDIR?= www/Zope28
ZOPE_PORTSDIR= ${PORTSDIR}/www/zope28
ZOPESKELDIR= ${ZOPEBASEDIR}/skel
-.elif ${ZOPE_VERSION} == "2.7"
-SZOPEBASEDIR?= www/Zope
-ZOPE_PORTSDIR= ${PORTSDIR}/www/zope
-ZOPESKELDIR= ${ZOPEBASEDIR}/skel
.else
check-makevars::
@${ECHO} "Makefile error: bad value for ZOPE_VERSION: ${ZOPE_VERSION}."
- @${ECHO} "Legal values are: 2.7 (default), 2.8, 2.9, 2.10, 3.2"
+ @${ECHO} "Legal values are: 2.8, 2.9, 2.10, 2.11 (default), 2.13, 3.2"
@${FALSE}
.endif
ZOPEBASEDIR?= ${PREFIX}/${SZOPEBASEDIR}
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201112071701.pB7H1hwP028456>