10 files changed, 74 insertions, 191 deletions

diff --git a/science/gnudatalanguage/Makefile b/science/gnudatalanguage/Makefile
index 5ac085b3c9c4..84e68c4ddfae 100644
--- a/science/gnudatalanguage/Makefile
+++ b/science/gnudatalanguage/Makefile
@@ -6,15 +6,14 @@
 #
 
 PORTNAME=	gnudatalanguage
-PORTVERSION=	0.8.11
-PORTREVISION=	7
+DISTVERSION=	0.9pre5
 CATEGORIES=	science lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 .if defined(BUILD_PYTHON_MODULE)
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 .endif
-DISTNAME=	gdl-${PORTVERSION}
+DISTNAME=	gdl-${DISTVERSION}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT?=	GDL, a free IDL compatible incremental compiler
@@ -82,7 +81,7 @@ CONFIGURE_ARGS+=--with-hdf=no
 .endif
 
 .if !defined(WITHOUT_PYTHON) || defined(BUILD_PYTHON_MODULE)
-USE_PYTHON=	2.3+
+USE_PYTHON=	2.4+
 BUILD_DEPENDS+=	${PYTHON_SITELIBDIR}/numarray:${PORTSDIR}/math/py-numarray
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/numarray:${PORTSDIR}/math/py-numarray \
 		${PYTHON_SITELIBDIR}/matplotlib:${PORTSDIR}/math/py-matplotlib
@@ -111,8 +110,9 @@ do-install:
 .if !defined(BUILD_PYTHON_MODULE)
 post-install:
 . if !defined(NOPORTDOCS)
