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.

4 files changed, 116 insertions, 114 deletions

diff --git a/lang/python24/Makefile b/lang/python24/Makefile
index 8861edead69..2d8ebcc9710 100644
--- a/lang/python24/Makefile
+++ b/lang/python24/Makefile
@@ -1,10 +1,120 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/12/05 23:27:49 recht Exp $
+# $NetBSD: Makefile,v 1.2 2005/01/23 20:41:47 recht Exp $
 #
 
+DISTNAME=	Python-2.4
 PKGNAME=	python24-2.4
+PKGREVISION=	2
+CATEGORIES=	lang python
+MASTER_SITES=	ftp://ftp.python.org/pub/python/2.4/
+EXTRACT_SUFX=	.tar.bz2
 
-CONFIGURE_ARGS+=	--without-threads
+MAINTAINER=	recht@NetBSD.org
+HOMEPAGE=	http://www.python.org/
+COMMENT=	Interpreted, interactive, object-oriented programming language
 
-PY_VER_SUFFIX=	2.4
+USE_LANGUAGES=		c c++
+USE_BUILDLINK3=		yes
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--enable-shared
+CONFIGURE_ARGS+=	OPT="${CFLAGS}"
 
-.include "../../lang/python24/Makefile.common"
+PTHREAD_OPTS=   require
+.include "../../mk/pthread.buildlink3.mk"
+.if ${PTHREAD_TYPE} == "pth"
+CONFIGURE_ARGS+=	--with-pth
+.endif
+
+# fdatasync()
+LIBS.SunOS=		-lrt
+
+PY_VER_SUFFIX=		2.4
+
+.include "../../mk/bsd.prefs.mk"
+
+PLIST_SRC=	${.CURDIR}/../../lang/python24/PLIST.common
+.if exists(${.CURDIR}/../../lang/python24/PLIST.${OPSYS})
+PLIST_SRC+=	${.CURDIR}/../../lang/python24/PLIST.${OPSYS}
+.endif
+PLIST_SRC+=	${.CURDIR}/../../lang/python24/PLIST.common_end
+
+.if ${OPSYS} == "Darwin" || ${OPSYS} == "Interix"
+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}
+
+# the dl module isn't built for 64 bit archs and Darwin
+.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "amd64" \
+	|| ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "x86_64" \
+	|| ${OPSYS} == "Darwin" || ( ${OPSYS} == "IRIX" && ${ABI} == "64" )
+PLIST_SUBST+=  DLMODULE="@comment "
+.else
+PLIST_SUBST+=  DLMODULE=
+.endif
+
+EXTRA_SO_SUBST=		"@comment "
+OSSAUDIODEV_SUBST=	"@comment "
+
+# activate extra modules
+.if ${MACHINE_ARCH} == "i386"
+EXTRA_SO_SUBST=
+# ossaudiodev is only available on x86 for the following platforms
+.  if ${PY_PLATNAME} == "linux2" || ${PY_PLATNAME} == "freebsd4" \
+	|| ${PY_PLATNAME} == "freebsd5"
+OSSAUDIODEV_SUBST=
+.   endif
+.elif ${OPSYS} == "SunOS" || ( ${OPSYS} == "IRIX" && ${ABI} != "64" ) \
+	|| ${OPSYS} == "Darwin"
+EXTRA_SO_SUBST=
+.endif
+
+PLIST_SUBST+=	EXTRA_SO=${EXTRA_SO_SUBST}
+PLIST_SUBST+=	OSSAUDIODEV=${OSSAUDIODEV_SUBST}
+
+# Make sure python modules can link correctly
+.if ${OPSYS} == "Darwin"
+INSTALL_UNSTRIPPED=	yes
+.endif
+
+.if ${OPSYS} == "IRIX"
+.  if ${ABI} == "64"
+PLIST_SUBST+=	NISMODULE="@comment "
+.  else
+PLIST_SUBST+=	NISMODULE=
+.  endif
+PLIST_SUBST+=	BSDDBMODULE="@comment "
+PLIST_SUBST+=	NOSHLIB="@comment "
+.else
+.  include "../../mk/bdb.buildlink3.mk"
+MAKE_ENV+=	PY_BDB_TYPE=${BDB_TYPE}
+MAKE_ENV+=	PY_BDB_INCDIRS=${BDBBASE}/${BUILDLINK_INCDIRS.${BDB_TYPE}}
+MAKE_ENV+=	PY_BDB_LIBDIRS=${BDBBASE}/lib
+PLIST_SUBST+=	BSDDBMODULE=
+PLIST_SUBST+=	NOSHLIB=
+PLIST_SUBST+=	NISMODULE=
+.endif
+
+.if defined(BUILDLINK_TRANSFORM)
+MAKE_ENV+=	PY_BDB_TRANSFORM="${BUILDLINK_TRANSFORM}"
+.endif
+
+PLIST_SUBST+=	PY_VER_SUFFIX=${PY_VER_SUFFIX}
+
+TEST_TARGET=	test
+INSTALL_TARGET=	altinstall
+
+post-extract:
+	${MV} ${WRKSRC}/Lib/smtpd.py ${WRKSRC}/Lib/smtpd${PY_VER_SUFFIX}.py
+	${MV} ${WRKSRC}/Tools/scripts/pydoc ${WRKSRC}/Tools/scripts/pydoc${PY_VER_SUFFIX}
+
+.include "../../archivers/bzip2/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../mk/dlopen.buildlink3.mk"
+.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/lang/python24/Makefile.common b/lang/python24/Makefile.common
deleted file mode 100644
index 2f1eb9ecca8..00000000000
--- a/lang/python24/Makefile.common
+++ /dev/null
@@ -1,110 +0,0 @@
-# $NetBSD: Makefile.common,v 1.3 2004/12/20 13:16:02 grant Exp $
-#
-
-DISTNAME=	Python-2.4
-CATEGORIES=	lang python
-MASTER_SITES=	ftp://ftp.python.org/pub/python/2.4/
-EXTRACT_SUFX=	.tar.bz2
-
-MAINTAINER=	recht@NetBSD.org
-HOMEPAGE=	http://www.python.org/
-COMMENT=	Interpreted, interactive, object-oriented programming language
-
-USE_LANGUAGES=		c c++
-USE_BUILDLINK3=		yes
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--enable-shared
-CONFIGURE_ARGS+=	OPT="${CFLAGS}"
-
-# fdatasync()
-LIBS.SunOS=		-lrt
-
-.include "../../mk/bsd.prefs.mk"
-
-PLIST_SRC=	${.CURDIR}/../../lang/python24/PLIST.common
-.if exists(${.CURDIR}/../../lang/python24/PLIST.${OPSYS})
-PLIST_SRC+=	${.CURDIR}/../../lang/python24/PLIST.${OPSYS}
-.endif
-PLIST_SRC+=	${.CURDIR}/../../lang/python24/PLIST.common_end
-
-.if ${OPSYS} == "Darwin" || ${OPSYS} == "Interix"
-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}
-
-# the dl module isn't built for 64 bit archs and Darwin
-.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "amd64" \
-	|| ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "x86_64" \
-	|| ${OPSYS} == "Darwin" || ( ${OPSYS} == "IRIX" && ${ABI} == "64" )
-PLIST_SUBST+=  DLMODULE="@comment "
-.else
-PLIST_SUBST+=  DLMODULE=
-.endif
-
-EXTRA_SO_SUBST=		"@comment "
-OSSAUDIODEV_SUBST=	"@comment "
-
-# activate extra modules
-.if ${MACHINE_ARCH} == "i386"
-EXTRA_SO_SUBST=
-# ossaudiodev is only available on x86 for the following platforms
-.  if ${PY_PLATNAME} == "linux2" || ${PY_PLATNAME} == "freebsd4" \
-	|| ${PY_PLATNAME} == "freebsd5"
-OSSAUDIODEV_SUBST=
-.   endif
-.elif ${OPSYS} == "SunOS" || ( ${OPSYS} == "IRIX" && ${ABI} != "64" ) \
-	|| ${OPSYS} == "Darwin"
-EXTRA_SO_SUBST=
-.endif
-
-PLIST_SUBST+=	EXTRA_SO=${EXTRA_SO_SUBST}
-PLIST_SUBST+=	OSSAUDIODEV=${OSSAUDIODEV_SUBST}
-
-# Make sure python modules can link correctly
-.if ${OPSYS} == "Darwin"
-INSTALL_UNSTRIPPED=	yes
-.endif
-
-.if ${OPSYS} == "IRIX"
-.  if ${ABI} == "64"
-PLIST_SUBST+=	NISMODULE="@comment "
-.  else
-PLIST_SUBST+=	NISMODULE=
-.  endif
-PLIST_SUBST+=	BSDDBMODULE="@comment "
-PLIST_SUBST+=	NOSHLIB="@comment "
-.else
-.  include "../../mk/bdb.buildlink3.mk"
-MAKE_ENV+=	PY_BDB_TYPE=${BDB_TYPE}
-MAKE_ENV+=	PY_BDB_INCDIRS=${BDBBASE}/${BUILDLINK_INCDIRS.${BDB_TYPE}}
-MAKE_ENV+=	PY_BDB_LIBDIRS=${BDBBASE}/lib
-PLIST_SUBST+=	BSDDBMODULE=
-PLIST_SUBST+=	NOSHLIB=
-PLIST_SUBST+=	NISMODULE=
-.endif
-
-.if defined(BUILDLINK_TRANSFORM)
-MAKE_ENV+=	PY_BDB_TRANSFORM="${BUILDLINK_TRANSFORM}"
-.endif
-
-PLIST_SUBST+=	PY_VER_SUFFIX=${PY_VER_SUFFIX}
-
-TEST_TARGET=	test
-INSTALL_TARGET=	altinstall
-
-post-extract:
-	${MV} ${WRKSRC}/Lib/smtpd.py ${WRKSRC}/Lib/smtpd${PY_VER_SUFFIX}.py
-	${MV} ${WRKSRC}/Tools/scripts/pydoc ${WRKSRC}/Tools/scripts/pydoc${PY_VER_SUFFIX}
-
-.include "../../archivers/bzip2/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../mk/dlopen.buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/lang/python24/PLIST.Darwin b/lang/python24/PLIST.Darwin
index 5b9d6c22b4e..8ff58a10f72 100644
--- a/lang/python24/PLIST.Darwin
+++ b/lang/python24/PLIST.Darwin
@@ -1,3 +1,4 @@
+@comment $NetBSD: PLIST.Darwin,v 1.2 2005/01/23 20:41:47 recht Exp $
 lib/python${PY_VER_SUFFIX}/lib-dynload/_CF.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/ColorPicker.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/autoGIL.so
diff --git a/lang/python24/PLIST.common_end b/lang/python24/PLIST.common_end
index 703b181b948..053f04fdbe1 100644
--- a/lang/python24/PLIST.common_end
+++ b/lang/python24/PLIST.common_end
@@ -1,3 +1,4 @@
+@comment $NetBSD: PLIST.common_end,v 1.2 2005/01/23 20:41:48 recht Exp $
 @dirrm lib/python${PY_VER_SUFFIX}/xml/sax
 @dirrm lib/python${PY_VER_SUFFIX}/xml/parsers
 @dirrm lib/python${PY_VER_SUFFIX}/xml/dom