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.

11 files changed, 24 insertions, 24 deletions

diff --git a/net/bittornado/Makefile.common b/net/bittornado/Makefile.common
index b493834626f..e850ee10616 100644
--- a/net/bittornado/Makefile.common
+++ b/net/bittornado/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2004/12/07 04:23:59 mrg Exp $
+# $NetBSD: Makefile.common,v 1.4 2005/01/23 20:41:48 recht Exp $
 #
 
 DISTNAME=		BitTornado-0.3.8
@@ -17,4 +17,4 @@ PATCHDIR=		${.CURDIR}/../../net/bittornado/patches
 WRKSRC=			${WRKDIR}/BitTornado-CVS
 USE_BUILDLINK3=		yes
 
-PYTHON_VERSIONS_ACCEPTED=	23pth 22pth
+PYTHON_VERSIONS_ACCEPTED=	23 22
diff --git a/net/bittorrent/Makefile.common b/net/bittorrent/Makefile.common
index 98c980703c6..7b42589c35f 100644
--- a/net/bittorrent/Makefile.common
+++ b/net/bittorrent/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2004/08/05 22:22:33 recht Exp $
+# $NetBSD: Makefile.common,v 1.9 2005/01/23 20:41:48 recht Exp $
 #
 
 DISTNAME=	BitTorrent-3.4.2
@@ -16,4 +16,4 @@ PATCHDIR=	${.CURDIR}/../../net/bittorrent/patches
 
 USE_BUILDLINK3=	YES
 
-PYTHON_VERSIONS_ACCEPTED=	23pth 22pth
+PYTHON_VERSIONS_ACCEPTED=	24 23 22
diff --git a/net/nicotine/Makefile b/net/nicotine/Makefile
index 327bfa64b59..44153775355 100644
--- a/net/nicotine/Makefile
+++ b/net/nicotine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/01/17 16:13:25 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2005/01/23 20:41:48 recht Exp $
 #
 
 DISTNAME=	nicotine-1.0.8
@@ -10,7 +10,7 @@ MAINTAINER=	hubertf@NetBSD.org
 HOMEPAGE=	http://nicotine.thegraveyard.org/
 COMMENT=	Client for soulseek, a peer-to-peer network for music
 
-PYTHON_VERSIONS_ACCEPTED=       23pth
+PYTHON_VERSIONS_ACCEPTED=       23
 USE_BUILDLINK3=	yes
 PY_PATCHPLIST=	yes
 PYDISTUTILSPKG=	yes
diff --git a/net/py-ORBit/Makefile b/net/py-ORBit/Makefile
index a10961af3df..f6a008028d1 100644
--- a/net/py-ORBit/Makefile
+++ b/net/py-ORBit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2004/12/29 11:04:45 recht Exp $
+# $NetBSD: Makefile,v 1.16 2005/01/23 20:41:48 recht Exp $
 #
 
 DISTNAME=	pyorbit-2.0.1
@@ -19,8 +19,8 @@ PKGCONFIG_OVERRIDE+=	pyorbit-2.pc.in
 GNU_CONFIGURE=	YES
 CONFIGURE_ENV+=	PYTHON=${PYTHONBIN}
 
-PYTHON_VERSIONS_ACCEPTED=	24pth 23pth 22pth
-BUILDLINK_DEPENDS.python22-pth=	python22-pth>=2.2.2nb2
+PYTHON_VERSIONS_ACCEPTED=	24 23 22
+BUILDLINK_DEPENDS.python22=	python22>=2.2.2nb2
 
 .include "../../devel/pkgconfig/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
diff --git a/net/py-google/Makefile b/net/py-google/Makefile
index fee1e866f26..a1ce74ec853 100644
--- a/net/py-google/Makefile
+++ b/net/py-google/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2004/10/03 00:17:57 tv Exp $
+# $NetBSD: Makefile,v 1.21 2005/01/23 20:41:48 recht Exp $
 #
 
 DISTNAME=	pygoogle-0.6
@@ -14,7 +14,7 @@ COMMENT=	Call the Google web API from Python
 PYDISTUTILSPKG=	yes
 USE_BUILDLINK3=	yes
 
-PYTHON_VERSIONS_ACCEPTED=       23pth 22pth 21pth
+PYTHON_VERSIONS_ACCEPTED=       23 22 21
 
 .include "../../lang/python/extension.mk"
 .include "../../net/py-soappy/buildlink3.mk"
diff --git a/net/py-kenosis/Makefile b/net/py-kenosis/Makefile
index ebc1afec3f8..ae8770fcdc6 100644
--- a/net/py-kenosis/Makefile
+++ b/net/py-kenosis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/01/13 12:55:32 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2005/01/23 20:41:48 recht Exp $
 #
 
 DISTNAME=		kenosis-0.92
@@ -11,7 +11,7 @@ HOMEPAGE=		http://kenosis.sourceforge.net/
 COMMENT=		P2P RPC system
 
 USE_BUILDLINK3=		yes
