pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc Remove Python 2.1 support.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/95a5a9e0af49
branches:  trunk
changeset: 554155:95a5a9e0af49
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Feb 09 21:09:20 2009 +0000

description:
Remove Python 2.1 support.

diffstat:

 chat/telepathy-gabble/Makefile      |     4 +-
 chat/telepathy-glib/Makefile        |     4 +-
 chat/telepathy-idle/Makefile        |     4 +-
 converters/py-cjkcodecs/Makefile    |     4 +-
 converters/py-jpCodecs/Makefile     |     3 +-
 databases/py-PgSQL/Makefile         |     3 +-
 databases/py-bsddb3/Makefile        |     5 +-
 databases/py-psycopg/Makefile       |     4 +-
 databases/py-sqlite/Makefile        |     3 +-
 devel/py-InlineEgg/Makefile         |     3 +-
 devel/py-idle/Makefile              |    26 +-
 devel/py-readline/Makefile          |     3 +-
 games/pysolfc/Makefile              |     4 +-
 graphics/py-imaging/Makefile        |     4 +-
 lang/Makefile                       |     4 +-
 lang/py21-html-docs/DESCR           |     1 -
 lang/py21-html-docs/Makefile        |    35 -
 lang/py21-html-docs/PLIST.pre       |     1 -
 lang/py21-html-docs/distinfo        |     5 -
 lang/python/pyversion.mk            |    13 +-
 lang/python/srcdist.mk              |    12 +-
 lang/python21/ALTERNATIVES          |     1 -
 lang/python21/DESCR                 |    14 -
 lang/python21/Makefile              |    93 -
 lang/python21/PLIST.DragonFly       |     7 -
 lang/python21/PLIST.FreeBSD         |     7 -
 lang/python21/PLIST.Linux           |     5 -
 lang/python21/PLIST.SunOS           |    11 -
 lang/python21/PLIST.common          |  1733 -----------------------------------
 lang/python21/PLIST.common_end      |    19 -
 lang/python21/buildlink3.mk         |    36 -
 lang/python21/distinfo              |    25 -
 lang/python21/patches/patch-aa      |    13 -
 lang/python21/patches/patch-ab      |    10 -
 lang/python21/patches/patch-ac      |   210 ----
 lang/python21/patches/patch-ad      |    23 -
 lang/python21/patches/patch-ae      |    14 -
 lang/python21/patches/patch-af      |    13 -
 lang/python21/patches/patch-ah      |    75 -
 lang/python21/patches/patch-ai      |    20 -
 lang/python21/patches/patch-aj      |    13 -
 lang/python21/patches/patch-ak      |    13 -
 lang/python21/patches/patch-bb      |    18 -
 lang/python21/patches/patch-bc      |    33 -
 lang/python21/patches/patch-bd      |    12 -
 lang/python21/patches/patch-be      |    19 -
 lang/python21/patches/patch-bf      |    73 -
 lang/python21/patches/patch-bg      |    67 -
 lang/python21/patches/patch-bh      |    31 -
 lang/python21/patches/patch-bi      |    12 -
 lang/python21/patches/patch-bj      |    16 -
 lang/python21/patches/patch-na      |    15 -
 multimedia/mkv2mp4/Makefile         |     4 +-
 net/py-mimelib/Makefile             |    11 +-
 net/py-spreadmodule/Makefile        |     4 +-
 pkgtools/pkglint/files/makevars.map |     4 +-
 security/mixminion/Makefile         |     4 +-
 security/py-gnupg/Makefile          |     3 +-
 security/py-m2crypto/Makefile       |     3 +-
 sysutils/rdiff-backup/Makefile      |     4 +-
 textproc/Makefile                   |     3 +-
 textproc/py-FourSuite/Makefile      |     3 +-
 textproc/py-HappyDoc/Makefile       |     3 +-
 textproc/py-csv/DESCR               |     2 -
 textproc/py-csv/Makefile            |    21 -
 textproc/py-csv/PLIST               |     2 -
 textproc/py-csv/distinfo            |     5 -
 textproc/py-elementtree/Makefile    |     3 +-
 textproc/py-html2text/Makefile      |     3 +-
 textproc/py-xml/Makefile            |     4 +-
 time/py-mxDateTime/Makefile         |     3 +-
 www/ap-python/Makefile              |     4 +-
 x11/gnome-terminal/Makefile         |     4 +-
 x11/py-Pmw/Makefile                 |     4 +-
 x11/py-Tk/Makefile                  |     4 +-
 75 files changed, 46 insertions(+), 2855 deletions(-)

