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.

2 files changed, 62 insertions, 63 deletions

diff --git a/lang/python21/Makefile b/lang/python21/Makefile
index ba5f95871c2..d41d3a925f2 100644
--- a/lang/python21/Makefile
+++ b/lang/python21/Makefile
@@ -1,11 +1,69 @@
-# $NetBSD: Makefile,v 1.16 2004/08/29 10:44:19 recht Exp $
+# $NetBSD: Makefile,v 1.17 2005/01/23 20:41:46 recht Exp $
 #
 
+DISTNAME=	Python-2.1.3
 PKGNAME=	python21-2.1.3
-PKGREVISION=	4
+PKGREVISION=	5
+CATEGORIES=	lang python
+MASTER_SITES=	ftp://ftp.python.org/pub/python/2.1.3/
+EXTRACT_SUFX=	.tgz
 
-CONFIGURE_ARGS+=	--without-threads
+MAINTAINER=	tech-pkg@NetBSD.org
+HOMEPAGE=	http://www.python.org/
+COMMENT=	Interpreted, interactive, object-oriented programming language
+
+USE_LANGUAGES=	c c++
+USE_BUILDLINK3=	YES
+GNU_CONFIGURE=	YES
+
+PTHREAD_OPTS=   require
+.include "../../mk/pthread.buildlink3.mk"
+.if ${PTHREAD_TYPE} == "pth"
+CONFIGURE_ARGS+=	--with-pth
+.endif
 
 PY_VER_SUFFIX=	2.1
 
-.include "../../lang/python21/Makefile.common"
+INSTALL_TARGET=		altinstall
+
+.include "../../mk/bsd.prefs.mk"
+
+PLIST_SRC=	${.CURDIR}/../../lang/python21/PLIST.common
+.if exists(${.CURDIR}/../../lang/python21/PLIST.${OPSYS})
+PLIST_SRC+=	${.CURDIR}/../../lang/python21/PLIST.${OPSYS}
+.endif
+PLIST_SRC+=	${.CURDIR}/../../lang/python21/PLIST.common_end
+
+.if ${OPSYS} == "Darwin"
+PY_PLATNAME=	${LOWER_OPSYS}
+.elif ${OPSYS} == "IRIX"
+PY_PLATNAME=	${LOWER_OPSYS:C/\..*//}
+.elif ${OPSYS} == "SunOS"
+PY_PLATNAME=	sunos${OS_VERSION:C/\..*//}
+.else
+PY_PLATNAME=	${LOWER_OPSYS}${OS_VERSION:C/\..*//}
+.endif
+PLIST_SUBST+=	PY_PLATNAME=${PY_PLATNAME}
+
+# bsddb.so is not built on Solaris (or IRIX?)
+BSDDB=
+.if ${OPSYS} == "SunOS" || ${OPSYS} == "IRIX"
+BSDDB=		"@comment "
+.endif
+PLIST_SUBST+=	BSDDB=${BSDDB}
+
+PLIST_SUBST+=	PY_VER_SUFFIX=${PY_VER_SUFFIX}
+
+post-extract:
+	${MV} ${WRKSRC}/Tools/scripts/pydoc ${WRKSRC}/Tools/scripts/pydoc${PY_VER_SUFFIX}
+
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../mk/dlopen.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
+
+# This comes after bsd.pkg.mk so that the LDFLAGS here overrides the one
+# set earlier in the environment (last definition wins).
+#
+.if ${OBJECT_FMT} == "a.out"
+MAKE_ENV+=	LDFLAGS="${LDFLAGS:S/-Wl,//}"
+.endif
diff --git a/lang/python21/Makefile.common b/lang/python21/Makefile.common
deleted file mode 100644
index 7f09c1146f2..00000000000
--- a/lang/python21/Makefile.common
+++ /dev/null
@@ -1,59 +0,0 @@
-# $NetBSD: Makefile.common,v 1.8 2004/12/19 05:34:07 grant Exp $
-#
-
-DISTNAME=	Python-2.1.3
-CATEGORIES=	lang python
-MASTER_SITES=	ftp://ftp.python.org/pub/python/2.1.3/
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	tech-pkg@NetBSD.org
-HOMEPAGE=	http://www.python.org/
-COMMENT=	Interpreted, interactive, object-oriented programming language
-
-USE_LANGUAGES=		c c++
-USE_BUILDLINK3=		YES
-GNU_CONFIGURE=		YES
-
-INSTALL_TARGET=		altinstall
-
-.include "../../mk/bsd.prefs.mk"
-
-PLIST_SRC=	${.CURDIR}/../../lang/python21/PLIST.common
-.if exists(${.CURDIR}/../../lang/python21/PLIST.${OPSYS})
-PLIST_SRC+=	${.CURDIR}/../../lang/python21/PLIST.${OPSYS}
-.endif
-PLIST_SRC+=	${.CURDIR}/../../lang/python21/PLIST.common_end
-
-.if ${OPSYS} == "Darwin"
-PY_PLATNAME=	${LOWER_OPSYS}
-.elif ${OPSYS} == "IRIX"
-PY_PLATNAME=	${LOWER_OPSYS:C/\..*//}
-.elif ${OPSYS} == "SunOS"
-PY_PLATNAME=	sunos${OS_VERSION:C/\..*//}
-.else
-PY_PLATNAME=	${LOWER_OPSYS}${OS_VERSION:C/\..*//}
-.endif
-PLIST_SUBST+=	PY_PLATNAME=${PY_PLATNAME}
-
-# bsddb.so is not built on Solaris (or IRIX?)
-BSDDB=
-.if ${OPSYS} == "SunOS" || ${OPSYS} == "IRIX"
-BSDDB=		"@comment "
-.endif
-PLIST_SUBST+=	BSDDB=${BSDDB}
-
-PLIST_SUBST+=	PY_VER_SUFFIX=${PY_VER_SUFFIX}
-
-post-extract:
-	${MV} ${WRKSRC}/Tools/scripts/pydoc ${WRKSRC}/Tools/scripts/pydoc${PY_VER_SUFFIX}
-
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/dlopen.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
-
-# This comes after bsd.pkg.mk so that the LDFLAGS here overrides the one
-# set earlier in the environment (last definition wins).
-#
-.if ${OBJECT_FMT} == "a.out"
-MAKE_ENV+=	LDFLAGS="${LDFLAGS:S/-Wl,//}"
-.endif