Index: head/science/gnudatalanguage/Makefile
===================================================================
--- head/science/gnudatalanguage/Makefile	(revision 405483)
+++ head/science/gnudatalanguage/Makefile	(revision 405484)
@@ -1,126 +1,132 @@
 # Created by: thierry@pompo.net
 # $FreeBSD$
 
 PORTNAME=	gnudatalanguage
-DISTVERSION=	0.9.5
-PORTREVISION=	7
+DISTVERSION=	0.9.6v2
 CATEGORIES=	science lang
-MASTER_SITES=	SF/${PORTNAME}/gdl/${DISTVERSION}
+MASTER_SITES=	SF/${PORTNAME}/gdl/${PORTVERSION:R}
 .if defined(BUILD_PYTHON_MODULE)
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 .endif
 DISTNAME=	gdl-${DISTVERSION}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT?=	GDL, a free IDL compatible incremental compiler
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS+=	libplplot.so:${PORTSDIR}/math/plplot	\
 		libpng.so:${PORTSDIR}/graphics/png	\
 		libps.so:${PORTSDIR}/print/pslib	\
 		libgsl.so:${PORTSDIR}/math/gsl
 
 USE_WX=		2.8
-WX_UNICODE=	yes
 USE_XORG=	x11 sm ice xext
-USES=		cmake:outsource compiler:gcc-c++11-lib dos2unix ncurses pkgconfig readline
+USES=		cmake:outsource compiler:gcc-c++11-lib dos2unix ncurses pkgconfig readline tar:tgz
 
 # Disable ncurses and readline from ports
 # Disable ImageMagick (does'nt work with plplot because dynamic drivers
 #	are enabled by default)
 # TODO: add a slave port for mpich
 CMAKE_ARGS=	-DREADLINEDIR:STRING="/usr"		\
 		-DNCURSESDIR:STRING="/usr"		\
 		-DMPICH:BOOL=NO				\
 		-DMAGICK:BOOL=NO
-CPPFLAGS+=	${CFLAGS} -fno-inline
+CPPFLAGS+=	${CFLAGS} -fno-inline -DNPY_NO_DEPRECATED_API -DNPY_1_7_API_VERSION
 LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
+WRKSRC=		${WRKDIR}/gdl-${PORTVERSION:R}
 
 SLAVEDIRS=	science/py-gnudatalanguage
 
 OPTIONS_DEFINE=	EIGEN EXAMPLES FFTW GRAPHICSMAGICK GRIB HDF5 LIBPROJ4 MPICH2 NETCDF PYTHON UDUNITS
 OPTIONS_DEFAULT=EIGEN EXAMPLES FFTW GRAPHICSMAGICK GRIB HDF5 LIBPROJ4 NETCDF PYTHON UDUNITS
 
 EIGEN_DESC=	Eigen3 support (boost performance)
 EIGEN_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/eigen3.pc:${PORTSDIR}/math/eigen3
 EIGEN_CMAKE_ON=		-DEIGEN3:BOOL=YES
 EIGEN_CMAKE_OFF=	-DEIGEN3:BOOL=NO
 
 FFTW_LIB_DEPENDS=	libfftw3.so:${PORTSDIR}/math/fftw3		\
 			libfftw3f.so:${PORTSDIR}/math/fftw3-float
 FFTW_CMAKE_ON=		-DFFTW:BOOL=YES
 FFTW_CMAKE_OFF=		-DFFTW:BOOL=NO
 
