pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc Build Python with thread support by default and turn t...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/5b823f2fb386
branches:  trunk
changeset: 488018:5b823f2fb386
user:      recht <recht%pkgsrc.org@localhost>
date:      Sun Jan 23 20:41:45 2005 +0000

description:
Build Python with thread support by default and turn the existing
python*-pth packages into meta-packages which will install the non-pth
packages. Bump PKGREVISIONs on the non-pth versions to propagate the
thread change, but leave the *-pth versions untouched to not affect
existing installations.
Sync all PYTHON_VERSIONS_AFFECTED lines in package Makefiles.

diffstat:

 audio/moss/Makefile                |    4 +-
 cad/py-MyHDL/Makefile              |    4 +-
 databases/py-ZODB/Makefile         |    4 +-
 databases/py-bsddb3/Makefile       |    4 +-
 databases/py-ldap/Makefile         |    8 +-
 databases/py-psycopg/Makefile      |    6 +-
 databases/py-sybase/Makefile       |    4 +-
 devel/ExmanIDE/Makefile            |    4 +-
 devel/boaconstructor/Makefile      |    4 +-
 devel/codeville/Makefile           |    6 +-
 devel/eric3/Makefile               |    4 +-
 devel/py-InlineEgg/Makefile        |    4 +-
 devel/py-TPG/Makefile              |    4 +-
 devel/py-cursespanel/Makefile      |    4 +-
 devel/py-idle/Makefile             |   10 +-
 devel/roundup/Makefile             |    4 +-
 fonts/mftrace/Makefile             |    4 +-
 graphics/mayavi/Makefile           |    6 +-
 graphics/vtk-python/Makefile       |    4 +-
 lang/py-funge/Makefile             |    4 +-
 lang/py-psyco/Makefile             |    4 +-
 lang/py-pyrex/Makefile             |    4 +-
 lang/python/pyversion.mk           |   81 +-------
 lang/python/srcdist.mk             |   10 +-
 lang/python21-pth/Makefile         |   27 ++-
 lang/python21-pth/PLIST            |    2 +
 lang/python21-pth/buildlink3.mk    |   27 --
 lang/python21-pth/distinfo         |   17 -
 lang/python21-pth/patches/patch-aa |   17 -
 lang/python21-pth/patches/patch-ab |   10 -
 lang/python21-pth/patches/patch-ac |  108 -----------
 lang/python21-pth/patches/patch-ad |   23 --
 lang/python21-pth/patches/patch-ae |   13 -
 lang/python21-pth/patches/patch-af |   31 ---
 lang/python21-pth/patches/patch-ag |   13 -
 lang/python21-pth/patches/patch-ah |   75 -------
 lang/python21-pth/patches/patch-ai |   20 --
 lang/python21-pth/patches/patch-aj |   13 -
 lang/python21-pth/patches/patch-ba |   32 ---
 lang/python21-pth/patches/patch-bb |   18 -
 lang/python21-pth/patches/patch-bc |   33 ---
 lang/python21/Makefile             |   66 ++++++-
 lang/python21/Makefile.common      |   59 ------
 lang/python22-pth/Makefile         |   27 ++-
 lang/python22-pth/PLIST            |    2 +
 lang/python22-pth/buildlink3.mk    |   27 --
 lang/python22-pth/distinfo         |   15 -
 lang/python22-pth/patches/patch-aa |  172 ------------------
 lang/python22-pth/patches/patch-ab |   10 -
 lang/python22-pth/patches/patch-ae |   23 --
 lang/python22-pth/patches/patch-af |   88 ---------
 lang/python22-pth/patches/patch-ag |   13 -
 lang/python22-pth/patches/patch-ah |   12 -
 lang/python22-pth/patches/patch-ai |   31 ---
 lang/python22-pth/patches/patch-aj |   12 -
 lang/python22-pth/patches/patch-ba |   32 ---
 lang/python22-pth/patches/patch-bb |   18 -
 lang/python22-pth/patches/patch-bc |   33 ---
 lang/python22/Makefile             |   58 +++++-
 lang/python22/Makefile.common      |   51 -----
 lang/python23-pth/Makefile         |   28 ++-
 lang/python23-pth/PLIST            |    2 +
 lang/python23-pth/buildlink3.mk    |   28 --
 lang/python23-pth/distinfo         |   19 --
 lang/python23-pth/patches/patch-aa |   13 -
 lang/python23-pth/patches/patch-ab |   26 --
 lang/python23-pth/patches/patch-ad |   23 --
 lang/python23-pth/patches/patch-ae |   13 -
 lang/python23-pth/patches/patch-af |   19 --
 lang/python23-pth/patches/patch-ah |   55 -----
 lang/python23-pth/patches/patch-al |   91 ---------
 lang/python23-pth/patches/patch-am |  350 -------------------------------------
 lang/python23-pth/patches/patch-ba |   86 ---------
 lang/python23-pth/patches/patch-bb |   34 ---
 lang/python23-pth/patches/patch-ca |   54 -----
 lang/python23-pth/patches/patch-cb |   24 --
 lang/python23-pth/patches/patch-da |   17 -
 lang/python23-pth/patches/patch-db |   35 ---
 lang/python23-pth/patches/patch-dc |   20 --
 lang/python23/Makefile             |    3 +-
 lang/python23/Makefile.common      |    3 +-
 lang/python24-pth/Makefile         |   27 ++-
 lang/python24-pth/PLIST            |    2 +
 lang/python24-pth/buildlink3.mk    |   27 --
 lang/python24-pth/distinfo         |   18 -
 lang/python24-pth/patches/patch-aa |   26 --
 lang/python24-pth/patches/patch-ab |   22 --
 lang/python24-pth/patches/patch-ac |   13 -
 lang/python24-pth/patches/patch-ad |   31 ---
 lang/python24-pth/patches/patch-ae |   18 -
 lang/python24-pth/patches/patch-af |   46 ----
 lang/python24-pth/patches/patch-ag |   17 -
 lang/python24-pth/patches/patch-ah |   86 ---------
 lang/python24-pth/patches/patch-ai |   15 -
 lang/python24-pth/patches/patch-aj |   15 -
 lang/python24-pth/patches/patch-ak |   22 --
 lang/python24-pth/patches/patch-al |   95 ----------
 lang/python24-pth/patches/patch-am |  268 ----------------------------
 lang/python24-pth/patches/patch-ba |   11 -
 lang/python24/Makefile             |  118 ++++++++++++-
 lang/python24/Makefile.common      |  110 -----------
 lang/python24/PLIST.Darwin         |    1 +
 lang/python24/PLIST.common_end     |    1 +
 mail/getmail/Makefile              |    4 +-
 mail/mailman/Makefile              |    4 +-
 mail/offlineimap/Makefile          |    4 +-
 mail/tmda/Makefile                 |    4 +-
 math/py-numarray/Makefile          |    4 +-
 math/py-pytables/Makefile          |    4 +-
 misc/koffice/Makefile              |    4 +-
 multimedia/gstreamer/Makefile      |    4 +-
 net/bittornado/Makefile.common     |    4 +-
 net/bittorrent/Makefile.common     |    4 +-
 net/nicotine/Makefile              |    4 +-
 net/py-ORBit/Makefile              |    6 +-
 net/py-google/Makefile             |    4 +-
 net/py-kenosis/Makefile            |    4 +-
 net/py-mimelib/Makefile            |    6 +-
 net/py-soappy/Makefile             |    4 +-
 net/py-spreadmodule/Makefile       |    4 +-
 net/py-twisted/Makefile            |    4 +-
 net/pygopherd/Makefile             |    4 +-
 security/mixminion/Makefile        |    4 +-
 security/py-gnutls/Makefile        |    4 +-
 security/py-m2crypto/Makefile      |    4 +-
 sysutils/duplicity/Makefile        |    4 +-
 sysutils/rdiff-backup/Makefile     |    4 +-
 sysutils/xentools12/Makefile       |    4 +-
 textproc/doclifter/Makefile        |    4 +-
 textproc/py-Lupy/Makefile          |    4 +-
 textproc/py-Reverend/Makefile      |    4 +-
 textproc/py-SimpleParse/Makefile   |    4 +-
 textproc/py-csv/Makefile           |    4 +-
 textproc/py-docutils/Makefile      |    4 +-
 textproc/py-feedparser/Makefile    |    4 +-
 textproc/rubber/Makefile           |    4 +-
 time/gdeskcal/Makefile             |    4 +-
 www/ap2-python/Makefile            |    4 +-
 www/py-clearsilver/Makefile        |    4 +-
 www/py-curl/Makefile               |    4 +-
 www/zope25/Makefile                |    4 +-
 www/zopeedit/Makefile              |    4 +-
 x11/py-Tk/Makefile                 |    4 +-
 x11/py-gnome2/Makefile             |    4 +-
 x11/py-gtk2/Makefile               |    4 +-
 x11/py-qt3-base/Makefile           |    4 +-
 x11/py-qt3-modules/Makefile        |    4 +-
 x11/py-qt3-qscintilla/Makefile     |    4 +-
 x11/py-qt3-sip/Makefile            |    4 +-
 x11/py-wxWidgets/Makefile          |    8 +-
 150 files changed, 482 insertions(+), 3069 deletions(-)

