Upgrade to 2.0-3 and chase the new site.

Changelog at <http://www.freefem.org/ff++/ftp/HISTORY>.

5 files changed, 105 insertions, 59 deletions

diff --git a/math/freefem++/Makefile b/math/freefem++/Makefile
index 6af7ead01eac..734881b854d7 100644
--- a/math/freefem++/Makefile
+++ b/math/freefem++/Makefile
@@ -6,12 +6,9 @@
 #
 
 PORTNAME=	freefem++
-DISTVERSION=	1.45-6
-PORTREVISION=	1
+DISTVERSION=	2.0-3
 CATEGORIES=	math science
-MASTER_SITES=	ftp://ftp.inria.fr/INRIA/Projects/Gamma/freefem/	\
-		http://mule.ann.jussieu.fr/~hecht/ftp/freefem/%SUBDIR%/
-MASTER_SITE_SUBDIR=	. old
+MASTER_SITES=	http://www.freefem.org/ff++/ftp/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An implementation of a language dedicated to the finite element method
@@ -41,14 +38,14 @@ CONFIGURE_ARGS=		--disable-download					\
 			--with-amd="-lamd"					\
 			--with-umfpack="-lumfpack"				\
 			--with-arpack="${LIBARPACK}"
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}"	\
-			LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV=		CPPFLAGS="${MPICFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}"	\
+			LDFLAGS="${MPILDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
 LIBBLAS=	-lf2c -lf77blas -latlas -lgslcblas
 LIBARPACK=	-larpack -lalapack ${LIBBLAS}
 
-DOCS=		AUTHORS BUGS COPYING HISTORY README TODO DOC/manual-full.pdf
-BADSAMPLES=	load/myfunction.o tutorial/Makefile.in.orig
+DOCS=		AUTHORS BUGS COPYING HISTORY README TODO
+BADSAMPLES=	load/myfunction.o
 
 .include <bsd.port.pre.mk>
 
@@ -66,6 +63,9 @@ WITH_MPI=	yes
 .if defined(WITH_MPI)
 BUILD_DEPENDS+=	${LOCALBASE}/mpich/bin/mpiCC:${PORTSDIR}/net/mpich
 RUN_DEPENDS+=	${LOCALBASE}/mpich/bin/mpiCC:${PORTSDIR}/net/mpich
+MPICFLAGS=	-I${LOCALBASE}/mpich/include
+MPILDFLAGS=	-L${LOCALBASE}/mpich/lib
+CONFIGURE_ENV+=	PATH="$$PATH:${LOCALBASE}/mpich/bin"
 PLIST_SUB+=	MPI=""
 .else
 PLIST_SUB+=	MPI="@comment "
@@ -73,29 +73,27 @@ PLIST_SUB+=	MPI="@comment "
 
 pre-configure:
 	@${REINPLACE_CMD} -e "s|-lpthread|${PTHREAD_LIBS}|g"		\
-		-e "s|mpiCC|${LOCALBASE}/mpich/bin/mpiCC|"		\
+		-e "s|mpiCC.|${LOCALBASE}/mpich/bin/mpiCC|"		\
 		-e "s|/usr/X11R6|${X11BASE}|g"				\
 		${WRKSRC}/${CONFIGURE_SCRIPT}
 	@${REINPLACE_CMD} -e "s|mpiCC|${LOCALBASE}/mpich/bin/mpiCC|"	\
 		${WRKSRC}/src/mpi/Makefile.in
 
 post-install:
-	@${STRIP_CMD} ${PREFIX}/bin/FreeFem++ ${PREFIX}/bin/FreeFem++-nw
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 . for doc in ${DOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
 . endfor
 	@${ECHO_MSG} "===>  Documentation installed in ${DOCSDIR}."
-. for direx in "" -bug -eigen -load -mpi -other -tutorial
-	@${MKDIR} ${EXAMPLESDIR}/${direx:S/-//}
-	@for sample in `${LS} ${WRKSRC}/examples++${direx}` ; do	\
-		${INSTALL_DATA} ${WRKSRC}/examples++${direx}/$$sample	\
-			${EXAMPLESDIR}/${direx:S/-//} ;			\
-	done
-	@(cd ${EXAMPLESDIR}/${direx:S/-//} &&				\
-	${RM} Makefile.am Makefile.in Makefile)
+. for direx in "" -bug -chapt3 -eigen -load -mpi -other -tutorial
+	cd ${WRKSRC}/examples++${direx} && ${FIND} . -type d	\
+		-exec ${MKDIR} ${EXAMPLESDIR}/${direx:S/-//}/{} \;
+	cd ${WRKSRC}/examples++${direx} && ${FIND} -L . -type f	\
+		-exec ${INSTALL_DATA} ${WRKSRC}/examples++${direx}/{}	\
+			${EXAMPLESDIR}/${direx:S/-//} \;
 . endfor
+	 ${FIND} ${EXAMPLESDIR} -name "Makefile*" -delete
 . for sample in ${BADSAMPLES}
 	@${RM} ${EXAMPLESDIR}/${sample}
 . endfor
diff --git a/math/freefem++/distinfo b/math/freefem++/distinfo
index 7a63b62547dd..15f61d4e3909 100644
--- a/math/freefem++/distinfo
+++ b/math/freefem++/distinfo
@@ -1,2 +1,2 @@
-MD5 (freefem++-1.45-6.tar.gz) = 0b80ff8374e9e4f05cb5921e77af3c79
-SIZE (freefem++-1.45-6.tar.gz) = 8034336
+MD5 (freefem++-2.0-3.tar.gz) = d27e76c84cfabe140f041f19953c489b
+SIZE (freefem++-2.0-3.tar.gz) = 13984090
diff --git a/math/freefem++/files/patch-configure b/math/freefem++/files/patch-configure
deleted file mode 100644
index 0f1b00d4569a..000000000000
--- a/math/freefem++/files/patch-configure
+++ /dev/null
@@ -1,29 +0,0 @@
---- configure.orig	Tue Feb  1 22:24:30 2005
-+++ configure	Thu Feb  3 22:07:34 2005
-@@ -7137,7 +7137,7 @@
- #  --------------------
- ff_cadna_ok=no
- ff_libs_old="$LIBS"
--ff_ldflag_old="$LDFLAGS"
-+ff_ldflags_old="$LDFLAGS"
- ff_cadna_dir="${curdir}/download/cadna"
-   LDFLAGS="$LDFLAGS -L$ff_cadna_dir"
-   echo "$as_me:$LINENO: checking for arit_zero in -lcadnafree" >&5
-@@ -8137,7 +8137,7 @@
- if test "${with_umfpack+set}" = set; then
-   withval="$with_umfpack"
-   ff_umfpack_ok=yes
--                ff_umfpack_lib="$ff_umfpack_lib ${withval}"
-+                ff_umfpack_lib="${withval} $ff_umfpack_lib"
- 
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_LIBUMFPACK 1
-@@ -8149,7 +8149,7 @@
- 
- 
- 
--for ac_header in umfpack.h umfpack/umfpack.h
-+for ac_header in UMFPACK/umfpack.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
diff --git a/math/freefem++/pkg-descr b/math/freefem++/pkg-descr
index 75a89b6fef65..f3d06c0adfd3 100644
--- a/math/freefem++/pkg-descr
+++ b/math/freefem++/pkg-descr
@@ -11,4 +11,4 @@ bamg) and test by designing an extension of freefem and of freefem+.
 
 Suggested add-on: the port graphics/xd3d.
 
-WWW: http://www.ann.jussieu.fr/~hecht/freefem++.htm
+WWW: http://www.freefem.org/ff++/
diff --git a/math/freefem++/pkg-plist b/math/freefem++/pkg-plist
index b03083ca16a2..bc46528f11f1 100644
--- a/math/freefem++/pkg-plist
+++ b/math/freefem++/pkg-plist
@@ -1,15 +1,18 @@
 bin/FreeFem++
 bin/FreeFem++-cs
-bin/FreeFem++-cs-server
+bin/FreeFem++-client
+bin/FreeFem++-ide
+bin/FreeFem++-server
 bin/FreeFem++-nw
+%%MPI%%bin/FreeFem++-mpi
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/BUGS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/HISTORY
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/manual-full.pdf
 %%PORTDOCS%%%%EXAMPLESDIR%%/D2.edp
+%%PORTDOCS%%%%EXAMPLESDIR%%/FE-medit.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/NSP1P1.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/NSP1P1b.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/NSP1P2.edp
@@ -23,19 +26,48 @@ bin/FreeFem++-nw
 %%PORTDOCS%%%%EXAMPLESDIR%%/all.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/arrayoFVh.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/bilap.edp
+%%PORTDOCS%%%%EXAMPLESDIR%%/bug/AAA.edp
+%%PORTDOCS%%%%EXAMPLESDIR%%/bug/NSP1P2.edp
+%%PORTDOCS%%%%EXAMPLESDIR%%/bug/P2b.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/bug/SegmentationFault.edp
-%%PORTDOCS%%%%EXAMPLESDIR%%/bug/aaa.edp
+%%PORTDOCS%%%%EXAMPLESDIR%%/bug/b.edp
+%%PORTDOCS%%%%EXAMPLESDIR%%/bug/bb.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/bug/bug-arg-string.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/bug/bugborder.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/bug/bugf.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/bug/bugv1.18.edp
+%%PORTDOCS%%%%EXAMPLESDIR%%/bug/fe-vect.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/bug/func.edp
+%%PORTDOCS%%%%EXAMPLESDIR%%/bug/laptopbig.edp
+%%PORTDOCS%%%%EXAMPLESDIR%%/bug/mesh.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/bug/zArithmetic_bug1.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/ccc-adp.edp
+%%PORTDOCS%%%%EXAMPLESDIR%%/chapt3/BlackScholes2D.edp
+%%PORTDOCS%%%%EXAMPLESDIR%%/chapt3/NSprojection.edp
+%%PORTDOCS%%%%EXAMPLESDIR%%/chapt3/all.edp
+%%PORTDOCS%%%%EXAMPLESDIR%%/chapt3/condensor.edp
+%%PORTDOCS%%%%EXAMPLESDIR%%/chapt3/convects.edp
+%%PORTDOCS%%%%EXAMPLESDIR%%/chapt3/heatex.edp
+%%PORTDOCS%%%%EXAMPLESDIR%%/chapt3/lame.edp
+%%PORTDOCS%%%%EXAMPLESDIR%%/chapt3/membrane.edp
+%%PORTDOCS%%%%EXAMPLESDIR%%/chapt3/membranerror.edp
+%%PORTDOCS%%%%EXAMPLESDIR%%/chapt3/muwave.edp
+%%PORTDOCS%%%%EXAMPLESDIR%%/chapt3/potential.edp
+%%PORTDOCS%%%%EXAMPLESDIR%%/chapt3/ref.edp
+%%PORTDOCS%%%%EXAMPLESDIR%%/chapt3/regtests.edp
+%%PORTDOCS%%%%EXAMPLESDIR%%/chapt3/regtests.m4
+%%PORTDOCS%%%%EXAMPLESDIR%%/chapt3/schwarz.edp
+%%PORTDOCS%%%%EXAMPLESDIR%%/chapt3/sound.edp
+%%PORTDOCS%%%%EXAMPLESDIR%%/chapt3/stokes.edp
+%%PORTDOCS%%%%EXAMPLESDIR%%/chapt3/test1.edp
+%%PORTDOCS%%%%EXAMPLESDIR%%/chapt3/testbed.edp
+%%PORTDOCS%%%%EXAMPLESDIR%%/chapt3/thermal.edp
+%%PORTDOCS%%%%EXAMPLESDIR%%/chapt3/thermic.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/demo.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/demo1.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/eigen/BeamEigenValue.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/eigen/BeamEigenValueperio.edp
+%%PORTDOCS%%%%EXAMPLESDIR%%/eigen/LapComplexEigenValue.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/eigen/LapEigenValue.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/eigen/LapnosymEigenValue.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/eigen/Stokes-eigen.edp
@@ -45,16 +77,57 @@ bin/FreeFem++-nw
 %%PORTDOCS%%%%EXAMPLESDIR%%/include.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/lap_mat.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/lapacienprecon.edp
+%%PORTDOCS%%%%EXAMPLESDIR%%/load/AFunction.hpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/load/AnyType.hpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/load/BamgFreeFem.hpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/load/CGNL.hpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/load/CodeAlloc.hpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/load/DOperator.hpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/load/FESpace.hpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/load/FQuadTree.hpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/load/InitFunct.hpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/load/MatriceCreuse.hpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/load/MatriceCreuse_tpl.hpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/load/MeshPoint.hpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/load/Operator.hpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/load/QuadratureFormular.hpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/load/RNM.hpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/load/RNM_op.hpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/load/RNM_opc.hpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/load/RNM_tpl.hpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/load/RefCounter.hpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/load/Serialize.hpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/load/String.hpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/load/config-wrapper.h
+%%PORTDOCS%%%%EXAMPLESDIR%%/load/config.h
+%%PORTDOCS%%%%EXAMPLESDIR%%/load/dfft.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/load/dfft.edp
+%%PORTDOCS%%%%EXAMPLESDIR%%/load/dfft.link
+%%PORTDOCS%%%%EXAMPLESDIR%%/load/error.hpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/load/fem.hpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/load/fem3.hpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/load/gmres.hpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/load/include.tar.gz
+%%PORTDOCS%%%%EXAMPLESDIR%%/load/lex.hpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/load/lgfem.hpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/load/lgsolver.hpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/load/load.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/load/load.link
 %%PORTDOCS%%%%EXAMPLESDIR%%/load/myfunction.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/load/myfunction.so
+%%PORTDOCS%%%%EXAMPLESDIR%%/load/problem.hpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/load/rgraph.hpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/load/showverb.hpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/load/strversionnumber.hpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/load/throwassert.hpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/load/versionnumber.hpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/makeref.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/mpi/essai.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/mpi/regtests.sh
 %%PORTDOCS%%%%EXAMPLESDIR%%/mpi/schwarz-b.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/mpi/schwarz-c.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/mpi/schwarz.edp
+%%PORTDOCS%%%%EXAMPLESDIR%%/other/graphics-benchmark.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/other/lap3-cpu.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/other/speedtest.sh
 %%PORTDOCS%%%%EXAMPLESDIR%%/parareal.edp
@@ -64,6 +137,7 @@ bin/FreeFem++-nw
 %%PORTDOCS%%%%EXAMPLESDIR%%/testFE.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/testadp.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/teste.edp
+%%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/BlackSchole.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/FE.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/FEComplex.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/LapDG2.edp
@@ -76,6 +150,8 @@ bin/FreeFem++-nw
 %%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/Newton.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/Periodic.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/StokesUzawa.edp
+%%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/VI-adap.edp
+%%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/VI.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/a_tutorial.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/adapt.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/adaptindicatorP1.edp
@@ -86,7 +162,6 @@ bin/FreeFem++-nw
 %%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/all.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/array.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/beam.edp
-%%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/blakschol.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/calculus.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/cavity.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/convect-apt.edp
@@ -124,10 +199,12 @@ bin/FreeFem++-nw
 %%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/xyf
 %%PORTDOCS%%%%EXAMPLESDIR%%/wafer-heating-laser-axi.edp
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/bug
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/eigen
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/load
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/tutorial
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/other
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/mpi
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/tutorial
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/load/include
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/load
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/eigen
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/chapt3
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/bug
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%