16 files changed, 201 insertions, 472 deletions

diff --git a/science/gnudatalanguage/Makefile b/science/gnudatalanguage/Makefile
index ece6f2ffa979..154dfc9d4478 100644
--- a/science/gnudatalanguage/Makefile
+++ b/science/gnudatalanguage/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gnudatalanguage
-DISTVERSION=	0.9.3
-PORTREVISION=	3
+DISTVERSION=	0.9.4
 CATEGORIES=	science lang
 MASTER_SITES=	SF/${PORTNAME}/gdl/${DISTVERSION}
 .if defined(BUILD_PYTHON_MODULE)
@@ -16,8 +15,9 @@ COMMENT?=	GDL, a free IDL compatible incremental compiler
 
 LICENSE=	GPLv2
 
+#NO_STAGE=	yes
+
 #---------------------------------------------------------------------------
-NO_STAGE=	yes
 # You may define these options:
 #
 # - WITHOUT_GRAPHICSMAGICK:	remove GraphicsMagick support
@@ -25,77 +25,95 @@ NO_STAGE=	yes
 # - WITHOUT_NETCDF:		remove netCDF support
 # - WITHOUT_HDF:		remove HDF 4 suppport (conflict with netCDF)
 # - WITHOUT_PYTHON:		don't build the interface to python
-# - WITH_FFTW3:			faster fft routine than GSL
+# - WITHOUT_FFTW3:		remove FFTW (faster fft routine than GSL)
+# - WITHOUT_EIGEN		remove Eigen support (boost performance)
+# - WITHOUT_UDUNITS		remove unit conversion in IMSL_CONSTANT
 #
 #---------------------------------------------------------------------------
 
 LIB_DEPENDS+=	libplplotd.so:${PORTSDIR}/math/plplot	\
-		libps.so:${PORTSDIR}/print/pslib		\
-		libgsl.so:${PORTSDIR}/math/gsl		\
-		libdps.so:${PORTSDIR}/x11/dgs
+		libps.so:${PORTSDIR}/print/pslib	\
+		libgsl.so:${PORTSDIR}/math/gsl
+
+USE_DOS2UNIX=	src/plotting_xyouts.cpp
 
 USE_GCC=	yes
 USE_WX=		2.8
 USE_XORG=	x11
-USES=		pkgconfig
-GNU_CONFIGURE=	yes
+USES=		pkgconfig cmake
+
 # Disable ncurses and readline from ports
 # Disable ImageMagick (does'nt work with plplot because dynamic drivers
 #	are enabled by default)
-CONFIGURE_ARGS=	--with-ncursesdir=/usr --with-readlinedir=/usr --without-Magick
-CONFIGURE_ENV=	wxConfig=${WX_CONFIG}
-CPPFLAGS+=	${CFLAGS} -fno-inline ${PTHREAD_CFLAGS} -I${LOCALBASE}/include ${GM_INC}
+# TODO: add a slave port for mpich - ATM just deactivate its support.
+CMAKE_ARGS=	-DREADLINEDIR:STRING="/usr"		\
+		-DNCURSESDIR:STRING="/usr"		\
+		-DMPICH:BOOL=NO				\
+		-DMAGICK:BOOL=NO
+CPPFLAGS+=	${CFLAGS} -fno-inline ${PTHREAD_CFLAGS}
 LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib
 
 SLAVEDIRS=	science/py-gnudatalanguage
 
 .if defined(BUILD_PYTHON_MODULE)
 CATEGORIES+=	python
-CONFIGURE_ARGS+=--enable-python_module --with-openmp=no
+CMAKE_ARGS+=	-DPYTHON_MODULE:BOOL=YES -DOPENMP:BOOL=NO
 PLIST_FILES=	%%PYTHON_SITELIBDIR%%/GDL.so
 PLIST_SUB+=	MASTER="@comment "
 .else
-MAN1=		gdl.1
+CMAKE_ARGS+=	-DPYTHON_MODULE:BOOL=NO
 PLIST_SUB+=	MASTER=""
 .endif
 
 .if !defined(WITHOUT_GRAPHICSMAGICK)
 LIB_DEPENDS+=	libGraphicsMagick.so.12:${PORTSDIR}/graphics/GraphicsMagick13
-CONFIGURE_ARGS+=--with-GraphicsMagick=${LOCALBASE}
-GM_INC=		-I${LOCALBASE}/include/GraphicsMagick
+CMAKE_ARGS+=	-DGRAPHICSMAGICK:BOOL=YES
 .else
-CONFIGURE_ARGS+=--with-Magick=no
+CMAKE_ARGS+=	-DGRAPHICSMAGICK:BOOL=NO
 .endif
 
 .if !defined(WITHOUT_HDF5)
 LIB_DEPENDS+=	libhdf5.so.7:${PORTSDIR}/science/hdf5-18
