6 files changed, 58 insertions, 89 deletions

diff --git a/french/aster/Makefile b/french/aster/Makefile
index 02cc437378c8..d041e1b08d7b 100644
--- a/french/aster/Makefile
+++ b/french/aster/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	aster
 DISTVERSION=	8.3.0-3
+PORTREVISION=	1
 CATEGORIES=	french cad python
 MASTER_SITES=	http://www.code-aster.org/FICHIERS/
 DISTNAME=	${PORTNAME}-full-src-${DISTVERSION}
@@ -43,7 +44,7 @@ LIB_DEPENDS+=	tcl${SHORT_TCL_VER}:${PORTSDIR}/lang/tcl${SHORT_TCL_VER}	\
 		tk${SHORT_TK_VER}:${PORTSDIR}/x11-toolkits/tk${SHORT_TK_VER}	\
 		lapack.3:${PORTSDIR}/math/lapack				\
 		hdf5.0:${PORTSDIR}/science/hdf5					\
-		med.1:${PORTSDIR}/french/med
+		med.2:${PORTSDIR}/french/med
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/Gnuplot:${PORTSDIR}/math/py-gnuplot	\
 		${LOCALBASE}/bin/onmetis.exe:${PORTSDIR}/math/metis-edf		\
 		${LOCALBASE}/aster/ASTK/ASTK_SERV:${PORTSDIR}/cad/astk-serveur
diff --git a/french/med/Makefile b/french/med/Makefile
index b72ff7741369..28c1754766eb 100644
--- a/french/med/Makefile
+++ b/french/med/Makefile
@@ -6,11 +6,9 @@
 #
 
 PORTNAME=	med
-PORTVERSION=	2.2.3
-PORTREVISION=	2
-CATEGORIES=	french cad converters
+PORTVERSION=	2.3.1
+CATEGORIES=	french science
 MASTER_SITES=	http://www.code-aster.org/FICHIERS/
-DISTNAME=	${PORTNAME}_fichier${PORTVERSION}.src
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Modelisation et Echanges de Donnees
@@ -22,7 +20,6 @@ RUN_DEPENDS=	wish${TK_VER}:${PORTSDIR}/x11-toolkits/tk${SHORT_TK_VER}
 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}" WISH=${LOCALBASE}/bin/wish${TK_VER}
@@ -30,6 +27,12 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 
+.if !defined(WITHOUT_F90)
+F90=		gfortran41
+BUILD_DEPENDS+=	${F90}:${PORTSDIR}/lang/gfortran
+CONFIGURE_ARGS+=	--with-f90=${F90}
+.endif
+
 DOC2FIX=	. gif html jpg png tests
 TST2FIX=	c f
 
@@ -59,4 +62,8 @@ post-install:
 	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
 .endif
 
+regression-test:
+	@(cd ${BUILD_WRKSRC};	\
+	${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check)
+
 .include <bsd.port.post.mk>
diff --git a/french/med/distinfo b/french/med/distinfo
index 2e634b97d6fc..84ce7111e631 100644
--- a/french/med/distinfo
+++ b/french/med/distinfo
@@ -1,3 +1,3 @@
-MD5 (med_fichier2.2.3.src.tar.gz) = 54ed56d0846cf1a2389bfd42efa342f2
-SHA256 (med_fichier2.2.3.src.tar.gz) = fe9cf13693e13bbd2769ebe1f225c542107de0f55b66dbade48aab6bf9dad7b4
-SIZE (med_fichier2.2.3.src.tar.gz) = 1990999
+MD5 (med-2.3.1.tar.gz) = caa877fe7c1b3450edaccd729c52844b
+SHA256 (med-2.3.1.tar.gz) = f46166c6850c0157f6b13429524de91e42a3e53de9b859555baba85d3a4c11b6
+SIZE (med-2.3.1.tar.gz) = 2022500
diff --git a/french/med/files/patch-configure b/french/med/files/patch-configure
deleted file mode 100644
index f579070d0fb4..000000000000
--- a/french/med/files/patch-configure
+++ /dev/null
@@ -1,12 +0,0 @@
---- configure.orig	Wed Sep 18 18:09:45 2002
-+++ configure	Wed Jul  9 21:19:27 2003
-@@ -667,6 +667,9 @@
-     linux*)
- 	machine=PCLINUX
- 	;;
-+    freebsd*)
-+	machine=PCLINUX
-+	;;
-     hpux*)
- 	machine=HP9000
- 	;;
diff --git a/french/med/files/patch-src::ci::MEDunvCr.c b/french/med/files/patch-src::ci::MEDunvCr.c
index 33a73f8c07ae..fcbb40ae5929 100644
--- a/french/med/files/patch-src::ci::MEDunvCr.c
+++ b/french/med/files/patch-src::ci::MEDunvCr.c
@@ -1,7 +1,7 @@
---- ./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>
+--- ./src/ci/MEDunvCr.c.orig	Thu May 18 11:43:58 2006
++++ ./src/ci/MEDunvCr.c	Mon Dec 11 21:31:06 2006
+@@ -43,6 +43,12 @@
+ 
  #endif
  
 +#ifdef __FreeBSD__
