Import of pkgsrc-2013Q2

cad/boolean/patches/patch-aa

@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.6 2012/01/03 01:18:46 dholland Exp $
+
+Configure for pkgsrc.
+
+--- bin/boolean.sh.orig	2007-02-27 08:54:20.000000000 +0100
++++ bin/boolean.sh
+@@ -1,7 +1,5 @@
+ #! /bin/sh
+-PATH=/opt/protools/boolean/6.6/boolean/apps/edit:$PATH
+-
+-GDSROOT=/opt/protools/boolean/6.6/boolean/apps/edit
++GDSROOT=@prefix@/share/boolean
+ export GDSROOT
+ 
+ echo "boolean operation program"

cad/boolean/patches/patch-ab

@@ -0,0 +1,18 @@
+$NetBSD: patch-ab,v 1.7 2012/11/16 00:32:50 joerg Exp $
+
+- configure for pkgsrc
+
+--- bin/FindwxWidgets.cmake.orig	2008-10-13 12:59:48.000000000 +0000
++++ bin/FindwxWidgets.cmake
+@@ -137,9 +137,9 @@ SET( wxWidgets_UCD "" )
+ SET( wxWidgets_DBG "" )
+ 
+ OPTION( wxWidgets_USE_MONOLITHIC "Use wxWidgets build as monolithic library" OFF)
+-OPTION( wxWidgets_USE_DEBUG  "Use Debug versions of wxWidgets libraries" ON)
++OPTION( wxWidgets_USE_DEBUG  "Use Debug versions of wxWidgets libraries" OFF)
+ OPTION( wxWidgets_USE_UNICODE "Use Unicode versions of wxWidgets libraries" OFF)
+-OPTION( wxWidgets_USE_SHARED "Use shared versions (.so) of wxWidgets libraries" OFF)
++OPTION( wxWidgets_USE_SHARED "Use shared versions (.so) of wxWidgets libraries" ON)
+ OPTION( wxWidgets_USE_UNIV "Use Universal versions (.so) of wxWidgets libraries" OFF)
+ 
+ IF( wxWidgets_USE_UNIV )

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)

cad/boolean/patches/patch-apps_edit_src_drivers_printer.cpp

@@ -0,0 +1,14 @@
+$NetBSD: patch-apps_edit_src_drivers_printer.cpp,v 1.1 2012/10/20 22:03:01 joerg Exp $
+
+--- apps/edit/src/drivers/printer.cpp.orig	2012-10-20 12:02:42.000000000 +0000
++++ apps/edit/src/drivers/printer.cpp
+@@ -87,7 +87,8 @@ bool PrintDriver::OnPrintPage(int)
+       // Multiply the points with the relative matrix
+       for (int i = 0; i < 4; i++)
+       {
+-         corners[i].Transform(&GLOB->SCRDRV->GetInverseMappingMatrix());
++         wxTransformMatrix tmp(GLOB->SCRDRV->GetInverseMappingMatrix());
++         corners[i].Transform(&tmp);
+       }
+       x = (int) corners[0].GetX();
+       y = (int) corners[0].GetY();

cad/boolean/patches/patch-apps_edit_src_gdssourc_text.cpp

@@ -0,0 +1,16 @@
+$NetBSD: patch-apps_edit_src_gdssourc_text.cpp,v 1.1 2012/10/20 22:03:01 joerg Exp $
+
+--- apps/edit/src/gdssourc/text.cpp.orig	2012-10-20 11:58:47.000000000 +0000
++++ apps/edit/src/gdssourc/text.cpp
+@@ -61,9 +61,10 @@ void Text::DoWrite(DrawDriver& dr)
+ 
+ 	dr.SetSelected(GetSelect());
+ 
++   wxTransformMatrix tmp(*dr.GetMatrix() * *GetRelativeMatrix());
+    dr.GDSDrawText(_text, min_point.GetX(), min_point.GetY(),
+ 										  max_point.GetX(), max_point.GetY(),
+-								   	  this, &(*dr.GetMatrix() * *GetRelativeMatrix()));
++								   	  this, &tmp);
+ 
+ }
+ 

cad/boolean/patches/patch-apps_edit_src_intrface_strucdlg_cpp

@@ -0,0 +1,24 @@
+$NetBSD: patch-apps_edit_src_intrface_strucdlg_cpp,v 1.1 2012/01/03 01:18:46 dholland Exp $
+
+Avoid undefined behvior, caught by gcc.
+
+--- apps/edit/src/intrface/strucdlg.cpp~	2006-05-03 11:41:00.000000000 +0000
++++ apps/edit/src/intrface/strucdlg.cpp
+@@ -286,7 +286,7 @@ void StructuresDialog::CmOk(wxCommandEve
+       selectedStruct = selectedStruct.Mid( 0, top );
+ 	_structure = _structurelist->GetStructure(selectedStruct);
+    if (_structure)
+-		GLOB->CMDH->DoCommand("viewstructure %s",selectedStruct);
++		GLOB->CMDH->DoCommand("viewstructure %s", (const char *)selectedStruct);
+ }
+ 
+ // OK button pressed: get the choosen structure
+@@ -299,7 +299,7 @@ void StructuresDialog::CmShow(wxCommandE
+       selectedStruct = selectedStruct.Mid( 0, top );
+ 	_structure = _structurelist->GetStructure(selectedStruct);
+    if (_structure)
+-		GLOB->CMDH->DoCommand("viewstructure %s",selectedStruct);
++		GLOB->CMDH->DoCommand("viewstructure %s", (const char *)selectedStruct);
+ }
+ 
+ Structure* StructuresDialog::GetStructure()