- Upgrade math/plplot to 5.11.0

  Announcement at
  <https://sourceforge.net/p/plplot/plplot/ci/plplot-5.11.0/tree/README.release>

- Take maintainership

- Chase dependencies.

PR:		ports/199539
Submitted by:	Ben Woods <woodsb02 (at) gmail.com>
Approved by:	marino (for plplot-ada), /me (for gnudatalanguage)

10 files changed, 117 insertions, 29 deletions

diff --git a/science/gnudatalanguage/Makefile b/science/gnudatalanguage/Makefile
index bd83101366f6..226ebc881ee1 100644
--- a/science/gnudatalanguage/Makefile
+++ b/science/gnudatalanguage/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gnudatalanguage
 DISTVERSION=	0.9.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science lang
 MASTER_SITES=	SF/${PORTNAME}/gdl/${DISTVERSION}
 .if defined(BUILD_PYTHON_MODULE)
@@ -16,7 +16,7 @@ COMMENT?=	GDL, a free IDL compatible incremental compiler
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS+=	libplplotd.so:${PORTSDIR}/math/plplot	\
+LIB_DEPENDS+=	libplplot.so:${PORTSDIR}/math/plplot	\
 		libpng.so:${PORTSDIR}/graphics/png	\
 		libps.so:${PORTSDIR}/print/pslib	\
 		libgsl.so:${PORTSDIR}/math/gsl
diff --git a/science/gnudatalanguage/files/patch-CMakeLists.txt b/science/gnudatalanguage/files/patch-CMakeLists.txt
index 1d57c453c9b9..1e14652565b9 100644
--- a/science/gnudatalanguage/files/patch-CMakeLists.txt
+++ b/science/gnudatalanguage/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2014-10-09 22:46:06.000000000 +0200
-+++ CMakeLists.txt	2014-10-09 22:46:06.000000000 +0200
-@@ -871,7 +871,7 @@
+--- CMakeLists.txt.orig	2015-04-22 19:37:22 UTC
++++ CMakeLists.txt
+@@ -871,7 +871,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-CMakeModules_FindPlplot.cmake b/science/gnudatalanguage/files/patch-CMakeModules_FindPlplot.cmake
new file mode 100644
index 000000000000..f90320de36d3
--- /dev/null
+++ b/science/gnudatalanguage/files/patch-CMakeModules_FindPlplot.cmake
@@ -0,0 +1,13 @@
+--- CMakeModules/FindPlplot.cmake.orig	2015-04-22 19:37:22 UTC
++++ CMakeModules/FindPlplot.cmake
+@@ -9,8 +9,8 @@
+ #
+ 
+ 
+-find_library(PLPLOT_LIBRARY NAMES plplotd)
+-find_library(PLPLOTCXX_LIBRARY NAMES plplotcxxd)
++find_library(PLPLOT_LIBRARY NAMES plplot)
++find_library(PLPLOTCXX_LIBRARY NAMES plplotcxx)
+ set(PLPLOT_LIBRARIES ${PLPLOT_LIBRARY} ${PLPLOTCXX_LIBRARY})
+ find_path(PLPLOT_INCLUDE_DIR NAMES plplot/plplot.h)
+ include(FindPackageHandleStandardArgs)
diff --git a/science/gnudatalanguage/files/patch-CMakeModules_Findlibps.cmake b/science/gnudatalanguage/files/patch-CMakeModules_Findlibps.cmake
index 84f47f21cc1e..f46be9a04957 100644
--- a/science/gnudatalanguage/files/patch-CMakeModules_Findlibps.cmake
+++ b/science/gnudatalanguage/files/patch-CMakeModules_Findlibps.cmake
@@ -1,5 +1,5 @@
---- ./CMakeModules/Findlibps.cmake.orig	2013-01-03 00:26:23.000000000 +0100
-+++ ./CMakeModules/Findlibps.cmake	2013-09-30 13:27:07.000000000 +0200
+--- CMakeModules/Findlibps.cmake.orig	2015-04-22 19:37:22 UTC
++++ CMakeModules/Findlibps.cmake
 @@ -1,4 +1,4 @@
 -find_path(LIBPSPKG libps.pc PATH_SUFFIXES lib lib/pkgconfig lib64/pkgconfig)
 +find_path(LIBPSPKG libps.pc PATH_SUFFIXES lib libdata/pkgconfig lib/pkgconfig lib64/pkgconfig)
