Change a unused variable referacne to a fixed string that I missed when

coping the Mac OS X sdk filename handling.

Thank to Matthias Rampke in PR#45581 for catching this.

10 files changed, 20 insertions, 20 deletions

diff --git a/lang/python24/distinfo b/lang/python24/distinfo
index 30450c695e8..8cac8396eae 100644
--- a/lang/python24/distinfo
+++ b/lang/python24/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.37 2011/10/31 06:50:53 sbd Exp $
+$NetBSD: distinfo,v 1.38 2011/11/08 07:30:08 sbd Exp $
 
 SHA1 (Python-2.4.6.tar.bz2) = cb1972a554a458f6a26d3e047b359251865d7c96
 RMD160 (Python-2.4.6.tar.bz2) = 0687989193dec2ac108142759281be7ddcf7f31e
@@ -15,7 +15,7 @@ SHA1 (patch-ai) = 6435c5a7269c14d94eab6fb9777b9d059507e7b8
 SHA1 (patch-aj) = e471737ade95423039661b475f2dd0fc27aa9dac
 SHA1 (patch-ak) = 4c6708eb29757179e6855d8fbe78cab92c5a18d5
 SHA1 (patch-al) = 3bcbdcacc451c8a354ea2d9e9887e61edaabfa41
-SHA1 (patch-am) = ffa0c2c37bdcfe121d4bb10be6c76d06b77fcca6
+SHA1 (patch-am) = 036c6b6b37878c657bc724e7494f518d4d1fa7cb
 SHA1 (patch-an) = 0ae5b3d547c7dbe1366c5ae6c60c11516e4550b8
 SHA1 (patch-ao) = 1ef48142acd8b591b11013b46048d9145f235843
 SHA1 (patch-ap) = 8fbfecdb80ee851db569b64201ccd94bd3552a81
diff --git a/lang/python24/patches/patch-am b/lang/python24/patches/patch-am
index 44d081f29b3..91c16861898 100644
--- a/lang/python24/patches/patch-am
+++ b/lang/python24/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.8 2011/10/31 06:50:53 sbd Exp $
+$NetBSD: patch-am,v 1.9 2011/11/08 07:30:08 sbd Exp $
 
 --- setup.py.orig	2006-10-08 17:41:25.000000000 +0000
 +++ setup.py
@@ -271,7 +271,7 @@ $NetBSD: patch-am,v 1.8 2011/10/31 06:50:53 sbd Exp $
 +                for dir in dirs:
 +                    f = os.path.join(dir, 'ndbm.h')
 +                    if sys.platform == 'darwin' and is_macosx_sdk_path(dir):
-+                        f = os.path.join(sysroot, dir[1:], filename)
++                        f = os.path.join(sysroot, dir[1:], 'ndbm.h')
 +                    if not os.path.exists(f): continue
 +
 +                    ret = 'True'
diff --git a/lang/python25/distinfo b/lang/python25/distinfo
index 6708d6d3505..942275a50cf 100644
--- a/lang/python25/distinfo
+++ b/lang/python25/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2011/10/31 06:50:54 sbd Exp $
+$NetBSD: distinfo,v 1.20 2011/11/08 07:30:08 sbd Exp $
 
 SHA1 (Python-2.5.6.tar.bz2) = 29f6dd41bf09c5e04311b367cbb7604fa016e699
 RMD160 (Python-2.5.6.tar.bz2) = 92f0a955971f187a7d50c6422168202ec551bf22
@@ -15,7 +15,7 @@ SHA1 (patch-ai) = a89bee00860910f53a23b1c670d9c091846a03c1
 SHA1 (patch-aj) = a75d680a6b8b1ad3c9222dcb841f4fb10db6d16d
 SHA1 (patch-ak) = 948362c15ad59abeef46971f9b870b70655a62c7
 SHA1 (patch-al) = a4e28f73d8da2f83fcfbb5daec8d7c2c5bb4ff7f
-SHA1 (patch-am) = a6d7484812a66eb0c474085e6020357911d0a1a5
+SHA1 (patch-am) = dd4372a43dab22d1debdf313ad44e9b53297be92
 SHA1 (patch-an) = 17b4e17b3b562c29a050e9bb20447084ce82b8ab
 SHA1 (patch-ao) = 9bbd5561c010e0a1ab8e0a70d27a5f77fd2089d2
 SHA1 (patch-ap) = b864db92761c843a91374663bd2dbcfa57b317cf