-CONFIGURE_ARGS+=--with-hdf5=${LOCALBASE}
+CMAKE_ARGS+=	-DHDF5:BOOL=YES
 .else
-CONFIGURE_ARGS+=--with-hdf5=no
+CMAKE_ARGS+=	-DHDF5:BOOL=NO
 .endif
 
 .if !defined(WITHOUT_NETCDF)
 LIB_DEPENDS+=	libnetcdf.so:${PORTSDIR}/science/netcdf
-CONFIGURE_ARGS+=--with-netcdf=${LOCALBASE} --with-hdf=no
+CMAKE_ARGS+=	-DNETCDF:BOOL=YES -DHDF:BOOL=NO
 .else
-CONFIGURE_ARGS+=--with-netcdf=no
+CMAKE_ARGS+=	-DNETCDF:BOOL=NO
 . if !defined(WITHOUT_HDF)
 LIB_DEPENDS+=	libdf.so.2:${PORTSDIR}/science/hdf
-CONFIGURE_ARGS+=--with-hdf=${LOCALBASE}
+CMAKE_ARGS+=	-DHDF:BOOL=YES
 . else
-CONFIGURE_ARGS+=--with-hdf=no
+CMAKE_ARGS+=	-DHDF:BOOL=NO
 . endif
 .endif
 
+.if !defined(WITHOUT_EIGEN)
+BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/eigen3.pc:${PORTSDIR}/math/eigen3
+CMAKE_ARGS+=	-DEIGEN3:BOOL=YES
+.else
+CMAKE_ARGS+=	-DEIGEN3:BOOL=NO
+.endif
+
+.if !defined(WITHOUT_UDUNITS)
+LIB_DEPENDS+=	libudunits2.so:${PORTSDIR}/science/udunits
+CMAKE_ARGS+=	-DUDUNITS:BOOL=YES
+.else
+CMAKE_ARGS+=	-DUDUNITS:BOOL=NO
+.endif
+
 .if !defined(WITHOUT_PYTHON) || defined(BUILD_PYTHON_MODULE)
 USE_PYTHON=	-2.7
 BUILD_DEPENDS+=	${PYNUMPY}
 RUN_DEPENDS+=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:${PORTSDIR}/math/py-matplotlib
-CONFIGURE_ENV+=	PYTHON_VERSION=${PYTHON_VER}
-CONFIGURE_ARGS+=--with-python=${PYTHONBASE}
+CMAKE_ARGS+=	-DPYTHON:BOOL=YES -DPYTHONVERSION:STRING="${PYTHON_VER}"
 .else
-CONFIGURE_ARGS+=--with-python=no
+CMAKE_ARGS+=	-DPYTHON:BOOL=NO
 .endif
 
 .include <bsd.port.pre.mk>
@@ -104,31 +122,24 @@ CONFIGURE_ARGS+=--with-python=no
 BROKEN=	Does not build with ancient binutils
 .endif
 
-.if defined(PACKAGE_BUILDING) || exists(${LOCALBASE}/lib/libfftw3.so)
-WITH_FFTW3=	yes
-.endif
-.if defined(WITH_FFTW3)
+.if !defined(WITHOUT_FFTW3)
 LIB_DEPENDS+=	libfftw3.so:${PORTSDIR}/math/fftw3		\
 		libfftw3f.so:${PORTSDIR}/math/fftw3-float
-CONFIGURE_ARGS+=--with-fftw=${LOCALBASE}
+CMAKE_ARGS+=	-DFFTW:BOOL=YES
+.else
+CMAKE_ARGS+=	-DFFTW:BOOL=NO
 .endif
 
-pre-configure:
-	${REINPLACE_CMD} -e 's|wx-config|${WX_CONFIG}|g'	\
-		${WRKSRC}/${CONFIGURE_SCRIPT}
-
 .if defined(BUILD_PYTHON_MODULE)
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/src/.libs/libgdl.so.0 ${PYTHON_SITELIBDIR}/GDL.so
 .endif
 
 .if !defined(BUILD_PYTHON_MODULE)
-post-install:
+post-stage:
 . if !defined(NOPORTEXAMPLES)
-	${MKDIR} ${EXAMPLESDIR}/testsuite
-	(cd ${WRKSRC}/testsuite && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}/testsuite/)
-	${RM} ${EXAMPLESDIR}/testsuite/Makefile.in.orig
-	@${ECHO_MSG} "===> Examples installed in ${EXAMPLESDIR}."
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/testsuite
+	(cd ${WRKSRC}/testsuite && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}/testsuite/)
 . endif
 .endif
 
