Upgrade to 2.2-0.

Remark: the PDF manual is broken, don't build it in this version.

3 files changed, 32 insertions, 8 deletions

diff --git a/math/freefem++/Makefile b/math/freefem++/Makefile
index a3954bb857fc..2175f555da41 100644
--- a/math/freefem++/Makefile
+++ b/math/freefem++/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	freefem++
-DISTVERSION=	2.1-2
+DISTVERSION=	2.2-0
 CATEGORIES=	math science
 MASTER_SITES=	http://www.freefem.org/ff++/ftp/
 
@@ -17,9 +17,11 @@ LIB_DEPENDS=	atlas.1:${PORTSDIR}/math/atlas				\
 		f2c.2:${PORTSDIR}/lang/f2c				\
 		gsl.7:${PORTSDIR}/math/gsl				\
 		lapack.3:${PORTSDIR}/math/lapack			\
-		fltk.1:${PORTSDIR}/x11-toolkits/fltk-threads
+		fltk.1:${PORTSDIR}/x11-toolkits/fltk-threads		\
+		fftw3.3:${PORTSDIR}/math/fftw3
 BUILD_DEPENDS=	${LOCALBASE}/lib/libumfpack.a:${PORTSDIR}/math/umfpack	\
 		${LOCALBASE}/lib/libarpack.a:${PORTSDIR}/math/arpack	\
+		convert:${PORTSDIR}/graphics/ImageMagick		\
 		dvips:${PORTSDIR}/print/dvipsk-tetex			\
 		pdflatex:${PORTSDIR}/print/teTeX-base
 RUN_DEPENDS=	dvips:${PORTSDIR}/print/dvipsk-tetex			\
@@ -44,8 +46,8 @@ CONFIGURE_ENV=		CPPFLAGS="${MPICFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}"
 LIBBLAS=	-lf2c -lf77blas -latlas -lgslcblas
 LIBARPACK=	-larpack -lalapack ${LIBBLAS}
 
-DOC_TARGET=	manual-full.pdf
-PORTDOCS=	AUTHORS BUGS COPYING HISTORY README TODO ${DOC_TARGET}
+#DOC_TARGET=	manual-full.pdf
+PORTDOCS=	AUTHORS BUGS COPYING HISTORY HISTORY_BEFORE_2005 INNOVATION README TODO ${DOC_TARGET}
 BADSAMPLES=	load/myfunction.o
 
 .include <bsd.port.pre.mk>
@@ -80,7 +82,7 @@ pre-configure:
 	@${REINPLACE_CMD} -e "s|mpiCC|${LOCALBASE}/mpich/bin/mpiCC|"	\
 		${WRKSRC}/src/mpi/Makefile.in
 
