Don't redefine local variables.

7 files changed, 125 insertions, 6 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;
+ 	}
+ 
+       ////////////////////////////////////////////////
diff --git a/cad/boolean/distinfo b/cad/boolean/distinfo
index d9cc1e3a601..0e418850118 100644
--- a/cad/boolean/distinfo
+++ b/cad/boolean/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.17 2012/10/20 22:03:01 joerg Exp $
+$NetBSD: distinfo,v 1.18 2012/11/16 00:32:50 joerg Exp $
 
 SHA1 (boolean_6_99.tgz) = 03e8dc7c9aa2886b0d5663669248c507524c5b22
 RMD160 (boolean_6_99.tgz) = 7977bb140169fa15a7dde9709ba1867e763b7b9c
 Size (boolean_6_99.tgz) = 4270460 bytes
 SHA1 (patch-aa) = 0ca93dd87f8c314d718b63a14a94cbea7739b5a3
-SHA1 (patch-ab) = 688efee8aeb2f2616a6f67a2dbfd1055d48cb9b3
+SHA1 (patch-ab) = de9890d92db5a2957b1372e9562eb1d416f7f4b1
+SHA1 (patch-apps_edit_src_drivers_gdsdrin.cpp) = 8845e71816bae65cb38c86217483ac868f5a0ce1
 SHA1 (patch-apps_edit_src_drivers_printer.cpp) = fcbe44d1f059bb9ee2cf8301a7f02ec0686b318a
 SHA1 (patch-apps_edit_src_gdssourc_text.cpp) = da50d4d3156e807177cdc7d71c8de586dbd04f6d
 SHA1 (patch-apps_edit_src_intrface_strucdlg_cpp) = 44637ca6b71f722c55f0986ee31ee29f35fe8858
diff --git a/cad/boolean/patches/patch-ab b/cad/boolean/patches/patch-ab
index 707fabefbb0..2bfb77a811b 100644
--- a/cad/boolean/patches/patch-ab
+++ b/cad/boolean/patches/patch-ab
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.6 2012/01/03 01:18:46 dholland Exp $
+$NetBSD: patch-ab,v 1.7 2012/11/16 00:32:50 joerg Exp $
 
 - configure for pkgsrc
 
---- bin/FindwxWidgets.cmake.orig	2009-08-14 18:59:11.000000000 +0200
+--- bin/FindwxWidgets.cmake.orig	2008-10-13 12:59:48.000000000 +0000
 +++ bin/FindwxWidgets.cmake
-@@ -137,9 +137,9 @@ SET( wxWidgets_UCD "" )
+@@ -137,9 +137,9 @@ SET( wxWidgets_UCD "" )

  SET( wxWidgets_DBG "" )

  

  OPTION( wxWidgets_USE_MONOLITHIC "Use wxWidgets build as monolithic library" OFF)

diff --git a/cad/boolean/patches/patch-apps_edit_src_drivers_gdsdrin.cpp b/cad/boolean/patches/patch-apps_edit_src_drivers_gdsdrin.cpp
new file mode 100644
index 00000000000..f8e6803c56c
--- /dev/null
+++ b/cad/boolean/patches/patch-apps_edit_src_drivers_gdsdrin.cpp
@@ -0,0 +1,47 @@
+$NetBSD: patch-apps_edit_src_drivers_gdsdrin.cpp,v 1.1 2012/11/16 00:32:50 joerg Exp $
+
+--- apps/edit/src/drivers/gdsdrin.cpp.orig	2012-11-15 14:12:33.000000000 +0000
++++ apps/edit/src/drivers/gdsdrin.cpp
+@@ -543,8 +543,8 @@ bool GDS_driver_in::ReadArrayReference(S
+       ReadString(strname);

+       _aref->SetStructureReferenceName(strname);

+ 

+-      Strans* _strans = new Strans();

+-      ReadStrans(_strans);

++      Strans* _strans2 = new Strans();

++      ReadStrans(_strans2);

+ 

+ 

+ 		if (!ReadHeader(GDS_COLROW))

+@@ -576,17 +576,17 @@ bool GDS_driver_in::ReadArrayReference(S
+       _relative_matrix = new wxTransformMatrix();

+ 

+       // Mirror in X if necessary

+-      if (_strans->GetReflection())

++      if (_strans2->GetReflection())

+          _relative_matrix->Mirror();

+ 

+       //  Rotate if necessary

+-      if (_strans->GetAbsAngle() == 0)

+-         _relative_matrix->Rotate(_strans->GetAngle(), 0, 0);

++      if (_strans2->GetAbsAngle() == 0)

++         _relative_matrix->Rotate(_strans2->GetAngle(), 0, 0);

+ 

+       // Scale if necessary

+-      if (_strans->GetAbsScale() == 0)

++      if (_strans2->GetAbsScale() == 0)

+       {

+-         EIGHT_G_BYTE_REAL scale = _strans->GetScale();

++         EIGHT_G_BYTE_REAL scale = _strans2->GetScale();

+          _relative_matrix->Scale(scale, scale, 0, 0);

+       }

+ 

+@@ -599,7 +599,7 @@ bool GDS_driver_in::ReadArrayReference(S
+       _structure->insend(_aref);

+ 

+       delete _Point;

+-      delete _strans;

++      delete _strans2;

+       delete _relative_matrix;

+    }

+ 	catch (GDS_Error& _error)