diff --git a/science/gnudatalanguage/distinfo b/science/gnudatalanguage/distinfo
index de185c6ba834..03858fa82c46 100644
--- a/science/gnudatalanguage/distinfo
+++ b/science/gnudatalanguage/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gdl-0.9.3.tar.gz) = 6d3c30c06ce2772a1017b3685dfc8fb74308e5f9d258fcb764b765c33d20f500
-SIZE (gdl-0.9.3.tar.gz) = 2540106
+SHA256 (gdl-0.9.4.tar.gz) = e18010cd874cad7b1fd8c752e9386571156e1fb066f2d27ecbcc15bbfc9514fa
+SIZE (gdl-0.9.4.tar.gz) = 2191342
diff --git a/science/gnudatalanguage/files/patch-CMakeLists.txt b/science/gnudatalanguage/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..4a6a807e6ec8
--- /dev/null
+++ b/science/gnudatalanguage/files/patch-CMakeLists.txt
@@ -0,0 +1,11 @@
+--- ./CMakeLists.txt.orig	2013-09-28 17:03:32.000000000 +0200
++++ ./CMakeLists.txt	2013-09-30 16:19:09.000000000 +0200
+@@ -752,7 +752,7 @@
+ endif(NOT PYTHON_MODULE)
+ 
+ install(FILES ${CMAKE_SOURCE_DIR}/AUTHORS ${CMAKE_SOURCE_DIR}/README DESTINATION ${CMAKE_INSTALL_PREFIX}/${GDL_DATA_DIR})
+-install(FILES ${CMAKE_SOURCE_DIR}/doc/gdl.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1)
++install(FILES ${CMAKE_SOURCE_DIR}/doc/gdl.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man1)
+ 
+ # substitute variables in configure.h.cmake and move it to configure.h
+ configure_file(${CMAKE_SOURCE_DIR}/config.h.cmake ${CMAKE_BINARY_DIR}/config.h)
diff --git a/science/gnudatalanguage/files/patch-CMakeModules_Findlibps.cmake b/science/gnudatalanguage/files/patch-CMakeModules_Findlibps.cmake
new file mode 100644
index 000000000000..84f47f21cc1e
--- /dev/null
+++ b/science/gnudatalanguage/files/patch-CMakeModules_Findlibps.cmake
@@ -0,0 +1,8 @@
+--- ./CMakeModules/Findlibps.cmake.orig	2013-01-03 00:26:23.000000000 +0100
++++ ./CMakeModules/Findlibps.cmake	2013-09-30 13:27:07.000000000 +0200
+@@ -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)
+ include(FindPackageHandleStandardArgs)
+ if(LIBPSPKG)
+ 	set(ENV{PKG_CONFIG_PATH} ${LIBPSPKG}) # pkg search path
diff --git a/science/gnudatalanguage/files/patch-Makefile.in b/science/gnudatalanguage/files/patch-Makefile.in
deleted file mode 100644
index 6504bea568bb..000000000000
--- a/science/gnudatalanguage/files/patch-Makefile.in
+++ /dev/null
@@ -1,69 +0,0 @@
---- Makefile.in.orig	2012-12-27 17:22:44.000000000 +0100
-+++ Makefile.in	2012-12-31 15:37:43.000000000 +0100
-@@ -44,10 +44,6 @@
- 	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
- 	TODO config.guess config.sub depcomp install-sh ltmain.sh \
- 	missing
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/configure.in
--am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
--	$(ACLOCAL_M4)
- am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
-  configure.lineno config.status.lineno
- mkinstalldirs = $(install_sh) -d
-@@ -274,55 +270,6 @@
- all: config.h
- 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
- 
--.SUFFIXES:
--am--refresh:
--	@:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
--	@for dep in $?; do \
--	  case '$(am__configure_deps)' in \
--	    *$$dep*) \
--	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
--	      $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
--		&& exit 0; \
--	      exit 1;; \
--	  esac; \
--	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
--	$(am__cd) $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu Makefile
--.PRECIOUS: Makefile
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
--	@case '$?' in \
--	  *config.status*) \
--	    echo ' $(SHELL) ./config.status'; \
--	    $(SHELL) ./config.status;; \
--	  *) \
--	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
--	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
--	esac;
--
--$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
--	$(SHELL) ./config.status --recheck
--
--$(top_srcdir)/configure:  $(am__configure_deps)
--	$(am__cd) $(srcdir) && $(AUTOCONF)
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
--	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
--$(am__aclocal_m4_deps):
--
--config.h: stamp-h1
--	@if test ! -f $@; then \
--	  rm -f stamp-h1; \
--	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
--	else :; fi
--
--stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
--	@rm -f stamp-h1
--	cd $(top_builddir) && $(SHELL) ./config.status config.h
--$(srcdir)/config.h.in:  $(am__configure_deps) 
--	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
--	rm -f stamp-h1
--	touch $@
- 
- distclean-hdr:
- 	-rm -f config.h stamp-h1
diff --git a/science/gnudatalanguage/files/patch-doc_Makefile.in b/science/gnudatalanguage/files/patch-doc_Makefile.in
deleted file mode 100644
index 9997ead125ff..000000000000
--- a/science/gnudatalanguage/files/patch-doc_Makefile.in
+++ /dev/null
@@ -1,50 +0,0 @@
---- doc/Makefile.in.orig	2012-12-27 17:22:45.000000000 +0100
-+++ doc/Makefile.in	2012-12-31 15:41:46.000000000 +0100
-@@ -35,10 +35,6 @@
- host_triplet = @host@
- subdir = doc
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/configure.in
--am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
--	$(ACLOCAL_M4)
- mkinstalldirs = $(install_sh) -d
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-@@ -213,36 +209,6 @@
- all: all-am
- 
- .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
--	@for dep in $?; do \
--	  case '$(am__configure_deps)' in \
--	    *$$dep*) \
--	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
--	        && { if test -f $@; then exit 0; else break; fi; }; \
--	      exit 1;; \
--	  esac; \
--	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
--	$(am__cd) $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu doc/Makefile
--.PRECIOUS: Makefile
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
--	@case '$?' in \
--	  *config.status*) \
--	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
--	  *) \
--	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
--	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
--	esac;
--
--$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
--	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--
--$(top_srcdir)/configure:  $(am__configure_deps)
--	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
--	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(am__aclocal_m4_deps):
- 
- mostlyclean-libtool:
- 	-rm -f *.lo
diff --git a/science/gnudatalanguage/files/patch-src_Makefile.in b/science/gnudatalanguage/files/patch-src_Makefile.in
deleted file mode 100644
index deb109308dd4..000000000000
--- a/science/gnudatalanguage/files/patch-src_Makefile.in
+++ /dev/null
@@ -1,50 +0,0 @@
---- src/Makefile.in.orig	2012-12-27 17:22:44.000000000 +0100
-+++ src/Makefile.in	2012-12-31 15:43:57.000000000 +0100
-@@ -38,10 +38,6 @@
- @BUILDASLIBRARY_FALSE@bin_PROGRAMS = gdl$(EXEEXT)
- subdir = src
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/configure.in
--am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
--	$(ACLOCAL_M4)
- mkinstalldirs = $(install_sh) -d
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-@@ -551,35 +547,7 @@
- 
- .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
--	@for dep in $?; do \
--	  case '$(am__configure_deps)' in \
--	    *$$dep*) \
--	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
--	        && { if test -f $@; then exit 0; else break; fi; }; \
--	      exit 1;; \
--	  esac; \
--	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
--	$(am__cd) $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu src/Makefile
--.PRECIOUS: Makefile
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
--	@case '$?' in \
--	  *config.status*) \
--	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
--	  *) \
--	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
--	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
--	esac;
--
--$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
--	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--
--$(top_srcdir)/configure:  $(am__configure_deps)
--	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
--	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
- $(am__aclocal_m4_deps):
- 
- clean-noinstLTLIBRARIES:
diff --git a/science/gnudatalanguage/files/patch-src_antlr_Makefile.in b/science/gnudatalanguage/files/patch-src_antlr_Makefile.in
deleted file mode 100644
index 38f842a1483a..000000000000
--- a/science/gnudatalanguage/files/patch-src_antlr_Makefile.in
+++ /dev/null
@@ -1,50 +0,0 @@
---- src/antlr/Makefile.in.orig	2012-12-27 17:22:44.000000000 +0100
-+++ src/antlr/Makefile.in	2012-12-31 15:50:35.000000000 +0100
-@@ -37,10 +37,6 @@
- host_triplet = @host@
- subdir = src/antlr
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/configure.in
--am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
--	$(ACLOCAL_M4)
- mkinstalldirs = $(install_sh) -d
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-@@ -355,36 +351,6 @@
- 
- .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
--	@for dep in $?; do \
--	  case '$(am__configure_deps)' in \
--	    *$$dep*) \
--	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
--	        && { if test -f $@; then exit 0; else break; fi; }; \
--	      exit 1;; \
--	  esac; \
--	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/antlr/Makefile'; \
--	$(am__cd) $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu src/antlr/Makefile
--.PRECIOUS: Makefile
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
--	@case '$?' in \
--	  *config.status*) \
--	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
--	  *) \
--	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
--	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
--	esac;
--
--$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
--	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--
--$(top_srcdir)/configure:  $(am__configure_deps)
--	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
--	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(am__aclocal_m4_deps):
- 
- clean-noinstLIBRARIES:
- 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
diff --git a/science/gnudatalanguage/files/patch-src_plotting.cpp b/science/gnudatalanguage/files/patch-src_plotting.cpp
new file mode 100644
index 000000000000..f978d76be8a8
--- /dev/null
+++ b/science/gnudatalanguage/files/patch-src_plotting.cpp
@@ -0,0 +1,56 @@
+--- src/plotting.cpp.orig	2013-09-22 05:09:11.000000000 +0200
++++ src/plotting.cpp	2013-10-11 10:55:14.000000000 +0200
+@@ -1891,7 +1891,7 @@
+       DFloatGDL* charthickVect=e->GetKWAs<DFloatGDL>( charthickIx );
+       charthick=(*charthickVect)[0];
+     }
+-    a->wid(charthick);
++    a->width(charthick);
+   }
+ 
+   void gdlSetAxisCharsize(EnvT *e, GDLGStream *a, string axis)
+@@ -1919,7 +1919,7 @@
+ 
+     e->AssureFloatScalarKWIfPresent("THICK", thick);
+     if ( thick<=0.0 ) thick=1.0;
+-    a->wid(static_cast<PLINT>(floor(thick-0.5)));
++    a->width(static_cast<PLINT>(floor(thick-0.5)));
+   }
+ 
+   //LINESTYLE
+@@ -2936,7 +2936,7 @@
+         a->smaj((PLFLT)OtherAxisSizeInMm, 1.0); //set base ticks to default 0.02 viewport converted to mm.
+         a->smin((PLFLT)OtherAxisSizeInMm/2.0,1.0); //idem min (plplt defaults)
+         //thick for box and ticks.
+-        a->wid(Thick);
++        a->width(Thick);
+         //ticks or grid eventually with style and length:
+         if (abs(TickLen)<1e-6) Opt=""; else Opt="st"; //remove ticks if ticklen=0
+         if (TickLen<0) {Opt+="i"; TickLen=-TickLen;}
+@@ -2981,7 +2981,7 @@
+         else if (axis=="Y") a->box("", 0.0, 0 , Opt.c_str(), 0.0, 0);
+       }
+       //reset charsize & thick
+-      a->wid(1);
++      a->width(1);
+       a->sizeChar(1.0);
+     }
+ 	return 0;
+@@ -3124,7 +3124,7 @@
+         a->smaj((PLFLT)OtherAxisSizeInMm, 1.0); //set base ticks to default 0.02 viewport converted to mm.
+         a->smin((PLFLT)OtherAxisSizeInMm/2.0,1.0); //idem min (plplt defaults)
+         //thick for box and ticks.
+-        a->wid(Thick);
++        a->width(Thick);
+         //ticks or grid eventually with style and length:
+         if (abs(TickLen)<1e-6) Opt=""; else Opt="st"; //remove ticks if ticklen=0
+         if (TickLen<0) {Opt+="i"; TickLen=-TickLen;}
+@@ -3149,7 +3149,7 @@
+         else if (axis=="Z") a->box3("","",0,0,"","",0,0, Opt.c_str(), "", TickInterval, Minor);
+       }
+       //reset charsize & thick
+-      a->wid(1);
++      a->width(1);
+       a->sizeChar(1.0);
+     }
+ 	return 0;
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..ef166d8852d8
--- /dev/null
+++ b/science/gnudatalanguage/files/patch-src_plotting_contour.cpp
@@ -0,0 +1,20 @@
+--- src/plotting_contour.cpp.orig	2013-09-17 22:13:27.000000000 +0200
++++ src/plotting_contour.cpp	2013-10-11 10:35:22.000000000 +0200
+@@ -728,7 +728,7 @@
+               actStream->pat(1,&ori,&spa);
+ 
+               if (docolors) actStream->Color ( ( *colors )[i%colors->N_Elements ( )], decomposed, (PLINT)colorindex_table_0_color );
+-              if (dothick) actStream->wid ( ( *thick )[i%thick->N_Elements ( )]);
++              if (dothick) actStream->width ( ( *thick )[i%thick->N_Elements ( )]);
+               if (dostyle) gdlLineStyle(actStream, ( *style )[i%style->N_Elements ( )]);
+               actStream->shade( map, xEl, yEl, isLog?doIt:NULL, xStart, xEnd, yStart, yEnd,
+               clevel[i], clevel[i+1],
+@@ -811,7 +811,7 @@
+               actStream->stransform(gdl3dTo2dTransformContour, &Data3d);
+             }
+             if (docolors) actStream->Color ( ( *colors )[i%colors->N_Elements ( )], decomposed, 2);
+-            if (dothick) actStream->wid ( ( *thick )[i%thick->N_Elements ( )]);
++            if (dothick) actStream->width ( ( *thick )[i%thick->N_Elements ( )]);
+             if (dostyle) gdlLineStyle(actStream, ( *style )[i%style->N_Elements ( )]);
+             if (dolabels) actStream->setcontlabelparam ( LABELOFFSET, (PLFLT) label_size, LABELSPACING,
+                                                         (PLINT)(*labels)[i%labels->N_Elements()] );
diff --git a/science/gnudatalanguage/files/patch-src_plotting_xyouts.cpp b/science/gnudatalanguage/files/patch-src_plotting_xyouts.cpp
new file mode 100644
index 000000000000..6b6437f1cf6f
--- /dev/null
+++ b/science/gnudatalanguage/files/patch-src_plotting_xyouts.cpp
@@ -0,0 +1,11 @@
+--- src/plotting_xyouts.cpp.orig	2013-10-11 11:26:06.000000000 +0200
++++ src/plotting_xyouts.cpp	2013-10-11 11:27:24.000000000 +0200
+@@ -339,7 +339,7 @@
+         //plot!
+         if (docharsize) actStream->sizeChar(( *size )[i%size->N_Elements ( )]);
+         if (docolor) actStream->Color ( ( *color )[i%color->N_Elements ( )], decomposed, 2);
+-        if (docharthick) actStream->wid ( ( *charthick )[i%charthick->N_Elements ( )]);
++        if (docharthick) actStream->width ( ( *charthick )[i%charthick->N_Elements ( )]);
+         //orientation word is not orientation page depending on axes increment direction [0..1] vs. [1..0]
+         PLFLT oriD=(( *orientation )[i%orientation->N_Elements ( )]); //ori DEVICE
+         PLFLT oriW=oriD; //ori WORLD
diff --git a/science/gnudatalanguage/files/patch-src_pro_Makefile.in b/science/gnudatalanguage/files/patch-src_pro_Makefile.in
deleted file mode 100644
index bc21c1f3e4ea..000000000000
--- a/science/gnudatalanguage/files/patch-src_pro_Makefile.in
+++ /dev/null
@@ -1,50 +0,0 @@
---- ./src/pro/Makefile.in.orig	2012-12-27 17:22:44.000000000 +0100
-+++ ./src/pro/Makefile.in	2012-12-31 15:53:23.000000000 +0100
-@@ -36,10 +36,6 @@
- host_triplet = @host@
- subdir = src/pro
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/configure.in
--am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
--	$(ACLOCAL_M4)
- mkinstalldirs = $(install_sh) -d
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-@@ -369,36 +365,6 @@
- all: all-recursive
- 
- .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
--	@for dep in $?; do \
--	  case '$(am__configure_deps)' in \
--	    *$$dep*) \
--	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
--	        && { if test -f $@; then exit 0; else break; fi; }; \
--	      exit 1;; \
--	  esac; \
--	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/pro/Makefile'; \
--	$(am__cd) $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu src/pro/Makefile
--.PRECIOUS: Makefile
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
--	@case '$?' in \
--	  *config.status*) \
--	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
--	  *) \
--	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
--	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
--	esac;
--
--$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
--	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--
--$(top_srcdir)/configure:  $(am__configure_deps)
--	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
--	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(am__aclocal_m4_deps):
- 
- mostlyclean-libtool:
- 	-rm -f *.lo
diff --git a/science/gnudatalanguage/files/patch-src_pro_dicom_Makefile.in b/science/gnudatalanguage/files/patch-src_pro_dicom_Makefile.in
deleted file mode 100644
index 951ddf51ebd9..000000000000
--- a/science/gnudatalanguage/files/patch-src_pro_dicom_Makefile.in
+++ /dev/null
@@ -1,50 +0,0 @@
---- ./src/pro/dicom/Makefile.in.orig	2012-12-27 17:22:44.000000000 +0100
-+++ ./src/pro/dicom/Makefile.in	2012-12-31 15:55:35.000000000 +0100
-@@ -36,10 +36,6 @@
- host_triplet = @host@
- subdir = src/pro/dicom
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/configure.in
--am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
--	$(ACLOCAL_M4)
- mkinstalldirs = $(install_sh) -d
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-@@ -224,36 +220,6 @@
- all: all-am
- 
- .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
--	@for dep in $?; do \
--	  case '$(am__configure_deps)' in \
--	    *$$dep*) \
--	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
--	        && { if test -f $@; then exit 0; else break; fi; }; \
--	      exit 1;; \
--	  esac; \
--	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/pro/dicom/Makefile'; \
--	$(am__cd) $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu src/pro/dicom/Makefile
--.PRECIOUS: Makefile
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
--	@case '$?' in \
--	  *config.status*) \
--	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
--	  *) \
--	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
--	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
--	esac;
--
--$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
--	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--
--$(top_srcdir)/configure:  $(am__configure_deps)
--	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
--	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(am__aclocal_m4_deps):
- 
- mostlyclean-libtool:
- 	-rm -f *.lo
diff --git a/science/gnudatalanguage/files/patch-src_pro_envi_Makefile.in b/science/gnudatalanguage/files/patch-src_pro_envi_Makefile.in
deleted file mode 100644
index 65fadbb39b23..000000000000
--- a/science/gnudatalanguage/files/patch-src_pro_envi_Makefile.in
+++ /dev/null
@@ -1,54 +0,0 @@
---- src/pro/envi/Makefile.in.orig	2012-12-27 17:22:44.000000000 +0100
-+++ src/pro/envi/Makefile.in	2012-12-31 16:30:42.000000000 +0100
-@@ -36,14 +36,6 @@
- host_triplet = @host@
- subdir = src/pro/envi
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/configure.in
--am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
--	$(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--CONFIG_CLEAN_VPATH_FILES =
- SOURCES =
- DIST_SOURCES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-@@ -217,36 +209,6 @@
- all: all-am
- 
- .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
--	@for dep in $?; do \
--	  case '$(am__configure_deps)' in \
--	    *$$dep*) \
--	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
--	        && { if test -f $@; then exit 0; else break; fi; }; \
--	      exit 1;; \
--	  esac; \
--	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/pro/envi/Makefile'; \
--	$(am__cd) $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu src/pro/envi/Makefile
--.PRECIOUS: Makefile
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
--	@case '$?' in \
--	  *config.status*) \
--	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
--	  *) \
--	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
--	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
--	esac;
--
--$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
--	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--
--$(top_srcdir)/configure:  $(am__configure_deps)
--	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
--	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(am__aclocal_m4_deps):
- 
- mostlyclean-libtool:
- 	-rm -f *.lo
diff --git a/science/gnudatalanguage/files/patch-testsuite_Makefile.in b/science/gnudatalanguage/files/patch-testsuite_Makefile.in
deleted file mode 100644
index d4a1d317181c..000000000000
--- a/science/gnudatalanguage/files/patch-testsuite_Makefile.in
+++ /dev/null
@@ -1,50 +0,0 @@
---- testsuite/Makefile.in.orig	2012-12-27 17:22:44.000000000 +0100
-+++ testsuite/Makefile.in	2012-12-31 16:10:06.000000000 +0100
-@@ -35,10 +35,6 @@
- host_triplet = @host@
- subdir = testsuite
- DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/configure.in
--am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
--	$(ACLOCAL_M4)
- mkinstalldirs = $(install_sh) -d
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-@@ -344,36 +340,6 @@
- 
- .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
--	@for dep in $?; do \
--	  case '$(am__configure_deps)' in \
--	    *$$dep*) \
--	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
--	        && { if test -f $@; then exit 0; else break; fi; }; \
--	      exit 1;; \
--	  esac; \
--	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu testsuite/Makefile'; \
--	$(am__cd) $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu testsuite/Makefile
--.PRECIOUS: Makefile
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
--	@case '$?' in \
--	  *config.status*) \
--	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
--	  *) \
--	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
--	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
--	esac;
--
--$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
--	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--
--$(top_srcdir)/configure:  $(am__configure_deps)
--	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
--	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(am__aclocal_m4_deps):
- 
- clean-checkLTLIBRARIES:
- 	-test -z "$(check_LTLIBRARIES)" || rm -f $(check_LTLIBRARIES)
diff --git a/science/gnudatalanguage/pkg-plist b/science/gnudatalanguage/pkg-plist
index ab6ea9b0234b..9a227a5a93de 100644
--- a/science/gnudatalanguage/pkg-plist
+++ b/science/gnudatalanguage/pkg-plist
@@ -1,11 +1,33 @@
 %%MASTER%%bin/gdl
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/CMakeFiles/CMakeDirectoryInformation.cmake
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/CMakeFiles/check.dir/DependInfo.cmake
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/CMakeFiles/check.dir/build.make
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/CMakeFiles/check.dir/cmake_clean.cmake
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/CMakeFiles/check.dir/progress.make
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/CMakeFiles/launchtest.dir/DependInfo.cmake
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/CMakeFiles/launchtest.dir/build.make
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/CMakeFiles/launchtest.dir/cmake_clean.cmake
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/CMakeFiles/launchtest.dir/depend.make
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/CMakeFiles/launchtest.dir/flags.make
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/CMakeFiles/launchtest.dir/link.txt
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/CMakeFiles/launchtest.dir/progress.make
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/CMakeFiles/progress.marks
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/CMakeFiles/test_ce.dir/DependInfo.cmake
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/CMakeFiles/test_ce.dir/build.make
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/CMakeFiles/test_ce.dir/cmake_clean.cmake
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/CMakeFiles/test_ce.dir/depend.make
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/CMakeFiles/test_ce.dir/flags.make
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/CMakeFiles/test_ce.dir/link.txt
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/CMakeFiles/test_ce.dir/progress.make
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/CMakeLists.txt
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/CTestTestfile.cmake
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/Makefile
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/Makefile.am
-%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/Makefile.in
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/README
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/Saturn.jpg
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/benchmark/bench_matrix_multiply.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/checks
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/cmake_install.cmake
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/example.grib
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/image_test.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/launchtest.c
@@ -17,6 +39,7 @@
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test-total.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_MathFunctionsDim.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_angles.pro
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_array_equal.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_axis.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_base64.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_besel.pro
@@ -68,6 +91,7 @@
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3488003.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3559291.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_byte_conversion.pro
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bytscl.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_call_function.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_call_procedure.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_ce.pro
@@ -129,6 +153,7 @@
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_known_bugs.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_ludc_lusol.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_map.pro
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_matrix_multiply.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_memory.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_minmax.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_moment.pro
@@ -136,6 +161,7 @@
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_multiroots.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_nans_in_sort_and_median.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_nestedloop.pro
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_netcdf.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_ntags.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_op_elem.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_op_power.pro
@@ -182,6 +208,7 @@
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_stregex.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_strmatch.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_strsplit.pro
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_structures.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_suite.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_surface_basic.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_systime.pro
@@ -199,7 +226,6 @@
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_widgets.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_zeropoly.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_zip.pro
-%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/testsuite/launchtest.c
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/try
 %%MASTER%%%%DATADIR%%/AUTHORS
 %%MASTER%%%%DATADIR%%/README