-	${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/src/pro/* ${EXAMPLESDIR}
+	${MKDIR} ${EXAMPLESDIR}/testsuite
+	(cd ${WRKSRC}/src/pro && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}/)
+	(cd ${WRKSRC}/testsuite && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}/testsuite/)
 	@${ECHO_MSG} "===> Examples installed in ${EXAMPLESDIR}."
 . endif
 .endif
@@ -124,7 +124,8 @@ regression-test:	install
 	@${ECHO_CMD} 'print GDL.function("sin",(1,))' >> ${WRKDIR}/testgdl.py
 	${PYTHON_CMD} ${WRKDIR}/testgdl.py
 . else
-	@${ECHO_CMD} ".RUN ${EXAMPLESDIR}/test_suite.pro" > ${WRKDIR}/testgdl
+	@${ECHO_CMD} ".RUN ${EXAMPLESDIR}/testsuite/test_suite.pro"	\
+		> ${WRKDIR}/testgdl
 	@${ECHO_CMD} "exit" >> ${WRKDIR}/testgdl
 	${PREFIX}/bin/gdl < ${WRKDIR}/testgdl
 . endif
diff --git a/science/gnudatalanguage/distinfo b/science/gnudatalanguage/distinfo
index 121aac880a2c..e8c82c9e81ce 100644
--- a/science/gnudatalanguage/distinfo
+++ b/science/gnudatalanguage/distinfo
@@ -1,3 +1,3 @@
-MD5 (gdl-0.8.11.tar.gz) = 837365b860889de03483cf84ae15b9b3
-SHA256 (gdl-0.8.11.tar.gz) = 3872fdbf5ec76632cad1fe1a488728592d72244c9c0553c96f265bdc78bb5906
-SIZE (gdl-0.8.11.tar.gz) = 827194
+MD5 (gdl-0.9pre5.tar.gz) = d2a740ba633ff7ace23f452d34a9c42c
+SHA256 (gdl-0.9pre5.tar.gz) = 81121a4e7e217dc986b4827ce690a8650f264dd648108ffde8f1eb77633d41cb
+SIZE (gdl-0.9pre5.tar.gz) = 1131751
diff --git a/science/gnudatalanguage/files/patch-configure b/science/gnudatalanguage/files/patch-configure
deleted file mode 100644
index fb977bd65d98..000000000000
--- a/science/gnudatalanguage/files/patch-configure
+++ /dev/null
@@ -1,38 +0,0 @@
---- configure.orig	Mon Oct 17 10:22:00 2005
-+++ configure	Sun Oct 23 11:40:43 2005
-@@ -19158,7 +19158,7 @@
- 
- fi;
- 
--if test "x$PYTHON_MODULE" == "xyes"; then
-+if test "x$PYTHON_MODULE" = "xyes"; then
- 
- cat >>confdefs.h <<\_ACEOF
- #define PYTHON_MODULE 1
-@@ -19386,7 +19386,7 @@
-   with_gsl=yes
- fi
- 
--if test "x$with_gsl" == "xno"; then
-+if test "x$with_gsl" = "xno"; then
- 	echo ""
- 	echo "Error! GSL library is obligatory."
-         exit -1
-@@ -19573,7 +19573,7 @@
-   with_plplot=yes
- fi
- 
--if test "x$with_plplot" == "xno"; then
-+if test "x$with_plplot" = "xno"; then
- 	echo ""
- 	echo "Error! PLPLOT library is obligatory."
-         exit -1
-@@ -20297,7 +20297,7 @@
- 
- fi;
- 
--if test "x$PYTHON_VERSION" == "x"; then
-+if test "x$PYTHON_VERSION" = "x"; then
- 
-    echo -n "Automatic determination of python version."
- 
diff --git a/science/gnudatalanguage/files/patch-src__basic_fun_cl.cpp b/science/gnudatalanguage/files/patch-src__basic_fun_cl.cpp
deleted file mode 100644
index 1d9b0a41ef2a..000000000000
--- a/science/gnudatalanguage/files/patch-src__basic_fun_cl.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
---- src/basic_fun_cl.cpp.orig	Mon Oct 17 10:22:04 2005
-+++ src/basic_fun_cl.cpp	Sun Oct 23 15:32:34 2005
-@@ -131,7 +131,7 @@
-       }
-     }
- 
--    //return the variable in seconds, either JULIAN, JULIAN+UTC, 
-+    //return the variable in seconds, either JULIAN, JULIAN+UTC,
-     //or no other keywords
-     struct tm *tstruct;
-     if( ret_seconds || e->KeywordSet("SECONDS") )
-@@ -139,38 +139,38 @@
-        if( e->KeywordSet("JULIAN") )
-          {
-            if( e->KeywordSet("UTC") )
--             tstruct=gmtime(&tval.tv_sec);
-+             tstruct=gmtime((time_t *)(&tval.tv_sec));
-            else
--             tstruct=localtime(&tval.tv_sec);
--         
-+             tstruct=localtime((time_t *)(&tval.tv_sec));
-+
-            return new DDoubleGDL(Gregorian2Julian(tstruct));
-          }
--       else 
-+       else
-          {
-            // does not (necessaryly) work: time might count backwards
-            //double tickTime = static_cast<double>(t) + tt - floor( tt);
-            return new DDoubleGDL(static_cast<double>(tt));
-          }
-       }
--    
-+
-     //return a string of the time, either UTC or local (default)
-     if(e->KeywordSet("UTC"))
--      tstruct= gmtime(&tval.tv_sec);
-+      tstruct= gmtime((time_t *)(&tval.tv_sec));
-     else
--      tstruct= localtime(&tval.tv_sec);
--    
-+      tstruct= localtime((time_t *)(&tval.tv_sec));
-+
-     //Convert the time to JULIAN or NOT
-     if(e->KeywordSet("JULIAN"))
--        return new DDoubleGDL(Gregorian2Julian(tstruct)); 
--    else 
-+        return new DDoubleGDL(Gregorian2Julian(tstruct));
-+    else
-       {
-        char *st=new char[MAX_DATE_STRING_LENGTH];
-        const char *format="%a %h %d %T %Y";//my IDL date format.
-        DStringGDL *S;
--                 
-+
-        SizeT res=strftime(st,MAX_DATE_STRING_LENGTH,format,tstruct);
- 
--       if(res != 0) 
-+       if(res != 0)
-          S=new DStringGDL(st);
-        else
-          S=new DStringGDL("");
diff --git a/science/gnudatalanguage/files/patch-src__dinterpreter.hpp b/science/gnudatalanguage/files/patch-src__dinterpreter.hpp
deleted file mode 100644
index 69b5c29a5ec9..000000000000
--- a/science/gnudatalanguage/files/patch-src__dinterpreter.hpp
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/dinterpreter.hpp.orig	Mon Oct 17 10:22:04 2005
-+++ src/dinterpreter.hpp	Sat Oct 29 21:46:46 2005
-@@ -25,7 +25,14 @@
- #include <fstream>
- #include <csignal>
- 
--#include <fenv.h>
-+#ifdef __cplusplus
-+  extern "C" {
-+#  include <fenv.h>
-+#  if defined(__FreeBSD__)
-+#    pragma STDC FENV_ACCESS ON
-+#  endif
-+}
-+#endif
- 
- #include "initsysvar.hpp"
- #include "objects.hpp"
diff --git a/science/gnudatalanguage/files/patch-src__file.cpp b/science/gnudatalanguage/files/patch-src__file.cpp
deleted file mode 100644
index 1663f9dbe5a8..000000000000
--- a/science/gnudatalanguage/files/patch-src__file.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/file.cpp.orig	Mon Oct 17 10:22:04 2005
-+++ src/file.cpp	Sun Oct 23 21:21:21 2005
-@@ -514,7 +514,7 @@
-     if( noSort)
-       flags |= GLOB_NOSORT;
- 
--#ifndef __APPLE__
-+#if !defined(__APPLE__) && !defined(__FreeBSD__)
-     if( !quote) // n/a on OS X
-       flags |= GLOB_NOESCAPE;
- 
diff --git a/science/gnudatalanguage/files/patch-src__math_fun_jmg.hpp b/science/gnudatalanguage/files/patch-src__math_fun_jmg.hpp
deleted file mode 100644
index 0b476e720ecb..000000000000
--- a/science/gnudatalanguage/files/patch-src__math_fun_jmg.hpp
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/math_fun_jmg.hpp.orig	Mon Oct 17 10:22:04 2005
-+++ src/math_fun_jmg.hpp	Sat Oct 29 21:48:25 2005
-@@ -18,7 +18,15 @@
- #ifndef MATH_FUN_HPP_
- #define MATH_FUN_HPP_
- 
--#include <fenv.h>
-+#ifdef __cplusplus
-+  extern "C" {
-+#  include <fenv.h>
-+#  if defined(__FreeBSD__)
-+#    pragma STDC FENV_ACCESS ON
-+#  endif
-+}
-+#endif
-+
- #include "datatypes.hpp"
- #include "envt.hpp"
- #include "math_utl.hpp"
diff --git a/science/gnudatalanguage/files/patch-src__pythongdl.cpp b/science/gnudatalanguage/files/patch-src__pythongdl.cpp
deleted file mode 100644
index f323172ed04f..000000000000
--- a/science/gnudatalanguage/files/patch-src__pythongdl.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/pythongdl.cpp.orig	Mon Oct 17 10:22:04 2005
-+++ src/pythongdl.cpp	Mon Oct 31 10:59:22 2005
-@@ -362,7 +362,7 @@
-       if( !success) goto ret;
-       
-       // build the environment
--      EnvT  e( interpreter, NULL, sub);
-+      EnvT  e( (EnvT*)interpreter, (DSub*)NULL, (BaseGDL**)sub);
- 
-       // copy arguments
-       success = CopyArgFromPython( parRef, kwRef, e, argTuple, kwDict);
diff --git a/science/gnudatalanguage/files/patch-src__specializations.hpp b/science/gnudatalanguage/files/patch-src__specializations.hpp
deleted file mode 100644
index b5b55c0c44a0..000000000000
--- a/science/gnudatalanguage/files/patch-src__specializations.hpp
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/specializations.hpp.orig	Mon Oct 17 10:22:04 2005
-+++ src/specializations.hpp	Fri Mar 23 22:11:15 2007
-@@ -237,6 +237,12 @@
- Data_<SpDByte>* Data_<SpDComplexDbl>::LogNeg();
- 
- // datatypes.cpp
-+template<>
-+Data_<SpDString>::Data_(const dimension& dim_, BaseGDL::InitType iT);
-+template<>
-+Data_<SpDPtr>::Data_(const dimension& dim_, BaseGDL::InitType iT);
-+template<>
-+Data_<SpDObj>::Data_(const dimension& dim_, BaseGDL::InitType iT);
- template<>  const SizeT Data_<SpDString>::NBytes() const;
- template<>  const SizeT Data_<SpDObj>::NBytes() const;
- template<>  const SizeT Data_<SpDPtr>::NBytes() const;
diff --git a/science/gnudatalanguage/pkg-plist b/science/gnudatalanguage/pkg-plist
index 873a3c056d09..ade754fca271 100644
--- a/science/gnudatalanguage/pkg-plist
+++ b/science/gnudatalanguage/pkg-plist
@@ -1,22 +1,46 @@
 %%MASTER%%bin/gdl
 %%MASTER%%lib/libantlr.a
+%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/README.txt
+%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/STATUS
+%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/UrgentNeed.txt
 %%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/appleman.pro
 %%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/array_indices.pro
+%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/deriv.pro
+%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/dicom/gdlffdicom__assoc__define.pro
+%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/dicom/gdlffdicom__define.pro
+%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/dicom/gdlffdicom__dictionary.pro
+%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/dicom/gdlffdicom_copy_lun.pro
+%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/dicom/gdlffdicom_date.pro
+%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/dicom/gdlffdicom_time.pro
+%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/dicom/gdlffdicom_trim.pro
 %%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/dist.pro
-%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/example_journal.pro
 %%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/factorial.pro
+%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/file_lines.pro
+%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/filepath.pro
+%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/findfile.pro
+%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/helpform.pro
 %%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/identity.pro
-%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/image_test.pro
+%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/ishft.pro
 %%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/kurtosis.pro
+%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/last_item.pro
 %%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/lmgr.pro
 %%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/loadct.pro
+%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/map_clip_set.pro
 %%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/mean.pro
 %%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/meanabsdev.pro
 %%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/moment.pro
-%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/nc_test.pro
+%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/norm.pro
+%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/path_sep.pro
+%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/ploterr.pro
 %%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/poly.pro
+%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/popd.pro
+%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/primes.pro
+%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/printd.pro
+%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/pushd.pro
 %%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/py_plot.pro
 %%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/py_print.pro
+%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/read_ascii.pro
+%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/read_binary.pro
 %%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/read_bmp.pro
 %%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/read_dicom.pro
 %%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/read_jpeg.pro
@@ -24,22 +48,54 @@
 %%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/read_png.pro
 %%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/read_tiff.pro
 %%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/read_xwd.pro
-%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/regression-total.pro
+%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/restore.pro
+%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/save.pro
 %%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/skewness.pro
+%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/smooth.pro
 %%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/stddev.pro
+%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/str_sep.pro
 %%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/strsplit.pro
 %%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/swap_endian.pro
 %%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/template.pro
 %%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/template_blank.pro
-%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/test_brain.pro
-%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/test_jd_op_tut.pro
-%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/test_suite.pro
+%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/testsuite/image_test.pro
+%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/testsuite/nc_test.pro
+%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/testsuite/test-read_ascii.pro
+%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/testsuite/test-read_ascii.txt
+%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/testsuite/test-swap_endian.pro
+%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/testsuite/test-total.pro
+%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/testsuite/test_besel.pro
+%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/testsuite/test_brain.pro
+%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/testsuite/test_colors.pro
+%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/testsuite/test_deriv.pro
+%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/testsuite/test_erfs.pro
+%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/testsuite/test_expint.pro
+%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/testsuite/test_gammas.pro
+%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/testsuite/test_histo.pro
+%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/testsuite/test_jd_op_tut.pro
+%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/testsuite/test_map.pro
+%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/testsuite/test_minmax.pro
+%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/testsuite/test_op_elem.pro
+%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/testsuite/test_op_power.pro
+%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/testsuite/test_plot_basic.pro
+%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/testsuite/test_plot_benchmark.pro
+%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/testsuite/test_plot_inf_nan.pro
+%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/testsuite/test_plot_info.pro
+%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/testsuite/test_plot_linestyle.pro
+%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/testsuite/test_restore.pro
+%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/testsuite/test_save.pro
+%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/testsuite/test_smooth.pro
+%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/testsuite/test_suite.pro
+%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/testsuite/test_uf77.pro
 %%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/trace.pro
 %%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/tvscl.pro
 %%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/uniq.pro
+%%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/value_locate.pro
 %%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/variance.pro
 %%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/write_bmp.pro
 %%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/write_jpeg.pro
 %%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/write_pict.pro
 %%MASTER%%%%PORTDOCS%%%%EXAMPLESDIR%%/write_png.pro
+%%MASTER%%%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/testsuite
+%%MASTER%%%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/dicom
 %%MASTER%%%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%