@@ -13,14 +13,14 @@
  med_err 
  MEDunvCr(med_idt fid, char *maa)
  {
-@@ -78,7 +84,11 @@
+@@ -87,7 +93,11 @@
    nSize = strlen(nomu)-1;
    if ( sprintf(&nomu[nSize]," %hu",tp.millitm) < 0 ) return -1;
  #else
 +# ifdef __FreeBSD__
-+  if (getpwuid(geteuid()) == NULL) return -1;
++  if ( !getpwuid(geteuid()) ) return -1;
 +# else
-   if (cuserid(nomu) == (void*) NULL) return -1;
+   if ( !cuserid(nomu) ) return -1;
 +# endif
    strcat(nomu," ");
    temps=time(&temps);
diff --git a/french/med/pkg-plist b/french/med/pkg-plist
index 7f4219a49669..a2034d476462 100644
--- a/french/med/pkg-plist
+++ b/french/med/pkg-plist
@@ -4,7 +4,7 @@ bin/medimport
 bin/xmdump
 include/med.h
 include/med.hf
-include/med/med_config.h
+include/med_config.h
 include/med_hdfi.h
 include/med_misc.h
 include/med_outils.h
@@ -13,11 +13,11 @@ include/med_utils.h
 lib/libmed.a
 lib/libmed.la
 lib/libmed.so
-lib/libmed.so.1
+lib/libmed.so.2
 lib/libmedC.a
 lib/libmedC.la
 lib/libmedC.so
-lib/libmedC.so.1
+lib/libmedC.so.2
 %%EXAMPLESDIR%%/testc/test1
 %%EXAMPLESDIR%%/testc/test10
 %%EXAMPLESDIR%%/testc/test11
@@ -39,7 +39,12 @@ lib/libmedC.so.1
 %%EXAMPLESDIR%%/testc/test26
 %%EXAMPLESDIR%%/testc/test27
 %%EXAMPLESDIR%%/testc/test28
+%%EXAMPLESDIR%%/testc/test29
 %%EXAMPLESDIR%%/testc/test3
+%%EXAMPLESDIR%%/testc/test30
+%%EXAMPLESDIR%%/testc/test31
+%%EXAMPLESDIR%%/testc/test32
+%%EXAMPLESDIR%%/testc/test33
 %%EXAMPLESDIR%%/testc/test4
 %%EXAMPLESDIR%%/testc/test5
 %%EXAMPLESDIR%%/testc/test6
@@ -48,9 +53,13 @@ lib/libmedC.so.1
 %%EXAMPLESDIR%%/testc/test9
 %%EXAMPLESDIR%%/testf/test1
 %%EXAMPLESDIR%%/testf/test10
+%%EXAMPLESDIR%%/testf/test11
 %%EXAMPLESDIR%%/testf/test12
+%%EXAMPLESDIR%%/testf/test13
 %%EXAMPLESDIR%%/testf/test14
+%%EXAMPLESDIR%%/testf/test15
 %%EXAMPLESDIR%%/testf/test16
+%%EXAMPLESDIR%%/testf/test17
 %%EXAMPLESDIR%%/testf/test18
 %%EXAMPLESDIR%%/testf/test19
 %%EXAMPLESDIR%%/testf/test2
@@ -63,10 +72,18 @@ lib/libmedC.so.1
 %%EXAMPLESDIR%%/testf/test26
 %%EXAMPLESDIR%%/testf/test27
 %%EXAMPLESDIR%%/testf/test28
+%%EXAMPLESDIR%%/testf/test29
 %%EXAMPLESDIR%%/testf/test3
+%%EXAMPLESDIR%%/testf/test30
+%%EXAMPLESDIR%%/testf/test31
+%%EXAMPLESDIR%%/testf/test32
+%%EXAMPLESDIR%%/testf/test33
 %%EXAMPLESDIR%%/testf/test4
+%%EXAMPLESDIR%%/testf/test5
 %%EXAMPLESDIR%%/testf/test6
+%%EXAMPLESDIR%%/testf/test7
 %%EXAMPLESDIR%%/testf/test8
+%%EXAMPLESDIR%%/testf/test9
 %%PORTDOCS%%%%DOCSDIR%%/gif/MED.gif
 %%PORTDOCS%%%%DOCSDIR%%/gif/aggregation.gif
 %%PORTDOCS%%%%DOCSDIR%%/gif/architecture.gif
@@ -117,6 +134,8 @@ lib/libmedC.so.1
 %%PORTDOCS%%%%DOCSDIR%%/html/include_f.html
 %%PORTDOCS%%%%DOCSDIR%%/html/installation.html
 %%PORTDOCS%%%%DOCSDIR%%/html/introduction.html
+%%PORTDOCS%%%%DOCSDIR%%/html/joint_reference.html
+%%PORTDOCS%%%%DOCSDIR%%/html/joint_utilisateur.html
 %%PORTDOCS%%%%DOCSDIR%%/html/maillage_reference.html
 %%PORTDOCS%%%%DOCSDIR%%/html/maillage_utilisateur.html
 %%PORTDOCS%%%%DOCSDIR%%/html/med_dump.html
@@ -127,6 +146,7 @@ lib/libmedC.so.1
 %%PORTDOCS%%%%DOCSDIR%%/html/noeud_reference.html
 %%PORTDOCS%%%%DOCSDIR%%/html/noeud_utilisateur.html
 %%PORTDOCS%%%%DOCSDIR%%/html/passageV2.1_V2.2.html
+%%PORTDOCS%%%%DOCSDIR%%/html/passageV2.2_V2.3.html
 %%PORTDOCS%%%%DOCSDIR%%/html/point_de_gauss_reference.html
 %%PORTDOCS%%%%DOCSDIR%%/html/point_de_gauss_utilisateur.html
 %%PORTDOCS%%%%DOCSDIR%%/html/profil_reference.html
@@ -155,6 +175,7 @@ lib/libmedC.so.1
 %%PORTDOCS%%%%DOCSDIR%%/png/code.png
 %%PORTDOCS%%%%DOCSDIR%%/png/composition.png
 %%PORTDOCS%%%%DOCSDIR%%/png/dependances_sous_packages_maillage.png
+%%PORTDOCS%%%%DOCSDIR%%/png/description-joint.png
 %%PORTDOCS%%%%DOCSDIR%%/png/equivalence.png
 %%PORTDOCS%%%%DOCSDIR%%/png/etude.png
 %%PORTDOCS%%%%DOCSDIR%%/png/evolution_temporelle.png
@@ -169,6 +190,7 @@ lib/libmedC.so.1
 %%PORTDOCS%%%%DOCSDIR%%/png/famille.png
 %%PORTDOCS%%%%DOCSDIR%%/png/heritage.png
 %%PORTDOCS%%%%DOCSDIR%%/png/indexation_grille.png
+%%PORTDOCS%%%%DOCSDIR%%/png/joint.png
 %%PORTDOCS%%%%DOCSDIR%%/png/maillage.png
 %%PORTDOCS%%%%DOCSDIR%%/png/maille.png
 %%PORTDOCS%%%%DOCSDIR%%/png/maille_0D.png
@@ -183,122 +205,74 @@ lib/libmedC.so.1
 %%PORTDOCS%%%%DOCSDIR%%/png/profil.png
 %%PORTDOCS%%%%DOCSDIR%%/png/resultat.png
 %%PORTDOCS%%%%DOCSDIR%%/png/sequence_de_calcul.png
+%%PORTDOCS%%%%DOCSDIR%%/png/sous-domaines.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/test29.c.html
+%%PORTDOCS%%%%DOCSDIR%%/tests/test29.f.html
 %%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/test30.c.html
+%%PORTDOCS%%%%DOCSDIR%%/tests/test30.f90.html
+%%PORTDOCS%%%%DOCSDIR%%/tests/test31.c.html
+%%PORTDOCS%%%%DOCSDIR%%/tests/test31.f.html
+%%PORTDOCS%%%%DOCSDIR%%/tests/test32.c.html
+%%PORTDOCS%%%%DOCSDIR%%/tests/test32.f.html
 %%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
@@ -308,5 +282,4 @@ lib/libmedC.so.1
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%EXAMPLESDIR%%/testf
 @dirrm %%EXAMPLESDIR%%/testc
-@dirrm include/med
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%