<pre style='margin:0'>
Takeshi Enomoto (tenomoto) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ad56b98e99fe9d3cf31a0a094174fc4716cb914d">https://github.com/macports/macports-ports/commit/ad56b98e99fe9d3cf31a0a094174fc4716cb914d</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 ad56b98 gnudatalanguage: update to 0.99 add support for glpk
</span>ad56b98 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ad56b98e99fe9d3cf31a0a094174fc4716cb914d
</span>Author: Takeshi Enomoto <takeshi@macports.org>
AuthorDate: Sun Aug 11 14:38:46 2019 +0900
<span style='display:block; white-space:pre;color:#404040;'> gnudatalanguage: update to 0.99 add support for glpk
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/57758
</span>---
math/gnudatalanguage/Portfile | 36 +++++++++-------------
.../files/patch-CMakeModules-FindGrib.cmake.diff | 11 -------
2 files changed, 15 insertions(+), 32 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/gnudatalanguage/Portfile b/math/gnudatalanguage/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5f19601..36a5022 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/gnudatalanguage/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/gnudatalanguage/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +1,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# -*- 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
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- 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
</span>
PortSystem 1.0
PortGroup cmake 1.0
PortGroup conflicts_build 1.0
PortGroup mpi 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name gnudatalanguage
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.9.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup gnudatalanguage gdl 0.9.9 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name ${github.author}
</span> epoch 2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 8
</span>
compilers.choose cc cxx
mpi.setup
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,18 +21,18 @@ description a free IDL combatible incremental compiler
</span> long_description \
A free IDL (Interactive Data Language) compatible \
incremental compiler (i.e. runs IDL programs).
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://gnudatalanguage.sourceforge.net/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites sourceforge:${name}:gdl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites ${github.homepage}/archive:gdl \
</span> http://www.soest.hawaii.edu/pwessel/gshhg:gshhs
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set gdlsrc gdl-${version}.tgz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set gdlsrc v${version}${extract.suffix}
</span> set dataversion 2.3.7
set gshhsdata gshhg-bin-${dataversion}.zip
distfiles ${gdlsrc}:gdl
worksrcdir gdl-${version}
checksums ${gdlsrc} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 ad8382265146592e23bbae42e339d871d9e3a983 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 2b5945d06e4d95f01cb70a3c432ac2fa4c81e1b3ac7c02687a6704ab042a7e21
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 1248d6270a9d3fd98a02bc1e53021a30bec3e43c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ad5de3fec095a5c58b46338dcc7367d2565c093794ab1bbcf180bba1a712cf14 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4478934
</span>
depends_build-append port:pkgconfig
depends_lib port:zlib \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,18 +53,10 @@ depends_lib port:zlib \
</span> port:cmsvlib \
port:pslib \
port:eigen3 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gettext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gettext \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:glpk
</span> conflicts_build antlr
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-CMakeModules-FindGrib.cmake.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Avoid using heimdal's broken fnmatch.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 18} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|<\\(fnmatch\.h\\)>|\"/usr/include/\\1\"|" ${worksrcpath}/src/file.cpp
</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;'>-
</span> cmake.out_of_source yes
configure.args-append -DEIGEN3DIR=${prefix} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -106,6 +98,8 @@ configure.args-append -DEIGEN3DIR=${prefix} \
</span> -DWXWIDGETS=OFF \
-DX11DIR=${prefix} \
-DZLIBDIR=${prefix} \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGLPK=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGLPKDIR=${prefix} \
</span> -DCMAKE_OSX_DEPLOYMENT_TARGET=""
configure.cxxflags-append \
-DPLPLOT_HAS_PLCALLBACK
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -123,7 +117,7 @@ post-destroot {
</span> file rename ${destroot}${prefix}/share/${name}/${f} \
${destroot}${prefix}/share/doc/${name}/
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 -W ${worksrcpath} COPYING ChangeLog HACKING NEWS MAP_INSTALL TODO \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 -W ${worksrcpath} COPYING ChangeLog HACKING NEWS MAP_INSTALL README README.GRIB README.md \
</span> ${destroot}${prefix}/share/doc/${name}
file copy ${worksrcpath}/testsuite ${destroot}${prefix}/share/${name}/
if {[variant_isset python27]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -170,7 +164,7 @@ variant python27 description {build with support for calling Python (2.7) from G
</span> -DPYTHONVERSION=2.7
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[gcc_variant_isset]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[gcc_variant_isset] || [clang_variant_isset]} {
</span> configure.args-delete -DOPENMP=OFF
configure.args-append -DOPENMP=ON
# Detecting CXX compiler ABI info fails without this
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/gnudatalanguage/files/patch-CMakeModules-FindGrib.cmake.diff b/math/gnudatalanguage/files/patch-CMakeModules-FindGrib.cmake.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5e300ef..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/gnudatalanguage/files/patch-CMakeModules-FindGrib.cmake.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;'>---- CMakeModules/FindGrib.cmake.orig 2017-01-21 17:17:12.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeModules/FindGrib.cmake 2017-11-25 14:34:41.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -9,7 +9,7 @@
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--find_library(GRIB_LIBRARIES NAMES grib_api)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+find_library(GRIB_LIBRARIES NAMES eccodes)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_path(GRIB_INCLUDE_DIR NAMES grib_api.h)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include(FindPackageHandleStandardArgs)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # since there's no grib_api.pc let's check if this installation of grib required jasper and jpeg
</span></pre><pre style='margin:0'>
</pre>