summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorrecht <recht@pkgsrc.org>2004-05-23 17:15:09 +0000
committerrecht <recht@pkgsrc.org>2004-05-23 17:15:09 +0000
commit4656bfa63752f45316dc187b0d4c53237fb2c097 (patch)
tree7bdb703ce2f00f27140736d0b349c2da09145bb4 /lang
parenta2993cfa0926de864e7c67c7e5cc45bb8f9b7363 (diff)
downloadpkgsrc-4656bfa63752f45316dc187b0d4c53237fb2c097.tar.gz
Now that all Python modules have been bl3ified remove the bl2 support.
Diffstat (limited to 'lang')
-rw-r--r--lang/python/pyversion.mk35
-rw-r--r--lang/python15/buildlink2.mk35
-rw-r--r--lang/python20/buildlink2.mk36
-rw-r--r--lang/python21-pth/buildlink2.mk35
-rw-r--r--lang/python21/buildlink2.mk35
-rw-r--r--lang/python22-pth/buildlink2.mk35
-rw-r--r--lang/python22/buildlink2.mk35
-rw-r--r--lang/python23-pth/buildlink2.mk35
-rw-r--r--lang/python23/buildlink2.mk35
9 files changed, 6 insertions, 310 deletions
diff --git a/lang/python/pyversion.mk b/lang/python/pyversion.mk
index e6ee57a4c05..80de227537f 100644
--- a/lang/python/pyversion.mk
+++ b/lang/python/pyversion.mk
@@ -1,4 +1,4 @@
-# $NetBSD: pyversion.mk,v 1.26 2004/04/23 01:25:09 danw Exp $
+# $NetBSD: pyversion.mk,v 1.27 2004/05/23 17:15:09 recht Exp $
.if !defined(PYTHON_PYVERSION_MK)
PYTHON_PYVERSION_MK= defined
@@ -111,13 +111,7 @@ PYDEPENDENCY= ${BUILDLINK_DEPENDS.python23-pth}:${PYPKGSRCDIR}
PYPACKAGE= python23-pth
PYVERSSUFFIX= 2p3
PYPKGPREFIX= py23pth
-. if defined(USE_BUILDLINK2) && empty(USE_BUILDLINK2:M[nN][oO])
-PTHREAD_OPTS= require
-. include "../../mk/pthread.buildlink2.mk"
-. if ${PTHREAD_TYPE} == "pth"
-. include "../../devel/pth/buildlink2.mk"
-. endif
-. elif defined(USE_BUILDLINK3) && empty(USE_BUILDLINK3:M[nN][oO])
+. if defined(USE_BUILDLINK3) && empty(USE_BUILDLINK3:M[nN][oO])
PTHREAD_OPTS= require
. include "../../mk/pthread.buildlink3.mk"
. if ${PTHREAD_TYPE} == "pth"
@@ -136,13 +130,7 @@ PYDEPENDENCY= ${BUILDLINK_DEPENDS.python22-pth}:${PYPKGSRCDIR}
PYPACKAGE= python22-pth
PYVERSSUFFIX= 2p2
PYPKGPREFIX= py22pth
-. if defined(USE_BUILDLINK2) && empty(USE_BUILDLINK2:M[nN][oO])
-PTHREAD_OPTS= require
-. include "../../mk/pthread.buildlink2.mk"
-. if ${PTHREAD_TYPE} == "pth"
-. include "../../devel/pth/buildlink2.mk"
-. endif
-. elif defined(USE_BUILDLINK3) && empty(USE_BUILDLINK3:M[nN][oO])
+. if defined(USE_BUILDLINK3) && empty(USE_BUILDLINK3:M[nN][oO])
PTHREAD_OPTS= require
. include "../../mk/pthread.buildlink3.mk"
. if ${PTHREAD_TYPE} == "pth"
@@ -161,13 +149,7 @@ PYPACKAGE= python21-pth
PYDEPENDENCY= ${BUILDLINK_DEPENDS.python21-pth}:${PYPKGSRCDIR}
PYVERSSUFFIX= 2p1
PYPKGPREFIX= py21pth
-. if defined(USE_BUILDLINK2) && empty(USE_BUILDLINK2:M[nN][oO])
-PTHREAD_OPTS= require
-. include "../../mk/pthread.buildlink2.mk"
-. if ${PTHREAD_TYPE} == "pth"
-. include "../../devel/pth/buildlink2.mk"
-. endif
-. elif defined(USE_BUILDLINK3) && empty(USE_BUILDLINK3:M[nN][oO])
+. if defined(USE_BUILDLINK3) && empty(USE_BUILDLINK3:M[nN][oO])
PTHREAD_OPTS= require
. include "../../mk/pthread.buildlink3.mk"
. if ${PTHREAD_TYPE} == "pth"
@@ -194,16 +176,11 @@ BUILD_DEPENDS+= py15-distutils-*:../../devel/py-distutils
error: no valid Python version
.endif
-.if (defined(USE_BUILDLINK2) && empty(USE_BUILDLINK2:M[nN][oO])) || \
- (defined(USE_BUILDLINK3) && empty(USE_BUILDLINK3:M[nN][oO]))
+.if (defined(USE_BUILDLINK3) && empty(USE_BUILDLINK3:M[nN][oO]))
. if defined(PYTHON_FOR_BUILD_ONLY)
BUILD_DEPMETHOD.python?= build
. endif
-. if defined(USE_BUILDLINK2) && empty(USE_BUILDLINK2:M[nN][oO])
-. include "${PYPKGSRCDIR}/buildlink2.mk"
-. else
-. include "${PYPKGSRCDIR}/buildlink3.mk"
-. endif
+. include "${PYPKGSRCDIR}/buildlink3.mk"
.else
. if defined(PYTHON_FOR_BUILD_ONLY)
BUILD_DEPENDS+= ${PYDEPENDENCY}
diff --git a/lang/python15/buildlink2.mk b/lang/python15/buildlink2.mk
deleted file mode 100644
index c206018f27b..00000000000
--- a/lang/python15/buildlink2.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.9 2004/01/29 10:33:51 grant Exp $
-
-.if !defined(PYTHON15_BUILDLINK2_MK)
-PYTHON15_BUILDLINK2_MK= # defined
-
-.include "../../mk/bsd.prefs.mk"
-
-BUILDLINK_PACKAGES+= python15
-BUILDLINK_PKGBASE.python15?= python15
-BUILDLINK_DEPENDS.python15?= python15>=1.5
-BUILDLINK_PKGSRCDIR.python15?= ../../lang/python15
-
-.if defined(BUILDLINK_DEPMETHOD.python)
-BUILDLINK_DEPMETHOD.python15?= ${BUILDLINK_DEPMETHOD.python}
-.endif
-
-EVAL_PREFIX+= BUILDLINK_PREFIX.python15=python15
-BUILDLINK_PREFIX.python15_DEFAULT= ${LOCALBASE}
-BUILDLINK_FILES_CMD.python15= \
- ${BUILDLINK_PLIST_CMD.python15} | \
- ${EGREP} '^(include|lib.*/lib[^/]*$$)'
-BUILDLINK_TRANSFORM+= l:python:python1.5
-
-BUILDLINK_CPPFLAGS.python15+= \
- -I${BUILDLINK_PREFIX.python15}/include/python1.5
-BUILDLINK_LDFLAGS.python15+= \
- -L${BUILDLINK_PREFIX.python15}/lib/python1.5/config \
- -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.python15}/lib/python1.5/config
-FIX_RPATH+= BUILDLINK_LDFLAGS.python15
-
-BUILDLINK_TARGETS+= python15-buildlink
-
-python15-buildlink: _BUILDLINK_USE
-
-.endif # PYTHON15_BUILDLINK2_MK
diff --git a/lang/python20/buildlink2.mk b/lang/python20/buildlink2.mk
deleted file mode 100644
index 45c806ec911..00000000000
--- a/lang/python20/buildlink2.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.11 2004/03/26 02:27:42 wiz Exp $
-
-.if !defined(PYTHON20_BUILDLINK2_MK)
-PYTHON20_BUILDLINK2_MK= # defined
-
-.include "../../mk/bsd.prefs.mk"
-
-BUILDLINK_PACKAGES+= python20
-BUILDLINK_PKGBASE.python20?= python20
-BUILDLINK_DEPENDS.python20?= python20>=2.0
-BUILDLINK_RECOMMENDED.python20?= python20>=2.0.1nb7
-BUILDLINK_PKGSRCDIR.python20?= ../../lang/python20
-
-.if defined(BUILDLINK_DEPMETHOD.python)
-BUILDLINK_DEPMETHOD.python20?= ${BUILDLINK_DEPMETHOD.python}
-.endif
-
-EVAL_PREFIX+= BUILDLINK_PREFIX.python20=python20
-BUILDLINK_PREFIX.python20_DEFAULT= ${LOCALBASE}
-BUILDLINK_FILES_CMD.python20= \
- ${BUILDLINK_PLIST_CMD.python20} | \
- ${EGREP} '^(include|lib.*/lib[^/]*$$)'
-BUILDLINK_TRANSFORM+= l:python:python2.0
-
-BUILDLINK_CPPFLAGS.python20+= \
- -I${BUILDLINK_PREFIX.python20}/include/python2.0
-BUILDLINK_LDFLAGS.python20+= \
- -L${BUILDLINK_PREFIX.python20}/lib/python2.0/config \
- -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.python20}/lib/python2.0/config
-FIX_RPATH+= BUILDLINK_LDFLAGS.python20
-
-BUILDLINK_TARGETS+= python20-buildlink
-
-python20-buildlink: _BUILDLINK_USE
-
-.endif # PYTHON20_BUILDLINK2_MK
diff --git a/lang/python21-pth/buildlink2.mk b/lang/python21-pth/buildlink2.mk
deleted file mode 100644
index 7b3ae1706d0..00000000000
--- a/lang/python21-pth/buildlink2.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.10 2004/01/29 10:33:51 grant Exp $
-
-.if !defined(PYTHON21_BUILDLINK2_MK)
-PYTHON21_BUILDLINK2_MK= # defined
-
-.include "../../mk/bsd.prefs.mk"
-
-BUILDLINK_PACKAGES+= python21-pth
-BUILDLINK_PKGBASE.python21-pth?= python21-pth
-BUILDLINK_DEPENDS.python21-pth?= python21-pth>=2.1.3nb2
-BUILDLINK_PKGSRCDIR.python21-pth?= ../../lang/python21-pth
-
-.if defined(BUILDLINK_DEPMETHOD.python)
-BUILDLINK_DEPMETHOD.python21-pth?= ${BUILDLINK_DEPMETHOD.python}
-.endif
-
-EVAL_PREFIX+= BUILDLINK_PREFIX.python21-pth=python21-pth
-BUILDLINK_PREFIX.python21-pth_DEFAULT= ${LOCALBASE}
-BUILDLINK_FILES_CMD.python21-pth= \
- ${BUILDLINK_PLIST_CMD.python21-pth} | \
- ${EGREP} '^(include|lib.*/lib[^/]*$$)'
-BUILDLINK_TRANSFORM+= l:python:python2p1
-
-BUILDLINK_CPPFLAGS.python21-pth+= \
- -I${BUILDLINK_PREFIX.python21-pth}/include/python2p1
-BUILDLINK_LDFLAGS.python21-pth+= \
- -L${BUILDLINK_PREFIX.python21-pth}/lib/python2p1/config \
- -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.python21-pth}/lib/python2p1/config
-FIX_RPATH+= BUILDLINK_LDFLAGS.python21-pth
-
-BUILDLINK_TARGETS+= python21-pth-buildlink
-
-python21-pth-buildlink: _BUILDLINK_USE
-
-.endif # PYTHON21_BUILDLINK2_MK
diff --git a/lang/python21/buildlink2.mk b/lang/python21/buildlink2.mk
deleted file mode 100644
index 80b1e6cea67..00000000000
--- a/lang/python21/buildlink2.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.9 2004/01/29 10:33:51 grant Exp $
-
-.if !defined(PYTHON21_BUILDLINK2_MK)
-PYTHON21_BUILDLINK2_MK= # defined
-
-.include "../../mk/bsd.prefs.mk"
-
-BUILDLINK_PACKAGES+= python21
-BUILDLINK_PKGBASE.python21?= python21
-BUILDLINK_DEPENDS.python21?= python21>=2.1
-BUILDLINK_PKGSRCDIR.python21?= ../../lang/python21
-
-.if defined(BUILDLINK_DEPMETHOD.python)
-BUILDLINK_DEPMETHOD.python21?= ${BUILDLINK_DEPMETHOD.python}
-.endif
-
-EVAL_PREFIX+= BUILDLINK_PREFIX.python21=python21
-BUILDLINK_PREFIX.python21_DEFAULT= ${LOCALBASE}
-BUILDLINK_FILES_CMD.python21= \
- ${BUILDLINK_PLIST_CMD.python21} | \
- ${EGREP} '^(include|lib.*/lib[^/]*$$)'
-BUILDLINK_TRANSFORM+= l:python:python2.1
-
-BUILDLINK_CPPFLAGS.python21+= \
- -I${BUILDLINK_PREFIX.python21}/include/python2.1
-BUILDLINK_LDFLAGS.python21+= \
- -L${BUILDLINK_PREFIX.python21}/lib/python2.1/config \
- -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.python21}/lib/python2.1/config
-FIX_RPATH+= BUILDLINK_LDFLAGS.python21
-
-BUILDLINK_TARGETS+= python21-buildlink
-
-python21-buildlink: _BUILDLINK_USE
-
-.endif # PYTHON21_BUILDLINK2_MK
diff --git a/lang/python22-pth/buildlink2.mk b/lang/python22-pth/buildlink2.mk
deleted file mode 100644
index 36e653f3c5b..00000000000
--- a/lang/python22-pth/buildlink2.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.4 2004/01/29 10:33:51 grant Exp $
-
-.if !defined(PYTHON22_BUILDLINK2_MK)
-PYTHON22_BUILDLINK2_MK= # defined
-
-.include "../../mk/bsd.prefs.mk"
-
-BUILDLINK_PACKAGES+= python22-pth
-BUILDLINK_PKGBASE.python22-pth?= python22-pth
-BUILDLINK_DEPENDS.python22-pth?= python22-pth>=2.2.2nb1
-BUILDLINK_PKGSRCDIR.python22-pth?= ../../lang/python22-pth
-
-.if defined(BUILDLINK_DEPMETHOD.python)
-BUILDLINK_DEPMETHOD.python22-pth?= ${BUILDLINK_DEPMETHOD.python}
-.endif
-
-EVAL_PREFIX+= BUILDLINK_PREFIX.python22-pth=python22-pth
-BUILDLINK_PREFIX.python22-pth_DEFAULT= ${LOCALBASE}
-BUILDLINK_FILES_CMD.python22-pth= \
- ${BUILDLINK_PLIST_CMD.python22-pth} | \
- ${EGREP} '^(include|lib.*/lib[^/]*$$)'
-BUILDLINK_TRANSFORM+= l:python:python2p2
-
-BUILDLINK_CPPFLAGS.python22-pth+= \
- -I${BUILDLINK_PREFIX.python22-pth}/include/python2p2
-BUILDLINK_LDFLAGS.python22-pth+= \
- -L${BUILDLINK_PREFIX.python22-pth}/lib/python2p2/config \
- -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.python22-pth}/lib/python2p2/config
-FIX_RPATH+= BUILDLINK_LDFLAGS.python22-pth
-
-BUILDLINK_TARGETS+= python22-pth-buildlink
-
-python22-pth-buildlink: _BUILDLINK_USE
-
-.endif # PYTHON22_BUILDLINK2_MK
diff --git a/lang/python22/buildlink2.mk b/lang/python22/buildlink2.mk
deleted file mode 100644
index a082188b516..00000000000
--- a/lang/python22/buildlink2.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.12 2004/01/29 10:33:51 grant Exp $
-
-.if !defined(PYTHON22_BUILDLINK2_MK)
-PYTHON22_BUILDLINK2_MK= # defined
-
-.include "../../mk/bsd.prefs.mk"
-
-BUILDLINK_PACKAGES+= python22
-BUILDLINK_PKGBASE.python22?= python22
-BUILDLINK_DEPENDS.python22?= python22>=2.2
-BUILDLINK_PKGSRCDIR.python22?= ../../lang/python22
-
-.if defined(BUILDLINK_DEPMETHOD.python)
-BUILDLINK_DEPMETHOD.python22?= ${BUILDLINK_DEPMETHOD.python}
-.endif
-
-EVAL_PREFIX+= BUILDLINK_PREFIX.python22=python22
-BUILDLINK_PREFIX.python22_DEFAULT= ${LOCALBASE}
-BUILDLINK_FILES_CMD.python22= \
- ${BUILDLINK_PLIST_CMD.python22} | \
- ${EGREP} '^(include|lib.*/lib[^/]*$$)'
-BUILDLINK_TRANSFORM+= l:python:python2.2
-
-BUILDLINK_CPPFLAGS.python22+= \
- -I${BUILDLINK_PREFIX.python22}/include/python2.2
-BUILDLINK_LDFLAGS.python22+= \
- -L${BUILDLINK_PREFIX.python22}/lib/python2.2/config \
- -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.python22}/lib/python2.2/config
-FIX_RPATH+= BUILDLINK_LDFLAGS.python22
-
-BUILDLINK_TARGETS+= python22-buildlink
-
-python22-buildlink: _BUILDLINK_USE
-
-.endif # PYTHON22_BUILDLINK2_MK
diff --git a/lang/python23-pth/buildlink2.mk b/lang/python23-pth/buildlink2.mk
deleted file mode 100644
index 1b30305e134..00000000000
--- a/lang/python23-pth/buildlink2.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.3 2004/03/26 02:27:42 wiz Exp $
-
-.if !defined(PYTHON23_BUILDLINK2_MK)
-PYTHON23_BUILDLINK2_MK= # defined
-
-.include "../../mk/bsd.prefs.mk"
-
-BUILDLINK_PACKAGES+= python23pth
-BUILDLINK_PKGBASE.python23pth?= python23-pth
-BUILDLINK_DEPENDS.python23pth?= python23-pth>=2.3
-BUILDLINK_RECOMMENDED.python23pth?= python23-pth>=2.3.3nb2
-BUILDLINK_PKGSRCDIR.python23pth?= ../../lang/python23-pth
-
-.if defined(BUILDLINK_DEPMETHOD.python)
-BUILDLINK_DEPMETHOD.python23pth?= ${BUILDLINK_DEPMETHOD.python}
-.endif
-
-EVAL_PREFIX+= BUILDLINK_PREFIX.python23pth=python23-pth
-BUILDLINK_PREFIX.python23pth_DEFAULT= ${LOCALBASE}
-BUILDLINK_FILES_CMD.python23pth= \
- ${BUILDLINK_PLIST_CMD.python23pth} | \
- ${EGREP} '^(include|lib.*/lib[^/]*$$)'
-BUILDLINK_TRANSFORM+= l:python:python2p3
-
-BUILDLINK_CPPFLAGS.python23pth+= \
- -I${BUILDLINK_PREFIX.python23pth}/include/python2p3
-BUILDLINK_LDFLAGS.python23pth+= \
- -L${BUILDLINK_PREFIX.python23pth}/lib/python2p3/config \
- -Wl,-R${BUILDLINK_PREFIX.python23pth}/lib/python2p3/config
-
-BUILDLINK_TARGETS+= python23pth-buildlink
-
-python23pth-buildlink: _BUILDLINK_USE
-
-.endif # PYTHON23_BUILDLINK2_MK
diff --git a/lang/python23/buildlink2.mk b/lang/python23/buildlink2.mk
deleted file mode 100644
index 40ef6fc19ca..00000000000
--- a/lang/python23/buildlink2.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.3 2004/03/26 02:27:42 wiz Exp $
-
-.if !defined(PYTHON23_BUILDLINK2_MK)
-PYTHON23_BUILDLINK2_MK= # defined
-
-.include "../../mk/bsd.prefs.mk"
-
-BUILDLINK_PACKAGES+= python23
-BUILDLINK_PKGBASE.python23?= python23
-BUILDLINK_DEPENDS.python23?= python23>=2.3
-BUILDLINK_RECOMMENDED.python23?= python23>=2.3.3nb2
-BUILDLINK_PKGSRCDIR.python23?= ../../lang/python23
-
-.if defined(BUILDLINK_DEPMETHOD.python)
-BUILDLINK_DEPMETHOD.python23?= ${BUILDLINK_DEPMETHOD.python}
-.endif
-
-EVAL_PREFIX+= BUILDLINK_PREFIX.python23=python23
-BUILDLINK_PREFIX.python23_DEFAULT= ${LOCALBASE}
-BUILDLINK_FILES_CMD.python23= \
- ${BUILDLINK_PLIST_CMD.python23} | \
- ${EGREP} '^(include|lib.*/lib[^/]*$$)'
-BUILDLINK_TRANSFORM+= l:python:python2.3
-
-BUILDLINK_CPPFLAGS.python23+= \
- -I${BUILDLINK_PREFIX.python23}/include/python2.3
-BUILDLINK_LDFLAGS.python23+= \
- -L${BUILDLINK_PREFIX.python23}/lib/python2.3/config \
- -Wl,-R${BUILDLINK_PREFIX.python23}/lib/python2.3/config
-
-BUILDLINK_TARGETS+= python23-buildlink
-
-python23-buildlink: _BUILDLINK_USE
-
-.endif # PYTHON23_BUILDLINK2_MK