Fix building under -CURRENT (gcc 3.3) by update to 3.5.7 [1]

Sort and use %%EXAMPLESDIR%% and %%DOCSDIR%% for pkg-plist [2]

Submitted by:	Simon Barner <barner@in.tum.de> [1], osa [2]

4 files changed, 49 insertions, 40 deletions

diff --git a/math/freefem/Makefile b/math/freefem/Makefile
index 9e04a64e3661..ded708fccc6a 100644
--- a/math/freefem/Makefile
+++ b/math/freefem/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	freefem
-PORTVERSION=	3.5.4
+PORTVERSION=	3.5.7
 CATEGORIES=	math cad
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	kfem
@@ -23,12 +23,6 @@ INSTALLS_SHLIB=	yes
 
 MAN1=		freefem.1
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O3 |\$$CXXFLAGS |g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|debian doc freefem|debian freefem|g ; \
@@ -44,4 +38,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/examples/*.pde ${EXAMPLESDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/math/freefem/distinfo b/math/freefem/distinfo
index 12fe42b37bfc..aefb534bac9b 100644
--- a/math/freefem/distinfo
+++ b/math/freefem/distinfo
@@ -1 +1 @@
-MD5 (freefem-3.5.4.tar.gz) = 746fe6487085011493a805e23507ae30
+MD5 (freefem-3.5.7.tar.gz) = e8f22515ab56f8e79fb789a11f8d4bef
diff --git a/math/freefem/files/patch-freefem::fem::femParser.cpp b/math/freefem/files/patch-freefem::fem::femParser.cpp
new file mode 100644
index 000000000000..0beb393bac3b
--- /dev/null
+++ b/math/freefem/files/patch-freefem::fem::femParser.cpp
@@ -0,0 +1,14 @@
+--- freefem/fem/femParser.cpp.orig	Thu Oct 25 00:49:36 2001
++++ freefem/fem/femParser.cpp	Mon Jul 21 13:32:54 2003
+@@ -2913,7 +2913,10 @@
+               for( k =0; k<3*__mesh.getNumberOfCells();k++)  (s->name)->table[k] = 0;
+               }
+             else
+-              {  (s->name)->table = new creal[__mesh.getNumberOfPoints()];
++              { // This is in order to avoid an internal compiler error
++			    // with gcc 2.95.4 (FreeBSD) 
++			  	int n = __mesh.getNumberOfPoints();
++			  (s->name)->table = new creal[n];
+               for( k =0; k<__mesh.getNumberOfPoints();k++)  (s->name)->table[k] = 0;
+               }
+             }
diff --git a/math/freefem/pkg-plist b/math/freefem/pkg-plist
index 38f72bac936a..c153227b27da 100644
--- a/math/freefem/pkg-plist
+++ b/math/freefem/pkg-plist
@@ -17,34 +17,35 @@ include/femTreeNode.hpp
 lib/libfreefem.a
 lib/libfreefem.so
 lib/libfreefem.so.0
-%%PORTDOCS%%share/doc/freefem/ChangeLog
-%%PORTDOCS%%share/doc/freefem/NEWS
-%%PORTDOCS%%share/doc/freefem/README
-%%PORTDOCS%%share/doc/freefem/TODO
-%%PORTDOCS%%share/examples/freefem/convhill.pde
-%%PORTDOCS%%share/examples/freefem/multib.pde
-%%PORTDOCS%%share/examples/freefem/valicplx.pde
-%%PORTDOCS%%share/examples/freefem/accous.pde
-%%PORTDOCS%%share/examples/freefem/crack.pde
-%%PORTDOCS%%share/examples/freefem/muonde.pde
-%%PORTDOCS%%share/examples/freefem/validate.pde
-%%PORTDOCS%%share/examples/freefem/adj.pde
-%%PORTDOCS%%share/examples/freefem/nacabig.pde
-%%PORTDOCS%%share/examples/freefem/validcplx.pde
-%%PORTDOCS%%share/examples/freefem/brachet.pde
-%%PORTDOCS%%share/examples/freefem/heat.pde
-%%PORTDOCS%%share/examples/freefem/nsstep.pde
-%%PORTDOCS%%share/examples/freefem/nsstepad.pde
-%%PORTDOCS%%share/examples/freefem/validsys.pde
-%%PORTDOCS%%share/examples/freefem/condens.pde
-%%PORTDOCS%%share/examples/freefem/holbeam.pde
-%%PORTDOCS%%share/examples/freefem/varvect.pde
-%%PORTDOCS%%share/examples/freefem/integ.pde
-%%PORTDOCS%%share/examples/freefem/shock.pde
-%%PORTDOCS%%share/examples/freefem/lame.pde
-%%PORTDOCS%%share/examples/freefem/stokespo.pde
-%%PORTDOCS%%share/examples/freefem/convectn.pde
-%%PORTDOCS%%share/examples/freefem/lamevar.pde
-%%PORTDOCS%%share/examples/freefem/timedfm.pde
-%%PORTDOCS%%@dirrm share/examples/freefem
-%%PORTDOCS%%@dirrm share/doc/freefem
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%EXAMPLESDIR%%/accous.pde
+%%PORTDOCS%%%%EXAMPLESDIR%%/adj.pde
+%%PORTDOCS%%%%EXAMPLESDIR%%/brachet.pde
+%%PORTDOCS%%%%EXAMPLESDIR%%/condens.pde
+%%PORTDOCS%%%%EXAMPLESDIR%%/convectn.pde
+%%PORTDOCS%%%%EXAMPLESDIR%%/convhill.pde
+%%PORTDOCS%%%%EXAMPLESDIR%%/crack.pde
+%%PORTDOCS%%%%EXAMPLESDIR%%/heat.pde
+%%PORTDOCS%%%%EXAMPLESDIR%%/holbeam.pde
+%%PORTDOCS%%%%EXAMPLESDIR%%/integ.pde
+%%PORTDOCS%%%%EXAMPLESDIR%%/lame.pde
+%%PORTDOCS%%%%EXAMPLESDIR%%/lamevar.pde
+%%PORTDOCS%%%%EXAMPLESDIR%%/multib.pde
+%%PORTDOCS%%%%EXAMPLESDIR%%/muonde.pde
+%%PORTDOCS%%%%EXAMPLESDIR%%/nacabig.pde
+%%PORTDOCS%%%%EXAMPLESDIR%%/nsstep.pde
+%%PORTDOCS%%%%EXAMPLESDIR%%/nsstepad.pde
+%%PORTDOCS%%%%EXAMPLESDIR%%/shock.pde
+%%PORTDOCS%%%%EXAMPLESDIR%%/stokespo.pde
+%%PORTDOCS%%%%EXAMPLESDIR%%/timedfm.pde
+%%PORTDOCS%%%%EXAMPLESDIR%%/triangle_laplace.pde
+%%PORTDOCS%%%%EXAMPLESDIR%%/valicplx.pde
+%%PORTDOCS%%%%EXAMPLESDIR%%/validate.pde
+%%PORTDOCS%%%%EXAMPLESDIR%%/validcplx.pde
+%%PORTDOCS%%%%EXAMPLESDIR%%/validsys.pde
+%%PORTDOCS%%%%EXAMPLESDIR%%/varvect.pde
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%