+GRAPHICSMAGICK_DESC=		Support GraphicsMagick
 GRAPHICSMAGICK_LIB_DEPENDS=	libGraphicsMagick.so:${PORTSDIR}/graphics/GraphicsMagick
 GRAPHICSMAGICK_CMAKE_ON=	-DGRAPHICSMAGICK:BOOL=YES
 GRAPHICSMAGICK_CMAKE_OFF=	-DGRAPHICSMAGICK:BOOL=NO
 
 GRIB_DESC=		Support GRIB messages
 GRIB_LIB_DEPENDS=	libgrib_api.so:${PORTSDIR}/science/grib_api
 GRIB_CMAKE_ON=		-DGRIB:BOOL=YES
 GRIB_CMAKE_OFF=		-DGRIB:BOOL=NO
 
 HDF5_LIB_DEPENDS=	libhdf5.so:${PORTSDIR}/science/hdf5
 HDF5_CMAKE_ON=		-DHDF5:BOOL=YES
 HDF5_CMAKE_OFF=		-DHDF5:BOOL=NO -DHDF:BOOL=NO
 
 LIBPROJ4_DESC=		Support cartographic processes
 LIBPROJ4_LIB_DEPENDS=	libproj4.so:${PORTSDIR}/math/libproj4
 LIBPROJ4_CMAKE_ON=	-DLIBPROJ4:BOOL=YES
 LIBPROJ4_CMAKE_OFF=	-DLIBPROJ4:BOOL=NO
 
 MPICH2_LIB_DEPENDS=	libmpich.so.8:${PORTSDIR}/net/mpich2
 MPICH2_CMAKE_ON=	-DMPICH:BOOL=YES
 MPICH2_CMAKE_OFF=	-DMPICH:BOOL=NO
 
 NETCDF_LIB_DEPENDS=	libnetcdf.so:${PORTSDIR}/science/netcdf
 NETCDF_CMAKE_ON=	-DNETCDF:BOOL=YES -DHDF:BOOL=NO
 NETCDF_CMAKE_OFF=	-DNETCDF:BOOL=NO
 
 PYTHON_USES=		python
 PYTHON_BUILD_DEPENDS=	${PYNUMPY}
 PYTHON_RUN_DEPENDS=	${PYNUMPY} \
 			${PYTHON_PKGNAMEPREFIX}matplotlib>0:${PORTSDIR}/math/py-matplotlib
 PYTHON_CMAKE_ON=	-DPYTHON:BOOL=YES -DPYTHONVERSION:STRING="${PYTHON_VER}"
 PYTHON_CMAKE_OFF=	-DPYTHON:BOOL=NO
+
+# math/qhull conflicts with math/plplot
+#QHULL_DESC=		Enable Qhull support
+#QHULL_LIB_DEPENDS=	libqhull.so:${PORTSDIR}/math/qhull
+#QHULL_CMAKE_ON=		-DQHULL:BOOL=YES
+#QHULL_CMAKE_OFF=	-DQHULL:BOOL=NO
 
 UDUNITS_LIB_DEPENDS=	libudunits2.so:${PORTSDIR}/science/udunits
 UDUNITS_CMAKE_ON=	-DUDUNITS:BOOL=YES
 UDUNITS_CMAKE_OFF=	-DUDUNITS:BOOL=NO
 
 .if defined(BUILD_PYTHON_MODULE)
 CATEGORIES+=	python
 CMAKE_ARGS+=	-DPYTHON_MODULE:BOOL=YES -DOPENMP:BOOL=NO
 PLIST=		pkg-plist.pymod
 .else
 CMAKE_ARGS+=	-DPYTHON_MODULE:BOOL=NO
 .endif
 
 .if defined(BUILD_PYTHON_MODULE)
 do-install:
 	${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
 	${INSTALL_DATA} ${INSTALL_WRKSRC}/src/libgdl.so ${STAGEDIR}${PYTHON_SITELIBDIR}/GDL.so
 .endif
 
 .if !defined(BUILD_PYTHON_MODULE)
 post-stage:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/testsuite
 	(cd ${WRKSRC}/testsuite && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}/testsuite/)
 .endif
 
 .if defined(MAINTAINER_MODE)
 regression-test:	install
 . if defined(BUILD_PYTHON_MODULE)
 	@${ECHO_CMD} 'import GDL' > ${WRKDIR}/testgdl.py
 	@${ECHO_CMD} 'print GDL.function("sin",(1,))' >> ${WRKDIR}/testgdl.py
 	${PYTHON_CMD} ${WRKDIR}/testgdl.py
 . else
 	@${ECHO_CMD} ".RUN ${EXAMPLESDIR}/testsuite/test_suite.pro"	\
 		> ${WRKDIR}/testgdl
 	@${ECHO_CMD} "exit" >> ${WRKDIR}/testgdl
 	${PREFIX}/bin/gdl < ${WRKDIR}/testgdl
 . endif
 .endif
 
 .include <bsd.port.mk>
