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.

5 files changed, 13 insertions, 13 deletions

diff --git a/databases/py-ZODB/Makefile b/databases/py-ZODB/Makefile
index 9564b189441..0541fb638ea 100644
--- a/databases/py-ZODB/Makefile
+++ b/databases/py-ZODB/Makefile
@@ -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 @@ USE_BUILDLINK3=		yes
 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 --git a/databases/py-bsddb3/Makefile b/databases/py-bsddb3/Makefile
index 6ed36e94b6d..566726f1710 100644
--- a/databases/py-bsddb3/Makefile
+++ b/databases/py-bsddb3/Makefile
@@ -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 @@ BUILDLINK_DEPENDS.db4+=		db4>=4.2.52
 
 .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 --git a/databases/py-ldap/Makefile b/databases/py-ldap/Makefile
index 37972ec3424..deff89dd4af 100644
--- a/databases/py-ldap/Makefile
+++ b/databases/py-ldap/Makefile
@@ -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 @@ MAINTAINER=	tech-pkg@NetBSD.org
 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 @@ SUBST_SED.setup=		-e "s|/usr/local/openldap-REL_ENG_2_1|${BUILDLINK_PREFIX.cyrus
 .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 --git a/databases/py-psycopg/Makefile b/databases/py-psycopg/Makefile
index d14161f89bb..51f7dd6dcc8 100644
--- a/databases/py-psycopg/Makefile
+++ b/databases/py-psycopg/Makefile
@@ -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 @@ CONFIGURE_ARGS+= \
 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 --git a/databases/py-sybase/Makefile b/databases/py-sybase/Makefile
index bc6a281da86..fd8441b51ff 100644
--- a/databases/py-sybase/Makefile
+++ b/databases/py-sybase/Makefile
@@ -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 @@ MAINTAINER=	tech-pkg@NetBSD.org
 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