<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/500e66446870769d2111d7394037d6b5d0f1169f">https://github.com/macports/macports-ports/commit/500e66446870769d2111d7394037d6b5d0f1169f</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 500e664 gerris/gts/gfsview: switch to snapshot versions
</span>500e664 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 500e66446870769d2111d7394037d6b5d0f1169f
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Mon Oct 29 04:49:54 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> gerris/gts/gfsview: switch to snapshot versions
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The last official releases of these interdependent ports were 2006.
</span><span style='display:block; white-space:pre;color:#404040;'> Snapshots have been created more recently (2012 and 2013).
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/19714
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/15790
</span>---
math/gts/Portfile | 30 ++++++---
math/gts/files/patch-examples-happrox.c.diff | 11 ----
science/gerris/Portfile | 92 ++++++++++++++++------------
science/gerris/files/patch-Makefile.in | 37 -----------
science/gerris/files/patch-fortran_lib.diff | 26 ++++++++
science/gerris/files/patch-hypre_no_mpi.diff | 11 ++++
science/gerris/files/patch-lis_names.diff | 29 +++++++++
science/gfsview/Portfile | 30 +++++++--
8 files changed, 163 insertions(+), 103 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/gts/Portfile b/math/gts/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d7edc18..831580c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/gts/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/gts/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,8 +4,8 @@ PortSystem 1.0
</span> PortGroup muniversal 1.0
name gts
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.7.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set snapshot 121130
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 0.7.6-20${snapshot}
</span> categories math
platforms darwin
maintainers ryandesign openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,17 +19,27 @@ long_description GTS stands for the GNU Triangulated Surface Library. \
</span> 3D surfaces meshed with interconnected triangles.
homepage http://gts.sourceforge.net/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites sourceforge:project/${name}/${name}/${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname ${name}-snapshot-${snapshot}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites http://gts.sourceforge.net/tarballs
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums sha1 000720bebecf0b153eb28260bd30fbd979dcc040 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 2bfd4121412c16d63ee0aca65ccbc2601d6a7d51
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 24b3c469d5a35b658825eb342ae03e9e9d93afb8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c23f72ab74bbf65599f8c0b599d6336fabe1ec2a09c19b70544eeefdc069b73b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 880569
</span>
depends_build port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libnetpbm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib path:lib/pkgconfig/glib-2.0.pc:glib2
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-examples-happrox.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_test port:libnetpbm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.run yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.target check
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # test files do not have the correct permissions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach file [glob ${worksrcpath}/test/**/*.sh] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file attributes ${file} -permissions +x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
if {[variant_isset universal]} {
# Find architectures which will not run on build platform.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,5 +74,5 @@ if {[variant_isset universal]} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type sourceforge
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex /${name}-(\[0-9.\]+)${extract.suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex {gts-snapshot-(\d+(?:\.\d+)*)}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.version ${snapshot}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/gts/files/patch-examples-happrox.c.diff b/math/gts/files/patch-examples-happrox.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8c36ba8..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/gts/files/patch-examples-happrox.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- examples/happrox.c.orig 2006-02-28 21:35:53.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ examples/happrox.c 2011-03-22 09:39:21.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21,7 +21,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <locale.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <string.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <pgm.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <netpbm/pgm.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "config.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef HAVE_GETOPT_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <getopt.h>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gerris/Portfile b/science/gerris/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b586819..9645e78 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gerris/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gerris/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,9 +1,12 @@
</span> #-*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup mpi 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup compiler_blacklist_versions 1.0
</span>
name gerris
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.9.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set snapshot 131206
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 0.9.2-20${snapshot}
</span> categories science
license GPL-2+
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,52 +14,63 @@ maintainers {mcalhoun @MarcusCalhoun-Lopez} openmaintainer
</span> description a program for solving fluid flow equations
long_description Gerris is a Free Software program for the solution of the partial differential equations describing fluid flow.
homepage http://gfs.sourceforge.net/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites sourceforge:gfs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname ${name}-snapshot-${snapshot}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites http://gerris.dalembert.upmc.fr/gerris/tarballs/
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 fdc3cee4a1c3154e60785e5d317a808d0f5cbdd6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ab605863bc2ce872c03f1f88fd4de4d7782f49734f2fe9c01bfbbfd16b68069d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 4180547
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 5575376c8d9ce252215dd361443dfeb1c8e82144 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d5346a362b104ccc858c4b79938727d56c4654b103c268e54cf3aa56d0b55b39 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2841686
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gts
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# C99 required
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+mpi.setup require_fortran \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -gcc44
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# most of the patches are from Gentoo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://gitweb.gentoo.org/repo/gentoo.git/tree/sci-libs/gerris/gerris-20131206-r1.ebuild
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-fortran_lib.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-hypre_no_mpi.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-lis_names.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_parallel_build no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:pkgconfig
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}/examples
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}/examples/boussinesq
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}/examples/cylinder
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}/examples/cylinder/heated
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}/examples/rt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}/examples/shear
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# N.B. wavewatch and agmg are non-free
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gts \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:proj \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:netcdf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:hypre \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gsl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:fftw-3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ode \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:lis
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}/faq
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}/html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}/tutorial
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${worksrcpath}/doc/examples/boussinesq/boussinesq.gfs ${destroot}${prefix}/share/doc/${name}/examples/boussinesq/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${worksrcpath}/doc/examples/boussinesq/boussinesq.gfv ${destroot}${prefix}/share/doc/${name}/examples/boussinesq/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${worksrcpath}/doc/examples/boussinesq/cylinder.gts ${destroot}${prefix}/share/doc/${name}/examples/boussinesq/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${worksrcpath}/doc/examples/cylinder/cylinder.gfs ${destroot}${prefix}/share/doc/${name}/examples/cylinder/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${worksrcpath}/doc/examples/cylinder/cylinder.gts ${destroot}${prefix}/share/doc/${name}/examples/cylinder/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${worksrcpath}/doc/examples/cylinder/heated/heated.gfs ${destroot}${prefix}/share/doc/${name}/examples/cylinder/heated/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${worksrcpath}/doc/examples/shear/shear.gfs ${destroot}${prefix}/share/doc/${name}/examples/shear/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${worksrcpath}/doc/examples/shear/circle.gts ${destroot}${prefix}/share/doc/${name}/examples/shear/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[mpi_variant_isset]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --enable-mpi \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-mpicc=${configure.cc}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --disable-mpi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${worksrcpath}/doc/examples/rt/rt.gfs ${destroot}${prefix}/share/doc/${name}/examples/rt/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${worksrcpath}/doc/examples/rt/rt.gfv ${destroot}${prefix}/share/doc/${name}/examples/rt/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+mpi.enforce_variant netcdf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+mpi.enforce_variant hypre
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+mpi.enforce_variant lis
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+mpi.enforce_variant fftw-3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+mpi.enforce_variant lis
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${worksrcpath}/doc/faq/faq.pdf ${destroot}${prefix}/share/doc/${name}/faq/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# proj port is installed in a non-standard location
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cppflags-append -I${prefix}/lib/proj5/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.ldflags-append -L${prefix}/lib/proj5/lib
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach fn [ glob ${worksrcpath}/doc/html/* ] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${fn} ${destroot}${prefix}/share/doc/${name}/html/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.run yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.target check
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # test files do not have the correct permissions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach file [glob ${worksrcpath}/test/**/*.sh] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file attributes ${file} -permissions +x
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${worksrcpath}/doc/tutorial/tutorial.pdf ${destroot}${prefix}/share/doc/${name}/tutorial/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${worksrcpath}/doc/tutorial/half-cylinder.gts ${destroot}${prefix}/share/doc/${name}/tutorial/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${worksrcpath}/doc/tutorial/gfs2D.net ${destroot}${prefix}/share/doc/${name}/tutorial/
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex {gerris-snapshot-(\d+(?:\.\d+)*)}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.version ${snapshot}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gerris/files/patch-Makefile.in b/science/gerris/files/patch-Makefile.in
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b1ea058..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gerris/files/patch-Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,37 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- doc/tutorial/Makefile.in.sav 2005-11-10 06:16:04.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ doc/tutorial/Makefile.in 2005-11-10 06:16:58.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -318,16 +318,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- uninstall-info-am
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--Makefile.deps: Makefile.am tutorial.tex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- awk -f depend.awk file="tutorial" < tutorial.tex > Makefile.deps
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- clean-generic:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(RM) *.dvi *.aux *.log *.toc *.out \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- boundaries.pdf direction.eps direction.pdf dxscreen.eps dxscreen.pdf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gfs2oogl.pdf half-cylinder.eps half-cylinder.pdf refined1.pdf refined1_cells.pdf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- refined2.pdf vorticity.eps vorticity.pdf gfsview.eps tutorial1.tex \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- Makefile.deps
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ refined2.pdf vorticity.eps vorticity.pdf gfsview.eps tutorial1.tex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tutorial.tar.gz: tutorial.ps.gz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -r -f tutorial
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -339,7 +334,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tar cf tutorial.tar tutorial
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gzip -f --best tutorial.tar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--tutorial1.dvi: tutorial.tex Makefile.deps
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+tutorial1.dvi: tutorial.tex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sed "s/GFS_VERSION/`$(top_srcdir)/src/gerris2D -V 2>&1 | awk '{ if ($$5 == "version") print $$6}'`/g" < tutorial.tex > tutorial1.tex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- latex -interaction=nonstopmode tutorial1.tex > /dev/null 2>&1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- latex -interaction=nonstopmode tutorial1.tex > /dev/null 2>&1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -391,7 +386,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- %.pdf: %.eps
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- epstopdf $<
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---include Makefile.deps
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Tell versions [3.59,3.63) of GNU make to not export all variables.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Otherwise a system limit (for SysV at least) may be exceeded.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .NOEXPORT:
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gerris/files/patch-fortran_lib.diff b/science/gerris/files/patch-fortran_lib.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..5ef0e21
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gerris/files/patch-fortran_lib.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,26 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2013-12-06 08:51:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2018-10-28 10:27:26.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20236,7 +20236,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo_n "(cached) " >&6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_check_lib_save_LIBS=$LIBS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LIBS="-llis -lgfortran -lm $LIBS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LIBS="-llis $LIBS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- modules/Makefile.in.orig 2013-12-06 08:51:35.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ modules/Makefile.in 2018-10-28 11:35:44.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -724,10 +724,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libhypre2D_la_LIBADD = $(GFS2D_LIBS) -lHYPRE -lm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ liblis3D_la_SOURCES = lis.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ liblis3D_la_CFLAGS = $(AM_CFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-liblis3D_la_LIBADD = $(GFS3D_LIBS) -llis -lgfortran -lm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++liblis3D_la_LIBADD = $(GFS3D_LIBS) -llis
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ liblis2D_la_SOURCES = lis.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ liblis2D_la_CFLAGS = $(AM_CFLAGS) -DFTT_2D=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-liblis2D_la_LIBADD = $(GFS2D_LIBS) -llis -lgfortran -lm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++liblis2D_la_LIBADD = $(GFS2D_LIBS) -llis
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libagmg3D_la_SOURCES = agmg.c dagmg.f90
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libagmg3D_la_CFLAGS = $(AM_CFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libagmg3D_la_LIBADD = $(GFS3D_LIBS) -llapack -lblas -lgfortran -lm
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gerris/files/patch-hypre_no_mpi.diff b/science/gerris/files/patch-hypre_no_mpi.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..94805c0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gerris/files/patch-hypre_no_mpi.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2013-12-06 08:51:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2018-10-28 11:16:01.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20148,7 +20148,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Build hypre module if HYPRE is installed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hypre=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if test "x$use_mpicc" = "xyes" ; then # HYPRE needs MPI
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if test "x" = "x" ; then # HYPRE does *not* need MPI
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for HYPRE_IJMatrixCreate in -lHYPRE" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo_n "checking for HYPRE_IJMatrixCreate in -lHYPRE... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ${ac_cv_lib_HYPRE_HYPRE_IJMatrixCreate+:} false; then :
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gerris/files/patch-lis_names.diff b/science/gerris/files/patch-lis_names.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..365f958
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gerris/files/patch-lis_names.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,29 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- modules/lis.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ modules/lis.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -45,7 +45,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_array_index (stencil->coeff, double, j),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ A);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- lis_matrix_set_type (A, LIS_MATRIX_CRS);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ lis_matrix_set_type (A, LIS_MATRIX_CSR);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lis_matrix_assemble (A);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIS_VECTOR b, x;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+sci-libs/lis changed some of its function prototypes by renaming
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lis_solver_get_iters to lis_solver_get_iter in version 1.4.43 from 17 July 2014
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+See also:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+http://www.ssisc.org/lis/ChangeLog.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://bugs.gentoo.org/show_bug.cgi?id=593282
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- modules/lis.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ modules/lis.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -67,7 +67,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lis_solve (A, b, x, solver);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int iter;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- lis_solver_get_iters (solver, &iter);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ lis_solver_get_iter (solver, &iter);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ par->niter = iter;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lis_vector_get_values (x, 0, lp->lhs->len, (double *) lp->lhs->data);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gfsview/Portfile b/science/gfsview/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9d1da55..d868fde 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gfsview/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gfsview/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,11 @@
</span> #-*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup compilers 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup mpi 1.0
</span>
name gfsview
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set snapshot 121130
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 0.4.2-20${snapshot}
</span> categories science
license GPL-2+
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,11 +13,12 @@ maintainers {mcalhoun @MarcusCalhoun-Lopez} openmaintainer
</span> description graphical viewer for Gerris simulation files
long_description GfsView is a graphical viewer for Gerris simulation files.
homepage http://gfs.sourceforge.net/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites sourceforge:gfs/${name}/${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname ${name}-snapshot-${snapshot}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites http://gerris.dalembert.upmc.fr/gerris/tarballs/
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 77d5bdfec579eddfe3e16478257cf6b9658e4ec8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 34b976f742976e07b0671bae5e8a4717f5dd4d0e5afebfa95238e72e7b4908a5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 299158
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 0eaa794d67f3f215283fc0c7b68cff16942bef55 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 60440319e506d78f7bb5ebf63383f541e30d5e99ad05ea175876fb346e0766d9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 707424
</span>
depends_build port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,8 +26,24 @@ depends_lib port:gerris \
</span> port:mesa \
port:gtk2 \
port:gtkglext \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ftgl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:startup-notification \
</span> path:lib/pkgconfig/glib-2.0.pc:glib2
# avoid
# fatal error: 'gdk/x11/gdkglx.h' file not found
require_active_variants port:gtk2 x11
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[mpi_variant_isset]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --enable-mpi \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-mpicc=${configure.cc}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --disable-mpi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+mpi.enforce_variant gerris
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex {gfsview-snapshot-(\d+(?:\.\d+)*)}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.version ${snapshot}
</span></pre><pre style='margin:0'>
</pre>