Index: head/science/gnudatalanguage/distinfo
===================================================================
--- head/science/gnudatalanguage/distinfo	(revision 405483)
+++ head/science/gnudatalanguage/distinfo	(revision 405484)
@@ -1,2 +1,2 @@
-SHA256 (gdl-0.9.5.tar.gz) = cc9635e836b5ea456cad93f8a07d589aed8649668fbd14c4aad22091991137e2
-SIZE (gdl-0.9.5.tar.gz) = 2341992
+SHA256 (gdl-0.9.6v2.tgz) = cfb005ee1d9c843b26cc474618225ce68a1f0bfaeddcd45bf63a0a8fb62eedb4
+SIZE (gdl-0.9.6v2.tgz) = 1777167
Index: head/science/gnudatalanguage/files/patch-src_plotting__contour.cpp
===================================================================
--- head/science/gnudatalanguage/files/patch-src_plotting__contour.cpp	(revision 405483)
+++ head/science/gnudatalanguage/files/patch-src_plotting__contour.cpp	(nonexistent)
@@ -1,75 +0,0 @@
---- 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);
-               }
-             }
-           }

Property changes on: head/science/gnudatalanguage/files/patch-src_plotting__contour.cpp
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/science/gnudatalanguage/files/patch-CMakeModules_FindPlplot.cmake
===================================================================
--- head/science/gnudatalanguage/files/patch-CMakeModules_FindPlplot.cmake	(revision 405483)
+++ head/science/gnudatalanguage/files/patch-CMakeModules_FindPlplot.cmake	(nonexistent)
@@ -1,13 +0,0 @@
---- 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)

