Don't redefine local variables.

4 files changed, 72 insertions, 1 deletions

diff --git a/biology/plink/distinfo b/biology/plink/distinfo
index cbe6e2c93d5..1bd362fd071 100644
--- a/biology/plink/distinfo
+++ b/biology/plink/distinfo
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.1.1.1 2012/09/14 17:46:23 asau Exp $
+$NetBSD: distinfo,v 1.2 2012/11/16 00:32:07 joerg Exp $
 
 SHA1 (plink-1.07-src.zip) = d41a2d014ebc02bf11e5235292b50fad6dedd407
 RMD160 (plink-1.07-src.zip) = ce22e2388fc711ac9938d21ffd3cb68512ba1150
 Size (plink-1.07-src.zip) = 2257297 bytes
 SHA1 (patch-Makefile) = cb01e12cea61d1fe41f352759481277284d9c187
+SHA1 (patch-elf.cpp) = ab0bfdda3c84b4f3891f53a95bacaafa5d016bd9
+SHA1 (patch-idhelp.cpp) = 3321f343a02bf7cfd253f12f24c8abfb2ef9ec3a
+SHA1 (patch-sets.cpp) = cd317b6b3775682e60e93f1d35955007d71b90b0
diff --git a/biology/plink/patches/patch-elf.cpp b/biology/plink/patches/patch-elf.cpp
new file mode 100644
index 00000000000..27f3633e690
--- /dev/null
+++ b/biology/plink/patches/patch-elf.cpp
@@ -0,0 +1,27 @@
+$NetBSD: patch-elf.cpp,v 1.1 2012/11/16 00:32:07 joerg Exp $
+
+--- elf.cpp.orig	2012-11-15 12:41:01.000000000 +0000
++++ elf.cpp
+@@ -1175,10 +1175,10 @@ void Plink::elfBaseline()
+ 	  << setw(8) << gcnt << " "
+ 	  << setw(8) << (double)cnt / (double)gcnt << "\n";
+ 
+-      map<int,int>::iterator i = chr_cnt.begin();
+-      while ( i != chr_cnt.end() )
++      map<int,int>::iterator i2 = chr_cnt.begin();
++      while ( i2 != chr_cnt.end() )
+ 	{
+-	  int c = i->first;
++	  int c = i2->first;
+ 	  int x = chr_cnt.find( c )->second;
+ 	  int y = chr_gcnt.find( c )->second;
+ 	  
+@@ -1189,7 +1189,7 @@ void Plink::elfBaseline()
+ 	      << setw(8) << y << " "
+ 	      << setw(8) << (double)x / (double)y << "\n";
+ 	  
+-	  ++i;
++	  ++i2;
+ 	}
+       
+     }
diff --git a/biology/plink/patches/patch-idhelp.cpp b/biology/plink/patches/patch-idhelp.cpp
new file mode 100644
index 00000000000..866bbc0b897
--- /dev/null
+++ b/biology/plink/patches/patch-idhelp.cpp
@@ -0,0 +1,21 @@
+$NetBSD: patch-idhelp.cpp,v 1.1 2012/11/16 00:32:07 joerg Exp $
+
+--- idhelp.cpp.orig	2012-11-15 12:44:01.000000000 +0000
++++ idhelp.cpp
+@@ -772,12 +772,12 @@ void IDHelper::idHelp()
+       for (int j = 0 ; j < jointField.size(); j++ )
+ 	{
+ 	  set<IDField*> & jf = jointField[j];
+-	  set<IDField*>::iterator j = jf.begin();
++	  set<IDField*>::iterator j2 = jf.begin();
+ 	  PP->printLOG(" { ");
+-	  while ( j != jf.end() )
++	  while ( j2 != jf.end() )
+ 	    {
+-	      PP->printLOG( (*j)->name + " " );
+-	      ++j;
++	      PP->printLOG( (*j2)->name + " " );
++	      ++j2;
+ 	    }
+ 	  PP->printLOG(" }");
+ 	}
diff --git a/biology/plink/patches/patch-sets.cpp b/biology/plink/patches/patch-sets.cpp
new file mode 100644
index 00000000000..70263c3b8fe
--- /dev/null
+++ b/biology/plink/patches/patch-sets.cpp
@@ -0,0 +1,20 @@
+$NetBSD: patch-sets.cpp,v 1.1 2012/11/16 00:32:07 joerg Exp $
+
+--- sets.cpp.orig	2012-11-15 12:39:15.000000000 +0000
++++ sets.cpp
+@@ -768,11 +768,11 @@ vector_t Set::profileTestScore()
+       //////////////////////////////////////////////
+       // Reset original missing status
+ 
+-      vector<Individual*>::iterator i = PP->sample.begin();
+-      while ( i != PP->sample.end() )
++      vector<Individual*>::iterator i2 = PP->sample.begin();
++      while ( i2 != PP->sample.end() )
+ 	{
+-	  (*i)->missing = (*i)->flag;
+-	  ++i;
++	  (*i2)->missing = (*i2)->flag;
++	  ++i2;
+ 	}
+ 
+       ////////////////////////////////////////////////