-PYTHON_VERSIONS_ACCEPTED= 23pth 24pth 22pth 21pth
+PYTHON_VERSIONS_ACCEPTED= 23 24 22 21
 PYDISTUTILSPKG=		yes
 PYSETUP=		kenosis_setup.py
 
diff --git a/net/py-mimelib/Makefile b/net/py-mimelib/Makefile
index 661a5e5eea0..0adc307e802 100644
--- a/net/py-mimelib/Makefile
+++ b/net/py-mimelib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/07/22 09:16:03 recht Exp $
+# $NetBSD: Makefile,v 1.7 2005/01/23 20:41:48 recht Exp $
 #
 
 DISTNAME=	email-2.5
@@ -14,12 +14,12 @@ USE_BUILDLINK3=	yes
 PYDISTUTILSPKG=	yes
 # This pkg (or an older version of it) comes with 2.2 and later;
 # 2.1 is the primary target (particulary for Zope).
-PYTHON_VERSIONS_ACCEPTED= 21pth 21 22 22pth 23 23pth
+PYTHON_VERSIONS_ACCEPTED= 21 22 23
 
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
 
-# _compat22.py is not byte-compiled if built with 2.1(-pth)
+# _compat22.py is not byte-compiled if built with 2.1(-)
 .if !empty(PYPKGPREFIX:Mpy21*)
 NOT21=	"@comment "
 .else
diff --git a/net/py-soappy/Makefile b/net/py-soappy/Makefile
index b1b51b98303..6f190a64b89 100644
--- a/net/py-soappy/Makefile
+++ b/net/py-soappy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/10/03 00:17:57 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/01/23 20:41:48 recht Exp $
 #
 
 DISTNAME=	SOAPpy-0.11.4
@@ -15,7 +15,7 @@ USE_BUILDLINK3=	YES
 PYDISTUTILSPKG=	YES
 PY_PATCHPLIST=	YES
 
-PYTHON_VERSIONS_ACCEPTED=	23pth 22pth 21pth
+PYTHON_VERSIONS_ACCEPTED=	24 23 22 21
 
 .include "../../lang/python/extension.mk"
 .include "../../math/py-fpconst/buildlink3.mk"
diff --git a/net/py-spreadmodule/Makefile b/net/py-spreadmodule/Makefile
index 8179c0a4f45..e405822b394 100644
--- a/net/py-spreadmodule/Makefile
+++ b/net/py-spreadmodule/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/07/22 09:16:04 recht Exp $
+# $NetBSD: Makefile,v 1.5 2005/01/23 20:41:48 recht Exp $
 #
 
 DISTNAME=	SpreadModule-1.4
@@ -15,7 +15,7 @@ COMMENT=	Python bindings for the Spread messaging service
 PYDISTUTILSPKG=	YES
 USE_BUILDLINK3=	YES
 
-PYTHON_VERSIONS_ACCEPTED=	23pth 22pth 21pth
+PYTHON_VERSIONS_ACCEPTED=	24 23 22 21
 
 SUBST_CLASSES+=		setup
 SUBST_STAGE.setup=	post-patch
diff --git a/net/py-twisted/Makefile b/net/py-twisted/Makefile
index 06e8100bce1..dd76826901d 100644
--- a/net/py-twisted/Makefile
+++ b/net/py-twisted/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/12/23 21:54:25 darcy Exp $
+# $NetBSD: Makefile,v 1.4 2005/01/23 20:41:48 recht Exp $
 #
 
 DISTNAME=		${TWISTED_DISTNAME}
@@ -16,7 +16,7 @@ PYDISTUTILSPKG=		yes
 PLIST_SUBST+=		PYVERSSUFFIX="-${PYVERSSUFFIX}"
 MAKE_ENV+=		PKGSRC="1" PYVERSSUFFIX="-${PYVERSSUFFIX}"
 
-PYTHON_VERSIONS_ACCEPTED=	24pth 24 23pth 23 22pth 22
+PYTHON_VERSIONS_ACCEPTED=	24 23 22
 
 .include "../../net/py-twisted/Makefile.common"
 .include "../../lang/python/extension.mk"
diff --git a/net/pygopherd/Makefile b/net/pygopherd/Makefile
index 1ff6c437593..d5d4c44aa88 100644
--- a/net/pygopherd/Makefile
+++ b/net/pygopherd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/12/28 02:47:47 reed Exp $
+# $NetBSD: Makefile,v 1.6 2005/01/23 20:41:48 recht Exp $
 #
 
 DISTNAME=	pygopherd_2.0.9
@@ -43,7 +43,7 @@ PYTHON_PATCH_SCRIPTS+=	pygopherd/gopherentryTest.py
 PYTHON_PATCH_SCRIPTS+=	pygopherd/initializationTest.py
 PYTHON_PATCH_SCRIPTS+=	pygopherd/testutil.py
 
-PYTHON_VERSIONS_ACCEPTED=	23 23pth 22 22pth
+PYTHON_VERSIONS_ACCEPTED=	23 22
 
 SUBST_CLASSES+=		man
 SUBST_STAGE.man=	post-patch