Fix Python's makesetup script to treat -pthread as linker flag.

This is needed for databases/py-psycopg at least to compile properly.
Since the installed version changed, bump revision.

15 files changed, 80 insertions, 14 deletions

diff --git a/lang/python20/Makefile b/lang/python20/Makefile
index a290821f4e9..8f5750678a4 100644
--- a/lang/python20/Makefile
+++ b/lang/python20/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.28 2005/08/19 06:06:09 grant Exp $
+# $NetBSD: Makefile,v 1.29 2005/11/16 19:18:58 joerg Exp $
 #
 
 DISTNAME=	Python-2.0.1
 PKGNAME=	python20-2.0.1
-PKGREVISION=	10
+PKGREVISION=	11
 CATEGORIES=	lang python
 MASTER_SITES=	ftp://ftp.python.org/pub/python/2.0.1/
 EXTRACT_SUFX=	.tgz
diff --git a/lang/python20/distinfo b/lang/python20/distinfo
index 74fe1f24685..e7371d1cc40 100644
--- a/lang/python20/distinfo
+++ b/lang/python20/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2005/08/19 06:12:09 grant Exp $
+$NetBSD: distinfo,v 1.10 2005/11/16 19:18:58 joerg Exp $
 
 SHA1 (python/Python-2.0.1.tgz) = 776584b245ad58ad548732d0c47397c582a4bbab
 RMD160 (python/Python-2.0.1.tgz) = fe663234ff4a8b363f10f6e5589acf1d8b00573f
@@ -9,6 +9,7 @@ SHA1 (patch-ac) = 74ff40fc338e8209d91e5da11fdbed497462dd83
 SHA1 (patch-ad) = f545b33bde36eac8737458506f3fdb25c0f39b5d
 SHA1 (patch-ae) = e962dad92260a1f506298ba3ebb059e852c4ccf4
 SHA1 (patch-af) = 9ed51b6868c3c7e24d92b52f0dc260e9c30d99bc
+SHA1 (patch-ag) = 4b1b561832d6a044c6be0372f9f915b09fab4c3c
 SHA1 (patch-bb) = adab8436d470acdc07149fdd6eed09c20ebf965e
 SHA1 (patch-bc) = fdd18d0fab171364d4733975351fbc60c81d0a4a
 SHA1 (patch-cd) = 60107e1857ff4177efebfbf33fcc2df2a50c61fc
diff --git a/lang/python20/patches/patch-ag b/lang/python20/patches/patch-ag
new file mode 100644
index 00000000000..4bb165d7b69
--- /dev/null
+++ b/lang/python20/patches/patch-ag
@@ -0,0 +1,12 @@
+$NetBSD: patch-ag,v 1.1 2005/11/16 19:18:58 joerg Exp $
+
+--- Modules/makesetup.orig	2000-08-11 15:58:37.000000000 +0200
++++ Modules/makesetup
+@@ -145,6 +145,7 @@ sed -e 's/[ 	]*#.*//' -e '/^[ 	]*$/d' |
+ 			-rpath)		libs="$libs $arg"; skip=libs;;
+ 			--rpath)	libs="$libs $arg"; skip=libs;;
+ 			-[A-Zl]*)	libs="$libs $arg";;
++			-pthread)	libs="$libs $arg";;
+ 			*.a)		libs="$libs $arg";;
+ 			*.so)		libs="$libs $arg";;
+ 			*.sl)		libs="$libs $arg";;
diff --git a/lang/python21/Makefile b/lang/python21/Makefile
index 55db82a93d4..6ed92fa250f 100644
--- a/lang/python21/Makefile
+++ b/lang/python21/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.24 2005/11/01 21:49:31 adrianp Exp $
+# $NetBSD: Makefile,v 1.25 2005/11/16 19:18:58 joerg Exp $
 #
 
 DISTNAME=	Python-2.1.3
 PKGNAME=	python21-2.1.3
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	lang python
 MASTER_SITES=	ftp://ftp.python.org/pub/python/2.1.3/
 EXTRACT_SUFX=	.tgz
diff --git a/lang/python21/distinfo b/lang/python21/distinfo
index 14aba28c799..2c04fe6a59a 100644
--- a/lang/python21/distinfo
+++ b/lang/python21/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2005/11/10 23:39:24 joerg Exp $
+$NetBSD: distinfo,v 1.23 2005/11/16 19:18:58 joerg Exp $
 
 SHA1 (Python-2.1.3.tgz) = 7042a5c5fd60d334c0ac227885d68a4c305713b4
 RMD160 (Python-2.1.3.tgz) = d7216480cf884507d97bf7932767871977fc1ccc
@@ -19,3 +19,4 @@ SHA1 (patch-be) = e1e5675e8b1059bd7836f8f23382a8305382a91b
 SHA1 (patch-bf) = 5a4f05c563d46c66485780c8dd8badac624c4f49
 SHA1 (patch-bg) = 2e0733e66681582d36b1470dce50c8e8b43cd083
 SHA1 (patch-bh) = fa0d154bc5e1ccb1d59b2902aa61df8c91d52b2d
+SHA1 (patch-bi) = 19e9e7ecba296b6fd955087f0dad85c52dfee058
diff --git a/lang/python21/patches/patch-bi b/lang/python21/patches/patch-bi
new file mode 100644
index 00000000000..87cbf0aeced
--- /dev/null
+++ b/lang/python21/patches/patch-bi
@@ -0,0 +1,12 @@
+$NetBSD: patch-bi,v 1.1 2005/11/16 19:18:58 joerg Exp $
+
+--- Modules/makesetup.orig	2005-11-16 15:48:30.000000000 +0100
++++ Modules/makesetup
+@@ -163,6 +163,7 @@ sed -e 's/[ 	]*#.*//' -e '/^[ 	]*$/d' |
+ 			-rpath)		libs="$libs $arg"; skip=libs;;
+ 			--rpath)	libs="$libs $arg"; skip=libs;;
+ 			-[A-Zl]*)	libs="$libs $arg";;
++			-pthread)	libs="$libs $arg";;
+ 			*.a)		libs="$libs $arg";;
+ 			*.so)		libs="$libs $arg";;
+ 			*.sl)		libs="$libs $arg";;
diff --git a/lang/python22/Makefile b/lang/python22/Makefile
index 63fc8a7db8e..aa4ee9b356c 100644
--- a/lang/python22/Makefile
+++ b/lang/python22/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.28 2005/10/01 19:59:39 recht Exp $
+# $NetBSD: Makefile,v 1.29 2005/11/16 19:18:58 joerg Exp $
 #
 
 DISTNAME=	Python-2.2.3
 PKGNAME=	python22-2.2.3
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	lang python
 MASTER_SITES=	ftp://ftp.python.org/pub/python/2.2.3/
 EXTRACT_SUFX=	.tgz
diff --git a/lang/python22/distinfo b/lang/python22/distinfo
index 10ca5c533a4..902e9ecb08a 100644
--- a/lang/python22/distinfo
+++ b/lang/python22/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.17 2005/10/01 19:59:39 recht Exp $
+$NetBSD: distinfo,v 1.18 2005/11/16 19:18:58 joerg Exp $
 
 SHA1 (Python-2.2.3.tgz) = 177d587e77e0eaa14131ab0d0d0b470777de4400
 RMD160 (Python-2.2.3.tgz) = 3590f813582d65194b467f4ab450e360e35eb40e
 Size (Python-2.2.3.tgz) = 6709556 bytes
 SHA1 (patch-aa) = e4d0ec82dc34b7c60fb926e10c205bdf0ea6cabd
 SHA1 (patch-ab) = aa06824d9f595a24aaddc96c83f31646f522ab09
+SHA1 (patch-ac) = 533d4c75b12f83a60808b784b794e200c4fa363f
 SHA1 (patch-ae) = aefeec78e25631a6e9e2aa047dce12c9c522715e
 SHA1 (patch-af) = a2b23859941766319f638e40c49b5af3f504ef52
 SHA1 (patch-ai) = 02f530a08fd8b61a696ae43ddabd7e86e4af7727
diff --git a/lang/python22/patches/patch-ac b/lang/python22/patches/patch-ac
new file mode 100644
index 00000000000..a83bb66f136
--- /dev/null
+++ b/lang/python22/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.3 2005/11/16 19:18:59 joerg Exp $
+
+--- Modules/makesetup.orig	2001-06-02 08:16:02.000000000 +0200
++++ Modules/makesetup
+@@ -163,6 +163,7 @@ sed -e 's/[ 	]*#.*//' -e '/^[ 	]*$/d' |
+ 			-rpath)		libs="$libs $arg"; skip=libs;;
+ 			--rpath)	libs="$libs $arg"; skip=libs;;
+ 			-[A-Zl]*)	libs="$libs $arg";;
++			-pthread)	libs="$libs $arg";;
+ 			*.a)		libs="$libs $arg";;
+ 			*.so)		libs="$libs $arg";;
+ 			*.sl)		libs="$libs $arg";;
diff --git a/lang/python23/Makefile b/lang/python23/Makefile
index e875065fd46..128224f9730 100644
--- a/lang/python23/Makefile
+++ b/lang/python23/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2005/10/01 19:36:01 recht Exp $
+# $NetBSD: Makefile,v 1.31 2005/11/16 19:18:59 joerg Exp $
 #
 
 PKGNAME=	python23-2.3.5
-PKGREVISION=	3
+PKGREVISION=	4
 
 CONFLICTS+=	python-[0-9]*
 
