pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang Now that all Python modules have been bl3ified re...
details: https://anonhg.NetBSD.org/pkgsrc/rev/7d13dc0bf22e
branches: trunk
changeset: 475699:7d13dc0bf22e
user: recht <recht%pkgsrc.org@localhost>
date: Sun May 23 17:15:09 2004 +0000
description:
Now that all Python modules have been bl3ified remove the bl2 support.
diffstat:
lang/python/pyversion.mk | 35 ++++++-----------------------------
lang/python15/buildlink2.mk | 35 -----------------------------------
lang/python20/buildlink2.mk | 36 ------------------------------------
lang/python21-pth/buildlink2.mk | 35 -----------------------------------
lang/python21/buildlink2.mk | 35 -----------------------------------
lang/python22-pth/buildlink2.mk | 35 -----------------------------------
lang/python22/buildlink2.mk | 35 -----------------------------------
lang/python23-pth/buildlink2.mk | 35 -----------------------------------
lang/python23/buildlink2.mk | 35 -----------------------------------
9 files changed, 6 insertions(+), 310 deletions(-)
diffs (truncated from 386 to 300 lines):
diff -r f5875ac9d50a -r 7d13dc0bf22e lang/python/pyversion.mk
--- a/lang/python/pyversion.mk Sun May 23 16:59:05 2004 +0000
+++ b/lang/python/pyversion.mk Sun May 23 17:15:09 2004 +0000
@@ -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 @@
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 @@
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 @@
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 @@
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 -r f5875ac9d50a -r 7d13dc0bf22e lang/python15/buildlink2.mk
--- a/lang/python15/buildlink2.mk Sun May 23 16:59:05 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r f5875ac9d50a -r 7d13dc0bf22e lang/python20/buildlink2.mk
--- a/lang/python20/buildlink2.mk Sun May 23 16:59:05 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r f5875ac9d50a -r 7d13dc0bf22e lang/python21-pth/buildlink2.mk
--- a/lang/python21-pth/buildlink2.mk Sun May 23 16:59:05 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r f5875ac9d50a -r 7d13dc0bf22e lang/python21/buildlink2.mk
--- a/lang/python21/buildlink2.mk Sun May 23 16:59:05 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r f5875ac9d50a -r 7d13dc0bf22e lang/python22-pth/buildlink2.mk
--- a/lang/python22-pth/buildlink2.mk Sun May 23 16:59:05 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r f5875ac9d50a -r 7d13dc0bf22e lang/python22/buildlink2.mk
--- a/lang/python22/buildlink2.mk Sun May 23 16:59:05 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 \
Home |
Main Index |
Thread Index |
Old Index