10 files changed, 20 insertions, 107 deletions

diff --git a/science/gnudatalanguage/files/patch-CMakeLists.txt b/science/gnudatalanguage/files/patch-CMakeLists.txt
index 8fc7a05a8585..936269e7c5fc 100644
--- a/science/gnudatalanguage/files/patch-CMakeLists.txt
+++ b/science/gnudatalanguage/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2016-04-29 17:03:25 UTC
+--- CMakeLists.txt.orig	2018-03-28 19:12:21 UTC
 +++ CMakeLists.txt
-@@ -925,7 +925,7 @@ if(NOT PYTHON_MODULE)
+@@ -987,7 +987,7 @@ if(NOT PYTHON_MODULE)
  endif(NOT PYTHON_MODULE)
  
  install(FILES ${CMAKE_SOURCE_DIR}/AUTHORS ${CMAKE_SOURCE_DIR}/README DESTINATION ${CMAKE_INSTALL_PREFIX}/${GDL_DATA_DIR})
diff --git a/science/gnudatalanguage/files/patch-src__basic_fun.cpp b/science/gnudatalanguage/files/patch-src__basic_fun.cpp
index 660a3951739a..3d9395a9baa0 100644
--- a/science/gnudatalanguage/files/patch-src__basic_fun.cpp
+++ b/science/gnudatalanguage/files/patch-src__basic_fun.cpp
@@ -1,6 +1,6 @@
---- src/basic_fun.cpp.orig	2016-04-29 17:03:25 UTC
+--- src/basic_fun.cpp.orig	2018-03-28 19:12:21 UTC
 +++ src/basic_fun.cpp