diff --git a/lang/python23/distinfo b/lang/python23/distinfo
index c5046c64b6a..315e5310a0e 100644
--- a/lang/python23/distinfo
+++ b/lang/python23/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.35 2005/10/23 20:05:33 rillig Exp $
+$NetBSD: distinfo,v 1.36 2005/11/16 19:18:59 joerg Exp $
 
 SHA1 (Python-2.3.5.tgz) = 2729d068f5d1abe7b743f32012d4f7c4b0508a3c
 RMD160 (Python-2.3.5.tgz) = 2104a393ca7c91b72b990ced53a0da752ccf42ef
 Size (Python-2.3.5.tgz) = 8535749 bytes
 SHA1 (patch-aa) = dd8f89952d7f40c9a979e362758775f093e047bc
 SHA1 (patch-ab) = 111d7fa8adbb7001bacad36e3bdbe23ae6ce8b9b
+SHA1 (patch-ac) = 0ae5b3d547c7dbe1366c5ae6c60c11516e4550b8
 SHA1 (patch-ad) = c8f6ea08e68dae3bd9ad639c38e74cf654c0b41e
 SHA1 (patch-ae) = 3dcf150147333342b333871b41fe6fa92bced2d9
 SHA1 (patch-af) = f161ce64bb1b318926bd9c534fe7050d7ddb636f
diff --git a/lang/python23/patches/patch-ac b/lang/python23/patches/patch-ac
new file mode 100644
index 00000000000..6384ad96ed5
--- /dev/null
+++ b/lang/python23/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.3 2005/11/16 19:18:59 joerg Exp $
+
+--- Modules/makesetup.orig	2002-03-29 19:00:18.000000000 +0100
++++ Modules/makesetup
+@@ -164,6 +164,7 @@ sed -e 's/[ 	]*#.*//' -e '/^[ 	]*$/d' |
+ 			-rpath)		libs="$libs $arg"; skip=libs;;
+ 			--rpath)	libs="$libs $arg"; skip=libs;;
+ 			-[A-Zl]*)	libs="$libs $arg";;
++			-pthread)	libs="$libs $arg";;
+ 			*.a)		libs="$libs $arg";;
+ 			*.so)		libs="$libs $arg";;
+ 			*.sl)		libs="$libs $arg";;
diff --git a/lang/python24/Makefile b/lang/python24/Makefile
index 6582a2c8f60..49f01426422 100644
--- a/lang/python24/Makefile
+++ b/lang/python24/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2005/10/01 21:12:05 recht Exp $
+# $NetBSD: Makefile,v 1.13 2005/11/16 19:18:59 joerg Exp $
 #
 
 DISTNAME=	Python-2.4.2
 PKGNAME=	python24-2.4.2
+PKGREVISION=	1
 CATEGORIES=	lang python
 MASTER_SITES=	ftp://ftp.python.org/pub/python/2.4.2/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/lang/python24/distinfo b/lang/python24/distinfo
index 71145704b3f..17e9ed4f057 100644
--- a/lang/python24/distinfo
+++ b/lang/python24/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2005/10/01 21:12:05 recht Exp $
+$NetBSD: distinfo,v 1.15 2005/11/16 19:18:59 joerg Exp $
 
 SHA1 (Python-2.4.2.tar.bz2) = a1f1c466fb4a06f612faac75dbaa8bc81e609c2e
 RMD160 (Python-2.4.2.tar.bz2) = c511d2b76b5394742d285e71570a2bcd3c1fa871
@@ -16,3 +16,4 @@ SHA1 (patch-aj) = e471737ade95423039661b475f2dd0fc27aa9dac
 SHA1 (patch-ak) = f2e1d4087a94490bd3589a8c829ec72e04f31f72
 SHA1 (patch-al) = 5aa766853c353a9ceae4513dc896a1d13a548c6c
 SHA1 (patch-am) = 9ce50340d76e8612384f94d4b03414d3f38e35d3
+SHA1 (patch-an) = 0ae5b3d547c7dbe1366c5ae6c60c11516e4550b8
diff --git a/lang/python24/patches/patch-an b/lang/python24/patches/patch-an
new file mode 100644
index 00000000000..35933d76773
--- /dev/null
+++ b/lang/python24/patches/patch-an
@@ -0,0 +1,12 @@
+$NetBSD: patch-an,v 1.7 2005/11/16 19:18:59 joerg Exp $
+
+--- Modules/makesetup.orig	2002-03-29 19:00:18.000000000 +0100
++++ Modules/makesetup
+@@ -164,6 +164,7 @@ sed -e 's/[ 	]*#.*//' -e '/^[ 	]*$/d' |
+ 			-rpath)		libs="$libs $arg"; skip=libs;;
+ 			--rpath)	libs="$libs $arg"; skip=libs;;
+ 			-[A-Zl]*)	libs="$libs $arg";;
++			-pthread)	libs="$libs $arg";;
+ 			*.a)		libs="$libs $arg";;
+ 			*.so)		libs="$libs $arg";;
+ 			*.sl)		libs="$libs $arg";;