diff --git a/lang/python25/patches/patch-am b/lang/python25/patches/patch-am
index e8a631a9718..62255982606 100644
--- a/lang/python25/patches/patch-am
+++ b/lang/python25/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.9 2011/10/31 06:50:54 sbd Exp $
+$NetBSD: patch-am,v 1.10 2011/11/08 07:30:08 sbd Exp $
 
 --- setup.py.orig	2008-10-16 18:58:19.000000000 +0000
 +++ setup.py
@@ -360,7 +360,7 @@ $NetBSD: patch-am,v 1.9 2011/10/31 06:50:54 sbd Exp $
 +                for dir in dirs:
 +                    f = os.path.join(dir, 'ndbm.h')
 +                    if sys.platform == 'darwin' and is_macosx_sdk_path(dir):
-+                        f = os.path.join(sysroot, dir[1:], filename)
++                        f = os.path.join(sysroot, dir[1:], 'ndbm.h')
 +                    if not os.path.exists(f): continue
 +
 +                    ret = 'True'
diff --git a/lang/python26/distinfo b/lang/python26/distinfo
index 907711ecdee..32f4ba4689e 100644
--- a/lang/python26/distinfo
+++ b/lang/python26/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.40 2011/10/31 06:50:54 sbd Exp $
+$NetBSD: distinfo,v 1.41 2011/11/08 07:30:08 sbd Exp $
 
 SHA1 (Python-2.6.7.tar.bz2) = 5d35eb746e85fb3deaff8518448137c9b9fb6daa
 RMD160 (Python-2.6.7.tar.bz2) = 513e84a7cb76ca876e3803bb03ed558bd0378063
@@ -14,7 +14,7 @@ SHA1 (patch-ad) = a997e39d16a8f0023125362b180d19ee97ab519b
 SHA1 (patch-ae) = a6d578b5f12eb42fbbcc11791576d2686a4807d9
 SHA1 (patch-ah) = 501d220b41e578402f3400fe88e582aa2408a147
 SHA1 (patch-al) = e18800d53de022e4c24055f7d03b69af2837b089
-SHA1 (patch-am) = 154b1d4fd7b5f7767dc383867390aa55d476e824
+SHA1 (patch-am) = 380dfaa8ca90532a52dcca972e34965f6e64fce1
 SHA1 (patch-an) = 17b4e17b3b562c29a050e9bb20447084ce82b8ab
 SHA1 (patch-ao) = 8c6a156b0f0c2a6d319658477fff348e6a0c3603
 SHA1 (patch-ap) = d23a869a449ab9dc166cfa149913b20c9acad9cb
diff --git a/lang/python26/patches/patch-am b/lang/python26/patches/patch-am
index 1327accae0a..8489a42e848 100644
--- a/lang/python26/patches/patch-am
+++ b/lang/python26/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.18 2011/10/31 06:50:54 sbd Exp $
+$NetBSD: patch-am,v 1.19 2011/11/08 07:30:08 sbd Exp $
 
 Disabled modules for normal build:
 bsddb
@@ -308,7 +308,7 @@ support building the "nis" and "crypt" modules.
 +                for dir in dirs:
 +                    f = os.path.join(dir, 'ndbm.h')
 +                    if sys.platform == 'darwin' and is_macosx_sdk_path(dir):
-+                        f = os.path.join(sysroot, dir[1:], filename)
++                        f = os.path.join(sysroot, dir[1:], 'ndbm.h')
 +                    if not os.path.exists(f): continue
 +
 +                    ret = 'True'
diff --git a/lang/python27/distinfo b/lang/python27/distinfo
index aadcb02bbd9..3a96b91809c 100644
--- a/lang/python27/distinfo
+++ b/lang/python27/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2011/10/31 06:49:58 sbd Exp $
+$NetBSD: distinfo,v 1.13 2011/11/08 07:30:08 sbd Exp $
 
 SHA1 (Python-2.7.2.tar.bz2) = 417bdeea77abfaf1b9257fc6b4a04aaa209f4547
 RMD160 (Python-2.7.2.tar.bz2) = c3bf4f09b7c429a4d9f4cc251c795304cd5232c5