diffs (truncated from 3582 to 300 lines):

diff -r 9ecd5c4b19cf -r 95a5a9e0af49 chat/telepathy-gabble/Makefile
--- a/chat/telepathy-gabble/Makefile    Mon Feb 09 21:07:15 2009 +0000
+++ b/chat/telepathy-gabble/Makefile    Mon Feb 09 21:09:20 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/02/07 22:57:49 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2009/02/09 21:09:20 joerg Exp $
 #
 
 DISTNAME=      telepathy-gabble-0.7.18
@@ -14,7 +14,7 @@
 USE_TOOLS+=    gmake pkg-config
 
 .include "../../lang/python/pyversion.mk"
-.if ${PYPKGPREFIX} == "py24" || ${PYPKGPREFIX} == "py23" || ${PYPKGPREFIX} == "py21"
+.if ${PYPKGPREFIX} == "py24" || ${PYPKGPREFIX} == "py23"
 BUILD_DEPENDS+=                ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 .endif
 
diff -r 9ecd5c4b19cf -r 95a5a9e0af49 chat/telepathy-glib/Makefile
--- a/chat/telepathy-glib/Makefile      Mon Feb 09 21:07:15 2009 +0000
+++ b/chat/telepathy-glib/Makefile      Mon Feb 09 21:09:20 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/01/18 16:18:50 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2009/02/09 21:09:20 joerg Exp $
 #
 
 DISTNAME=      telepathy-glib-0.7.22
@@ -16,7 +16,7 @@
 PKGCONFIG_OVERRIDE+=   telepathy-glib/telepathy-glib.pc.in
 
 .include "../../lang/python/pyversion.mk"
-.if ${PYPKGPREFIX} == "py24" || ${PYPKGPREFIX} == "py23" || ${PYPKGPREFIX} == "py21"
+.if ${PYPKGPREFIX} == "py24" || ${PYPKGPREFIX} == "py23"
 BUILD_DEPENDS+=                ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 .endif
 
diff -r 9ecd5c4b19cf -r 95a5a9e0af49 chat/telepathy-idle/Makefile
--- a/chat/telepathy-idle/Makefile      Mon Feb 09 21:07:15 2009 +0000
+++ b/chat/telepathy-idle/Makefile      Mon Feb 09 21:09:20 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/02/07 22:57:49 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2009/02/09 21:09:20 joerg Exp $
 #
 
 DISTNAME=      telepathy-idle-0.1.2
@@ -17,7 +17,7 @@
 CONFIGURE_ARGS+=       OPENSSL_LIBS="-L${BUILDLINK_PREFIX.openssl}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib -lssl"
 
 .include "../../lang/python/pyversion.mk"
-.if ${PYPKGPREFIX} == "py24" || ${PYPKGPREFIX} == "py23" || ${PYPKGPREFIX} == "py21"
+.if ${PYPKGPREFIX} == "py24" || ${PYPKGPREFIX} == "py23"
 BUILD_DEPENDS+=                ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 .endif
 
diff -r 9ecd5c4b19cf -r 95a5a9e0af49 converters/py-cjkcodecs/Makefile
--- a/converters/py-cjkcodecs/Makefile  Mon Feb 09 21:07:15 2009 +0000
+++ b/converters/py-cjkcodecs/Makefile  Mon Feb 09 21:09:20 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2008/11/23 23:37:18 snj Exp $
+# $NetBSD: Makefile,v 1.12 2009/02/09 21:09:20 joerg Exp $
 #
 
 DISTNAME=      cjkcodecs-1.1.1