diff --git a/science/gnudatalanguage/files/patch-src__base64.hpp b/science/gnudatalanguage/files/patch-src__base64.hpp
index e91fb7826acb..7e8cfa99c124 100644
--- a/science/gnudatalanguage/files/patch-src__base64.hpp
+++ b/science/gnudatalanguage/files/patch-src__base64.hpp
@@ -1,6 +1,6 @@
---- src/base64.hpp.orig	2014-10-10 23:11:19.000000000 +0200
-+++ src/base64.hpp	2014-10-10 23:17:21.000000000 +0200
-@@ -147,7 +147,7 @@
+--- src/base64.hpp.orig	2015-04-22 19:37:22 UTC
++++ src/base64.hpp
+@@ -147,7 +147,7 @@ namespace base64 {
  						Warning("base64 decode error: unexpected fill char -- offset read?");
  						return false;
  					}
@@ -9,7 +9,7 @@
  						//cerr << "base 64 decode error: illegal character '" << data[i-1] << "' (0x" << std::hex << (int)data[i-1] << std::dec << ")" << endl;
  						Warning("base 64 decode error: illegal character");
  						return false;
-@@ -165,7 +165,7 @@
+@@ -165,7 +165,7 @@ namespace base64 {
  						Warning("base64 decode error: unexpected fill char -- offset read?");
  						return false;
  					}
@@ -18,7 +18,7 @@
  						//cerr << "base 64 decode error: illegal character '" << data[i-1] << '\'' << endl;
  						Warning("base 64 decode error: illegal character");
  						return false;
