? pythonmk-zope28support.diff
Index: bsd.python.mk
===================================================================
RCS file: /home/pcvs/ports/Mk/bsd.python.mk,v
retrieving revision 1.68
diff -u -r1.68 bsd.python.mk
--- bsd.python.mk	2 Oct 2005 14:31:39 -0000	1.68
+++ bsd.python.mk	2 Nov 2005 14:49:09 -0000
@@ -141,14 +141,22 @@
 #				server, SZOPEBASEDIR - absolute base directory of zope that
 #				is ${LOCALBASE}/${SZOPEBASEDIR} by default, 
 #				ZOPEPRODUCTDIR - directory, where products for zope can be 
-#				found. Note that USE_ZOPE require python2.3
+#				found.
+#
+# ZOPE_VERSION:	Use a specific version of Zope.  27 and 28 are available for
+#				now.	default: 27
 #
 
 _PYTHON_PORTBRANCH=		2.4
 _PYTHON_ALLBRANCHES=	2.4 2.3 2.2 2.1 2.5 # preferred first
 
+ZOPE_VERSION?=			27
 .if defined(USE_ZOPE)
-PYTHON_VERSION=		python2.3
+. if ${ZOPE_VERSION} == "27"
+PYTHON_VERSION=         python2.3
+. else
+PYTHON_VERSION=         python2.4
+. endif
 .endif
 
 .if defined(PYTHON_VERSION)
@@ -318,13 +326,23 @@
 PYDISTUTILS_BUILDARGS?=
 PYDISTUTILS_INSTALLARGS?=	-c -O1 --prefix=${PREFIX}
 
-# Zope specific variables
-.if defined(USE_ZOPE)
+# Zope-related variables
+.if ${ZOPE_VERSION} == "28"
+SZOPEBASEDIR?=			www/Zope28
+ZOPE_PORTSDIR=			${PORTSDIR}/www/zope28
+.elif ${ZOPE_VERSION} == "27"
 SZOPEBASEDIR?=			www/Zope
+ZOPE_PORTSDIR=			${PORTSDIR}/www/zope
+.else
+check-makevars::
+	@${ECHO} "Makefile error: bad value for ZOPE_VERSION: ${ZOPE_VERSION}."
+	@${ECHO} "Legal values are:	27 (default), 28"
+	@${FALSE}
+.endif
 ZOPEBASEDIR?=			${PREFIX}/${SZOPEBASEDIR}
 ZOPEPRODUCTDIR?=		Products
-.endif
 
+# Python 3rd-party modules
 PYDISTUTILS=	${PYTHON_LIBDIR}/distutils/core.py:${PYTHON_PORTSDIR}
 PYNUMERIC=		${PYTHON_SITELIBDIR}/Numeric/Numeric.py:${PORTSDIR}/math/py-numeric
 PYXML=			${PYTHON_SITELIBDIR}/_xmlplus/__init__.py:${PORTSDIR}/textproc/py-xml
@@ -348,7 +366,7 @@
 .endif		# ${PYTHON_NO_DEPENDS} == "NO"
 
 .if defined(USE_ZOPE)
-RUN_DEPENDS+=	${ZOPEBASEDIR}/skel/bin/zopectl.in:${PORTSDIR}/www/zope
+RUN_DEPENDS+=	${ZOPEBASEDIR}/skel/bin/zopectl.in:${ZOPE_PORTSDIR}
 .endif
 
 # set $PREFIX as Python's one