10 files changed, 430 insertions, 9 deletions

diff --git a/science/gnudatalanguage/Makefile b/science/gnudatalanguage/Makefile
index 21eee151319c..9488f678e0d8 100644
--- a/science/gnudatalanguage/Makefile
+++ b/science/gnudatalanguage/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnudatalanguage
-DISTVERSION=	0.9
-PORTREVISION=	1
+DISTVERSION=	0.9.1
 CATEGORIES=	science lang
 MASTER_SITES=	SF/${PORTNAME}/gdl/${DISTVERSION}
 .if defined(BUILD_PYTHON_MODULE)
@@ -39,8 +38,8 @@ USE_WX=		2.8
 GNU_CONFIGURE=	yes
 # Disable ncurses and readline from ports
 CONFIGURE_FLAGS=--with_ncursesdir=/usr --with_readlinedir=/usr
-CONFIGURE_ENV=	CPPFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/include/ImageMagick"	\
-		LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS} -L${LOCALBASE}/lib"	\
+CPPFLAGS=	${CFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/include/ImageMagick
+CONFIGURE_ENV=	LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS} -L${LOCALBASE}/lib"	\
 		wxConfig=${WX_CONFIG}
 
 SLAVEDIRS=	science/py-gnudatalanguage
@@ -63,7 +62,7 @@ CONFIGURE_ARGS+=--with-Magick=no
 .endif
 
 .if !defined(WITHOUT_HDF5)
-LIB_DEPENDS+=	hdf5.0:${PORTSDIR}/science/hdf5
+LIB_DEPENDS+=	hdf5.6:${PORTSDIR}/science/hdf5-18
 CONFIGURE_ARGS+=--with-hdf5=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=--with-hdf5=no
@@ -122,6 +121,7 @@ post-install:
 . 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}."
 . endif
 .endif
diff --git a/science/gnudatalanguage/distinfo b/science/gnudatalanguage/distinfo
index e83e8129b4d6..59e92dd616b1 100644
--- a/science/gnudatalanguage/distinfo
+++ b/science/gnudatalanguage/distinfo
@@ -1,3 +1,2 @@
-MD5 (gdl-0.9.tar.gz) = dd357a8b2569629ba8d29078200d45e7
-SHA256 (gdl-0.9.tar.gz) = def5bc2887d506d3f7b14c47bb6ccbd59532e535ab333b38456955b00a3f5da6
-SIZE (gdl-0.9.tar.gz) = 1454786
+SHA256 (gdl-0.9.1.tar.gz) = 873e235a4ec7c16ecec05b42f3e3e2cc9fedbd6ccb9e13d167336fdaec3ca197
+SIZE (gdl-0.9.1.tar.gz) = 1528008
diff --git a/science/gnudatalanguage/files/patch-Makefile.in b/science/gnudatalanguage/files/patch-Makefile.in
new file mode 100644
index 000000000000..ab79eb37b268
--- /dev/null
+++ b/science/gnudatalanguage/files/patch-Makefile.in
@@ -0,0 +1,75 @@
+--- Makefile.in.orig	2011-03-11 17:49:13.000000000 +0100
++++ Makefile.in	2011-04-05 21:20:28.000000000 +0200
+@@ -39,15 +39,11 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ subdir = .
+-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
++DIST_COMMON = README $(srcdir)/Makefile.am \
+ 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
+ 	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
+ 	TODO config.guess config.sub depcomp install-sh ltmain.sh \
+ 	missing mkinstalldirs
+-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 = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -271,55 +267,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
new file mode 100644
index 000000000000..d45b7bf40f4a
--- /dev/null
+++ b/science/gnudatalanguage/files/patch-doc_Makefile.in
@@ -0,0 +1,50 @@
+--- ./doc/Makefile.in.orig	2011-03-11 17:49:14.000000000 +0100
++++ ./doc/Makefile.in	2011-04-05 21:38:51.000000000 +0200
+@@ -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 = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+@@ -210,36 +206,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
new file mode 100644
index 000000000000..7567e8405889
--- /dev/null
+++ b/science/gnudatalanguage/files/patch-src_Makefile.in
@@ -0,0 +1,49 @@
+--- src/Makefile.in.orig	2011-03-11 17:49:14.000000000 +0100
++++ src/Makefile.in	2011-04-05 21:27:27.000000000 +0200
+@@ -40,10 +40,6 @@
+ subdir = src
+ DIST_COMMON = $(noinst_HEADERS) $(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 = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+@@ -528,35 +524,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/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):
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
diff --git a/science/gnudatalanguage/files/patch-src_antlr_Makefile.in b/science/gnudatalanguage/files/patch-src_antlr_Makefile.in
new file mode 100644
index 000000000000..c180498f6136
--- /dev/null
+++ b/science/gnudatalanguage/files/patch-src_antlr_Makefile.in
@@ -0,0 +1,50 @@
+--- src/antlr/Makefile.in.orig	2011-03-11 17:49:14.000000000 +0100
++++ src/antlr/Makefile.in	2011-04-05 21:30:17.000000000 +0200
+@@ -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 = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+@@ -352,36 +348,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_pro_Makefile.in b/science/gnudatalanguage/files/patch-src_pro_Makefile.in
new file mode 100644
index 000000000000..5f99555fc096
--- /dev/null
+++ b/science/gnudatalanguage/files/patch-src_pro_Makefile.in
@@ -0,0 +1,50 @@
+--- ./src/pro/Makefile.in.orig	2011-03-29 21:51:27.000000000 +0200
++++ ./src/pro/Makefile.in	2011-04-05 21:37:02.000000000 +0200
+@@ -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 = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+@@ -362,36 +358,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
new file mode 100644
index 000000000000..3fede1748c1d
--- /dev/null
+++ b/science/gnudatalanguage/files/patch-src_pro_dicom_Makefile.in
@@ -0,0 +1,50 @@
+--- ./src/pro/dicom/Makefile.in.orig	2011-03-11 17:49:14.000000000 +0100
++++ ./src/pro/dicom/Makefile.in	2011-04-05 21:35:14.000000000 +0200
+@@ -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 = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+@@ -221,36 +217,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-testsuite_Makefile.in b/science/gnudatalanguage/files/patch-testsuite_Makefile.in
new file mode 100644
index 000000000000..c9def6d5cf31
--- /dev/null
+++ b/science/gnudatalanguage/files/patch-testsuite_Makefile.in
@@ -0,0 +1,50 @@
+--- testsuite/Makefile.in.orig	2011-03-29 21:51:27.000000000 +0200
++++ testsuite/Makefile.in	2011-04-05 22:18:39.000000000 +0200
+@@ -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 = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+@@ -311,36 +307,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 a9167a0cf983..7832ad065f25 100644
--- a/science/gnudatalanguage/pkg-plist
+++ b/science/gnudatalanguage/pkg-plist
@@ -1,4 +1,5 @@
 %%MASTER%%bin/gdl
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/CMakeLists.txt
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/Makefile
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/Makefile.am
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/Makefile.in
@@ -7,6 +8,7 @@
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/checks
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/example.grib
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/image_test.pro
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/libtest_ce.cpp
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/nc_test.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test-read_ascii.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test-read_ascii.txt
@@ -19,20 +21,52 @@
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_besel.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_binfmt.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_brain.pro
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_1779553.pro
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_2555865.pro
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_2610174.pro
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_2846561.pro
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_2876150.pro
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_2876161.pro
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_2974380.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3033108.pro
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3054361.pro
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3055720.pro
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3057511.pro
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3057520.pro
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3061072.pro
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3081887.pro
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3085858.pro
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3086851.pro
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3091599.pro
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3091610.pro
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3100945.pro
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3104209.pro
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3104214.pro
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3104326.pro
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3104349.pro
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3147146.pro
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3147181.pro
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3151760.pro
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3189068.pro
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_bug_3199465.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_byte_conversion.pro
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_ce.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_check_math.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_clip.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_colors.pro
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_common.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_constants.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_contour_basic.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_contour_extra.pro
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_correlate.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_cursor.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_deriv.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_device.pro
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_dicom.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_dims_of_arrays.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_erfinv.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_erfs.pro
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_execute.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_expint.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_factorial.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_fft.pro
@@ -43,6 +77,7 @@
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_file_dirname.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_file_search.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_fix.pro
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_fixprint.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_float2string.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_gammas.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_gc.pro
@@ -60,6 +95,8 @@
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_map.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_memory.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_minmax.pro
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_moment.pro
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_mpfit.pro
 %%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