@@ -211,6 +237,7 @@
 %%MASTER%%%%DATADIR%%/lib/calendar.pro
 %%MASTER%%%%DATADIR%%/lib/congrid.pro
 %%MASTER%%%%DATADIR%%/lib/correlate.pro
+%%MASTER%%%%DATADIR%%/lib/delvar.pro
 %%MASTER%%%%DATADIR%%/lib/deriv.pro
 %%MASTER%%%%DATADIR%%/lib/diag_matrix.pro
 %%MASTER%%%%DATADIR%%/lib/dialog_message.pro
@@ -226,15 +253,16 @@
 %%MASTER%%%%DATADIR%%/lib/dicom/gdlffdicom_time.pro
 %%MASTER%%%%DATADIR%%/lib/dicom/gdlffdicom_trim.pro
 %%MASTER%%%%DATADIR%%/lib/dist.pro
+%%MASTER%%%%DATADIR%%/lib/doc_library.pro
 %%MASTER%%%%DATADIR%%/lib/envi/read_envi_file.pro
 %%MASTER%%%%DATADIR%%/lib/envi/test_write_read_envi.pro
 %%MASTER%%%%DATADIR%%/lib/envi/write_envi_file.pro
 %%MASTER%%%%DATADIR%%/lib/escape_special_char.pro
 %%MASTER%%%%DATADIR%%/lib/factorial.pro