@@ -12,7 +12,7 @@ SHA1 (patch-ad) = de730b9f5a5efb56afa8bed05824b5f6579242ec
 SHA1 (patch-ae) = ff6d8c6164fe3c6dc4fb33d88eb8a49d5c5442f6
 SHA1 (patch-ah) = 8e9ee44c7a054f1387b6d8ef8dbe9c1b8dc8d891
 SHA1 (patch-al) = b97c2e73b9038e22f55ec226c2cbcc671466ad19
-SHA1 (patch-am) = 7cb89371d4afb32e9263aacee81c3a0ff7fef228
+SHA1 (patch-am) = f56a53eb9f4694913d317c09e162bdd413f8f38f
 SHA1 (patch-an) = 6098fbf0fc31422196cc40d3a227934523db11ca
 SHA1 (patch-ao) = 9996a444fc0034c9f01fd18f4ad7bf714a8c8d04
 SHA1 (patch-au) = 18fce68df48e43c2927cc83e6b4b404b5e1103b7
diff --git a/lang/python27/patches/patch-am b/lang/python27/patches/patch-am
index 3661c4807d0..97055821166 100644
--- a/lang/python27/patches/patch-am
+++ b/lang/python27/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.6 2011/10/31 06:49:59 sbd Exp $
+$NetBSD: patch-am,v 1.7 2011/11/08 07:30:08 sbd Exp $
 
 Disabled modules for normal build:
 bsddb
@@ -280,7 +280,7 @@ Build the 1.85 compat module all the time against the BDB version of choice.
 +                for dir in dirs:
 +                    f = os.path.join(dir, 'ndbm.h')
 +                    if sys.platform == 'darwin' and is_macosx_sdk_path(dir):
-+                        f = os.path.join(sysroot, dir[1:], filename)
++                        f = os.path.join(sysroot, dir[1:], 'ndbm.h')
 +                    if not os.path.exists(f): continue
 +
 +                    ret = 'True'
diff --git a/lang/python31/distinfo b/lang/python31/distinfo
index 4eb6d907f0e..5e596d2581a 100644
--- a/lang/python31/distinfo
+++ b/lang/python31/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2011/10/31 06:50:54 sbd Exp $
+$NetBSD: distinfo,v 1.6 2011/11/08 07:30:08 sbd Exp $
 
 SHA1 (Python-3.1.4.tar.bz2) = 043d0240247f289205deeb0e620d799005202b3c
 RMD160 (Python-3.1.4.tar.bz2) = d537706808b00989a636418b6b6a06357b6bb94b
@@ -7,7 +7,7 @@ SHA1 (patch-aa) = ae156c486007cfd14d378dd211108d3af4b841b1
 SHA1 (patch-ab) = 7d4d6aa9239f53f1ce9ecd377890d71557c58ca4
 SHA1 (patch-ah) = f93c0aab7b0d5e8e9f80433dda5ed5a22861f6b9
 SHA1 (patch-al) = 48e348c64cf54756cf5b10254661ac089bec3e0a
-SHA1 (patch-am) = dcc335f48a33c23275e07fa0e8f775917c770623
+SHA1 (patch-am) = 8ae86a7715ad30f30c0d600088e08341ae42d421
 SHA1 (patch-an) = 933acde107b735931d26ace4eef251000b9f07ba
 SHA1 (patch-ao) = dca396744edc5c0f86c8912bf54347a630cd865b
 SHA1 (patch-au) = a2cefb240d91121315d02104416324c971af6a20
diff --git a/lang/python31/patches/patch-am b/lang/python31/patches/patch-am
index 14475c61048..42d185de8ff 100644
--- a/lang/python31/patches/patch-am
+++ b/lang/python31/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.4 2011/10/31 06:50:55 sbd Exp $
+$NetBSD: patch-am,v 1.5 2011/11/08 07:30:09 sbd Exp $
 
 --- setup.py.orig	2011-06-11 15:48:52.000000000 +0000
 +++ setup.py
@@ -54,7 +54,7 @@ $NetBSD: patch-am,v 1.4 2011/10/31 06:50:55 sbd Exp $
 +                for dir in dirs:
 +                    f = os.path.join(dir, 'ndbm.h')
 +                    if sys.platform == 'darwin' and is_macosx_sdk_path(dir):
-+                        f = os.path.join(sysroot, dir[1:], filename)
++                        f = os.path.join(sysroot, dir[1:], 'ndbm.h')
 +                    if not os.path.exists(f): continue
 +
 +                    ret = 'True'