pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang De-orbit support for python 2.0 and python 2.2 un...
details: https://anonhg.NetBSD.org/pkgsrc/rev/13da54e60b8a
branches: trunk
changeset: 541756:13da54e60b8a
user: tnn <tnn%pkgsrc.org@localhost>
date: Fri Apr 25 16:11:11 2008 +0000
description:
De-orbit support for python 2.0 and python 2.2 under the "three major
releases is enough" rule of thumb. (python 2.3 was released 5 years ago.)
Keep python 1.5 and 2.1 though, because there are a handful of packages
that still need them.
diffstat:
lang/python/pyversion.mk | 26 +-
lang/python/srcdist.mk | 24 +-
lang/python20/ALTERNATIVES | 1 -
lang/python20/DESCR | 14 -
lang/python20/Makefile | 81 -
lang/python20/PLIST.pre | 2 -
lang/python20/buildlink3.mk | 29 -
lang/python20/distinfo | 19 -
lang/python20/files/Setup.config.in | 18 -
lang/python20/files/Setup.in | 416 -------
lang/python20/patches/patch-aa | 38 -
lang/python20/patches/patch-ab | 24 -
lang/python20/patches/patch-ac | 23 -
lang/python20/patches/patch-ad | 24 -
lang/python20/patches/patch-ae | 15 -
lang/python20/patches/patch-af | 13 -
lang/python20/patches/patch-ag | 12 -
lang/python20/patches/patch-ah | 32 -
lang/python20/patches/patch-ai | 13 -
lang/python20/patches/patch-aj | 13 -
lang/python20/patches/patch-ak | 18 -
lang/python20/patches/patch-bb | 18 -
lang/python20/patches/patch-bc | 31 -
lang/python20/patches/patch-cd | 22 -
lang/python22/ALTERNATIVES | 1 -
lang/python22/DESCR | 14 -
lang/python22/Makefile | 74 -
lang/python22/PLIST.Darwin | 32 -
lang/python22/PLIST.DragonFly | 4 -
lang/python22/PLIST.IRIX | 69 -
lang/python22/PLIST.Interix | 2 -
lang/python22/PLIST.Linux | 13 -
lang/python22/PLIST.NetBSD | 4 -
lang/python22/PLIST.SunOS | 19 -
lang/python22/PLIST.common | 2042 -----------------------------------
lang/python22/PLIST.common_end | 25 -
lang/python22/buildlink3.mk | 31 -
lang/python22/distinfo | 22 -
lang/python22/patches/patch-aa | 172 --
lang/python22/patches/patch-ab | 10 -
lang/python22/patches/patch-ac | 12 -
lang/python22/patches/patch-ae | 23 -
lang/python22/patches/patch-af | 88 -
lang/python22/patches/patch-ag | 31 -
lang/python22/patches/patch-ah | 13 -
lang/python22/patches/patch-ai | 13 -
lang/python22/patches/patch-aj | 13 -
lang/python22/patches/patch-al | 70 -
lang/python22/patches/patch-an | 70 -
lang/python22/patches/patch-bb | 19 -
lang/python22/patches/patch-bc | 34 -
lang/python22/patches/patch-ea | 12 -
lang/python22/patches/patch-eb | 19 -
lang/python22/patches/patch-ec | 69 -
lang/python22/patches/patch-na | 15 -
55 files changed, 7 insertions(+), 3954 deletions(-)
diffs (truncated from 4247 to 300 lines):
diff -r 0c60998d89aa -r 13da54e60b8a lang/python/pyversion.mk
--- a/lang/python/pyversion.mk Fri Apr 25 16:10:27 2008 +0000
+++ b/lang/python/pyversion.mk Fri Apr 25 16:11:11 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: pyversion.mk,v 1.57 2008/04/24 02:02:04 tnn Exp $
+# $NetBSD: pyversion.mk,v 1.58 2008/04/25 16:11:11 tnn Exp $
# This file determines which Python version is used as a dependency for
# a package.
@@ -8,7 +8,7 @@
# PYTHON_VERSION_DEFAULT
# The preferred Python version to use.
#
-# Possible values: 15 20 21 22 23 24 25
+# Possible values: 15 21 23 24 25
# Default: 24
#
# === Package-settable variables ===
@@ -21,13 +21,13 @@
# PYTHON_VERSIONS_INCOMPATIBLE instead, since it will
# automatically include future versions.
#
-# Possible values: 25 24 23 22 21 20 15
+# Possible values: 25 24 23 21 15
# Default: (all)
#
# PYTHON_VERSIONS_INCOMPATIBLE
# The Python versions that are NOT acceptable for the package.
#
-# Possible values: 15 20 21 22 23 24 25
+# Possible values: 15 21 23 24 25
# Default: (depends on the platform)
#
# PYTHON_FOR_BUILD_ONLY
@@ -62,17 +62,15 @@
BUILD_DEFS_EFFECTS+= PYPACKAGE
PYTHON_VERSION_DEFAULT?= 24
-PYTHON_VERSIONS_ACCEPTED?= 25 24 23 22 21 20
+PYTHON_VERSIONS_ACCEPTED?= 25 24 23 21
PYTHON_VERSIONS_INCOMPATIBLE?= # empty by default
.if ${OPSYS} == "Darwin"
-PYTHON_VERSIONS_INCOMPATIBLE+= 22 21 20 15
+PYTHON_VERSIONS_INCOMPATIBLE+= 21 15
.endif
BUILDLINK_API_DEPENDS.python15?= python15>=1.5
-BUILDLINK_API_DEPENDS.python20?= python20>=2.0
BUILDLINK_API_DEPENDS.python21?= python21>=2.1
-BUILDLINK_API_DEPENDS.python22?= python22>=2.2
BUILDLINK_API_DEPENDS.python23?= python23>=2.3
BUILDLINK_API_DEPENDS.python24?= python24>=2.4
BUILDLINK_API_DEPENDS.python25?= python25>=2.5.1
@@ -135,24 +133,12 @@
PYPACKAGE= python23
PYVERSSUFFIX= 2.3
PYPKGPREFIX= py23
-.elif ${_PYTHON_VERSION} == "22"
-PYPKGSRCDIR= ../../lang/python22
-PYDEPENDENCY= ${BUILDLINK_API_DEPENDS.python22}:${PYPKGSRCDIR}
-PYPACKAGE= python22
-PYVERSSUFFIX= 2.2
-PYPKGPREFIX= py22
.elif ${_PYTHON_VERSION} == "21"
PYPKGSRCDIR= ../../lang/python21
PYPACKAGE= python21
PYDEPENDENCY= ${BUILDLINK_API_DEPENDS.python21}:${PYPKGSRCDIR}
PYVERSSUFFIX= 2.1
PYPKGPREFIX= py21
-.elif ${_PYTHON_VERSION} == "20"
-PYPKGSRCDIR= ../../lang/python20
-PYPACKAGE= python20
-PYDEPENDENCY= ${BUILDLINK_API_DEPENDS.python20}:${PYPKGSRCDIR}
-PYVERSSUFFIX= 2.0
-PYPKGPREFIX= py20
.elif ${_PYTHON_VERSION} == "15"
PYPKGSRCDIR= ../../lang/python15
PYPACKAGE= python15
diff -r 0c60998d89aa -r 13da54e60b8a lang/python/srcdist.mk
--- a/lang/python/srcdist.mk Fri Apr 25 16:10:27 2008 +0000
+++ b/lang/python/srcdist.mk Fri Apr 25 16:11:11 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: srcdist.mk,v 1.21 2008/04/24 01:39:25 tnn Exp $
+# $NetBSD: srcdist.mk,v 1.22 2008/04/25 16:11:11 tnn Exp $
.include "../../lang/python/pyversion.mk"
@@ -32,16 +32,6 @@
WRKSRC= ${WRKDIR}/${PYSUBDIR}
MASTER_SITES= ftp://ftp.python.org/pub/python/2.3.5/
-.elif ${_PYTHON_VERSION} == "22"
-
-DISTNAME= Python-2.2.3
-EXTRACT_SUFX= .tgz
-DISTINFO_FILE= ${.CURDIR}/../../lang/python22/distinfo
-PATCHDIR= ${.CURDIR}/../../lang/python22/patches
-PYSUBDIR= Python-2.2.3
-WRKSRC= ${WRKDIR}/${PYSUBDIR}
-MASTER_SITES= ftp://ftp.python.org/pub/python/2.2.3/
-
.elif ${_PYTHON_VERSION} == "21"
DISTNAME= Python-2.1.3
@@ -52,18 +42,6 @@
WRKSRC= ${WRKDIR}/${PYSUBDIR}
MASTER_SITES= ftp://ftp.python.org/pub/python/2.1.3/
-.elif ${_PYTHON_VERSION} == "20"
-
-DISTNAME= Python-2.0.1
-# for historical reasons
-DIST_SUBDIR= python
-EXTRACT_SUFX= .tgz
-DISTINFO_FILE= ${.CURDIR}/../../lang/python20/distinfo
-PATCHDIR= ${.CURDIR}/../../lang/python20/patches
-PYSUBDIR= Python-2.0.1
-WRKSRC= ${WRKDIR}/${PYSUBDIR}
-MASTER_SITES= ftp://ftp.python.org/pub/python/2.0.1/
-
.elif ${_PYTHON_VERSION} == "15"
DISTNAME= py152
diff -r 0c60998d89aa -r 13da54e60b8a lang/python20/ALTERNATIVES
--- a/lang/python20/ALTERNATIVES Fri Apr 25 16:10:27 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-bin/python @PREFIX@/bin/python2.0
diff -r 0c60998d89aa -r 13da54e60b8a lang/python20/DESCR
--- a/lang/python20/DESCR Fri Apr 25 16:10:27 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-Python is an interpreted, interactive, object-oriented
-programming language that combines remarkable power with
-very clear syntax. For an introduction to programming in
-Python you are referred to the Python Tutorial. The
-Python Library Reference documents built-in and standard
-types, constants, functions and modules. Finally, the
-Python Reference Manual describes the syntax and semantics
-of the core language in (perhaps too) much detail.
-
-Python's basic power can be extended with your own modules
-written in C or C++. On most systems such modules may be
-dynamically loaded. Python is also adaptable as an exten-
-sion language for existing applications. See the internal
-documentation for hints.
diff -r 0c60998d89aa -r 13da54e60b8a lang/python20/Makefile
--- a/lang/python20/Makefile Fri Apr 25 16:10:27 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-# $NetBSD: Makefile,v 1.35 2008/01/18 05:06:44 tnn Exp $
-#
-
-DISTNAME= Python-2.0.1
-PKGNAME= python20-2.0.1
-PKGREVISION= 14
-CATEGORIES= lang python
-MASTER_SITES= ftp://ftp.python.org/pub/python/2.0.1/
-EXTRACT_SUFX= .tgz
-
-MAINTAINER= tsarna%NetBSD.org@localhost
-HOMEPAGE= http://www.python.org/
-COMMENT= Interpreted, interactive, object-oriented programming language
-
-CONFLICTS+= python-[0-9]*
-CONFLICTS+= python-2.0.*
-
-PLIST_SRC= ${WRKDIR}/.PLIST_SRC
-
-WRKSRC= ${WRKDIR}/Python-2.0.1
-DIST_SUBDIR= python
-
-USE_LANGUAGES= c c++
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --without-threads
-INSTALL_TARGET= altinstall
-
-# Make sure having environment variable OPT doesn't affect the
-# installed module-building Makefile
-MAKE_ENV+= 'OPT=${CFLAGS}'
-CONFIGURE_ENV+= 'OPT=${CFLAGS}'
-
-SSLFLAGS= -DUSE_SSL -I${BUILDLINK_PREFIX.openssl}/include/openssl \
- -L${BUILDLINK_PREFIX.openssl}/lib \
- ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib -lssl -lcrypto
-FIX_RPATH+= SSLFLAGS
-
-# Handle the module setup file:
-# - disable a few broken modules on 64 bit platforms (nothing important)
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD"
-PRIVILEGED_STAGES+= clean
-.endif
-
-.if ${OPSYS} == "SunOS"
-ZOULARIS?= ${PREFIX}/bsd
-MODADD= -I${ZOULARIS}/include -L${ZOULARIS}/lib ${COMPILER_RPATH_FLAG}${ZOULARIS}/lib
-FIX_RPATH+= MODADD
-.endif
-
-REPLACE_INTERPRETER+= py
-REPLACE.py.old= .*python
-REPLACE.py.new= ${PREFIX}/bin/python2.0
-REPLACE_FILES.py= Lib/cgi.py
-
-post-install:
- ${CAT} ${PKGDIR}/PLIST.pre >${PLIST_SRC}
- (cd ${PREFIX}; ${FIND} lib/python2.0 -type f -print | \
- ${GREP} -v site-packages >>${PLIST_SRC})
- ${ECHO} lib/python2.0/site-packages/README >>${PLIST_SRC}
- (cd ${PREFIX}; ${FIND} include/python2.0 -type f -print \
- >>${PLIST_SRC})
- (cd ${PREFIX}; ${FIND} -d include/python2.0 -type d -print | \
- ${SED} -e "s/^/@dirrm /" >>${PLIST_SRC})
- (cd ${PREFIX}; ${FIND} -d lib/python2.0 -type d -print | \
- ${GREP} -v site-packages | \
- ${GREP} -vx lib/python2.0 | \
- ${SED} -e "s/^/@dirrm /" >>${PLIST_SRC})
- ${ECHO} "@dirrm lib/python2.0/site-packages" >>${PLIST_SRC}
- ${ECHO} "@dirrm lib/python2.0" >>${PLIST_SRC}
- # Reinstall Python binary to get it stripped
- ${RM} ${PREFIX}/bin/python2.0
- ${INSTALL_PROGRAM} ${WRKSRC}/python ${PREFIX}/bin/python2.0
-
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../mk/bdb.buildlink3.mk"
-.include "../../mk/dlopen.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff -r 0c60998d89aa -r 13da54e60b8a lang/python20/PLIST.pre
--- a/lang/python20/PLIST.pre Fri Apr 25 16:10:27 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.pre,v 1.1.1.1 2002/01/16 18:40:48 drochner Exp $
-bin/python2.0
diff -r 0c60998d89aa -r 13da54e60b8a lang/python20/buildlink3.mk
--- a/lang/python20/buildlink3.mk Fri Apr 25 16:10:27 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:55 jlam Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-PYTHON20_BUILDLINK3_MK:= ${PYTHON20_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= python20
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npython20}
-BUILDLINK_PACKAGES+= python20
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}python20
-
-.if !empty(PYTHON20_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.python20+= python20>=2.0
-BUILDLINK_ABI_DEPENDS.python20?= python20>=2.0.1nb7
-BUILDLINK_PKGSRCDIR.python20?= ../../lang/python20
-
-.if defined(BUILDLINK_DEPMETHOD.python)
-BUILDLINK_DEPMETHOD.python20?= ${BUILDLINK_DEPMETHOD.python}
-.endif
-
-BUILDLINK_INCDIRS.python20+= include/python2.0
-BUILDLINK_LIBDIRS.python20+= lib/python2.0/config
-BUILDLINK_TRANSFORM+= l:python:python2.0
-
-.endif # PYTHON20_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff -r 0c60998d89aa -r 13da54e60b8a lang/python20/distinfo
--- a/lang/python20/distinfo Fri Apr 25 16:10:27 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-$NetBSD: distinfo,v 1.13 2007/07/24 16:53:20 drochner Exp $
-
-SHA1 (python/Python-2.0.1.tgz) = 776584b245ad58ad548732d0c47397c582a4bbab
-RMD160 (python/Python-2.0.1.tgz) = fe663234ff4a8b363f10f6e5589acf1d8b00573f
-Size (python/Python-2.0.1.tgz) = 4097453 bytes
-SHA1 (patch-aa) = 2db263ea719733692536bb4a9990659099583351
-SHA1 (patch-ab) = 6a2bbaafdc21e7dcde84af7f4dbd9acdfde2aaf0
-SHA1 (patch-ac) = 74ff40fc338e8209d91e5da11fdbed497462dd83
-SHA1 (patch-ad) = f545b33bde36eac8737458506f3fdb25c0f39b5d
-SHA1 (patch-ae) = e962dad92260a1f506298ba3ebb059e852c4ccf4
-SHA1 (patch-af) = 9ed51b6868c3c7e24d92b52f0dc260e9c30d99bc
-SHA1 (patch-ag) = 4b1b561832d6a044c6be0372f9f915b09fab4c3c
-SHA1 (patch-ah) = c48beff9fe4d4f61e21c0952f4a7547cae28c0bb
-SHA1 (patch-ai) = 87b430f97ec258d423f7841bf369970223323a6b
-SHA1 (patch-aj) = 56e34352284a0b71fecb9b4abef8825ce4edf6d7
-SHA1 (patch-ak) = 0603b4731413bb098991f34df00c627f0b64e6df
-SHA1 (patch-bb) = adab8436d470acdc07149fdd6eed09c20ebf965e
-SHA1 (patch-bc) = fdd18d0fab171364d4733975351fbc60c81d0a4a
-SHA1 (patch-cd) = 60107e1857ff4177efebfbf33fcc2df2a50c61fc
diff -r 0c60998d89aa -r 13da54e60b8a lang/python20/files/Setup.config.in
--- a/lang/python20/files/Setup.config.in Fri Apr 25 16:10:27 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-# This file is transmogrified into Setup.config by config.status.
-
Home |
Main Index |
Thread Index |
Old Index