<pre style='margin:0'>
Sebastien Maret (smaret) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ac7d8de078ea085755d5a9e081872e070ac2a778">https://github.com/macports/macports-ports/commit/ac7d8de078ea085755d5a9e081872e070ac2a778</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit ac7d8de078ea085755d5a9e081872e070ac2a778
</span>Author: Sebastien Bardeau <bardeau@iram.fr>
AuthorDate: Thu Feb 8 14:02:43 2018 +0100
<span style='display:block; white-space:pre;color:#404040;'> Gildas: updated to version 201802a.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This version also bypasses a MacPorts issue which does seem to honor
</span><span style='display:block; white-space:pre;color:#404040;'> the GNU Making-Makefiles rules (see
</span><span style='display:block; white-space:pre;color:#404040;'> https://www.gnu.org/software/make/manual/html_node/Remaking-Makefiles.html
</span><span style='display:block; white-space:pre;color:#404040;'> , paragrah 2). This issue is to be confirmed. For the time being,
</span><span style='display:block; white-space:pre;color:#404040;'> our "make depend" is added before "make" or "make install", while
</span><span style='display:block; white-space:pre;color:#404040;'> GNU make ensures it should be useless.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also added -w flag to "make" calls. This adds entering/leaving
</span><span style='display:block; white-space:pre;color:#404040;'> directory traces for a better compilation log.
</span>---
science/gildas/Portfile | 8 ++++----
science/gildas/files/patch-admin-gildas-env.sh.diff | 18 +++++++++---------
2 files changed, 13 insertions(+), 13 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gildas/Portfile b/science/gildas/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cff8167..c7bd7b1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gildas/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gildas/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup compilers 1.0
</span> PortGroup active_variants 1.1
name gildas
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 201712a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 201802a
</span> set my_version [string tolower [clock format [clock scan 2000-[string range ${version} 4 5]-10] -format %b]][string range ${version} 2 3][string range ${version} 6 end]
categories science
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,8 +30,8 @@ master_sites http://www.iram.fr/~gildas/dist/ \
</span> http://www.iram.fr/~gildas/dist/archive/gildas/
distname ${name}-src-${my_version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 505b6df0ce10a835fa3fdf7600de218ab2f2fbef \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 309fd9a383a7b4b85aacb09f21c0150eb3a6af95f6c4bcc95c5cc4cdef3d1ceb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 78b817738bad1e3fd28f9803481428b83c0782cb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 82e7fd4246cbdde693736febf4a9c7863c8666c62502ff9cb9d5f1b4799dd6c6
</span>
patch.pre_args -p1
patchfiles patch-admin-Makefile.def.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -84,7 +84,7 @@ configure {
</span> }
build {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "source admin/gildas-env.sh -c ${configure.fc} -s ${prefix}/include:${prefix}/lib:/System/Library/Frameworks/Accelerate.framework/Frameworks/vecLib.framework/Versions/Current/ && export GAG_SLDFLAGS='-shared -o ${prefix}/lib/gildas/x86_64-darwin-gfortran/lib/\$(notdir \$@) -install_name ${prefix}/lib/gildas/x86_64-darwin-gfortran/lib/\$(notdir \$@)' && export DYLD_LIBRARY_PATH=${worksrcpath}/integ/x86_64-darwin-gfortran/lib && export GAG_ADDONS=yes && make install"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "source admin/gildas-env.sh -c ${configure.fc} -s ${prefix}/include:${prefix}/lib:/System/Library/Frameworks/Accelerate.framework/Frameworks/vecLib.framework/Versions/Current/ && export GAG_SLDFLAGS='-shared -o ${prefix}/lib/gildas/x86_64-darwin-gfortran/lib/\$(notdir \$@) -install_name ${prefix}/lib/gildas/x86_64-darwin-gfortran/lib/\$(notdir \$@)' && export DYLD_LIBRARY_PATH=${worksrcpath}/integ/x86_64-darwin-gfortran/lib && export GAG_ADDONS=yes && make -w [...]
</span> }
destroot {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gildas/files/patch-admin-gildas-env.sh.diff b/science/gildas/files/patch-admin-gildas-env.sh.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index e98236b..daf856b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gildas/files/patch-admin-gildas-env.sh.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gildas/files/patch-admin-gildas-env.sh.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gildas-src-dec15a/admin/gildas-env.sh.orig 2015-11-30 13:25:52.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gildas-src-dec15a/admin/gildas-env.sh 2015-12-04 17:04:00.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -442,34 +442,34 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gildas-src-feb18a/admin/gildas-env.sh.orig 2018-02-07 11:00:57.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gildas-src-feb18a/admin/gildas-env.sh 2018-02-07 11:01:17.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -449,34 +449,34 @@
</span> NUMPY_PRESENT=no
NUMERIC_PRESENT=no
SQLITE3_PRESENT=no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,10 +44,10 @@
</span> SQLITE3_PRESENT=yes
fi
fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -545,11 +545,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ATM2003_PRESENT=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ATM2003_LIB_DIR=$DIR
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -556,11 +556,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SDM_MISSING=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for DIR in $GAGENV_SEARCH_PATH; do
</span> - if file_present "liblapack." "${DIR}"; then
+ if file_present "libLAPACK." "${DIR}"; then
LAPACK_PRESENT=yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,7 +58,7 @@
</span> BLAS_PRESENT=yes
BLAS_LIB_DIR=$DIR
fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -557,13 +557,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -568,13 +568,13 @@
</span> SLATEC_PRESENT=yes
SLATEC_LIB_DIR=$DIR
fi
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -79,7 +79,7 @@
</span> if file_present "libasdmStandalone." "${DIR}"; then
SDM_PRESENT=yes
if [ "$SDM_PRESENT" = "yes" ]; then
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -597,6 +597,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -608,6 +608,8 @@
</span> XML_PRESENT="yes"
#
unset GAG_LIB_DEP_PATH GAG_INC_DEP_PATH
</pre><pre style='margin:0'>
</pre>