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.

8 files changed, 18 insertions, 18 deletions

diff --git a/x11/py-Tk/Makefile b/x11/py-Tk/Makefile
index a8302633e8e..240d2ce6d7d 100644
--- a/x11/py-Tk/Makefile
+++ b/x11/py-Tk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2004/12/24 14:23:43 darcy Exp $
+# $NetBSD: Makefile,v 1.33 2005/01/23 20:41:49 recht Exp $
 #
 
 PKGNAME=	${PYPKGPREFIX}-Tk-0
@@ -24,7 +24,7 @@ PY_SETUP_SUBST+= TKRTPREFIX=${BUILDLINK_PREFIX.tk}
 PY_SETUP_SUBST+= X11PREFIX=${X11BASE}
 PY_SETUP_SUBST+= X11RTPREFIX=${X11BASE}
 
-PYTHON_VERSIONS_ACCEPTED=	24pth 24 23pth 22pth 21pth
+PYTHON_VERSIONS_ACCEPTED=	24 23 22 21
 
 # ignore errors due to missing files (EXTRACT_ELEMENTS!)
 do-patch:
diff --git a/x11/py-gnome2/Makefile b/x11/py-gnome2/Makefile
index cdab5601822..805cc4be43b 100644
--- a/x11/py-gnome2/Makefile
+++ b/x11/py-gnome2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2004/12/29 11:12:10 recht Exp $
+# $NetBSD: Makefile,v 1.22 2005/01/23 20:41:49 recht Exp $
 #
 
 DISTNAME=	gnome-python-2.6.2
@@ -18,7 +18,7 @@ PKGCONFIG_OVERRIDE+=	gnome-python-2.0.pc.in
 GNU_CONFIGURE=	YES
 CONFIGURE_ENV+=	PYTHON=${PYTHONBIN}
 
-PYTHON_VERSIONS_ACCEPTED=	24pth 23pth
+PYTHON_VERSIONS_ACCEPTED=	24 23
 
 .include "../../lang/python/extension.mk"
 .include "../../lang/python/application.mk"
diff --git a/x11/py-gtk2/Makefile b/x11/py-gtk2/Makefile
index 0572df2f618..88e9fda3a35 100644
--- a/x11/py-gtk2/Makefile
+++ b/x11/py-gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2004/12/29 11:12:50 recht Exp $
+# $NetBSD: Makefile,v 1.22 2005/01/23 20:41:50 recht Exp $
 #
 
 DISTNAME=	pygtk-2.4.1
@@ -20,7 +20,7 @@ PKGCONFIG_OVERRIDE+=	pygtk-2.0.pc.in
 GNU_CONFIGURE=	YES
 CONFIGURE_ENV+=	PYTHON=${PYTHONBIN}
 
-PYTHON_VERSIONS_ACCEPTED=	24pth 23pth
+PYTHON_VERSIONS_ACCEPTED=	24 23
 
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/pkgconfig/buildlink3.mk"
diff --git a/x11/py-qt3-base/Makefile b/x11/py-qt3-base/Makefile
index c0c8bea07d6..7b8417142c0 100644
--- a/x11/py-qt3-base/Makefile
+++ b/x11/py-qt3-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/01/05 10:05:19 darcy Exp $
+# $NetBSD: Makefile,v 1.11 2005/01/23 20:41:50 recht Exp $
 #
 
 DISTNAME=		PyQt-x11-gpl-3.11
@@ -22,7 +22,7 @@ CONFIGURE_ARGS=		-b ${PREFIX}/bin
 CONFIGURE_ARGS+=	-d ${PREFIX}/${PYSITELIB}
 CONFIGURE_ARGS+=	-v ${PREFIX}/share/sip${PYVERSSUFFIX}
 
-PYTHON_VERSIONS_ACCEPTED=	24pth 23pth 22pth 21pth
+PYTHON_VERSIONS_ACCEPTED=	24 23 22 21
 PY_PATCHPLIST=	yes
 PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
 