-%%MASTER%%%%DATADIR%%/lib/file_basename.pro
+%%MASTER%%%%DATADIR%%/lib/file_basename_old.pro
 %%MASTER%%%%DATADIR%%/lib/file_copy.pro
 %%MASTER%%%%DATADIR%%/lib/file_delete.pro
-%%MASTER%%%%DATADIR%%/lib/file_dirname.pro
+%%MASTER%%%%DATADIR%%/lib/file_dirname_old.pro
 %%MASTER%%%%DATADIR%%/lib/file_expand_path.pro
 %%MASTER%%%%DATADIR%%/lib/file_lines.pro
 %%MASTER%%%%DATADIR%%/lib/file_which.pro
@@ -264,6 +292,8 @@
 %%MASTER%%%%DATADIR%%/lib/meanabsdev.pro
 %%MASTER%%%%DATADIR%%/lib/moment.pro
 %%MASTER%%%%DATADIR%%/lib/norm.pro
+%%MASTER%%%%DATADIR%%/lib/online_help.pro
+%%MASTER%%%%DATADIR%%/lib/oploterr.pro
 %%MASTER%%%%DATADIR%%/lib/path_sep.pro
 %%MASTER%%%%DATADIR%%/lib/ploterr.pro
 %%MASTER%%%%DATADIR%%/lib/poly.pro
@@ -327,10 +357,15 @@
 %%MASTER%%%%DATADIR%%/lib/write_pict.pro
 %%MASTER%%%%DATADIR%%/lib/write_png.pro
 %%MASTER%%%%DATADIR%%/lib/zenity_check.pro
+%%MASTER%%man/man1/gdl.1.gz
 %%MASTER%%@dirrm %%DATADIR%%/lib/envi
 %%MASTER%%@dirrm %%DATADIR%%/lib/dicom
 %%MASTER%%@dirrm %%DATADIR%%/lib
 %%MASTER%%@dirrm %%DATADIR%%
-%%MASTER%%%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/testsuite/testsuite
-%%MASTER%%%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/testsuite
-%%MASTER%%%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+%%MASTER%%%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/testsuite/benchmark
+%%MASTER%%%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/testsuite/CMakeFiles/test_ce.dir
+%%MASTER%%%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/testsuite/CMakeFiles/launchtest.dir
+%%MASTER%%%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/testsuite/CMakeFiles/check.dir
+%%MASTER%%%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/testsuite/CMakeFiles
+%%MASTER%%%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/testsuite
+%%MASTER%%%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%