-@@ -190,7 +190,7 @@
+@@ -190,7 +190,7 @@ namespace base64 {
  					if(fillchar == data[i-1]) {
  						return true;
  					}
@@ -27,7 +27,7 @@
  						//cerr << "base 64 decode error: illegal character '" << data[i-1] << '\'' << endl;
  						Warning("base 64 decode error: illegal character");
  						return false;
-@@ -215,7 +215,7 @@
+@@ -215,7 +215,7 @@ namespace base64 {
  					if(fillchar == data[i-1]) {
  						return true;
  					}
diff --git a/science/gnudatalanguage/files/patch-src__basic_fun.cpp b/science/gnudatalanguage/files/patch-src__basic_fun.cpp
index cb5b8630ba91..91629e479210 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	2014-10-10 23:18:05.000000000 +0200
-+++ src/basic_fun.cpp	2014-10-10 23:21:54.000000000 +0200
-@@ -6483,7 +6483,7 @@
+--- src/basic_fun.cpp.orig	2015-04-22 19:37:22 UTC
++++ src/basic_fun.cpp
+@@ -6483,7 +6483,7 @@ BaseGDL* strtok_fun(EnvT* e) {
        while (p < e) 
        {
          // scheme = 1*[ lowalpha | digit | "+" | "-" | "." ]
@@ -9,7 +9,7 @@
          {
            if (e + 1 < ue) goto parse_port;
            else goto just_path;
-@@ -6501,7 +6501,7 @@
+@@ -6501,7 +6501,7 @@ BaseGDL* strtok_fun(EnvT* e) {
        {
          // check if the data we get is a port this allows us to correctly parse things like a.com:80
          p = e + 1;
diff --git a/science/gnudatalanguage/files/patch-src__gshhs.cpp b/science/gnudatalanguage/files/patch-src__gshhs.cpp
index 8ad12a6278be..1a517e71e275 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	2014-10-11 19:11:00.000000000 +0200
-+++ src/gshhs.cpp	2014-10-11 19:37:17.000000000 +0200
-@@ -175,7 +175,7 @@
+--- src/gshhs.cpp.orig	2015-04-22 19:37:22 UTC
++++ src/gshhs.cpp
+@@ -175,7 +175,7 @@ private:
          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__gsl_fun.cpp b/science/gnudatalanguage/files/patch-src__gsl_fun.cpp
index eb1bb5138824..dd41d0e405ca 100644
--- a/science/gnudatalanguage/files/patch-src__gsl_fun.cpp
+++ b/science/gnudatalanguage/files/patch-src__gsl_fun.cpp
@@ -1,6 +1,6 @@
---- src/gsl_fun.cpp.orig	2014-10-09 22:55:52.000000000 +0200
-+++ src/gsl_fun.cpp	2014-10-09 22:55:52.000000000 +0200
-@@ -3183,7 +3183,7 @@
+--- src/gsl_fun.cpp.orig	2015-04-22 19:37:22 UTC
++++ src/gsl_fun.cpp
+@@ -3183,7 +3183,7 @@ namespace lib {
        e->AssureScalarPar<DStringGDL>(0, tmpname);    
        name.reserve(tmpname.length());
        for (string::iterator it = tmpname.begin(); it < tmpname.end(); it++) 
diff --git a/science/gnudatalanguage/files/patch-src__str.cpp b/science/gnudatalanguage/files/patch-src__str.cpp
index e5082a6db1a3..17337dfafc77 100644
--- a/science/gnudatalanguage/files/patch-src__str.cpp
+++ b/science/gnudatalanguage/files/patch-src__str.cpp
@@ -1,6 +1,6 @@
---- ./src/str.cpp.orig	2014-04-08 16:53:53.954118000 +0200
-+++ ./src/str.cpp	2014-04-08 16:58:59.524163473 +0200
-@@ -180,7 +180,7 @@
+--- src/str.cpp.orig	2015-04-22 19:37:22 UTC
++++ src/str.cpp
+@@ -178,7 +178,7 @@ string StrUpCase(const string& s)
    ArrayGuard<char> guard( r);
    r[len]=0;
    for(unsigned i=0;i<len;i++)
@@ -9,7 +9,7 @@
    return string(r);
  }
  void StrUpCaseInplace( string& s)
-@@ -191,7 +191,7 @@
+@@ -189,7 +189,7 @@ void StrUpCaseInplace( string& s)
  //   ArrayGuard<char> guard( r);
  //   r[len]=0;
    for(unsigned i=0;i<len;i++)
@@ -18,7 +18,7 @@
  //   return string(r);
  }
  
-@@ -203,7 +203,7 @@
+@@ -201,7 +201,7 @@ string StrLowCase(const string& s)
    ArrayGuard<char> guard( r);
    r[len]=0;
    for(unsigned i=0;i<len;i++)
@@ -27,7 +27,7 @@
    return string(r);
  }
  void StrLowCaseInplace(string& s)
-@@ -211,7 +211,7 @@
+@@ -209,7 +209,7 @@ void StrLowCaseInplace(string& s)
    unsigned len=s.length();
  //   char const *sCStr=s.c_str();
    for(unsigned i=0;i<len;i++)
diff --git a/science/gnudatalanguage/files/patch-src_plotting__contour.cpp b/science/gnudatalanguage/files/patch-src_plotting__contour.cpp
new file mode 100644
index 000000000000..06d9c9e26fc0
--- /dev/null
+++ b/science/gnudatalanguage/files/patch-src_plotting__contour.cpp
@@ -0,0 +1,75 @@
+--- src/plotting_contour.cpp.orig	2015-04-22 19:37:22 UTC
++++ src/plotting_contour.cpp
+@@ -789,8 +789,8 @@ namespace lib
+               1, value, 
+               static_cast<PLFLT>(( *thick )[i%thick->N_Elements()]),
+               0,0,0,0,
+-              (plstream::fill), (oneDim),
+-              (oneDim)?(plstream::tr1):(plstream::tr2), (oneDim)?(void *)&cgrid1:(void *)&cgrid2);
++              (plcallback::fill), (oneDim),
++              (oneDim)?(plcallback::tr1):(plcallback::tr2), (oneDim)?(void *)&cgrid1:(void *)&cgrid2);
+             }
+             actStream->psty(0);
+ //            if (docolors) gdlSetGraphicsForegroundColorFromKw( e, actStream );
+@@ -808,8 +808,8 @@ namespace lib
+               clevel[i], maxmax, 
+               1,value,
+               0,0,0,0,0,
+-                  plstream::fill, (oneDim), //Onedim is accelerator since rectangles are kept rectangles see plplot doc
+-                  (oneDim)?(plstream::tr1):(plstream::tr2), (oneDim)?(void *)&cgrid1:(void *)&cgrid2);
++                  plcallback::fill, (oneDim), //Onedim is accelerator since rectangles are kept rectangles see plplot doc
++                  (oneDim)?(plcallback::tr1):(plcallback::tr2), (oneDim)?(void *)&cgrid1:(void *)&cgrid2);
+                 }
+           } else {  //every other case of fill 
+             // note that plshades is not protected against 1 level (color formula is
+@@ -818,8 +818,8 @@ namespace lib
+             if (nlevel>2 && !(docolors)) { //acceleration with shades when no c_colors are given. use continuous table1, decomposed or not.
+               //acceleration is most sensible when a (x,y) transform (rotate, stretch) is in place since plplot does not recompute the map.
+               actStream->shades( map, xEl, yEl, isLog?doIt:NULL, xStart, xEnd, yStart, yEnd,
+-                                clevel, nlevel, 1, 0, 0, plstream::fill, (oneDim),
+-                                (oneDim)?(plstream::tr1):(plstream::tr2),
++                                clevel, nlevel, 1, 0, 0, plcallback::fill, (oneDim),
++                                (oneDim)?(plcallback::tr1):(plcallback::tr2),
+                                 (oneDim)?(void *)&cgrid1:(void *)&cgrid2);
+             }
+             else { //fill with colors defined with c_colors or n<=2
+@@ -832,8 +832,8 @@ namespace lib
+                 clevel[i], maxmax,
+                 1,value,
+                 0,0,0,0,0,
+-                plstream::fill, (oneDim), //Onedim is accelerator since rectangles are kept rectangles see plplot doc
+-                (oneDim)?(plstream::tr1):(plstream::tr2), (oneDim)?(void *)&cgrid1:(void *)&cgrid2);
++                plcallback::fill, (oneDim), //Onedim is accelerator since rectangles are kept rectangles see plplot doc
++                (oneDim)?(plcallback::tr1):(plcallback::tr2), (oneDim)?(void *)&cgrid1:(void *)&cgrid2);
+               } else
+ 		        printf(" Problem, sorry! plplot doesn't like to FILL with a single level!");
+             }
+@@ -854,7 +854,7 @@ namespace lib
+             if (doT3d) { //no label in T3D , bug in plplot...
+               actStream->setcontlabelparam ( LABELOFFSET, (PLFLT) label_size, LABELSPACING, 0 );
+               actStream->cont ( map, xEl, yEl, 1, xEl, 1, yEl, &( clevel[i] ), 1,
+-                (oneDim)?(plstream::tr1):(plstream::tr2), (oneDim)?(void *)&cgrid1:(void *)&cgrid2);
++                (oneDim)?(plcallback::tr1):(plcallback::tr2), (oneDim)?(void *)&cgrid1:(void *)&cgrid2);
+             } else {
+               if (dolabels && i<labels->N_Elements()) 
+               {
+@@ -862,16 +862,16 @@ namespace lib
+                                                               //else (lables thicker than contours) impossible with plplot...
+                   actStream->setcontlabelparam ( LABELOFFSET, (PLFLT) label_size, LABELSPACING, 0 ); 
+                   actStream->cont ( map, xEl, yEl, 1, xEl, 1, yEl, &( clevel[i] ), 1,
+-                  (oneDim)?(plstream::tr1):(plstream::tr2), (oneDim)?(void *)&cgrid1:(void *)&cgrid2); //thick contours, no label
++                  (oneDim)?(plcallback::tr1):(plcallback::tr2), (oneDim)?(void *)&cgrid1:(void *)&cgrid2); //thick contours, no label
+                   actStream->Thick(label_thick);
+                 } 
+                 actStream->setcontlabelparam ( LABELOFFSET, (PLFLT) label_size, LABELSPACING*sqrt(label_size),(PLINT)(*labels)[i] ); 
+                 actStream->cont ( map, xEl, yEl, 1, xEl, 1, yEl, &( clevel[i] ), 1,
+-                (oneDim)?(plstream::tr1):(plstream::tr2), (oneDim)?(void *)&cgrid1:(void *)&cgrid2);
++                (oneDim)?(plcallback::tr1):(plcallback::tr2), (oneDim)?(void *)&cgrid1:(void *)&cgrid2);
+                 if (!dothick) gdlSetPenThickness(e, actStream);
+               } else {
+                 actStream->cont ( map, xEl, yEl, 1, xEl, 1, yEl, &( clevel[i] ), 1,
+-                (oneDim)?(plstream::tr1):(plstream::tr2), (oneDim)?(void *)&cgrid1:(void *)&cgrid2);
++                (oneDim)?(plcallback::tr1):(plcallback::tr2), (oneDim)?(void *)&cgrid1:(void *)&cgrid2);
+               }
+             }
+           }