Upgrade to 2.2.2.

17 files changed, 475 insertions, 181 deletions

diff --git a/french/med/Makefile b/french/med/Makefile
index 5e5be81d3b90..7d414b26e9f8 100644
--- a/french/med/Makefile
+++ b/french/med/Makefile
@@ -6,50 +6,56 @@
 #
 
 PORTNAME=	med
-PORTVERSION=	2.1.5
-PORTREVISION=	1
+PORTVERSION=	2.2.2
 CATEGORIES=	french cad converters
 MASTER_SITES=	http://www.code-aster.org/FICHIERS/
-DISTNAME=	${PORTNAME}hdf-src-${PORTVERSION}-1.noarch
-EXTRACT_SUFX=	.tar
+DISTNAME=	${PORTNAME}_fichier${PORTVERSION}.src
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Modélisation et Échanges de Données
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libhdf5.a:${PORTSDIR}/science/hdf5
+BUILD_DEPENDS=	wish${TK_VER}:${PORTSDIR}/x11-toolkits/tk${SHORT_TK_VER}
+LIB_DEPENDS=	hdf5.0:${PORTSDIR}/science/hdf5
 
-EXTRACT_CMD=	${TAR}
-EXTRACT_BEFORE_ARGS=	-xf
-EXTRACT_AFTER_ARGS=	# empty
-CONFIGURE_ARGS=	--prefix=${PREFIX} --disable-shared
-CONFIGURE_ENV=	HDF5HOME=${LOCALBASE}
-USE_INC_LIBTOOL_VER=	13
+TK_VER?=	8.4
+SHORT_TK_VER=	${TK_VER:S/.//}
+
+#CONFIGURE_ARGS=	--disable-shared
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	HDF5HOME=${LOCALBASE} CPPFLAGS="${PTHREAD_CFLAGS}"	\
+		LDFLAGS="${PTHREAD_LIBS}"
+USE_LIBTOOL_VER=	15
 USE_GMAKE=	yes
+INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
 
-WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION}.src
+DOC2FIX=	. gif html jpg png tests
+TST2FIX=	c f
 
-post-extract:
-	@(cd ${WRKDIR} && \
-	${TAR} xfz ${WRKDIR}/${PORTNAME}${PORTVERSION}.src.tar.gz)
+.include <bsd.port.pre.mk>
 