@@ -15,7 +15,7 @@
 
 PYDISTUTILSPKG=        yes
 PYBINMODULE=   yes
-PYTHON_VERSIONS_ACCEPTED= 23 21 # included in python>=2.4
+PYTHON_VERSIONS_ACCEPTED= 23 # included in python>=2.4
 
 post-install:
        @strip ${PREFIX}/${PYSITELIB}/cjkcodecs/*.so
diff -r 9ecd5c4b19cf -r 95a5a9e0af49 converters/py-jpCodecs/Makefile
--- a/converters/py-jpCodecs/Makefile   Mon Feb 09 21:07:15 2009 +0000
+++ b/converters/py-jpCodecs/Makefile   Mon Feb 09 21:09:20 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2008/06/12 02:14:17 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2009/02/09 21:09:20 joerg Exp $
 
 DISTNAME=      JapaneseCodecs-1.4.11
 PKGNAME=       ${PYPKGPREFIX}-jpCodecs-1.4.11
@@ -15,7 +15,6 @@
 
 PYDISTUTILSPKG=        yes
 PYBINMODULE=   yes
-PYTHON_VERSIONS_ACCEPTED= 25 24 23 21
 
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 9ecd5c4b19cf -r 95a5a9e0af49 databases/py-PgSQL/Makefile
--- a/databases/py-PgSQL/Makefile       Mon Feb 09 21:07:15 2009 +0000
+++ b/databases/py-PgSQL/Makefile       Mon Feb 09 21:09:20 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2008/06/12 02:14:20 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2009/02/09 21:09:20 joerg Exp $
 #
 
 DISTNAME=      pyPgSQL-2.4
@@ -17,7 +17,6 @@
 PYDISTUTILSPKG=        YES
 PYBINMODULE=   YES
 PY_PATCHPLIST= YES
-PYTHON_VERSIONS_ACCEPTED=      25 24 23 21
 
 .include "../../lang/python/extension.mk"
 .include "../../lang/python/application.mk"
diff -r 9ecd5c4b19cf -r 95a5a9e0af49 databases/py-bsddb3/Makefile
--- a/databases/py-bsddb3/Makefile      Mon Feb 09 21:07:15 2009 +0000
+++ b/databases/py-bsddb3/Makefile      Mon Feb 09 21:09:20 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2009/01/07 21:15:49 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2009/02/09 21:09:20 joerg Exp $
 #
 
 DISTNAME=      bsddb3-4.7.3
@@ -22,9 +22,6 @@
 REPLACE_PYTHON+=       Lib3/bsddb/dbshelve.py
 
 .include "../../mk/pthread.buildlink3.mk"
-.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "native"
-PYTHON_VERSIONS_INCOMPATIBLE=  21
-.endif
 
 do-test:
        cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHONBIN} test.py
diff -r 9ecd5c4b19cf -r 95a5a9e0af49 databases/py-psycopg/Makefile
--- a/databases/py-psycopg/Makefile     Mon Feb 09 21:07:15 2009 +0000
+++ b/databases/py-psycopg/Makefile     Mon Feb 09 21:09:20 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2008/04/26 15:36:22 joerg Exp $
+# $NetBSD: Makefile,v 1.31 2009/02/09 21:09:20 joerg Exp $
 #
 
 DISTNAME=      psycopg-1.1.21
@@ -20,8 +20,6 @@
 
 PY_PATCHPLIST= yes
 
-PYTHON_VERSIONS_ACCEPTED=      25 24 23 21
-
 .include "../../lang/python/extension.mk"
 .include "../../time/py-mxDateTime/buildlink3.mk"
 .include "../../mk/pgsql.buildlink3.mk"
diff -r 9ecd5c4b19cf -r 95a5a9e0af49 databases/py-sqlite/Makefile
--- a/databases/py-sqlite/Makefile      Mon Feb 09 21:07:15 2009 +0000
+++ b/databases/py-sqlite/Makefile      Mon Feb 09 21:09:20 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2008/09/06 16:09:35 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2009/02/09 21:09:20 joerg Exp $
 
 DISTNAME=      pysqlite-1.0.1
 PKGNAME=       ${PYPKGPREFIX}-sqlite-1.0.1
@@ -16,7 +16,6 @@
 
 PYDISTUTILSPKG=        yes
 PY_PATCHPLIST= yes
-PYTHON_VERSIONS_ACCEPTED=      25 24 23 21
 WRKSRC=                ${WRKDIR}/pysqlite
 
 .include "../../databases/sqlite/buildlink3.mk"
diff -r 9ecd5c4b19cf -r 95a5a9e0af49 devel/py-InlineEgg/Makefile
--- a/devel/py-InlineEgg/Makefile       Mon Feb 09 21:07:15 2009 +0000
+++ b/devel/py-InlineEgg/Makefile       Mon Feb 09 21:09:20 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2008/06/12 02:14:28 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2009/02/09 21:09:20 joerg Exp $
 #
 
 DISTNAME=              InlineEgg-1.08
@@ -18,7 +18,6 @@
 PY_PATCHPLIST=         YES
 PYDISTUTILSPKG=                YES
 
-PYTHON_VERSIONS_ACCEPTED=      25 24 23 21
 PYTHON_PATCH_SCRIPTS=          examples/example1.py examples/example2.py \
                                examples/example3.py examples/example4.py \
                                examples/example5.py examples/example6.py \
diff -r 9ecd5c4b19cf -r 95a5a9e0af49 devel/py-idle/Makefile
--- a/devel/py-idle/Makefile    Mon Feb 09 21:07:15 2009 +0000
+++ b/devel/py-idle/Makefile    Mon Feb 09 21:09:20 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2008/04/25 18:28:33 joerg Exp $
+# $NetBSD: Makefile,v 1.28 2009/02/09 21:09:20 joerg Exp $
 #
 
 PKGNAME=       ${PYPKGPREFIX}-idle-0
@@ -27,29 +27,7 @@
 # We just install a wrapper script. Also, threads are required now.
 # NOTE: if you add a new version of Python here, add to the following test
 #
-PYTHON_VERSIONS_ACCEPTED=      25 24 23 21
 .include "../../lang/python/extension.mk"
-.if (${PYPKGPREFIX} != "py23") && (${PYPKGPREFIX} != "py24") && (${PYPKGPREFIX} != "py25")
-
-EXTRACT_ELEMENTS=      ${PYSUBDIR}/Tools/idle/*
-PYTHON_PATCH_SCRIPTS=  Tools/idle/idle.py
-INSTALLATION_DIRS=     bin ${PYSITELIB}
-
-do-build:
-       ${PYTHONBIN} ${LOCALBASE}/${PYLIB}/compileall.py ${WRKSRC}/Tools/idle
-
-do-install:
-       ${CP} -r ${WRKSRC}/Tools/idle ${DESTDIR}${PREFIX}/${PYSITELIB}
-       ${CHMOD} +x ${DESTDIR}${PREFIX}/${PYSITELIB}/idle/idle.py
-       ${LN} -sf ${PREFIX}/${PYSITELIB}/idle/idle.py \
-               ${DESTDIR}${PREFIX}/bin/idle${PYVERSSUFFIX}
-       ${CAT} ${PKGDIR}/PLIST.pre >${PLIST_SRC}
-       (cd ${DESTDIR}${PREFIX}; ${FIND} ${PYSITELIB}/idle -type f -print \
-               >>${PLIST_SRC})
-       (cd ${DESTDIR}${PREFIX}; ${FIND} -d ${PYSITELIB}/idle -type d -print | \
-               ${SED} -e "s/^/@dirrm /" >>${PLIST_SRC})
-
-.else # py23 and up
 
 EXTRACT_ELEMENTS=      ${PYSUBDIR}/Tools/scripts/idle
 PYTHON_PATCH_SCRIPTS= Tools/scripts/idle
@@ -61,8 +39,6 @@
                ${DESTDIR}${PREFIX}/bin/idle${PYVERSSUFFIX}
        ${CAT} ${PKGDIR}/PLIST.pre >${PLIST_SRC}
 
-.endif # py23 and up
-
 .include "../../lang/python/srcdist.mk"
 .include "../../lang/python/application.mk"
 .include "../../x11/py-Tk/buildlink3.mk"
diff -r 9ecd5c4b19cf -r 95a5a9e0af49 devel/py-readline/Makefile
--- a/devel/py-readline/Makefile        Mon Feb 09 21:07:15 2009 +0000
+++ b/devel/py-readline/Makefile        Mon Feb 09 21:09:20 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2008/07/14 14:43:45 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2009/02/09 21:09:20 joerg Exp $
 #
 
 PKGNAME=       ${PYPKGPREFIX}-readline-0
@@ -28,7 +28,6 @@
        ${PATCH} --batch <$$f || true; \
        done)
 
-BUILDLINK_API_DEPENDS.python21+=       python21>=2.1.3nb16
 BUILDLINK_API_DEPENDS.python23+=       python23>=2.3.5nb11
 BUILDLINK_API_DEPENDS.python24+=       python24>=2.4.5nb1
 BUILDLINK_API_DEPENDS.python25+=       python25>=2.5.2nb2
diff -r 9ecd5c4b19cf -r 95a5a9e0af49 games/pysolfc/Makefile
--- a/games/pysolfc/Makefile    Mon Feb 09 21:07:15 2009 +0000
+++ b/games/pysolfc/Makefile    Mon Feb 09 21:09:20 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/11/29 21:17:20 snj Exp $
+# $NetBSD: Makefile,v 1.3 2009/02/09 21:09:20 joerg Exp $
 
 DISTNAME=      PySolFC-1.1
 PKGNAME=       ${DISTNAME:tl}
@@ -12,8 +12,6 @@
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
-PYTHON_VERSIONS_INCOMPATIBLE=  21
-
 PYDISTUTILSPKG=        yes
 
 SUBST_CLASSES+=                        fix-paths
diff -r 9ecd5c4b19cf -r 95a5a9e0af49 graphics/py-imaging/Makefile
--- a/graphics/py-imaging/Makefile      Mon Feb 09 21:07:15 2009 +0000
+++ b/graphics/py-imaging/Makefile      Mon Feb 09 21:09:20 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2008/04/25 19:46:49 joerg Exp $
+# $NetBSD: Makefile,v 1.32 2009/02/09 21:09:20 joerg Exp $
 
 DISTNAME=      Imaging-1.1.6
 PKGNAME=       ${PYPKGPREFIX}-imaging-1.1.6
@@ -11,8 +11,6 @@
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
-PYTHON_VERSIONS_ACCEPTED=      25 24 23 21
-
 DIST_SUBDIR=   python
 PYDISTUTILSPKG= yes
 PY_PATCHPLIST= yes
diff -r 9ecd5c4b19cf -r 95a5a9e0af49 lang/Makefile
--- a/lang/Makefile     Mon Feb 09 21:07:15 2009 +0000
+++ b/lang/Makefile     Mon Feb 09 21:09:20 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.265 2009/01/19 22:38:08 kefren Exp $
+# $NetBSD: Makefile,v 1.266 2009/02/09 21:09:21 joerg Exp $
 #
 
 COMMENT=       Programming languages
@@ -123,13 +123,11 @@
 SUBDIR+=       py-html-docs
 SUBDIR+=       py-psyco
 SUBDIR+=       py-pyrex
-SUBDIR+=       py21-html-docs
 SUBDIR+=       py22-html-docs
 SUBDIR+=       py23-html-docs
 SUBDIR+=       py24-html-docs
 SUBDIR+=       py25-html-docs
 #SUBDIR+=      python          # only contains Makefile fragments
-SUBDIR+=       python21
 SUBDIR+=       python23
 SUBDIR+=       python24



Home | Main Index | Thread Index | Old Index