-post-build:
+post-build-MANUAL-PDF-IS-BROKEN:
 .if !defined(NOPORTDOCS)
 	@(cd ${BUILD_WRKSRC}/DOC;	\
 	${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${DOC_TARGET}; \
diff --git a/math/freefem++/distinfo b/math/freefem++/distinfo
index 9911d8948f7c..ba80a047f983 100644
--- a/math/freefem++/distinfo
+++ b/math/freefem++/distinfo
@@ -1,3 +1,3 @@
-MD5 (freefem++-2.1-2.tar.gz) = 1a87f6598f6eb3e7b4b64a708e00b008
-SHA256 (freefem++-2.1-2.tar.gz) = 4818d40ce7969dde5bec454fcbd770440433601e02ec7ea0af90ec2f37f76965
-SIZE (freefem++-2.1-2.tar.gz) = 14070319
+MD5 (freefem++-2.2-0.tar.gz) = 0f3cfd7fdd2224bbbfdefa2172d7ba51
+SHA256 (freefem++-2.2-0.tar.gz) = 9b4c82dc8e65789bb2eb55c25b695be81aac0e36db2d7deb5e1c14093b8f3217
+SIZE (freefem++-2.2-0.tar.gz) = 10213347
diff --git a/math/freefem++/pkg-plist b/math/freefem++/pkg-plist
index 508ad0722982..9eba1ba7ceff 100644
--- a/math/freefem++/pkg-plist
+++ b/math/freefem++/pkg-plist
@@ -27,6 +27,7 @@ bin/FreeFem++-nw
 %%PORTDOCS%%%%EXAMPLESDIR%%/bug/b.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/bug/bb.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/bug/bug-arg-string.edp
+%%PORTDOCS%%%%EXAMPLESDIR%%/bug/bug-mesh.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/bug/bugborder.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/bug/bugf.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/bug/bugv1.18.edp
@@ -74,8 +75,12 @@ bin/FreeFem++-nw
 %%PORTDOCS%%%%EXAMPLESDIR%%/lapacienprecon.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/load/AFunction.hpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/load/AFunction_ext.hpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/load/AddNewFE.h
 %%PORTDOCS%%%%EXAMPLESDIR%%/load/AnyType.hpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/load/BamgFreeFem.hpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/load/BernadiRaugel.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/load/BernadiRaugel.o
+%%PORTDOCS%%%%EXAMPLESDIR%%/load/BernadiRaugel.so
 %%PORTDOCS%%%%EXAMPLESDIR%%/load/CGNL.hpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/load/CodeAlloc.hpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/load/DOperator.hpp
@@ -85,6 +90,10 @@ bin/FreeFem++-nw
 %%PORTDOCS%%%%EXAMPLESDIR%%/load/MatriceCreuse.hpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/load/MatriceCreuse_tpl.hpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/load/MeshPoint.hpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/load/Morley.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/load/Morley.o
+%%PORTDOCS%%%%EXAMPLESDIR%%/load/Morley.so
+%%PORTDOCS%%%%EXAMPLESDIR%%/load/NSP2BRP0.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/load/Operator.hpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/load/QuadratureFormular.hpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/load/RNM.hpp
@@ -94,18 +103,24 @@ bin/FreeFem++-nw
 %%PORTDOCS%%%%EXAMPLESDIR%%/load/RefCounter.hpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/load/Serialize.hpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/load/String.hpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/load/bilapMorley.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/load/config-wrapper.h
 %%PORTDOCS%%%%EXAMPLESDIR%%/load/config.h
 %%PORTDOCS%%%%EXAMPLESDIR%%/load/convect_dervieux.edp
+%%PORTDOCS%%%%EXAMPLESDIR%%/load/convectchacon.edp
 %%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/ff-mt19937ar.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/load/ff-mt19937ar.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/load/ffstack.hpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/load/funcTemplate.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/load/funcTemplate.edp
+%%PORTDOCS%%%%EXAMPLESDIR%%/load/funcTemplate.o
+%%PORTDOCS%%%%EXAMPLESDIR%%/load/funcTemplate.so
 %%PORTDOCS%%%%EXAMPLESDIR%%/load/gmres.hpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/load/include.tar.gz
 %%PORTDOCS%%%%EXAMPLESDIR%%/load/lex.hpp
@@ -113,13 +128,20 @@ bin/FreeFem++-nw
 %%PORTDOCS%%%%EXAMPLESDIR%%/load/lgsolver.hpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/load/load.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/load/load.link
+%%PORTDOCS%%%%EXAMPLESDIR%%/load/makeref.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/load/mat_dervieux.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/load/mat_psi.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/load/myfunction.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/load/myfunction.so
 %%PORTDOCS%%%%EXAMPLESDIR%%/load/problem.hpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/load/ref.edp
+%%PORTDOCS%%%%EXAMPLESDIR%%/load/regtests.edp
+%%PORTDOCS%%%%EXAMPLESDIR%%/load/regtests.m4
 %%PORTDOCS%%%%EXAMPLESDIR%%/load/rgraph.hpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/load/showverb.hpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/load/strversionnumber.hpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/load/testFE.edp
+%%PORTDOCS%%%%EXAMPLESDIR%%/load/testFEMorley.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/load/throwassert.hpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/load/versionnumber.hpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/makeref.edp