4 files changed, 16 insertions, 79 deletions

diff --git a/science/fvm/Makefile b/science/fvm/Makefile
index 997d33eae180..160a9704e7cc 100644
--- a/science/fvm/Makefile
+++ b/science/fvm/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	fvm
-PORTVERSION=	0.6.3
+PORTVERSION=	0.9.0
 CATEGORIES=	science parallel
 MASTER_SITES=	http://www.edf.fr/html/RetD/livraison_saturne_${REL_DATE}/
 
@@ -18,7 +18,7 @@ LIB_DEPENDS=	med.2:${PORTSDIR}/french/med		\
 		hdf5.0:${PORTSDIR}/science/hdf5		\
 		cgns.0:${PORTSDIR}/science/cgnslib
 
-REL_DATE=	070305
+REL_DATE=	20071218
 
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
@@ -47,8 +47,15 @@ CONFIGURE_ARGS+=	--with-mpi-prefix=${LOCALBASE}/mpich2
 CONFIGURE_ARGS+=	--enable-debug
 .endif
 
+TESTSBIN=	fvm_file_test fvm_interface_test fvm_selector_postfix_test fvm_selector_test
+
 pre-configure:
 	# No useful doc there
 	${REINPLACE_CMD} -e 's|tests doc|tests|' ${WRKSRC}/Makefile.in
 
+regression-test:
+.for pg in ${TESTSBIN}
+	@(cd ${WRKSRC}/tests; ./${pg})
+.endfor
+
 .include <bsd.port.mk>
diff --git a/science/fvm/distinfo b/science/fvm/distinfo
index d86bbb5e77da..bba3b8d0cd9d 100644
--- a/science/fvm/distinfo
+++ b/science/fvm/distinfo
@@ -1,3 +1,3 @@
-MD5 (fvm-0.6.3.tar.gz) = f02b468bb9677809305d160b41b8f949
-SHA256 (fvm-0.6.3.tar.gz) = 1566ff22213846f24d976ef11a9e1e9aef485f870206656ab301f899bc5bdcbb
-SIZE (fvm-0.6.3.tar.gz) = 566676
+MD5 (fvm-0.9.0.tar.gz) = 9f6a7f59e15245997b060f98fdfbe195
+SHA256 (fvm-0.9.0.tar.gz) = 70a61717d5bd9d79f862335744cddeb25eb1ed5aee788d1fa038ef533bf70275
+SIZE (fvm-0.9.0.tar.gz) = 664087
diff --git a/science/fvm/files/patch-configure b/science/fvm/files/patch-configure
deleted file mode 100644
index 758f79ea0227..000000000000
--- a/science/fvm/files/patch-configure
+++ /dev/null
@@ -1,74 +0,0 @@
---- configure.orig	Thu Feb 15 18:57:25 2007
-+++ configure	Fri May  4 23:03:56 2007
-@@ -19654,7 +19654,7 @@
-     HDF5_CPPFLAGS="-I$with_hdf5_prefix/include"
-     HDF5_LDFLAGS="-L$with_hdf5_prefix/lib"
-   fi
--  HDF5_LIBS="-lhdf5"
-+  HDF5_LIBS="-lhdf5 $PTHREAD_LIBS"
- 
-   CPPFLAGS="${CPPFLAGS} ${HDF5_CPPFLAGS}"
-   LDFLAGS="${LDFLAGS} ${HDF5_LDFLAGS}"
-@@ -19666,7 +19666,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lhdf5  $LIBS"
-+LIBS="$HDF5_LIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -19810,7 +19810,7 @@
-   elif test "x$with_cgns_prefix" != "x" ; then
-     CGNS_LDFLAGS="-L$with_cgns_prefix/lib"
-   fi
--  CGNS_LIBS="-lcgns"
-+  CGNS_LIBS="-lcgns $HDF5_LIBS"
-   CPPFLAGS="${CPPFLAGS} ${CGNS_CPPFLAGS}"
-   LDFLAGS="${LDFLAGS} ${CGNS_LDFLAGS}"
-   LIBS="${LIBS} ${CGNS_LIBS}"
-@@ -19821,7 +19821,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lcgns  $LIBS"
-+LIBS="$CGNS_LIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -20810,6 +20810,8 @@
- 	fi
-       fi;
-       MED_LIBS="-lmedC -lpthread";;
-+    freebsd*)
-+      MED_ARCH_NAME=FREEBSD;;
-     osf*)
-       if test "x$ints_are_64bit" != "xyes" ; then
-         MED_ARCH_NAME=OSF1_32
-@@ -25366,7 +25368,7 @@
-   { echo "$as_me:$LINENO: checking for MPI (basic test)" >&5
- echo $ECHO_N "checking for MPI (basic test)... $ECHO_C" >&6; }
-   if test "$MPI_LIBS" = "" ; then
--    MPI_LIBS="-lmpi"
-+    MPI_LIBS="-lmpi $PTHREAD_LIBS"
-   fi
-   CPPFLAGS="$saved_CPPFLAGS $MPI_CPPFLAGS"
-   LDFLAGS="$saved_LDFLAGS $MPI_LDFLAGS"
-@@ -25422,7 +25424,7 @@
-     { echo "$as_me:$LINENO: checking for MPI (mpich test)" >&5
- echo $ECHO_N "checking for MPI (mpich test)... $ECHO_C" >&6; }
-     # First try (simplest)
--    MPI_LIBS="-lmpich"
-+    MPI_LIBS="-lmpich $PTHREAD_LIBS"
-     LIBS="$saved_LIBS $MPI_LIBS"
-     cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -25524,7 +25526,7 @@
-     { echo "$as_me:$LINENO: checking for MPI (lam-mpi test)" >&5
- echo $ECHO_N "checking for MPI (lam-mpi test)... $ECHO_C" >&6; }
-     # First try (without MPI-IO)
--    MPI_LIBS="-lmpi -llam -lpthread"
-+    MPI_LIBS="-lmpi -llam $PTHREAD_LIBS"
-     LIBS="$saved_LIBS $MPI_LIBS"
-     cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
diff --git a/science/fvm/pkg-plist b/science/fvm/pkg-plist
index 65dab748c27d..c8b52ad909b8 100644
--- a/science/fvm/pkg-plist
+++ b/science/fvm/pkg-plist
@@ -2,6 +2,8 @@ bin/fvm-config
 include/fvm_config.h
 include/fvm_config_priv.h
 include/fvm_defs.h
+include/fvm_file.h
+include/fvm_group.h
 include/fvm_interface.h
 include/fvm_io_num.h
 include/fvm_locator.h
@@ -15,6 +17,8 @@ include/fvm_nodal_project.h
 include/fvm_nodal_triangulate.h
 include/fvm_order.h
 include/fvm_parall.h
+include/fvm_periodicity.h
+include/fvm_selector.h
 include/fvm_triangulate.h
 include/fvm_writer.h
 lib/libfvm.a