@@ -78,6 +115,11 @@
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_point_lun.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_poly2d.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_product.pro
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_ps_decomposed.pro
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_python.pro
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_python_module_0.pro
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_python_module_1.pro
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_python_module_2.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_read_jpeg.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_readf.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_rebin.pro
@@ -88,6 +130,7 @@
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_smooth.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_spher_harm.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_spl_init.pro
+%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_step.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_str_functions.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_strsplit.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_suite.pro
@@ -105,7 +148,6 @@
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_zip.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/test_zzz.pro
 %%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/try
-%%MASTER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsuite/try.local
 %%MASTER%%%%DATADIR%%/AUTHORS
 %%MASTER%%%%DATADIR%%/README
 %%MASTER%%%%DATADIR%%/lib/README.txt
@@ -113,11 +155,16 @@
 %%MASTER%%%%DATADIR%%/lib/appleman.pro
 %%MASTER%%%%DATADIR%%/lib/array_indices.pro
 %%MASTER%%%%DATADIR%%/lib/calendar.pro
+%%MASTER%%%%DATADIR%%/lib/correlate.pro
 %%MASTER%%%%DATADIR%%/lib/deriv.pro
+%%MASTER%%%%DATADIR%%/lib/dialog_message.pro
 %%MASTER%%%%DATADIR%%/lib/dialog_pickfile.pro
 %%MASTER%%%%DATADIR%%/lib/dicom/gdlffdicom__assoc__define.pro
+%%MASTER%%%%DATADIR%%/lib/dicom/gdlffdicom__assoc__test.pro
+%%MASTER%%%%DATADIR%%/lib/dicom/gdlffdicom__assoc_generateuid.pro
 %%MASTER%%%%DATADIR%%/lib/dicom/gdlffdicom__define.pro
 %%MASTER%%%%DATADIR%%/lib/dicom/gdlffdicom__dictionary.pro
+%%MASTER%%%%DATADIR%%/lib/dicom/gdlffdicom__test.pro
 %%MASTER%%%%DATADIR%%/lib/dicom/gdlffdicom_copy_lun.pro
 %%MASTER%%%%DATADIR%%/lib/dicom/gdlffdicom_date.pro
 %%MASTER%%%%DATADIR%%/lib/dicom/gdlffdicom_time.pro
@@ -195,6 +242,7 @@
 %%MASTER%%%%DATADIR%%/lib/str_sep.pro
 %%MASTER%%%%DATADIR%%/lib/strsplit.pro
 %%MASTER%%%%DATADIR%%/lib/swap_endian.pro
+%%MASTER%%%%DATADIR%%/lib/swap_endian_inplace.pro
 %%MASTER%%%%DATADIR%%/lib/template.pro
 %%MASTER%%%%DATADIR%%/lib/template_blank.pro
 %%MASTER%%%%DATADIR%%/lib/trace.pro