Upgrade to 2.0-4 and build the manual again.

3 files changed, 20 insertions, 25 deletions

diff --git a/math/freefem++/Makefile b/math/freefem++/Makefile
index 734881b854d..67a047ad390 100644
--- a/math/freefem++/Makefile
+++ b/math/freefem++/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	freefem++
-DISTVERSION=	2.0-3
+DISTVERSION=	2.0-4
 CATEGORIES=	math science
 MASTER_SITES=	http://www.freefem.org/ff++/ftp/
 
@@ -44,7 +44,8 @@ CONFIGURE_ENV=		CPPFLAGS="${MPICFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}"
 LIBBLAS=	-lf2c -lf77blas -latlas -lgslcblas
 LIBARPACK=	-larpack -lalapack ${LIBBLAS}
 
-DOCS=		AUTHORS BUGS COPYING HISTORY README TODO
+DOC_TARGET=	manual-full.pdf
+PORTDOCS=	AUTHORS BUGS COPYING HISTORY README TODO ${DOC_TARGET}
 BADSAMPLES=	load/myfunction.o
 
 .include <bsd.port.pre.mk>
@@ -79,21 +80,27 @@ pre-configure:
 	@${REINPLACE_CMD} -e "s|mpiCC|${LOCALBASE}/mpich/bin/mpiCC|"	\
 		${WRKSRC}/src/mpi/Makefile.in
 
+post-build:
+.if !defined(NOPORTDOCS)
+	@(cd ${BUILD_WRKSRC}/DOC;	\
+	${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${DOC_TARGET}; \
+	${CP} ${DOC_TARGET} ${BUILD_WRKSRC})
+.endif
+
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-. for doc in ${DOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
-. endfor
+	@${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
 	@${ECHO_MSG} "===>  Documentation installed in ${DOCSDIR}."
 . for direx in "" -bug -chapt3 -eigen -load -mpi -other -tutorial
-	cd ${WRKSRC}/examples++${direx} && ${FIND} . -type d	\
+	@cd ${WRKSRC}/examples++${direx} && ${FIND} . -type d	\
 		-exec ${MKDIR} ${EXAMPLESDIR}/${direx:S/-//}/{} \;
-	cd ${WRKSRC}/examples++${direx} && ${FIND} -L . -type f	\
+	@cd ${WRKSRC}/examples++${direx} && ${FIND} -L . -type f	\
 		-exec ${INSTALL_DATA} ${WRKSRC}/examples++${direx}/{}	\
 			${EXAMPLESDIR}/${direx:S/-//} \;
 . endfor
-	 ${FIND} ${EXAMPLESDIR} -name "Makefile*" -delete
+	@${FIND} ${EXAMPLESDIR} -name "Makefile*" -delete
+	@${RMDIR} ${EXAMPLESDIR}/load/include
 . for sample in ${BADSAMPLES}
 	@${RM} ${EXAMPLESDIR}/${sample}
 . endfor
diff --git a/math/freefem++/distinfo b/math/freefem++/distinfo
index 15f61d4e390..dc4627515dd 100644
--- a/math/freefem++/distinfo
+++ b/math/freefem++/distinfo
@@ -1,2 +1,2 @@
-MD5 (freefem++-2.0-3.tar.gz) = d27e76c84cfabe140f041f19953c489b
-SIZE (freefem++-2.0-3.tar.gz) = 13984090
+MD5 (freefem++-2.0-4.tar.gz) = e87ff3ca28dba133344d694753c343b1
+SIZE (freefem++-2.0-4.tar.gz) = 13982198
diff --git a/math/freefem++/pkg-plist b/math/freefem++/pkg-plist
index bc46528f11f..df2e2d77857 100644
--- a/math/freefem++/pkg-plist
+++ b/math/freefem++/pkg-plist
@@ -5,12 +5,6 @@ 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%%%%EXAMPLESDIR%%/D2.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/FE-medit.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/NSP1P1.edp
@@ -26,20 +20,14 @@ 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/b.edp
-%%PORTDOCS%%%%EXAMPLESDIR%%/bug/bb.edp
+%%PORTDOCS%%%%EXAMPLESDIR%%/bug/aaa.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
@@ -100,6 +88,7 @@ bin/FreeFem++-nw
 %%PORTDOCS%%%%EXAMPLESDIR%%/load/String.hpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/load/config-wrapper.h
 %%PORTDOCS%%%%EXAMPLESDIR%%/load/config.h
+%%PORTDOCS%%%%EXAMPLESDIR%%/load/convect_dervieux.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/load/dfft.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/load/dfft.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/load/dfft.link
@@ -113,6 +102,7 @@ bin/FreeFem++-nw
 %%PORTDOCS%%%%EXAMPLESDIR%%/load/lgsolver.hpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/load/load.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/load/load.link
+%%PORTDOCS%%%%EXAMPLESDIR%%/load/mat_dervieux.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/load/myfunction.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/load/myfunction.so
 %%PORTDOCS%%%%EXAMPLESDIR%%/load/problem.hpp
@@ -198,11 +188,9 @@ bin/FreeFem++-nw
 %%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/tablefunction.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/xyf
 %%PORTDOCS%%%%EXAMPLESDIR%%/wafer-heating-laser-axi.edp
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/tutorial
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/other
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/mpi
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/load/include
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/load
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/eigen
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/chapt3