-@@ -6523,7 +6523,7 @@ namespace lib {
+@@ -8067,7 +8067,7 @@ template <typename Ty, typename T2>  sta
  	  {
  	    // check if the data we get is a port this allows us to correctly parse things like a.com:80
  	    p = e + 1;
@@ -9,7 +9,7 @@
  	    if ((*p == '\0' || *p == '/') && (p - e) < 7) goto parse_port;
  	    urlstru->InitTag("SCHEME", DStringGDL(string(s, (e - s))));
  	    length -= ++e - s;
-@@ -6574,7 +6574,7 @@ namespace lib {
+@@ -8118,7 +8118,7 @@ template <typename Ty, typename T2>  sta
        parse_port:
  	p = e + 1;
  	pp = p;
diff --git a/science/gnudatalanguage/files/patch-src__gshhs.cpp b/science/gnudatalanguage/files/patch-src__gshhs.cpp
index b3e4d4c49752..7fc66c7558a7 100644
--- a/science/gnudatalanguage/files/patch-src__gshhs.cpp
+++ b/science/gnudatalanguage/files/patch-src__gshhs.cpp
@@ -1,6 +1,6 @@
---- src/gshhs.cpp.orig	2016-04-29 17:03:25 UTC
+--- src/gshhs.cpp.orig	2018-03-28 19:12:21 UTC
 +++ src/gshhs.cpp
-@@ -175,7 +175,7 @@ private:
+@@ -235,7 +235,7 @@ else
          double ss = h.south * GSHHS_SCL;
          double nn = h.north * GSHHS_SCL;
          char source = (src == 1) ? 'W' : 'C'; // Either WVS or CIA (WDBII) pedigree 
diff --git a/science/gnudatalanguage/files/patch-src_dialog.cpp b/science/gnudatalanguage/files/patch-src_dialog.cpp
deleted file mode 100644
index be706b95232e..000000000000
--- a/science/gnudatalanguage/files/patch-src_dialog.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/dialog.cpp.orig	2017-05-31 19:49:13 UTC
-+++ src/dialog.cpp
-@@ -18,8 +18,9 @@
- #include "includefirst.hpp"
- 
- #ifdef HAVE_LIBWXWIDGETS
--#include <wx/filedlg.h>
--#include <wx/msgdlg.h>
-+//following includes are 1) not necessary and 2) create a problem with gcc6
-+//#include <wx/filedlg.h>
-+//#include <wx/msgdlg.h>
- #endif
- 
- #include "envt.hpp"
diff --git a/science/gnudatalanguage/files/patch-src_gdlgstream.hpp b/science/gnudatalanguage/files/patch-src_gdlgstream.hpp
deleted file mode 100644
index e6ed9cde41e0..000000000000
--- a/science/gnudatalanguage/files/patch-src_gdlgstream.hpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gdlgstream.hpp.orig	2017-05-19 17:32:58 UTC
-+++ src/gdlgstream.hpp
-@@ -199,7 +199,7 @@ public:
-     const char **devnames = NULL;
- #endif
- 
--    static vector<std::string> devNames;
-+    static std::vector<std::string> devNames;
- 
-     // do only once
-     if( devNames.empty())
diff --git a/science/gnudatalanguage/files/patch-src_gdlwidget.cpp b/science/gnudatalanguage/files/patch-src_gdlwidget.cpp
deleted file mode 100644
index 9a20419fb795..000000000000
--- a/science/gnudatalanguage/files/patch-src_gdlwidget.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gdlwidget.cpp.orig	2017-05-19 17:32:58 UTC
-+++ src/gdlwidget.cpp
-@@ -2455,7 +2455,7 @@ BaseGDL* GDLWidgetTable::GetTableValuesA
-   } 
-   else { //use the wxWidget selection or the passed selection, mode-dependent:
-     if (disjointSelection) { //pairs lists
--      vector<wxPoint> list;
-+      std::vector<wxPoint> list;
-       if (selection->Rank()==0) { //use current wxWidgets selection. Result is a STRUCT
-         list=grid->GetSelectedDisjointCellsList();
-       } else {                   //make equivalent vector.
diff --git a/science/gnudatalanguage/files/patch-src_gdlwidget.hpp b/science/gnudatalanguage/files/patch-src_gdlwidget.hpp
deleted file mode 100644
index 375edfb702ca..000000000000
--- a/science/gnudatalanguage/files/patch-src_gdlwidget.hpp
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/gdlwidget.hpp.orig	2017-05-19 17:32:58 UTC
-+++ src/gdlwidget.hpp
-@@ -275,7 +275,7 @@ protected:
-   long  alignment; //alignment of the widget
-   long widgetStyle; //style (alignment code + other specific codes used as option to widgetsizer) 
-   int dynamicResize; //for some widgets, will enable resizing: -1: not resizable, 0/1 resizable
--  vector<WidgetIDT> followers; //all the widgets that use me as group_leader
-+  std::vector<WidgetIDT> followers; //all the widgets that use me as group_leader
- 
-   
- private:  
-@@ -1256,8 +1256,8 @@ public:
-       if ( selectionCol.GetCount() > 0 ) return TRUE;
-       return FALSE;
-   }
--  vector<wxPoint> GetSelectedDisjointCellsList(){
--      vector<wxPoint> list;
-+  std::vector<wxPoint> GetSelectedDisjointCellsList(){
-+      std::vector<wxPoint> list;
-       wxGridCellCoordsArray cellSelection=this->GetSelectedCells();
-       for( int i=0; i<cellSelection.Count(); i++ ) {
-        int row = cellSelection[i].GetRow();
diff --git a/science/gnudatalanguage/files/patch-src_hdf5__fun.cpp b/science/gnudatalanguage/files/patch-src_hdf5__fun.cpp
deleted file mode 100644
index 20ab2d79f667..000000000000
--- a/science/gnudatalanguage/files/patch-src_hdf5__fun.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/hdf5_fun.cpp.orig	2016-04-29 17:03:25 UTC
-+++ src/hdf5_fun.cpp
-@@ -348,7 +348,7 @@ namespace lib {
-     SizeT nParam=e->NParam(1);
-     hsize_t dims_out[MAXRANK];
- 
--    hid_t h5a_id;
-+    DLong h5a_id;
-     e->AssureLongScalarPar(0, h5a_id);
-     
-     hid_t h5s_id = H5Aget_space(h5a_id);
-@@ -402,7 +402,7 @@ namespace lib {
-     SizeT nParam=e->NParam(1);
-     hsize_t dims_out[MAXRANK];
- 
--    hid_t h5d_id;
-+    DLong h5d_id;
-     e->AssureLongScalarPar(0, h5d_id);
-     
-     hid_t h5s_id = H5Dget_space(h5d_id);
diff --git a/science/gnudatalanguage/files/patch-src_specializations.hpp b/science/gnudatalanguage/files/patch-src_specializations.hpp
deleted file mode 100644
index a0665f054267..000000000000
--- a/science/gnudatalanguage/files/patch-src_specializations.hpp
+++ /dev/null
@@ -1,22 +0,0 @@
-Fix the build with GCC 6 (bug 219300).
-
-Obtained from: https://sourceforge.net/p/gnudatalanguage/bugs/688/#4622
---- src/specializations.hpp.orig	2017-08-15 19:53:08 UTC
-+++ src/specializations.hpp
-@@ -534,16 +534,6 @@ void Data_<SpDString>::MinMax( DLong* minE, DLong* max
- 
- // default_io.cpp
- template<>  
--std::istream& operator>>(std::istream& i, Data_<SpDFloat>& data_); 
--template<>  
--std::istream& operator>>(std::istream& i, Data_<SpDDouble>& data_); 
--template<>  
--std::istream& operator>>(std::istream& i, Data_<SpDComplex>& data_); 
--template<>  
--std::istream& operator>>(std::istream& i, Data_<SpDComplexDbl>& data_); 
--template<>  
--std::istream& operator>>(std::istream& is, Data_<SpDString>& data_); 
--template<>  
- std::ostream& Data_<SpDLong>::ToStream(std::ostream& o, SizeT w, SizeT* actPosPtr); 
- template<>  
- std::ostream& Data_<SpDULong>::ToStream(std::ostream& o, SizeT w, SizeT* actPosPtr); 
diff --git a/science/gnudatalanguage/files/patch-src_ssrfpack.c b/science/gnudatalanguage/files/patch-src_ssrfpack.c
new file mode 100644
index 000000000000..2b942e986332
--- /dev/null
+++ b/science/gnudatalanguage/files/patch-src_ssrfpack.c
@@ -0,0 +1,13 @@
+--- src/ssrfpack.c.orig	2018-04-07 19:40:08 UTC
++++ src/ssrfpack.c
+@@ -7,6 +7,10 @@
+ #define sincosf(x, s, c) __sincosf(x, s, c)
+ #endif
+ 
++#ifdef __FreeBSD__
++#define sincos(x,s,c) *s = sin(x); *c = cos(x)
++#endif
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif