upgrade to 3.4.5

PR:		36293
Submitted by:	Ports Fury

5 files changed, 103 insertions, 49 deletions

diff --git a/math/freefem/Makefile b/math/freefem/Makefile
index 393bc6796cab..8cb4e13fdcbf 100644
--- a/math/freefem/Makefile
+++ b/math/freefem/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	freefem
-PORTVERSION=	3.5.1
+PORTVERSION=	3.5.4
 CATEGORIES=	math cad
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	kfem
@@ -14,21 +14,26 @@ MASTER_SITE_SUBDIR=	kfem
 MAINTAINER=	ports@FreeBSD.org
 
 USE_X_PREFIX=	yes
-USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--enable-adapt --with-optimization
+GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ARGS=	--with-optimization
+INSTALLS_SHLIB=	yes
 
 MAN1=		freefem.1
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/freefem/freefem ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/debian/freefem.1 ${MANPREFIX}/man/man1
-	@${MKDIR} ${PREFIX}/share/examples/freefem
-	${INSTALL_DATA} ${WRKSRC}/examples/*.pde ${PREFIX}/share/examples/freefem
+post-patch:
+	@${PERL} -pi -e 's|-O3 |\$$CXXFLAGS |g' ${WRKSRC}/configure
+	@${PERL} -pi -e 's|debian doc freefem|debian freefem|g ; \
+		 s|^install-data-am:|install-data-am: #|g' ${WRKSRC}/Makefile.in
+
+post-install:
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/freefem
-.for file in ChangeLog NEWS README
-	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/freefem
+	@${MKDIR} ${DOCSDIR}
+.for file in ChangeLog NEWS README TODO
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
+	@${MKDIR} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/*.pde ${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/math/freefem/distinfo b/math/freefem/distinfo
index 0f76a40209b0..12fe42b37bfc 100644
--- a/math/freefem/distinfo
+++ b/math/freefem/distinfo
@@ -1 +1 @@
-MD5 (freefem-3.5.1.tar.gz) = 822fd42fb4b4e9c3152d15b7e0899c98
+MD5 (freefem-3.5.4.tar.gz) = 746fe6487085011493a805e23507ae30
diff --git a/math/freefem/files/patch-admin:ltmain.sh b/math/freefem/files/patch-admin:ltmain.sh
new file mode 100644
index 000000000000..8ec30a2068dc
--- /dev/null
+++ b/math/freefem/files/patch-admin:ltmain.sh
@@ -0,0 +1,41 @@
+--- admin/ltmain.sh.orig	Mon Oct  8 11:27:21 2001
++++ admin/ltmain.sh	Thu Mar 21 13:38:17 2002
+@@ -1043,14 +1043,14 @@
+ 	    # These systems don't actually have a C library (as such)
+ 	    test "X$arg" = "X-lc" && continue
+ 	    ;;
+-	  *-*-openbsd*)
++	  *-*-openbsd* | *-*-freebsd*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    test "X$arg" = "X-lc" && continue
+ 	    ;;
+ 	  esac
+ 	 elif test "X$arg" = "X-lc_r"; then
+ 	  case $host in
+-	  *-*-openbsd*)
++	  *-*-openbsd* | *-*-freebsd*)
+ 	    # Do not include libc_r directly, use -pthread flag.
+ 	    continue
+ 	    ;;
+@@ -2441,7 +2441,7 @@
+ 	  *-*-netbsd*)
+ 	    # Don't link with libc until the a.out ld.so is fixed.
+ 	    ;;
+-	  *-*-openbsd*)
++	  *-*-openbsd* | *-*-freebsd*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    ;;
+ 	  *)
+@@ -4210,10 +4210,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/math/freefem/files/patch-ah b/math/freefem/files/patch-ah
deleted file mode 100644
index 3fc46551eb83..000000000000
--- a/math/freefem/files/patch-ah
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Mon Nov 27 23:54:52 2000
-+++ configure	Mon Nov 27 23:57:18 2000
-@@ -4014,7 +4014,7 @@
-   withval="$with_optimization"
-   
-     if test "$CXX" = "g++" || test "$CXX" = "c++" || test "$host_os" = "linux" ; then
--	CXXFLAGS="-O3 -fforce-mem -fforce-addr -fomit-frame-pointer"
-+	CXXFLAGS="$CXXFLAGS -fforce-mem -fforce-addr -fomit-frame-pointer"
-     fi
-     if test "$CXX" = "CC" && test "$host_os" = "hpux" ; then
- 	CXXFLAGS="+O3 +a1"
diff --git a/math/freefem/pkg-plist b/math/freefem/pkg-plist
index 1e6116e3a9ba..38f72bac936a 100644
--- a/math/freefem/pkg-plist
+++ b/math/freefem/pkg-plist
@@ -1,31 +1,50 @@
 bin/freefem
+include/femCommon.hpp
+include/femDisk.hpp
+include/femFunction.hpp
+include/femGibbs.hpp
+include/femGraphic.hpp
+include/femGraphicDeviceIndependent.hpp
+include/femIdentifier.hpp
+include/femLexical.hpp
+include/femMesh.hpp
+include/femMisc.hpp
+include/femParser.hpp
+include/femSolver.hpp
+include/femSolver1.hpp
+include/femSolver1c.hpp
+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
-share/examples/freefem/accous.pde
-share/examples/freefem/adj.pde
-share/examples/freefem/brachet.pde
-share/examples/freefem/condens.pde
-share/examples/freefem/convectn.pde
-share/examples/freefem/convhill.pde
-share/examples/freefem/crack.pde
-share/examples/freefem/heat.pde
-share/examples/freefem/holbeam.pde
-share/examples/freefem/integ.pde
-share/examples/freefem/lame.pde
-share/examples/freefem/lamevar.pde
-share/examples/freefem/multib.pde
-share/examples/freefem/muonde.pde
-share/examples/freefem/nacabig.pde
-share/examples/freefem/nsstep.pde
-share/examples/freefem/nsstepad.pde
-share/examples/freefem/shock.pde
-share/examples/freefem/stokespo.pde
-share/examples/freefem/timedfm.pde
-share/examples/freefem/valicplx.pde
-share/examples/freefem/validate.pde
-share/examples/freefem/validcplx.pde
-share/examples/freefem/validsys.pde
-share/examples/freefem/varvect.pde
-@dirrm share/examples/freefem
+%%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