From afb6c634cf36bd0b8ca88bdb63f886e1d081aada Mon Sep 17 00:00:00 2001
From: recht <recht>
Date: Sun, 23 Jan 2005 20:41:45 +0000
Subject: 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.

---
 www/ap2-python/Makefile     | 4 ++--
 www/py-clearsilver/Makefile | 4 ++--
 www/py-curl/Makefile        | 4 ++--
 www/zope25/Makefile         | 4 ++--
 www/zopeedit/Makefile       | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'www')

diff --git a/www/ap2-python/Makefile b/www/ap2-python/Makefile
index 00e853a14b3..21f688fcb38 100644
--- a/www/ap2-python/Makefile
+++ b/www/ap2-python/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/01/05 20:50:07 darcy Exp $
+# $NetBSD: Makefile,v 1.5 2005/01/23 20:41:49 recht Exp $
 # FreeBSD Id: ports/www/mod_python3/Makefile,v 1.28 2004/03/11 14:36:30 perky Exp
 
 DISTNAME=		mod_python-${VERSION}
@@ -21,7 +21,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-apxs="${APXS}"
 CONFIGURE_ARGS+=--with-python=${PYTHONBIN:Q}
 
-PYTHON_VERSIONS_ACCEPTED= 24 24pth 23 23pth
+PYTHON_VERSIONS_ACCEPTED= 24 23
 PY_PATCHPLIST=	YES
 
 .include "../../lang/python/extension.mk"
diff --git a/www/py-clearsilver/Makefile b/www/py-clearsilver/Makefile
index 2ab4335ad49..61cca9fef12 100644
--- a/www/py-clearsilver/Makefile
+++ b/www/py-clearsilver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/11/29 00:21:13 epg Exp $
+# $NetBSD: Makefile,v 1.3 2005/01/23 20:41:49 recht Exp $
 
 PKGNAME=			${PYPKGPREFIX}-${DISTNAME}
 
@@ -13,7 +13,7 @@ INSTALL_DIRS=			${WRKSRC}/python
 
 PY_PATCHPLIST=			YES
 PYBINMODULE=			YES
-PYTHON_VERSIONS_ACCEPTED=	23pth 22pth 21pth
+PYTHON_VERSIONS_ACCEPTED=	23 22 21
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
diff --git a/www/py-curl/Makefile b/www/py-curl/Makefile
index 11bad131123..22064051794 100644
--- a/www/py-curl/Makefile
+++ b/www/py-curl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/01/03 15:59:12 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2005/01/23 20:41:49 recht Exp $
 
 DISTNAME=	pycurl-7.12.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -12,7 +12,7 @@ COMMENT=	Python module interface to the cURL library
 
 PYDISTUTILSPKG=	# defined
 PYBINMODULE=	# defined
-PYTHON_VERSIONS_ACCEPTED=	23pth 22pth
+PYTHON_VERSIONS_ACCEPTED=	23 22
 USE_BUILDLINK3=	yes
 PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
 
diff --git a/www/zope25/Makefile b/www/zope25/Makefile
index 155274919fd..76fbefebc51 100644
--- a/www/zope25/Makefile
+++ b/www/zope25/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/05/23 11:41:35 recht Exp $
+# $NetBSD: Makefile,v 1.14 2005/01/23 20:41:49 recht Exp $
 #
 
 DISTNAME=	Zope-2.6.2-src
@@ -13,7 +13,7 @@ COMMENT=	Zope, the Z Object Publishing Environment
 
 DIST_SUBDIR=	zope
 
-PYTHON_VERSIONS_ACCEPTED=	21pth
+PYTHON_VERSIONS_ACCEPTED=	21
 USE_BUILDLINK3=	yes
 
 ZOPEDIR=	${PREFIX}/lib/zope
diff --git a/www/zopeedit/Makefile b/www/zopeedit/Makefile
index 5bc1da91051..2a520e32ecc 100644
--- a/www/zopeedit/Makefile
+++ b/www/zopeedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/04/19 05:01:48 snj Exp $
+# $NetBSD: Makefile,v 1.10 2005/01/23 20:41:49 recht Exp $
 #
 
 DISTNAME=	zopeedit-0.7-src
@@ -12,7 +12,7 @@ HOMEPAGE=	http://www.zope.org/Members/Caseman/ExternalEditor
 COMMENT=	Helper client application for Zope's ExternalEditor
 
 USE_BUILDLINK3=	YES
-PYTHON_VERSIONS_ACCEPTED= 22 22pth 23 23pth
+PYTHON_VERSIONS_ACCEPTED= 22 23
 PYDISTUTILSPKG=	yes
 
 post-install:
-- 
cgit v1.2.3