-pre-configure:
-	@${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g'	\
-		${WRKSRC}/config/commence.in
-	@${REINPLACE_CMD} -e 's|@PTHREAD_LIBS@|${PTHREAD_LIBS}|'	\
-		 -e 's|@PTHREAD_CFLAGS@|${PTHREAD_CFLAGS}|'		\
-			${WRKSRC}/tests/Makefile.in
+.if !${OSVERSION} < 500039
+F77?=		f77
+.endif
+FFLAGS?=	-O2
 
-pre-install:
-	@${MKDIR} ${EXAMPLESDIR}
+pre-configure:
+.if defined(NOPORTDOCS)
+	@${REINPLACE_CMD} -e 's|SUBDIRS = src tests tools doc|SUBDIRS = src tests tools|'	\
+		${WRKSRC}/Makefile.in
+.endif
+.for dd in ${DOC2FIX}
+	@${REINPLACE_CMD} -e 's|docdir = $$(datadir)/doc|docdir = $$(datadir)/doc/@PACKAGE@|'	\
+		${WRKSRC}/doc/${dd}/Makefile.in
+.endfor
+.for dd in ${TST2FIX}
+	@${REINPLACE_CMD} -e 's|test${dd}dir = $$(bindir)/test|test${dd}dir = ${EXAMPLESDIR}/test|' \
+		${WRKSRC}/tests/${dd}/Makefile.in
+.endfor
 
 post-install:
-.if defined(NOPORTDOCS)
-	@${RM} -rf ${EXAMPLESDIR}
-.else
-	@${MKDIR} ${DOCSDIR}
-	@${CP} -R ${WRKSRC}/doc/html ${DOCSDIR}
+.if !defined(NOPORTDOCS)
 	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/french/med/distinfo b/french/med/distinfo
index f1827b0dca6e..4e18b3baba6d 100644
--- a/french/med/distinfo
+++ b/french/med/distinfo
@@ -1,2 +1,2 @@
-MD5 (medhdf-src-2.1.5-1.noarch.tar) = a19a5f481fbf48b1a2934517dfb717c5
-SIZE (medhdf-src-2.1.5-1.noarch.tar) = 5038080
+MD5 (med_fichier2.2.2.src.tar.gz) = 2f8c7b50c256d0e69ee6826f9ea62b64
+SIZE (med_fichier2.2.2.src.tar.gz) = 1989587
diff --git a/french/med/files/patch-Makefile.in b/french/med/files/patch-Makefile.in
deleted file mode 100644
index e7dafe6eadae..000000000000
--- a/french/med/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Wed Nov 20 17:21:36 2002
-+++ Makefile.in	Sat Apr 24 21:06:50 2004
-@@ -35,7 +35,7 @@
- 	   (cd $$d && $(MAKE) $@) || exit 1;				      \
- 	done
- 	@$(LT) --mode=finish $(libdir);
--	$(INSTALL_PROGRAM) $(top_builddir)/bin/xmdump $(bindir)/.
-+	$(INSTALL_SCRIPT) $(top_builddir)/bin/xmdump $(bindir)/.
- 	$(INSTALL_DATA) $(top_srcdir)/include/med.h $(includedir)/.
- 	$(INSTALL_DATA) $(top_srcdir)/include/med.hf $(includedir)/.
- 	$(INSTALL_DATA) $(top_srcdir)/include/med_proto.h $(includedir)/.
diff --git a/french/med/files/patch-config::commence.in b/french/med/files/patch-config::commence.in
deleted file mode 100644
index a379fe449ae8..000000000000
--- a/french/med/files/patch-config::commence.in
+++ /dev/null
@@ -1,28 +0,0 @@
---- config/commence.in.orig	Wed Sep 18 18:09:44 2002
-+++ config/commence.in	Sat Apr 24 21:17:41 2004
-@@ -28,7 +28,7 @@
- CFLAGS=@CFLAGS@
- CPPFLAGS= -I$(top_srcdir)/include -I$(HDF5INC) -D$(MACHINE) @CPPFLAGS@
- LIBS=@LIBS@
--FLIBS=@FLIBS@
-+FLIBS=%%PTHREAD_LIBS%% -lhdf5 @FLIBS@
- LDFLAGS=@LDFLAGS@ $(LIBS)
- AR=@AR@
- RANLIB=@RANLIB@
-@@ -36,6 +36,7 @@
- CP=cp
- INSTALL=@INSTALL@
- INSTALL_PROGRAM=@INSTALL_PROGRAM@
-+INSTALL_SCRIPT=@INSTALL_SCRIPT@
- INSTALL_DATA=@INSTALL_DATA@
- RUNSERIAL=@RUNSERIAL@
- RUNPARALLEL=@RUNPARALLEL@
-@@ -49,7 +50,7 @@
- libdir=@libdir@
- includedir=@includedir@
- docdir=@exec_prefix@/doc
--testdir=@exec_prefix@/tests
-+testdir=@exec_prefix@/share/examples/med/tests
- PUB_LIB=$(LIB)
- 
- # Shared libraries
diff --git a/french/med/files/patch-config::conclude.in b/french/med/files/patch-config::conclude.in
deleted file mode 100644
index 42a6948479b2..000000000000
--- a/french/med/files/patch-config::conclude.in
+++ /dev/null
@@ -1,19 +0,0 @@
---- ./config/conclude.in.orig	Wed Sep 18 18:09:44 2002
-+++ ./config/conclude.in	Sat Apr 24 22:04:34 2004
-@@ -88,11 +88,11 @@
- 	   fi;							              \
- 	done
- # Install tests programmes in bindir
--	@for f in X $(TEST_PROGS); do  					      \
--	   if test $$f != X; then					      \
--	     ($(LT_INSTALL_PROG) $$f $(bindir)/. || exit 1);		      \
--	   fi;							              \
--	done
-+#	@for f in X $(TEST_PROGS); do  					      \
-+#	   if test $$f != X; then					      \
-+#	     ($(LT_INSTALL_PROG) $$f $(bindir)/. || exit 1);		      \
-+#	   fi;							              \
-+#	done
- # Install sources tests programmes in testdir
- 	for f in X $(TEST_SRC); do					      \
- echo $$f;\
diff --git a/french/med/files/patch-include::med_outils.h b/french/med/files/patch-include::med_outils.h
index 813f0539d243..bd8370cdb58d 100644
--- a/french/med/files/patch-include::med_outils.h
+++ b/french/med/files/patch-include::med_outils.h
@@ -1,11 +1,11 @@
---- include/med_outils.h.orig	Tue Dec 10 19:05:22 2002
-+++ include/med_outils.h	Wed Jul 23 11:37:29 2003
-@@ -111,7 +111,7 @@
- #define MED_TAILLE_PROFILS 9 

- 

- /*Pour eviter le bug solaris*/

--#include <malloc.h>

-+#include <stdlib.h>

- 

- /* Interface des routines du composant tools */

- #include <med_misc.h>

+--- include/med_outils.h.orig	Wed Nov 17 15:05:46 2004
++++ include/med_outils.h	Sat Jan  8 22:51:32 2005
+@@ -152,7 +152,7 @@
+ #define MED_TAILLE_LIENS 7 
+ 
+ /*Pour eviter le bug solaris*/
+-#include <malloc.h>
++#include <stdlib.h>
+ 
+ /* Interface des routines du composant tools */
+ #include <med_misc.h>
diff --git a/french/med/files/patch-src::cfi::Makefile.in b/french/med/files/patch-src::cfi::Makefile.in
new file mode 100644
index 000000000000..5591ee94fe76
--- /dev/null
+++ b/french/med/files/patch-src::cfi::Makefile.in
@@ -0,0 +1,19 @@
+--- src/cfi/Makefile.in.orig	Thu Nov 18 11:34:29 2004
++++ src/cfi/Makefile.in	Sun Jan  9 00:30:48 2005
+@@ -57,11 +57,13 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/config/depcomp
+ am__depfiles_maybe = depfiles
++# FreeBSD patch: put AM_CFLAGS before CPPFLAGS to be able to compile
++# even if includes from previous version are installed.
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++	$(AM_CFLAGS) $(CPPFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CFLAGS) $(CFLAGS)
++	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(AM_CFLAGS) \
++	$(CPPFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
diff --git a/french/med/files/patch-src::api::ci::MEDunvCr.c b/french/med/files/patch-src::ci::MEDunvCr.c
index 1eef65ca7b67..33a73f8c07ae 100644
--- a/french/med/files/patch-src::api::ci::MEDunvCr.c
+++ b/french/med/files/patch-src::ci::MEDunvCr.c
@@ -1,5 +1,5 @@
---- src/api/ci/MEDunvCr.c.orig	Tue Dec 10 16:48:14 2002
-+++ src/api/ci/MEDunvCr.c	Fri Jun 27 16:10:48 2003
+--- ./src/ci/MEDunvCr.c.orig	Tue Dec 10 16:48:14 2002
++++ ./src/ci/MEDunvCr.c	Fri Jun 27 16:10:48 2003
 @@ -34,6 +34,12 @@
  #include <sys/time.h>
  #endif
diff --git a/french/med/files/patch-src::ci::Makefile.in b/french/med/files/patch-src::ci::Makefile.in
new file mode 100644
index 000000000000..6f764974a0c0
--- /dev/null
+++ b/french/med/files/patch-src::ci::Makefile.in
@@ -0,0 +1,16 @@
+--- src/ci/Makefile.in.orig	Thu Nov 18 11:34:30 2004
++++ src/ci/Makefile.in	Sun Jan  9 00:04:36 2005
+@@ -86,10 +86,10 @@
+ depcomp = $(SHELL) $(top_srcdir)/config/depcomp
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++	$(AM_CFLAGS) $(CPPFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CFLAGS) $(CFLAGS)
++	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(AM_CFLAGS) \
++	$(CPPFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
diff --git a/french/med/files/patch-src::hdfi::Makefile.in b/french/med/files/patch-src::hdfi::Makefile.in
new file mode 100644
index 000000000000..9bd4d2b0729c
--- /dev/null
+++ b/french/med/files/patch-src::hdfi::Makefile.in
@@ -0,0 +1,16 @@
+--- src/hdfi/Makefile.in.orig	Thu Nov 18 11:34:30 2004
++++ src/hdfi/Makefile.in	Sun Jan  9 00:13:09 2005
+@@ -67,10 +67,10 @@
+ depcomp = $(SHELL) $(top_srcdir)/config/depcomp
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++	$(AM_CFLAGS) $(CPPFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CFLAGS) $(CFLAGS)
++	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(AM_CFLAGS) \
++	$(CPPFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
diff --git a/french/med/files/patch-src::misc::Makefile.in b/french/med/files/patch-src::misc::Makefile.in
new file mode 100644
index 000000000000..4bcdfabe3010
--- /dev/null
+++ b/french/med/files/patch-src::misc::Makefile.in
@@ -0,0 +1,16 @@
+--- src/misc/Makefile.in.orig	Thu Nov 18 11:34:31 2004
++++ src/misc/Makefile.in	Sun Jan  9 00:11:05 2005
+@@ -59,10 +59,10 @@
+ depcomp = $(SHELL) $(top_srcdir)/config/depcomp
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++	$(AM_CFLAGS) $(CPPFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CFLAGS) $(CFLAGS)
++	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(AM_CFLAGS) \
++	$(CPPFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
diff --git a/french/med/files/patch-tests::Makefile.in b/french/med/files/patch-tests::Makefile.in
deleted file mode 100644
index 01f27085ce4e..000000000000
--- a/french/med/files/patch-tests::Makefile.in
+++ /dev/null
@@ -1,42 +0,0 @@
---- tests/Makefile.in.orig	Wed Sep 18 18:09:58 2002
-+++ tests/Makefile.in	Sat Apr 24 22:44:52 2004
-@@ -3,7 +3,10 @@
- top_srcdir=@top_srcdir@
- top_builddir=..
- srcdir=@srcdir@
-+pthread_cflags=@PTHREAD_CFLAGS@
-+pthread_libs=@PTHREAD_LIBS@
- VPATH=@srcdir@/c:@srcdir@/f
-+
- @COMMENCE@
- 
- SRC_C= \
-@@ -38,22 +41,22 @@
- endif
- 
- %_c.out: %_c.o
--	$(CC) -o $@ $< $(LDFLAGS) -L$(top_builddir)/src/.libs -lmed -lhdf5
-+	$(CC) -o $@ $< $(LDFLAGS) $(pthread_libs) -L$(top_builddir)/src/.libs -lmed -lhdf5
- 
- %_c.o: %.c
--	$(CC) -c -o $@ $< $(CFLAGS) $(CPPFLAGS) $(CFLAGS)
-+	$(CC) -c -o $@ $< $(CFLAGS) $(CPPFLAGS) $(CFLAGS) $(pthread_cflags)
- 
- %_f.out: %_f.o
--	$(FC) -o $@ $< $(LDFLAGS) -L$(top_builddir)/src/.libs -lmed -lhdf5
-+	$(FC) -o $@ $< $(LDFLAGS) $(pthread_libs) -L$(top_builddir)/src/.libs -lmed -lhdf5
- 
- %_f.o: %.f
--	$(FC) -c -o $@ $< $(FFLAGS)
-+	$(FC) -c -o $@ $< $(FFLAGS) $(pthread_cflags)
- 
- %_f90.out: %_f90.o
--	$(F90) $(FFLAGS) -o $@ $< $(LDFLAGS) -L$(top_builddir)/src/.libs -lmed -lhdf5
-+	$(F90) $(FFLAGS) -o $@ $< $(LDFLAGS) $(pthread_libs) -L$(top_builddir)/src/.libs -lmed -lhdf5
- 
- %_f90.o: %.f90
--	$(F90) -c -o $@ $< $(FFLAGS)
-+	$(F90) -c -o $@ $< $(FFLAGS) $(pthread_cflags)
- 
- @CONCLUDE@
- 
diff --git a/french/med/files/patch-tests::c::Makefile.in b/french/med/files/patch-tests::c::Makefile.in
new file mode 100644
index 000000000000..545ae8b9432b
--- /dev/null
+++ b/french/med/files/patch-tests::c::Makefile.in
@@ -0,0 +1,16 @@
+--- tests/c/Makefile.in.orig	Thu Nov 18 11:34:31 2004
++++ tests/c/Makefile.in	Sun Jan  9 00:15:18 2005
+@@ -148,10 +148,10 @@
+ depcomp = $(SHELL) $(top_srcdir)/config/depcomp
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++	$(AM_CFLAGS) $(CPPFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CFLAGS) $(CFLAGS)
++	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(AM_CFLAGS) \
++	$(CPPFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
diff --git a/french/med/files/patch-tools::mdump::Makefile.in b/french/med/files/patch-tools::mdump::Makefile.in
new file mode 100644
index 000000000000..96ba60fba77b
--- /dev/null
+++ b/french/med/files/patch-tools::mdump::Makefile.in
@@ -0,0 +1,16 @@
+--- tools/mdump/Makefile.in.orig	Thu Nov 18 11:34:33 2004
++++ tools/mdump/Makefile.in	Sun Jan  9 00:18:22 2005
+@@ -62,10 +62,10 @@
+ depcomp = $(SHELL) $(top_srcdir)/config/depcomp
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++	$(AM_CFLAGS) $(CPPFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CFLAGS) $(CFLAGS)
++	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(AM_CFLAGS) \
++	$(CPPFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
diff --git a/french/med/files/patch-tools::medconforme::Makefile.in b/french/med/files/patch-tools::medconforme::Makefile.in
new file mode 100644
index 000000000000..9cead79db7e0
--- /dev/null
+++ b/french/med/files/patch-tools::medconforme::Makefile.in
@@ -0,0 +1,16 @@
+--- tools/medconforme/Makefile.in.orig	Thu Nov 18 11:34:33 2004
++++ tools/medconforme/Makefile.in	Sun Jan  9 00:24:43 2005
+@@ -59,10 +59,10 @@
+ depcomp = $(SHELL) $(top_srcdir)/config/depcomp
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++	$(AM_CFLAGS) $(CPPFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CFLAGS) $(CFLAGS)
++	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(AM_CFLAGS) \
++	$(CPPFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
diff --git a/french/med/files/patch-tools::medimport::Makefile.in b/french/med/files/patch-tools::medimport::Makefile.in
new file mode 100644
index 000000000000..c8aea8f2e15e
--- /dev/null
+++ b/french/med/files/patch-tools::medimport::Makefile.in
@@ -0,0 +1,16 @@
+--- tools/medimport/Makefile.in.orig	Thu Nov 18 11:34:34 2004
++++ tools/medimport/Makefile.in	Sun Jan  9 00:26:51 2005
+@@ -59,10 +59,10 @@
+ depcomp = $(SHELL) $(top_srcdir)/config/depcomp
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++	$(AM_CFLAGS) $(CPPFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CFLAGS) $(CFLAGS)
++	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(AM_CFLAGS) \
++	$(CPPFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
diff --git a/french/med/pkg-plist b/french/med/pkg-plist
index 98f27bcf3c40..ef39d0cb29f9 100644
--- a/french/med/pkg-plist
+++ b/french/med/pkg-plist
@@ -1,51 +1,308 @@
-bin/medconforme
 bin/mdump
+bin/medconforme
+bin/medimport
 bin/xmdump
 include/med.h
 include/med.hf
-include/med_proto.h
-include/med_outils.h
-include/med_utils.h
 include/med_hdfi.h
 include/med_misc.h
+include/med_outils.h
+include/med_proto.h
+include/med_utils.h
 lib/libmed.a
-%%PORTDOCS%%%%DOCSDIR%%/html/menu.html
-%%PORTDOCS%%%%DOCSDIR%%/html/index.html
-%%PORTDOCS%%%%DOCSDIR%%/html/introduction.html
+lib/libmed.so
+lib/libmed.so.1
+lib/libmedC.a
+lib/libmedC.so
+lib/libmedC.so.1
+%%EXAMPLESDIR%%/testc/test1
+%%EXAMPLESDIR%%/testc/test10
+%%EXAMPLESDIR%%/testc/test11
+%%EXAMPLESDIR%%/testc/test12
+%%EXAMPLESDIR%%/testc/test13
+%%EXAMPLESDIR%%/testc/test14
+%%EXAMPLESDIR%%/testc/test15
+%%EXAMPLESDIR%%/testc/test16
+%%EXAMPLESDIR%%/testc/test17
+%%EXAMPLESDIR%%/testc/test18
+%%EXAMPLESDIR%%/testc/test19
+%%EXAMPLESDIR%%/testc/test2
+%%EXAMPLESDIR%%/testc/test20
+%%EXAMPLESDIR%%/testc/test21
+%%EXAMPLESDIR%%/testc/test22
+%%EXAMPLESDIR%%/testc/test23
+%%EXAMPLESDIR%%/testc/test24
+%%EXAMPLESDIR%%/testc/test25
+%%EXAMPLESDIR%%/testc/test26
+%%EXAMPLESDIR%%/testc/test27
+%%EXAMPLESDIR%%/testc/test28
+%%EXAMPLESDIR%%/testc/test3
+%%EXAMPLESDIR%%/testc/test4
+%%EXAMPLESDIR%%/testc/test5
+%%EXAMPLESDIR%%/testc/test6
+%%EXAMPLESDIR%%/testc/test7
+%%EXAMPLESDIR%%/testc/test8
+%%EXAMPLESDIR%%/testc/test9
+%%EXAMPLESDIR%%/testf/test1
+%%EXAMPLESDIR%%/testf/test10
+%%EXAMPLESDIR%%/testf/test12
+%%EXAMPLESDIR%%/testf/test14
+%%EXAMPLESDIR%%/testf/test16
+%%EXAMPLESDIR%%/testf/test18
+%%EXAMPLESDIR%%/testf/test19
+%%EXAMPLESDIR%%/testf/test2
+%%EXAMPLESDIR%%/testf/test20
+%%EXAMPLESDIR%%/testf/test21
+%%EXAMPLESDIR%%/testf/test22
+%%EXAMPLESDIR%%/testf/test23
+%%EXAMPLESDIR%%/testf/test24
+%%EXAMPLESDIR%%/testf/test25
+%%EXAMPLESDIR%%/testf/test26
+%%EXAMPLESDIR%%/testf/test27
+%%EXAMPLESDIR%%/testf/test28
+%%EXAMPLESDIR%%/testf/test3
+%%EXAMPLESDIR%%/testf/test4
+%%EXAMPLESDIR%%/testf/test6
+%%EXAMPLESDIR%%/testf/test8
+%%PORTDOCS%%%%DOCSDIR%%/gif/MED.gif
+%%PORTDOCS%%%%DOCSDIR%%/gif/aggregation.gif
+%%PORTDOCS%%%%DOCSDIR%%/gif/architecture.gif
+%%PORTDOCS%%%%DOCSDIR%%/gif/architecture_fonctionnelle.gif
+%%PORTDOCS%%%%DOCSDIR%%/gif/architecture_fonctionnelle_detaillee.gif
+%%PORTDOCS%%%%DOCSDIR%%/gif/architecture_technique.gif
+%%PORTDOCS%%%%DOCSDIR%%/gif/arete.gif
+%%PORTDOCS%%%%DOCSDIR%%/gif/association.gif
+%%PORTDOCS%%%%DOCSDIR%%/gif/cas_utilisation_med.gif
+%%PORTDOCS%%%%DOCSDIR%%/gif/composante.gif
+%%PORTDOCS%%%%DOCSDIR%%/gif/composition.gif
+%%PORTDOCS%%%%DOCSDIR%%/gif/equivalence.gif
+%%PORTDOCS%%%%DOCSDIR%%/gif/etude.gif
+%%PORTDOCS%%%%DOCSDIR%%/gif/face.gif
+%%PORTDOCS%%%%DOCSDIR%%/gif/famille.gif
+%%PORTDOCS%%%%DOCSDIR%%/gif/guide_utilisation.gif
+%%PORTDOCS%%%%DOCSDIR%%/gif/heritage.gif
+%%PORTDOCS%%%%DOCSDIR%%/gif/hexaedres.gif
+%%PORTDOCS%%%%DOCSDIR%%/gif/maillage.gif
+%%PORTDOCS%%%%DOCSDIR%%/gif/maille.gif
+%%PORTDOCS%%%%DOCSDIR%%/gif/maille_0D.gif
+%%PORTDOCS%%%%DOCSDIR%%/gif/maille_1D.gif
+%%PORTDOCS%%%%DOCSDIR%%/gif/maille_2D.gif
+%%PORTDOCS%%%%DOCSDIR%%/gif/maille_3D.gif
+%%PORTDOCS%%%%DOCSDIR%%/gif/noeud.gif
+%%PORTDOCS%%%%DOCSDIR%%/gif/pentaedres.gif
+%%PORTDOCS%%%%DOCSDIR%%/gif/profil.gif
+%%PORTDOCS%%%%DOCSDIR%%/gif/pyramides.gif
+%%PORTDOCS%%%%DOCSDIR%%/gif/quadrangles.gif
+%%PORTDOCS%%%%DOCSDIR%%/gif/resultat.gif
+%%PORTDOCS%%%%DOCSDIR%%/gif/segments.gif
+%%PORTDOCS%%%%DOCSDIR%%/gif/tetraedres.gif
+%%PORTDOCS%%%%DOCSDIR%%/gif/triangles.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/champ_reference.html
+%%PORTDOCS%%%%DOCSDIR%%/html/champ_utilisateur.html
+%%PORTDOCS%%%%DOCSDIR%%/html/entite_reference.html
+%%PORTDOCS%%%%DOCSDIR%%/html/entite_utilisateur.html
+%%PORTDOCS%%%%DOCSDIR%%/html/equivalence_reference.html
+%%PORTDOCS%%%%DOCSDIR%%/html/equivalence_utilisateur.html
+%%PORTDOCS%%%%DOCSDIR%%/html/exemple_utilisateur.html
 %%PORTDOCS%%%%DOCSDIR%%/html/external_links.html
+%%PORTDOCS%%%%DOCSDIR%%/html/famille_reference.html
+%%PORTDOCS%%%%DOCSDIR%%/html/famille_utilisateur.html
+%%PORTDOCS%%%%DOCSDIR%%/html/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/html/fichier_reference.html
+%%PORTDOCS%%%%DOCSDIR%%/html/fichier_utilisateur.html
+%%PORTDOCS%%%%DOCSDIR%%/html/include_c.html
+%%PORTDOCS%%%%DOCSDIR%%/html/include_f.html
+%%PORTDOCS%%%%DOCSDIR%%/html/installation.html
+%%PORTDOCS%%%%DOCSDIR%%/html/introduction.html
+%%PORTDOCS%%%%DOCSDIR%%/html/maillage_reference.html
+%%PORTDOCS%%%%DOCSDIR%%/html/maillage_utilisateur.html
+%%PORTDOCS%%%%DOCSDIR%%/html/med_dump.html
+%%PORTDOCS%%%%DOCSDIR%%/html/medconforme.html
+%%PORTDOCS%%%%DOCSDIR%%/html/medimport.html
+%%PORTDOCS%%%%DOCSDIR%%/html/menu.html
+%%PORTDOCS%%%%DOCSDIR%%/html/modele_de_donnees.html
+%%PORTDOCS%%%%DOCSDIR%%/html/noeud_reference.html
+%%PORTDOCS%%%%DOCSDIR%%/html/noeud_utilisateur.html
+%%PORTDOCS%%%%DOCSDIR%%/html/passageV2.1_V2.2.html
+%%PORTDOCS%%%%DOCSDIR%%/html/point_de_gauss_reference.html
+%%PORTDOCS%%%%DOCSDIR%%/html/point_de_gauss_utilisateur.html
+%%PORTDOCS%%%%DOCSDIR%%/html/profil_reference.html
+%%PORTDOCS%%%%DOCSDIR%%/html/profil_utilisateur.html
 %%PORTDOCS%%%%DOCSDIR%%/html/reference_guide.html
 %%PORTDOCS%%%%DOCSDIR%%/html/root.html
+%%PORTDOCS%%%%DOCSDIR%%/html/scalaire_reference.html
+%%PORTDOCS%%%%DOCSDIR%%/html/scalaire_utilisateur.html
+%%PORTDOCS%%%%DOCSDIR%%/html/tutorial.html
 %%PORTDOCS%%%%DOCSDIR%%/html/user_guide.html
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/test1.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/test1.f
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/test10.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/test10.f
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/test11.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/test12.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/test12.f
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/test13.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/test14.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/test14.f
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/test15.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/test16.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/test16.f
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/test17.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/test18.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/test18.f
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/test2.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/test2.f
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/test3.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/test3.f
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/test4.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/test4.f
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/test5.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/test6.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/test6.f
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/test7.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/test8.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/test8.f
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/test9.c
+%%PORTDOCS%%%%DOCSDIR%%/html/utilitaires.html
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/jpg/medconforme.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpg/medimport.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpg/xmdump.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpg/xmdump1.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpg/xmdump2.jpg
+%%PORTDOCS%%%%DOCSDIR%%/jpg/xmdump3.jpg
+%%PORTDOCS%%%%DOCSDIR%%/med.css
+%%PORTDOCS%%%%DOCSDIR%%/png/MED_fichier.png
+%%PORTDOCS%%%%DOCSDIR%%/png/agregation.png
+%%PORTDOCS%%%%DOCSDIR%%/png/arete.png
+%%PORTDOCS%%%%DOCSDIR%%/png/association.png
+%%PORTDOCS%%%%DOCSDIR%%/png/chainage.png
+%%PORTDOCS%%%%DOCSDIR%%/png/classe.png
+%%PORTDOCS%%%%DOCSDIR%%/png/code.png
+%%PORTDOCS%%%%DOCSDIR%%/png/composition.png
+%%PORTDOCS%%%%DOCSDIR%%/png/dependances_sous_packages_maillage.png
+%%PORTDOCS%%%%DOCSDIR%%/png/equivalence.png
+%%PORTDOCS%%%%DOCSDIR%%/png/etude.png
+%%PORTDOCS%%%%DOCSDIR%%/png/evolution_temporelle.png
+%%PORTDOCS%%%%DOCSDIR%%/png/exemple_connectivite_descendante_polyedres.png
+%%PORTDOCS%%%%DOCSDIR%%/png/exemple_connectivite_nodale_polyedres.png
+%%PORTDOCS%%%%DOCSDIR%%/png/exemple_connectivite_polygones.png
+%%PORTDOCS%%%%DOCSDIR%%/png/exemple_grille_cartesienne.png
+%%PORTDOCS%%%%DOCSDIR%%/png/exemple_grille_cartesienne_coordonnees.png
+%%PORTDOCS%%%%DOCSDIR%%/png/exemple_gro2fam.png
+%%PORTDOCS%%%%DOCSDIR%%/png/exemple_numerotation_grille.png
+%%PORTDOCS%%%%DOCSDIR%%/png/face.png
+%%PORTDOCS%%%%DOCSDIR%%/png/famille.png
+%%PORTDOCS%%%%DOCSDIR%%/png/heritage.png
+%%PORTDOCS%%%%DOCSDIR%%/png/indexation_grille.png
+%%PORTDOCS%%%%DOCSDIR%%/png/maillage.png
+%%PORTDOCS%%%%DOCSDIR%%/png/maille.png
+%%PORTDOCS%%%%DOCSDIR%%/png/maille_0D.png
+%%PORTDOCS%%%%DOCSDIR%%/png/maille_1D.png
+%%PORTDOCS%%%%DOCSDIR%%/png/maille_2D.png
+%%PORTDOCS%%%%DOCSDIR%%/png/maille_3D.png
+%%PORTDOCS%%%%DOCSDIR%%/png/med.png
+%%PORTDOCS%%%%DOCSDIR%%/png/noeud.png
+%%PORTDOCS%%%%DOCSDIR%%/png/numerotation_grille.png
+%%PORTDOCS%%%%DOCSDIR%%/png/package.png
+%%PORTDOCS%%%%DOCSDIR%%/png/points_de_gauss_par_element.png
+%%PORTDOCS%%%%DOCSDIR%%/png/profil.png
+%%PORTDOCS%%%%DOCSDIR%%/png/resultat.png
+%%PORTDOCS%%%%DOCSDIR%%/png/sequence_de_calcul.png
+%%PORTDOCS%%%%DOCSDIR%%/png/types_de_base.png
+%%PORTDOCS%%%%DOCSDIR%%/png/valeur_sur_entite.png
+%%PORTDOCS%%%%DOCSDIR%%/png/variable_scalaire_numerique.png
+%%PORTDOCS%%%%DOCSDIR%%/tests/mdump.c
+%%PORTDOCS%%%%DOCSDIR%%/tests/mdump.c.html
+%%PORTDOCS%%%%DOCSDIR%%/tests/test1.c
+%%PORTDOCS%%%%DOCSDIR%%/tests/test1.c.html
+%%PORTDOCS%%%%DOCSDIR%%/tests/test1.f
+%%PORTDOCS%%%%DOCSDIR%%/tests/test1.f.html
+%%PORTDOCS%%%%DOCSDIR%%/tests/test10.c
+%%PORTDOCS%%%%DOCSDIR%%/tests/test10.c.html
+%%PORTDOCS%%%%DOCSDIR%%/tests/test10.f
+%%PORTDOCS%%%%DOCSDIR%%/tests/test10.f.html
+%%PORTDOCS%%%%DOCSDIR%%/tests/test11.c
+%%PORTDOCS%%%%DOCSDIR%%/tests/test11.c.html
+%%PORTDOCS%%%%DOCSDIR%%/tests/test11.f90
+%%PORTDOCS%%%%DOCSDIR%%/tests/test11.f90.html
+%%PORTDOCS%%%%DOCSDIR%%/tests/test12.c
+%%PORTDOCS%%%%DOCSDIR%%/tests/test12.c.html
+%%PORTDOCS%%%%DOCSDIR%%/tests/test12.f
+%%PORTDOCS%%%%DOCSDIR%%/tests/test12.f.html
+%%PORTDOCS%%%%DOCSDIR%%/tests/test13.c
+%%PORTDOCS%%%%DOCSDIR%%/tests/test13.c.html
+%%PORTDOCS%%%%DOCSDIR%%/tests/test13.f90
+%%PORTDOCS%%%%DOCSDIR%%/tests/test13.f90.html
+%%PORTDOCS%%%%DOCSDIR%%/tests/test14.c
+%%PORTDOCS%%%%DOCSDIR%%/tests/test14.c.html
+%%PORTDOCS%%%%DOCSDIR%%/tests/test14.f
+%%PORTDOCS%%%%DOCSDIR%%/tests/test14.f.html
+%%PORTDOCS%%%%DOCSDIR%%/tests/test15.c
+%%PORTDOCS%%%%DOCSDIR%%/tests/test15.c.html
+%%PORTDOCS%%%%DOCSDIR%%/tests/test15.f90
+%%PORTDOCS%%%%DOCSDIR%%/tests/test15.f90.html
+%%PORTDOCS%%%%DOCSDIR%%/tests/test16.c
+%%PORTDOCS%%%%DOCSDIR%%/tests/test16.c.html
+%%PORTDOCS%%%%DOCSDIR%%/tests/test16.f
+%%PORTDOCS%%%%DOCSDIR%%/tests/test16.f.html
+%%PORTDOCS%%%%DOCSDIR%%/tests/test17.c
+%%PORTDOCS%%%%DOCSDIR%%/tests/test17.c.html
+%%PORTDOCS%%%%DOCSDIR%%/tests/test17.f90
+%%PORTDOCS%%%%DOCSDIR%%/tests/test17.f90.html
+%%PORTDOCS%%%%DOCSDIR%%/tests/test18.c
+%%PORTDOCS%%%%DOCSDIR%%/tests/test18.c.html
+%%PORTDOCS%%%%DOCSDIR%%/tests/test18.f
+%%PORTDOCS%%%%DOCSDIR%%/tests/test18.f.html
+%%PORTDOCS%%%%DOCSDIR%%/tests/test19.c
+%%PORTDOCS%%%%DOCSDIR%%/tests/test19.c.html
+%%PORTDOCS%%%%DOCSDIR%%/tests/test19.f
+%%PORTDOCS%%%%DOCSDIR%%/tests/test19.f.html
+%%PORTDOCS%%%%DOCSDIR%%/tests/test2.c
+%%PORTDOCS%%%%DOCSDIR%%/tests/test2.c.html
+%%PORTDOCS%%%%DOCSDIR%%/tests/test2.f
+%%PORTDOCS%%%%DOCSDIR%%/tests/test2.f.html
+%%PORTDOCS%%%%DOCSDIR%%/tests/test20.c
+%%PORTDOCS%%%%DOCSDIR%%/tests/test20.c.html
+%%PORTDOCS%%%%DOCSDIR%%/tests/test20.f
+%%PORTDOCS%%%%DOCSDIR%%/tests/test20.f.html
+%%PORTDOCS%%%%DOCSDIR%%/tests/test21.c
+%%PORTDOCS%%%%DOCSDIR%%/tests/test21.c.html
+%%PORTDOCS%%%%DOCSDIR%%/tests/test21.f
+%%PORTDOCS%%%%DOCSDIR%%/tests/test21.f.html
+%%PORTDOCS%%%%DOCSDIR%%/tests/test22.c
+%%PORTDOCS%%%%DOCSDIR%%/tests/test22.c.html
+%%PORTDOCS%%%%DOCSDIR%%/tests/test22.f
+%%PORTDOCS%%%%DOCSDIR%%/tests/test22.f.html
+%%PORTDOCS%%%%DOCSDIR%%/tests/test23.c
+%%PORTDOCS%%%%DOCSDIR%%/tests/test23.c.html
+%%PORTDOCS%%%%DOCSDIR%%/tests/test23.f
+%%PORTDOCS%%%%DOCSDIR%%/tests/test23.f.html
+%%PORTDOCS%%%%DOCSDIR%%/tests/test24.c
+%%PORTDOCS%%%%DOCSDIR%%/tests/test24.c.html
+%%PORTDOCS%%%%DOCSDIR%%/tests/test24.f
+%%PORTDOCS%%%%DOCSDIR%%/tests/test24.f.html
+%%PORTDOCS%%%%DOCSDIR%%/tests/test25.c
+%%PORTDOCS%%%%DOCSDIR%%/tests/test25.c.html
+%%PORTDOCS%%%%DOCSDIR%%/tests/test25.f
+%%PORTDOCS%%%%DOCSDIR%%/tests/test25.f.html
+%%PORTDOCS%%%%DOCSDIR%%/tests/test26.c
+%%PORTDOCS%%%%DOCSDIR%%/tests/test26.c.html
+%%PORTDOCS%%%%DOCSDIR%%/tests/test26.f
+%%PORTDOCS%%%%DOCSDIR%%/tests/test26.f.html
+%%PORTDOCS%%%%DOCSDIR%%/tests/test27.c
+%%PORTDOCS%%%%DOCSDIR%%/tests/test27.c.html
+%%PORTDOCS%%%%DOCSDIR%%/tests/test27.f
+%%PORTDOCS%%%%DOCSDIR%%/tests/test27.f.html
+%%PORTDOCS%%%%DOCSDIR%%/tests/test28.c
+%%PORTDOCS%%%%DOCSDIR%%/tests/test28.c.html
+%%PORTDOCS%%%%DOCSDIR%%/tests/test28.f
+%%PORTDOCS%%%%DOCSDIR%%/tests/test28.f.html
+%%PORTDOCS%%%%DOCSDIR%%/tests/test3.c
+%%PORTDOCS%%%%DOCSDIR%%/tests/test3.c.html
+%%PORTDOCS%%%%DOCSDIR%%/tests/test3.f
+%%PORTDOCS%%%%DOCSDIR%%/tests/test3.f.html
+%%PORTDOCS%%%%DOCSDIR%%/tests/test4.c
+%%PORTDOCS%%%%DOCSDIR%%/tests/test4.c.html
+%%PORTDOCS%%%%DOCSDIR%%/tests/test4.f
+%%PORTDOCS%%%%DOCSDIR%%/tests/test4.f.html
+%%PORTDOCS%%%%DOCSDIR%%/tests/test5.c
+%%PORTDOCS%%%%DOCSDIR%%/tests/test5.c.html
+%%PORTDOCS%%%%DOCSDIR%%/tests/test5.f90
+%%PORTDOCS%%%%DOCSDIR%%/tests/test5.f90.html
+%%PORTDOCS%%%%DOCSDIR%%/tests/test6.c
+%%PORTDOCS%%%%DOCSDIR%%/tests/test6.c.html
+%%PORTDOCS%%%%DOCSDIR%%/tests/test6.f
+%%PORTDOCS%%%%DOCSDIR%%/tests/test6.f.html
+%%PORTDOCS%%%%DOCSDIR%%/tests/test7.c
+%%PORTDOCS%%%%DOCSDIR%%/tests/test7.c.html
+%%PORTDOCS%%%%DOCSDIR%%/tests/test7.f90
+%%PORTDOCS%%%%DOCSDIR%%/tests/test7.f90.html
+%%PORTDOCS%%%%DOCSDIR%%/tests/test8.c
+%%PORTDOCS%%%%DOCSDIR%%/tests/test8.c.html
+%%PORTDOCS%%%%DOCSDIR%%/tests/test8.f
+%%PORTDOCS%%%%DOCSDIR%%/tests/test8.f.html
+%%PORTDOCS%%%%DOCSDIR%%/tests/test9.c
+%%PORTDOCS%%%%DOCSDIR%%/tests/test9.c.html
+%%PORTDOCS%%%%DOCSDIR%%/tests/test9.f90
+%%PORTDOCS%%%%DOCSDIR%%/tests/test9.f90.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/tests
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/png
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/jpg
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/gif
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/tests
+@dirrm %%EXAMPLESDIR%%/testf
+@dirrm %%EXAMPLESDIR%%/testc
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%