diff --git a/x11/py-qt3-modules/Makefile b/x11/py-qt3-modules/Makefile
index 341563b5932..34e31d38e7c 100644
--- a/x11/py-qt3-modules/Makefile
+++ b/x11/py-qt3-modules/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/01/05 10:05:19 darcy Exp $
+# $NetBSD: Makefile,v 1.12 2005/01/23 20:41:50 recht Exp $
 #
 
 DISTNAME=		PyQt-x11-gpl-3.11
@@ -21,7 +21,7 @@ CONFIGURE_ARGS=		-b ${PREFIX}/bin
 CONFIGURE_ARGS+=	-d ${PREFIX}/${PYSITELIB}
 CONFIGURE_ARGS+=	-v ${PREFIX}/share/sip${PYVERSSUFFIX}
 
-PYTHON_VERSIONS_ACCEPTED=	24pth 23pth 22pth 21pth
+PYTHON_VERSIONS_ACCEPTED=	24 23 22 21
 PY_PATCHPLIST=	yes
 PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
 
diff --git a/x11/py-qt3-qscintilla/Makefile b/x11/py-qt3-qscintilla/Makefile
index 16fb3cd3e0d..0d33129013e 100644
--- a/x11/py-qt3-qscintilla/Makefile
+++ b/x11/py-qt3-qscintilla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/01/05 20:50:07 darcy Exp $
+# $NetBSD: Makefile,v 1.11 2005/01/23 20:41:50 recht Exp $
 #
 
 DISTNAME=		PyQt-x11-gpl-3.11
@@ -23,7 +23,7 @@ CONFIGURE_ARGS+=	-v ${PREFIX}/share/sip${PYVERSSUFFIX}
 CONFIGURE_ARGS+=	-n ${QTDIR}/include
 CONFIGURE_ARGS+=	-o ${QTDIR}/lib
 
-PYTHON_VERSIONS_ACCEPTED=	24pth 23pth 22pth 21pth
+PYTHON_VERSIONS_ACCEPTED=	24 23 22 21
 PY_PATCHPLIST=	yes
 PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
 
diff --git a/x11/py-qt3-sip/Makefile b/x11/py-qt3-sip/Makefile
index f15f3e34b9d..8ff6a313c21 100644
--- a/x11/py-qt3-sip/Makefile
+++ b/x11/py-qt3-sip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/01/05 10:05:19 darcy Exp $
+# $NetBSD: Makefile,v 1.11 2005/01/23 20:41:50 recht Exp $
 #
 
 DISTNAME=	sip-4.0rc3
@@ -27,7 +27,7 @@ CONFIGURE_ARGS+=	-d ${PREFIX}/${PYSITELIB}
 CONFIGURE_ARGS+=	-e ${PREFIX}/${PYINC}
 CONFIGURE_ARGS+=	-v ${PREFIX}/share/sip${PYVERSSUFFIX}
 
-PYTHON_VERSIONS_ACCEPTED=	24pth 23pth
+PYTHON_VERSIONS_ACCEPTED=	24 23
 PY_PATCHPLIST=	yes
 PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
 
diff --git a/x11/py-wxWidgets/Makefile b/x11/py-wxWidgets/Makefile
index 204c5e52174..3096f3b6683 100644
--- a/x11/py-wxWidgets/Makefile
+++ b/x11/py-wxWidgets/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/12/26 13:39:39 darcy Exp $
+# $NetBSD: Makefile,v 1.4 2005/01/23 20:41:50 recht Exp $
 #
 
 DISTNAME=	wxPythonSrc-2.4.2.4
@@ -19,9 +19,9 @@ USE_GNU_TOOLS+=	make
 CONFLICTS+=	${PYPKGPREFIX}-wxWindows-[0-9]*
 
 # we depend on glib which pulls in threads
-PYTHON_VERSIONS_ACCEPTED=	24pth 23pth 22pth 21pth
-BUILDLINK_DEPENDS.python21-pth=	python21-pth>=2.1.3nb3
-BUILDLINK_DEPENDS.python22-pth=	python22-pth>=2.2.2nb2
+PYTHON_VERSIONS_ACCEPTED=	24 23 22 21
+BUILDLINK_DEPENDS.python21=	python21>=2.1.3nb3
+BUILDLINK_DEPENDS.python22=	python22>=2.2.2nb2
 
 .include "../../mk/bsd.prefs.mk"