Property changes on: head/science/gnudatalanguage/files/patch-CMakeModules_FindPlplot.cmake
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/science/gnudatalanguage/files/patch-src__base64.hpp
===================================================================
--- head/science/gnudatalanguage/files/patch-src__base64.hpp	(revision 405483)
+++ head/science/gnudatalanguage/files/patch-src__base64.hpp	(nonexistent)
@@ -1,38 +0,0 @@
---- 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;
- 					}
--					if(!(isspace(data[i-1]))) {
-+					if(!(std::isspace(data[i-1]))) {
- 						//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 @@ namespace base64 {
- 						Warning("base64 decode error: unexpected fill char -- offset read?");
- 						return false;
- 					}
--					if(!(isspace(data[i-1]))) {
-+					if(!(std::isspace(data[i-1]))) {
- 						//cerr << "base 64 decode error: illegal character '" << data[i-1] << '\'' << endl;
- 						Warning("base 64 decode error: illegal character");
- 						return false;
-@@ -190,7 +190,7 @@ namespace base64 {
- 					if(fillchar == data[i-1]) {
- 						return true;
- 					}
--					if((!isspace(data[i-1]))) {
-+					if((!std::isspace(data[i-1]))) {
- 						//cerr << "base 64 decode error: illegal character '" << data[i-1] << '\'' << endl;
- 						Warning("base 64 decode error: illegal character");
- 						return false;
-@@ -215,7 +215,7 @@ namespace base64 {
- 					if(fillchar == data[i-1]) {
- 						return true;
- 					}
--					if(!(isspace(data[i-1]))) {
-+					if(!(std::isspace(data[i-1]))) {
- 						//cerr << "base 64 decode error: illegal character '" << data[i-1] << '\'' << endl;
- 						Warning("base 64 decode error: illegal character");
- 						return false;

Property changes on: head/science/gnudatalanguage/files/patch-src__base64.hpp
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/science/gnudatalanguage/files/patch-src__str.cpp
===================================================================
--- head/science/gnudatalanguage/files/patch-src__str.cpp	(revision 405483)
+++ head/science/gnudatalanguage/files/patch-src__str.cpp	(nonexistent)
@@ -1,38 +0,0 @@
---- 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++)
--    r[i]=toupper(sCStr[i]);
-+    r[i]=std::toupper(sCStr[i]);
-   return string(r);
- }
- void StrUpCaseInplace( string& s)
-@@ -189,7 +189,7 @@ void StrUpCaseInplace( string& s)
- //   ArrayGuard<char> guard( r);
- //   r[len]=0;
-   for(unsigned i=0;i<len;i++)
--    s[i]=toupper(s[i]);
-+    s[i]=std::toupper(s[i]);
- //   return string(r);
- }
- 
-@@ -201,7 +201,7 @@ string StrLowCase(const string& s)
-   ArrayGuard<char> guard( r);
-   r[len]=0;
-   for(unsigned i=0;i<len;i++)
--    r[i]=tolower(sCStr[i]);
-+    r[i]=std::tolower(sCStr[i]);
-   return string(r);
- }
- void StrLowCaseInplace(string& s)
-@@ -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++)
--    s[i]=tolower(s[i]);
-+    s[i]=std::tolower(s[i]);
- //     s[i]=tolower(sCStr[i]);
- }
- 

Property changes on: head/science/gnudatalanguage/files/patch-src__str.cpp
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/science/gnudatalanguage/files/patch-src__gsl_fun.cpp
===================================================================
--- head/science/gnudatalanguage/files/patch-src__gsl_fun.cpp	(revision 405483)
+++ head/science/gnudatalanguage/files/patch-src__gsl_fun.cpp	(nonexistent)
@@ -1,11 +0,0 @@
---- 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++) 
--        if (*it != ' ' && *it != '_') name.append(1, (char)tolower(*it));
-+        if (*it != ' ' && *it != '_') name.append(1, (char)std::tolower(*it));
-     }
- 
- #ifdef USE_UDUNITS

Property changes on: head/science/gnudatalanguage/files/patch-src__gsl_fun.cpp
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/science/gnudatalanguage/files/patch-src__basic_fun.cpp
===================================================================
--- head/science/gnudatalanguage/files/patch-src__basic_fun.cpp	(revision 405483)
+++ head/science/gnudatalanguage/files/patch-src__basic_fun.cpp	(revision 405484)
@@ -1,20 +1,20 @@
---- src/basic_fun.cpp.orig	2015-04-22 19:37:22 UTC
+--- src/basic_fun.cpp.orig	2016-01-04 19:52:38 UTC
 +++ src/basic_fun.cpp
-@@ -6483,7 +6483,7 @@ BaseGDL* strtok_fun(EnvT* e) {
-       while (p < e) 
-       {
-         // scheme = 1*[ lowalpha | digit | "+" | "-" | "." ]
--        if (!(isalpha(*p)) && !(isdigit(*p)) && (*p != '+') && (*p != '.') && (*p != '-')) 
-+        if (!(std::isalpha(*p)) && !(std::isdigit(*p)) && (*p != '+') && (*p != '.') && (*p != '-')) 
-         {
-           if (e + 1 < ue) goto parse_port;
-           else goto just_path;
-@@ -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;
--        while (isdigit(*p)) p++;
-+        while (std::isdigit(*p)) p++;
- 	if ((*p == '\0' || *p == '/') && (p - e) < 7) goto parse_port;
-         urlstru->InitTag("SCHEME", DStringGDL(string(s, (e - s))));
-         length -= ++e - s;
+@@ -6523,7 +6523,7 @@ namespace lib {
+ 	  {
+ 	    // check if the data we get is a port this allows us to correctly parse things like a.com:80
+ 	    p = e + 1;
+-	    while (isdigit(*p)) p++;
++	    while (std::isdigit(*p)) p++;
+ 	    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 {
+       parse_port:
+ 	p = e + 1;
+ 	pp = p;
+-	while (pp-p < 6 && isdigit(*pp)) pp++;
++	while (pp-p < 6 && std::isdigit(*pp)) pp++;
+ 	if (pp-p < 6 && (*pp == '/' || *pp == '\0')) 
+ 	  {
+ 	    memcpy(port_buf, p, (pp-p));
Index: head/science/gnudatalanguage/files/patch-src__file.cpp
===================================================================
--- head/science/gnudatalanguage/files/patch-src__file.cpp	(nonexistent)
+++ head/science/gnudatalanguage/files/patch-src__file.cpp	(revision 405484)
@@ -0,0 +1,15 @@
+--- src/file.cpp.orig	2016-01-04 20:50:45 UTC
++++ src/file.cpp
+@@ -242,10 +242,11 @@ extern "C"
+ #endif
+ #define NTEST_SEARCH 7
+ 
+-#ifdef __CYGWIN__
++#if defined(__CYGWIN__) || defined(__FreeBSD__)
+ #define stat64 stat
+ #define lstat64 lstat
+ // for religious reasons, CYGWIN doesn't do lstat64
++// FreeBSD doesn't do lstat64 because there is no need for it
+ #endif
+ 
+ namespace lib {

Property changes on: head/science/gnudatalanguage/files/patch-src__file.cpp
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/science/gnudatalanguage/pkg-plist
===================================================================
--- head/science/gnudatalanguage/pkg-plist	(revision 405483)
+++ head/science/gnudatalanguage/pkg-plist	(revision 405484)
@@ -1,375 +1,410 @@
 bin/gdl
 man/man1/gdl.1.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/CMakeLists.txt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/Makefile.am
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/Saturn.jpg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/add_error.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/banner_for_testsuite.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/benchmark/bench_matrix_multiply.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/checks
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/demo_graphics1.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/demo_graphics2.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/demo_graphics3.pro
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/demo_widgets.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/example.grib
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/formats.idl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/gdl_idl_fl.pro
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/idl.xdr
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/image_test.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/launchtest.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/libtest_ce.cpp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/nc_test.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test-read_ascii.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test-read_ascii.txt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test-swap_endian.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test-total.pro
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_MathFunctionsDim.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_angles.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_array_equal.pro
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_array_indices.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_axis.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_base64.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_besel.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_binfmt.pro
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bits_per_pix.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_brain.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_1779553.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_2555865.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_2610174.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_2846561.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_2876150.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_2876161.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_2876372.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_2892631.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_2949487.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_2974380.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3033108.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3054361.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3055720.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3057511.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3057520.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3061072.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3081887.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3085858.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3086851.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3091599.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3091610.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3100945.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3104209.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3104214.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3104326.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3104349.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3147146.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3147181.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3147733.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3151760.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3152892.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3152899.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3189072.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3199465.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3275334.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3285659.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3286031.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3288652.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3290532.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3296360.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3298378.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3300626.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3313522.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3376577.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3394430.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3426399.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3453775.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3483402.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3488003.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3559291.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3572473.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3595172.pro
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_635.dat
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_635.f90
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_635.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_n000542.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_n000580.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_n000581.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_n000587.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_n000597.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_n000599.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_n000607.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_n000608.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_byte_conversion.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bytscl.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_call_function.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_call_procedure.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_ce.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_check_math.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_clip.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_colors.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_common.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_congrid.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_constants.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_contour_basic.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_contour_extra.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_convert_coord.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_convol.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_correlate.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_cursor.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_deriv.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_device.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_diag_matrix.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_dialog_message.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_dicom.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_dims_of_arrays.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_erfinv.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_erfs.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_execute.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_expint.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_extra_keywords.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_factorial.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_fft.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_fft_dim.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_fft_leak.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_file_basename.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_file_copy.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_file_delete.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_file_dirname.pro
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_file_info.pro
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_file_move.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_file_search.pro
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_file_test.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_file_which.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_finite.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_fix.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_fixprint.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_float2string.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_format.pro
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_formats.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_fx_root.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_fz_roots.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_gammas.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_gc.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_get_kbrd.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_get_lun.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_get_screen_size.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_greek_letters.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_grib.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_healpix.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_hist_2d.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_hist_equal.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_histo.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_idl8.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_idl_validname.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_image_statistics.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_interpol.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_interpolate_missing.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_invert_matrix.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_isa.pro
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_ishft.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_jd_op_tut.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_known_bugs.pro
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_la_least_squares.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_levels.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_list.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_ludc_lusol.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_map.pro
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_math_function_dim.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_matrix_multiply.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_memory.pro
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_message.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_minmax.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_modulo.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_moment.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_mpfit.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_multiroots.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_nans_in_sort_and_median.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_nestedloop.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_netcdf.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_ntags.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_null.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_obj_new.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_op_elem.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_op_power.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_outofmem.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_plot_basic.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_plot_benchmark.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_plot_inf_nan.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_plot_info.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_plot_linestyle.pro
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_plot_oo.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_plotting_misc.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_plotting_ranges.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_pmulti.pro
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_pmulti_basic.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_point_lun.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_poly2d.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_postscript.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_product.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_ps_decomposed.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_ptrarr.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_python.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_python_module_0.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_python_module_1.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_python_module_2.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_qromb.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_qromo.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_random.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_read_jpeg.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_read_standard_images.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_readf.pro
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_reads.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_rebin.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_restore.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_rk4.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_routine_names.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_same_name.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_save.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_scope_varfetch.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_sem.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_skip_lun.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_smooth.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_spawn_unit.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_spher_harm.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_spl_init.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_standardize.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_step.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_str_functions.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_str_sep.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_stregex.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_strmatch.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_strsplit.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_structures.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_suite.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_surface_basic.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_systime.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_titles.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_trisol.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_tv.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_tv_ps.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_tvlct.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_typename.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_uf77.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_url.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_usersym.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_valgrind.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_voigt.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_wait.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_wavelet.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_where.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_widgets.pro
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_window_background.pro
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_xdr.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_zeropoly.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_zip.pro
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/try
 %%DATADIR%%/AUTHORS
 %%DATADIR%%/README
 %%DATADIR%%/lib/README.txt
 %%DATADIR%%/lib/STATUS
 %%DATADIR%%/lib/appleman.pro
 %%DATADIR%%/lib/array_indices.pro
 %%DATADIR%%/lib/bilinear.pro
 %%DATADIR%%/lib/calendar.pro
 %%DATADIR%%/lib/congrid.pro
 %%DATADIR%%/lib/correlate.pro
-%%DATADIR%%/lib/cw_bgroup.pro
 %%DATADIR%%/lib/delvar.pro
 %%DATADIR%%/lib/deriv.pro
 %%DATADIR%%/lib/diag_matrix.pro
 %%DATADIR%%/lib/dialog_message.pro
 %%DATADIR%%/lib/dialog_pickfile.pro
 %%DATADIR%%/lib/dicom/gdlffdicom__assoc__define.pro
 %%DATADIR%%/lib/dicom/gdlffdicom__assoc__test.pro
 %%DATADIR%%/lib/dicom/gdlffdicom__assoc_generateuid.pro
 %%DATADIR%%/lib/dicom/gdlffdicom__define.pro
 %%DATADIR%%/lib/dicom/gdlffdicom__dictionary.pro
 %%DATADIR%%/lib/dicom/gdlffdicom__test.pro
 %%DATADIR%%/lib/dicom/gdlffdicom_copy_lun.pro
 %%DATADIR%%/lib/dicom/gdlffdicom_date.pro
 %%DATADIR%%/lib/dicom/gdlffdicom_time.pro
 %%DATADIR%%/lib/dicom/gdlffdicom_trim.pro
 %%DATADIR%%/lib/dist.pro
 %%DATADIR%%/lib/doc_library.pro
 %%DATADIR%%/lib/envi/read_envi_file.pro
 %%DATADIR%%/lib/envi/test_write_read_envi.pro
 %%DATADIR%%/lib/envi/write_envi_file.pro
 %%DATADIR%%/lib/escape_special_char.pro
 %%DATADIR%%/lib/factorial.pro
 %%DATADIR%%/lib/file_basename_old.pro
 %%DATADIR%%/lib/file_copy.pro
 %%DATADIR%%/lib/file_delete.pro
 %%DATADIR%%/lib/file_dirname_old.pro
 %%DATADIR%%/lib/file_expand_path.pro
 %%DATADIR%%/lib/file_lines.pro
+%%DATADIR%%/lib/file_move.pro
 %%DATADIR%%/lib/file_which.pro
 %%DATADIR%%/lib/filepath.pro
 %%DATADIR%%/lib/findex.pro
 %%DATADIR%%/lib/findfile.pro
 %%DATADIR%%/lib/get_login_info.pro
+%%DATADIR%%/lib/handle_create.pro
+%%DATADIR%%/lib/handle_free.pro
+%%DATADIR%%/lib/handle_info.pro
+%%DATADIR%%/lib/handle_value.pro
 %%DATADIR%%/lib/helpform.pro
 %%DATADIR%%/lib/hist_2d.pro
 %%DATADIR%%/lib/hist_equal.pro
 %%DATADIR%%/lib/hist_nd.pro
 %%DATADIR%%/lib/identity.pro
 %%DATADIR%%/lib/idl_validname.pro
 %%DATADIR%%/lib/image_statistics.pro
 %%DATADIR%%/lib/imsl_erf.pro
 %%DATADIR%%/lib/imsl_zerosys.pro
 %%DATADIR%%/lib/interpol.pro
 %%DATADIR%%/lib/ishft.pro
 %%DATADIR%%/lib/kurtosis.pro
 %%DATADIR%%/lib/la_invert.pro
 %%DATADIR%%/lib/last_item.pro
 %%DATADIR%%/lib/lmgr.pro
 %%DATADIR%%/lib/loadct.pro
+%%DATADIR%%/lib/make_dll.pro
 %%DATADIR%%/lib/map_clip_set.pro
 %%DATADIR%%/lib/matrix_multiply.pro
 %%DATADIR%%/lib/mean.pro
 %%DATADIR%%/lib/meanabsdev.pro
 %%DATADIR%%/lib/moment.pro
 %%DATADIR%%/lib/norm.pro
 %%DATADIR%%/lib/online_help.pro
 %%DATADIR%%/lib/oploterr.pro
 %%DATADIR%%/lib/path_sep.pro
 %%DATADIR%%/lib/ploterr.pro
 %%DATADIR%%/lib/poly.pro
 %%DATADIR%%/lib/poly_area.pro
+%%DATADIR%%/lib/polywarp.pro
 %%DATADIR%%/lib/popd.pro
 %%DATADIR%%/lib/primes.pro
 %%DATADIR%%/lib/printd.pro
 %%DATADIR%%/lib/pushd.pro
 %%DATADIR%%/lib/py_plot.pro
 %%DATADIR%%/lib/py_print.pro
 %%DATADIR%%/lib/query_bmp.pro
 %%DATADIR%%/lib/query_dicom.pro
 %%DATADIR%%/lib/query_gif.pro
 %%DATADIR%%/lib/query_image.pro
 %%DATADIR%%/lib/query_jpeg.pro
 %%DATADIR%%/lib/query_pict.pro
 %%DATADIR%%/lib/query_png.pro
 %%DATADIR%%/lib/query_ppm.pro
 %%DATADIR%%/lib/query_tiff.pro
 %%DATADIR%%/lib/read_ascii.pro
 %%DATADIR%%/lib/read_binary.pro
 %%DATADIR%%/lib/read_bmp.pro
 %%DATADIR%%/lib/read_dicom.pro
 %%DATADIR%%/lib/read_gif.pro
 %%DATADIR%%/lib/read_image.pro
 %%DATADIR%%/lib/read_jpeg.pro
 %%DATADIR%%/lib/read_jpeg2000.pro
 %%DATADIR%%/lib/read_pict.pro
 %%DATADIR%%/lib/read_png.pro
 %%DATADIR%%/lib/read_tiff.pro
 %%DATADIR%%/lib/read_xwd.pro
 %%DATADIR%%/lib/real_part.pro
+%%DATADIR%%/lib/resolve_all.pro
 %%DATADIR%%/lib/restore.pro
 %%DATADIR%%/lib/rot.pro
 %%DATADIR%%/lib/rstrpos.pro
 %%DATADIR%%/lib/save.pro
 %%DATADIR%%/lib/showfont.pro
 %%DATADIR%%/lib/skewness.pro
 %%DATADIR%%/lib/skip_lun.pro
 %%DATADIR%%/lib/smooth.pro
 %%DATADIR%%/lib/spl_init_old.pro
 %%DATADIR%%/lib/spl_interp_old.pro
 %%DATADIR%%/lib/standardize.pro
 %%DATADIR%%/lib/stddev.pro
 %%DATADIR%%/lib/str_sep.pro
 %%DATADIR%%/lib/strmatch.pro
 %%DATADIR%%/lib/strsplit.pro
+%%DATADIR%%/lib/svsol.pro
 %%DATADIR%%/lib/swap_endian.pro
 %%DATADIR%%/lib/swap_endian_inplace.pro
 %%DATADIR%%/lib/template.pro
 %%DATADIR%%/lib/template_blank.pro
 %%DATADIR%%/lib/tic.pro
 %%DATADIR%%/lib/toc.pro
 %%DATADIR%%/lib/trace.pro
 %%DATADIR%%/lib/tvscl.pro
 %%DATADIR%%/lib/uniq.pro
+%%DATADIR%%/lib/unxregister.pro
 %%DATADIR%%/lib/value_locate.pro
 %%DATADIR%%/lib/variance.pro
+%%DATADIR%%/lib/widget_message.pro
 %%DATADIR%%/lib/wmenu.pro
 %%DATADIR%%/lib/write_bmp.pro
 %%DATADIR%%/lib/write_gif.pro
 %%DATADIR%%/lib/write_image.pro
 %%DATADIR%%/lib/write_jpeg.pro
 %%DATADIR%%/lib/write_pict.pro
 %%DATADIR%%/lib/write_png.pro
+%%DATADIR%%/lib/write_tiff.pro
+%%DATADIR%%/lib/xdisplayfile.pro
 %%DATADIR%%/lib/xmanager.pro
+%%DATADIR%%/lib/xregistered.pro
 %%DATADIR%%/lib/zenity_check.pro