summaryrefslogtreecommitdiffstats
path: root/Mk
diff options
context:
space:
mode:
authortg <tg@FreeBSD.org>2000-09-12 11:50:53 +0000
committertg <tg@FreeBSD.org>2000-09-12 11:50:53 +0000
commit54d1e69edb725b40cbb7f9314fcfeb1db0528d4f (patch)
treeedbd78247e283bb0a1e6c22cb06e76e1137c498a /Mk
parent6e012c844b936e05d0eec98fd0c653828d56d9ef (diff)
downloadFreeBSD-ports-54d1e69edb725b40cbb7f9314fcfeb1db0528d4f.zip
FreeBSD-ports-54d1e69edb725b40cbb7f9314fcfeb1db0528d4f.tar.gz
Fix PYXML dependency line.
Add PYTHON_REL, which gives the version as a number, not a string.
Diffstat (limited to 'Mk')
-rw-r--r--Mk/bsd.python.mk14
1 files changed, 10 insertions, 4 deletions
diff --git a/Mk/bsd.python.mk b/Mk/bsd.python.mk
index f77ab12..5287510 100644
--- a/Mk/bsd.python.mk
+++ b/Mk/bsd.python.mk
@@ -25,13 +25,16 @@ Python_Include_MAINTAINER= tg@FreeBSD.org
# distribution.
#
# PYTHON_LIBDIR: Base of the python library tree
-# default: ${LOCALBASE}/lib/python${PYVERSION}
+# default: ${LOCALBASE}/lib/python${PYTHON_VERSION}
#
# PYTHON_PORTSDIR: The source of your binary's port. Needed for the
# RUN_DEPENDS.
#
# PYTHON_PORTVERSION: Version number suitable for ${PORTVERSION}.
#
+# PYTHON_REL: Version number in numerical format, to ease
+# comparison in makefiles
+#
# PYTHON_SITELIBDIR: Location of the site-packages tree. Don't change,
# unless you know what you do.
# default: ${PYTHON_LIBDIR}/site-packages
@@ -66,28 +69,31 @@ PYTHON_PORTVERSION!= (${PYTHON_VERSION} -c 'import string, sys; \
# Python-2.0
.if ${PYTHON_VERSION} == "python2.0"
PYDISTUTILS= ${PYTHON_LIBDIR}/distutils/core.py:${PORTSDIR}/lang/python
-PYXML= ${PYTHON_LIBDIR}/xml/xmllib.py:${PORTSDIR}/lang/python
+PYXML= ${PYTHON_LIBDIR}/xml/__init__.py:${PORTSDIR}/lang/python
PYTHON_DISTFILE= BeOpen-Python-2.0b1.tar.gz
PYTHON_PORTSDIR= ${PORTSDIR}/lang/python-beta
+PYTHON_REL= 190
PYTHON_WRKSRC= ${WRKDIR}/Python-2.0b1
# Python-1.6
.elif ${PYTHON_VERSION} == "python1.6"
PYDISTUTILS= ${PYTHON_LIBDIR}/distutils/core.py:${PORTSDIR}/misc/py-distutils
-PYXML= ${PYTHON_LIBDIR}/site-packages/xml/xmllib.py:${PORTSDIR}/textproc/py-xml
+PYXML= ${PYTHON_LIBDIR}/site-packages/xml/__init__.py:${PORTSDIR}/textproc/py-xml
PYTHON_DISTFILE= Python-1.6.tar.gz
PYTHON_PORTSDIR= ${PORTSDIR}/lang/python
+PYTHON_REL= 160
PYTHON_WRKSRC= ${WRKDIR}/Python-1.6
# Python-1.5
.elif ${PYTHON_VERSION} == "python1.5"
PYDISTUTILS= ${PYTHON_LIBDIR}/site-packages/distutils/core.py:${PORTSDIR}/misc/py-distutils
-PYXML= ${PYTHON_LIBDIR}/site-packages/xml/xmllib.py:${PORTSDIR}/textproc/py-xml
+PYXML= ${PYTHON_LIBDIR}/site-packages/xml/__init__.py:${PORTSDIR}/textproc/py-xml
PYTHON_DISTFILE= py152.tgz
PYTHON_PORTSDIR= ${PORTSDIR}/lang/python15
+PYTHON_REL= 152
PYTHON_WRKSRC= ${WRKDIR}/Python-1.5.2
.else
OpenPOWER on IntegriCloud