diffs (truncated from 5023 to 300 lines):

diff -r 3619dcf1adf7 -r 5b823f2fb386 audio/moss/Makefile
--- a/audio/moss/Makefile       Sun Jan 23 20:36:47 2005 +0000
+++ b/audio/moss/Makefile       Sun Jan 23 20:41:45 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/12/28 02:47:41 reed Exp $
+# $NetBSD: Makefile,v 1.8 2005/01/23 20:41:45 recht Exp $
 
 DISTNAME=      moss-0.1.13
 PKGREVISION=   1
@@ -15,7 +15,7 @@
 USE_BUILDLINK3=        yes
 USE_PKGINSTALL= yes
 
-PYTHON_VERSIONS_ACCEPTED=      23pth 22pth 21pth
+PYTHON_VERSIONS_ACCEPTED=      23 22 21
 PYTHON_PATCH_SCRIPTS=  ${WRKSRC}/*.py
 
 RCD_SCRIPTS=   moss
diff -r 3619dcf1adf7 -r 5b823f2fb386 cad/py-MyHDL/Makefile
--- a/cad/py-MyHDL/Makefile     Sun Jan 23 20:36:47 2005 +0000
+++ b/cad/py-MyHDL/Makefile     Sun Jan 23 20:41:45 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/01/05 15:20:10 drochner Exp $
+# $NetBSD: Makefile,v 1.8 2005/01/23 20:41:45 recht Exp $
 #
 
 DISTNAME=      myhdl-0.4.1
@@ -12,7 +12,7 @@
 
 USE_BUILDLINK3=        YES
 PYDISTUTILSPKG=        yes
-PYTHON_VERSIONS_ACCEPTED=      23 23pth 24 24pth
+PYTHON_VERSIONS_ACCEPTED=      23 24
 
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 3619dcf1adf7 -r 5b823f2fb386 databases/py-ZODB/Makefile
--- a/databases/py-ZODB/Makefile        Sun Jan 23 20:36:47 2005 +0000
+++ b/databases/py-ZODB/Makefile        Sun Jan 23 20:41:45 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/07/22 09:16:00 recht Exp $
+# $NetBSD: Makefile,v 1.9 2005/01/23 20:41:45 recht Exp $
 #
 
 DISTNAME=              ZODB3-3.2.1
@@ -15,7 +15,7 @@
 PY_PATCHPLIST=         yes
 PYDISTUTILSPKG=                yes
 
-PYTHON_VERSIONS_ACCEPTED=      23pth 23 22pth 22
+PYTHON_VERSIONS_ACCEPTED=      23 22
 
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 3619dcf1adf7 -r 5b823f2fb386 databases/py-bsddb3/Makefile
--- a/databases/py-bsddb3/Makefile      Sun Jan 23 20:36:47 2005 +0000
+++ b/databases/py-bsddb3/Makefile      Sun Jan 23 20:41:45 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/01/16 19:52:29 markd Exp $
+# $NetBSD: Makefile,v 1.13 2005/01/23 20:41:45 recht Exp $
 #
 
 DISTNAME=      bsddb3-4.3.0
@@ -21,7 +21,7 @@
 
 .include "../../mk/pthread.buildlink3.mk"
 .if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "native"
-PYTHON_VERSIONS_ACCEPTED=      24pth 23pth 22pth
+PYTHON_VERSIONS_ACCEPTED=      24 23 22
 .endif
 
 do-test:
diff -r 3619dcf1adf7 -r 5b823f2fb386 databases/py-ldap/Makefile
--- a/databases/py-ldap/Makefile        Sun Jan 23 20:36:47 2005 +0000
+++ b/databases/py-ldap/Makefile        Sun Jan 23 20:41:45 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/12/03 13:55:48 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2005/01/23 20:41:45 recht Exp $
 
 DISTNAME=      python-ldap-2.0.2
 PKGNAME=       ${DISTNAME:S/python/${PYPKGPREFIX}/}
@@ -10,7 +10,7 @@
 HOMEPAGE=      http://sourceforge.net/projects/python-ldap/
 COMMENT=       LDAP client API for Python
 
-PYTHON_VERSIONS_ACCEPTED=      21pth 22pth 23pth
+PYTHON_VERSIONS_ACCEPTED=      21 22 23
 PYDISTUTILSPKG=                        yes
 USE_BUILDLINK3=                        yes
 
@@ -24,8 +24,8 @@
 .include "../../security/cyrus-sasl2/buildlink3.mk"
 .include "../../lang/python/extension.mk"
 
-.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "pth"
-SUBST_SED.setup+=              -e "s|crypto|& pthread|"
+.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == ""
+SUBST_SED.setup+=              -e "s|crypto|& read|"
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff -r 3619dcf1adf7 -r 5b823f2fb386 databases/py-psycopg/Makefile
--- a/databases/py-psycopg/Makefile     Sun Jan 23 20:36:47 2005 +0000
+++ b/databases/py-psycopg/Makefile     Sun Jan 23 20:41:45 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/12/03 15:14:53 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2005/01/23 20:41:45 recht Exp $
 #
 
 DISTNAME=      psycopg-1.1.14
@@ -18,11 +18,11 @@
 BUILD_TARGET=  default
 USE_BUILDLINK3=        yes
 
-PYTHON_VERSIONS_ACCEPTED= 23pth 22pth 21pth
+PYTHON_VERSIONS_ACCEPTED= 23 22 21
 PY_PATCHPLIST= yes
 
 .include "../../lang/python/extension.mk"
 .include "../../time/py-mxDateTime/buildlink3.mk"
 .include "../../mk/pgsql.buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/read.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 3619dcf1adf7 -r 5b823f2fb386 databases/py-sybase/Makefile
--- a/databases/py-sybase/Makefile      Sun Jan 23 20:36:47 2005 +0000
+++ b/databases/py-sybase/Makefile      Sun Jan 23 20:41:45 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/10/05 19:49:28 tsarna Exp $
+# $NetBSD: Makefile,v 1.8 2005/01/23 20:41:45 recht Exp $
 #
 
 DISTNAME=      sybase-0.36
@@ -11,7 +11,7 @@
 HOMEPAGE=      http://www.object-craft.com.au/projects/sybase/
 COMMENT=       Sybase interface for Python using FreeTDS
 
-PYTHON_VERSIONS_ACCEPTED=      21pth 22pth 23pth
+PYTHON_VERSIONS_ACCEPTED=      21 22 23
 
 BUILDLINK_DEPENDS.freetds=     freetds-0.61*
 PYSETUPBUILDARGS=      build_ext -D HAVE_FREETDS=61 -U WANT_BULKCOPY
diff -r 3619dcf1adf7 -r 5b823f2fb386 devel/ExmanIDE/Makefile
--- a/devel/ExmanIDE/Makefile   Sun Jan 23 20:36:47 2005 +0000
+++ b/devel/ExmanIDE/Makefile   Sun Jan 23 20:41:45 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/12/25 20:03:52 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2005/01/23 20:41:45 recht Exp $
 
 DISTNAME=      ExmanIDE-0.9.4
 PKGREVISION=   1
@@ -16,7 +16,7 @@
 NO_CONFIGURE=  yes
 NO_BUILD=      yes
 
-PYTHON_VERSIONS_ACCEPTED?=     23 23pth 22 22pth
+PYTHON_VERSIONS_ACCEPTED?=     23 22
 
 SUBST_CLASSES+=                mod
 SUBST_MESSAGE.mod=     "Fixing deprecated module names."
diff -r 3619dcf1adf7 -r 5b823f2fb386 devel/boaconstructor/Makefile
--- a/devel/boaconstructor/Makefile     Sun Jan 23 20:36:47 2005 +0000
+++ b/devel/boaconstructor/Makefile     Sun Jan 23 20:41:45 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/12/25 20:03:52 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2005/01/23 20:41:45 recht Exp $
 #
 
 DISTNAME=              boa-constructor-0.2.3.src
@@ -15,7 +15,7 @@
 WRKSRC=                ${WRKDIR}/boa-constructor-0.2.3
 EXTRACT_CMD_OPTS.zip=  -aqo
 USE_BUILDLINK3=                yes
-PYTHON_VERSIONS_ACCEPTED=      23pth
+PYTHON_VERSIONS_ACCEPTED=      23
 
 BOADIR=        ${PREFIX}/share/boa-constructor-0.2.3
 SEDSUBST=      -e "s|@PYTHONBIN@|${PYTHONBIN}|"
diff -r 3619dcf1adf7 -r 5b823f2fb386 devel/codeville/Makefile
--- a/devel/codeville/Makefile  Sun Jan 23 20:36:47 2005 +0000
+++ b/devel/codeville/Makefile  Sun Jan 23 20:41:45 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/10/03 00:13:25 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/01/23 20:41:45 recht Exp $
 #
 
 DISTNAME=              Codeville-0.1.8
@@ -14,8 +14,8 @@
 USE_BUILDLINK3=                yes
 PYDISTUTILSPKG=                yes
 
-# XXX we don't need threads, but db3 is linked against libpthread
-PYTHON_VERSIONS_ACCEPTED= 23pth
+# XXX we don't need threads, but db3 is linked against libread
+PYTHON_VERSIONS_ACCEPTED= 23
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
diff -r 3619dcf1adf7 -r 5b823f2fb386 devel/eric3/Makefile
--- a/devel/eric3/Makefile      Sun Jan 23 20:36:47 2005 +0000
+++ b/devel/eric3/Makefile      Sun Jan 23 20:41:45 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/01/05 20:50:07 darcy Exp $
+# $NetBSD: Makefile,v 1.6 2005/01/23 20:41:45 recht Exp $
 #
 
 DISTNAME=      eric-3.4.2
@@ -17,7 +17,7 @@
 USE_LANGUAGES=
 
 PY_PATCHPLIST=         yes
-PYTHON_VERSIONS_ACCEPTED=      24pth 23pth 22pth
+PYTHON_VERSIONS_ACCEPTED=      24 23 22
 
 CONFIGURE_ARGS=        -b ${PREFIX}/bin -d ${PREFIX}/${PYSITELIB}
 
diff -r 3619dcf1adf7 -r 5b823f2fb386 devel/py-InlineEgg/Makefile
--- a/devel/py-InlineEgg/Makefile       Sun Jan 23 20:36:47 2005 +0000
+++ b/devel/py-InlineEgg/Makefile       Sun Jan 23 20:41:45 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/12/28 23:04:15 adrianp Exp $
+# $NetBSD: Makefile,v 1.3 2005/01/23 20:41:45 recht Exp $
 #
 
 DISTNAME=              InlineEgg-1.08
@@ -16,7 +16,7 @@
 PY_PATCHPLIST=         YES
 PYDISTUTILSPKG=                YES
 
-PYTHON_VERSIONS_ACCEPTED=      24 23 22 21 24pth 23pth 22pth 21pth
+PYTHON_VERSIONS_ACCEPTED=      24 23 22 21
 PYTHON_PATCH_SCRIPTS=          examples/example1.py examples/example2.py \
                                examples/example3.py examples/example4.py \
                                examples/example5.py examples/example6.py \
diff -r 3619dcf1adf7 -r 5b823f2fb386 devel/py-TPG/Makefile
--- a/devel/py-TPG/Makefile     Sun Jan 23 20:36:47 2005 +0000
+++ b/devel/py-TPG/Makefile     Sun Jan 23 20:41:45 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/07/22 09:16:01 recht Exp $
+# $NetBSD: Makefile,v 1.5 2005/01/23 20:41:45 recht Exp $
 #
 
 DISTNAME=              TPG-2.1.6
@@ -9,7 +9,7 @@
 HOMEPAGE=              http://christophe.delord.free.fr/soft/tpg/
 COMMENT=               ToyParserGenerator for Python
 
-PYTHON_VERSIONS_ACCEPTED=      23 23pth 22 22pth
+PYTHON_VERSIONS_ACCEPTED=      23 22
 PYDISTUTILSPKG=        yes
 USE_BUILDLINK3=        yes
 
diff -r 3619dcf1adf7 -r 5b823f2fb386 devel/py-cursespanel/Makefile
--- a/devel/py-cursespanel/Makefile     Sun Jan 23 20:36:47 2005 +0000
+++ b/devel/py-cursespanel/Makefile     Sun Jan 23 20:41:45 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/10/03 00:13:32 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/01/23 20:41:45 recht Exp $
 #
 
 PKGNAME=       ${PYPKGPREFIX}-cursespanel-0
@@ -18,7 +18,7 @@
 PYDISTUTILSPKG=        yes
 PYBINMODULE=   yes
 PY_PATCHPLIST= yes
-PYTHON_VERSIONS_ACCEPTED= 23 23pth 22 22pth 21 21pth
+PYTHON_VERSIONS_ACCEPTED= 24 23 22 21
 
 PY_SETUP_SUBST=        NCURSESPREFIX=${BUILDLINK_PREFIX.ncurses}
 
diff -r 3619dcf1adf7 -r 5b823f2fb386 devel/py-idle/Makefile
--- a/devel/py-idle/Makefile    Sun Jan 23 20:36:47 2005 +0000
+++ b/devel/py-idle/Makefile    Sun Jan 23 20:41:45 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/01/13 21:51:42 darcy Exp $
+# $NetBSD: Makefile,v 1.18 2005/01/23 20:41:46 recht Exp $
 #
 
 PKGNAME=       ${PYPKGPREFIX}-idle-0
@@ -28,9 +28,9 @@
 # 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=      24pth 23pth 22pth 22 21pth 21 20pth 20
+PYTHON_VERSIONS_ACCEPTED=      24 23 22 21 20
 .include "../../lang/python/extension.mk"
-.if (${PYPKGPREFIX} != "py23pth") && (${PYPKGPREFIX} != "py24pth")
+.if (${PYPKGPREFIX} != "py23") && (${PYPKGPREFIX} != "py24")
 
 EXTRACT_ELEMENTS=      ${PYSUBDIR}/Tools/idle/*
 PYTHON_PATCH_SCRIPTS=  Tools/idle/idle.py
@@ -49,7 +49,7 @@
        (cd ${PREFIX}; ${FIND} -d ${PYSITELIB}/idle -type d -print | \
                ${SED} -e "s/^/@dirrm /" >>${PLIST_SRC})
 
-.else # py23pth and up
+.else # py23 and up
 
 EXTRACT_ELEMENTS=      ${PYSUBDIR}/Tools/scripts/idle
 PYTHON_PATCH_SCRIPTS= Tools/scripts/idle



Home | Main Index | Thread Index | Old Index