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.

9 files changed, 22 insertions, 22 deletions

diff --git a/devel/ExmanIDE/Makefile b/devel/ExmanIDE/Makefile
index 85594b94284..e7de8679cc5 100644
--- a/devel/ExmanIDE/Makefile
+++ b/devel/ExmanIDE/Makefile
@@ -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 @@ USE_BUILDLINK3=	yes
 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 --git a/devel/boaconstructor/Makefile b/devel/boaconstructor/Makefile
index de0fdaad139..a1cd5601c61 100644
--- a/devel/boaconstructor/Makefile
+++ b/devel/boaconstructor/Makefile
@@ -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 @@ COMMENT=		Python IDE
 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 --git a/devel/codeville/Makefile b/devel/codeville/Makefile
index 21a5a54b28b..f5952c4f8e6 100644
--- a/devel/codeville/Makefile
+++ b/devel/codeville/Makefile
@@ -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 @@ COMMENT=		Distributed revision control system
 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 --git a/devel/eric3/Makefile b/devel/eric3/Makefile
index e31e28b61f5..95e45c13ca4 100644
--- a/devel/eric3/Makefile
+++ b/devel/eric3/Makefile
@@ -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 @@ NO_BUILD=		yes
 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 --git a/devel/py-InlineEgg/Makefile b/devel/py-InlineEgg/Makefile
index 735fb74efc5..6d97336a389 100644
--- a/devel/py-InlineEgg/Makefile
+++ b/devel/py-InlineEgg/Makefile
@@ -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 @@ USE_BUILDLINK3=		YES
 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 --git a/devel/py-TPG/Makefile b/devel/py-TPG/Makefile
index ec56ce6f8af..b992d4b98e2 100644
--- a/devel/py-TPG/Makefile
+++ b/devel/py-TPG/Makefile
@@ -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 @@ MAINTAINER=		dotz@irc.pl
 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 --git a/devel/py-cursespanel/Makefile b/devel/py-cursespanel/Makefile
index 46b8cf14d23..75f22f6cb11 100644
--- a/devel/py-cursespanel/Makefile
+++ b/devel/py-cursespanel/Makefile
@@ -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 @@ EXTRACT_ELEMENTS=	${PYSUBDIR}/Modules/_curses_panel.c
 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 --git a/devel/py-idle/Makefile b/devel/py-idle/Makefile
index 4280c2a9081..0fb1cf9c543 100644
--- a/devel/py-idle/Makefile
+++ b/devel/py-idle/Makefile
@@ -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 @@ do-patch:
 # 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 @@ do-install:
 	(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
@@ -60,7 +60,7 @@ do-install:
 		${PREFIX}/bin/idle${PYVERSSUFFIX}
 	${CAT} ${PKGDIR}/PLIST.pre >${PLIST_SRC}
 
-.endif # py23pth and up
+.endif # py23 and up
 
 .include "../../lang/python/srcdist.mk"
 .include "../../lang/python/application.mk"
diff --git a/devel/roundup/Makefile b/devel/roundup/Makefile
index 56f0e1785f7..cd5a4dff923 100644
--- a/devel/roundup/Makefile
+++ b/devel/roundup/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2004/11/28 16:26:50 recht Exp $
+# $NetBSD: Makefile,v 1.21 2005/01/23 20:41:46 recht Exp $
 
 DISTNAME=	roundup-0.7.9
 CATEGORIES=	devel
@@ -13,7 +13,7 @@ PY_PATCHPLIST=	yes
 USE_BUILDLINK3=	yes
 USE_LANGUAGES=
 
-PYTHON_VERSIONS_ACCEPTED=	23 23pth 22 22pth 21 21pth
+PYTHON_VERSIONS_ACCEPTED=	24 23 22 21
 
 PYTHON_PATCH_SCRIPTS=	cgi-bin/roundup.cgi demo.py roundup/admin.py
 PYTHON_PATCH_SCRIPTS+=	roundup/backends/locking.py roundup/version_check.py