<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[143120] trunk/dports/science/gildas</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/143120">143120</a></dd>
<dt>Author</dt> <dd>smaret@macports.org</dd>
<dt>Date</dt> <dd>2015-12-04 08:50:37 -0800 (Fri, 04 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>gildas: Update to version 201512a.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssciencegildasPortfile">trunk/dports/science/gildas/Portfile</a></li>
<li><a href="#trunkdportssciencegildasfilespatchadminMakefiledefdiff">trunk/dports/science/gildas/files/patch-admin-Makefile.def.diff</a></li>
<li><a href="#trunkdportssciencegildasfilespatchadmingildasenvshdiff">trunk/dports/science/gildas/files/patch-admin-gildas-env.sh.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportssciencegildasfilespatchadminMakefilestdcxxlibdiff">trunk/dports/science/gildas/files/patch-admin-Makefile.stdcxxlib.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssciencegildasPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/gildas/Portfile (143119 => 143120)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gildas/Portfile 2015-12-04 16:33:01 UTC (rev 143119)
+++ trunk/dports/science/gildas/Portfile 2015-12-04 16:50:37 UTC (rev 143120)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> PortGroup compilers 1.0
</span><span class="cx">
</span><span class="cx"> name gildas
</span><del>-version 201511b
</del><ins>+version 201512a
</ins><span class="cx"> 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]
</span><span class="cx"> categories science
</span><span class="cx"> platforms darwin
</span><span class="lines">@@ -28,12 +28,11 @@
</span><span class="cx"> master_sites http://www.iram.fr/~gildas/dist/
</span><span class="cx"> distname ${name}-src-${my_version}
</span><span class="cx">
</span><del>-checksums rmd160 8df03af39d526ac3a82210bf9de768e20131ce6f \
- sha256 8719723d36871919528d8406d2597f1120cec5685d79dc468ac908cc8ed9e112
</del><ins>+checksums rmd160 33f158d3419170e4e6cd065b32649054bcd7eec7 \
+ sha256 c67acfe4f5ef0f14976f7e05eb7b2bcfd6011dd07f3958306e24eed3a13361f4
</ins><span class="cx">
</span><span class="cx"> patch.pre_args -p1
</span><span class="cx"> patchfiles patch-admin-Makefile.def.diff \
</span><del>- patch-admin-Makefile.stdcxxlib.diff \
</del><span class="cx"> patch-admin-Makefile.python.diff \
</span><span class="cx"> patch-admin-gildas-env.sh.diff \
</span><span class="cx"> patch-admin-define-system.sh.diff \
</span></span></pre></div>
<a id="trunkdportssciencegildasfilespatchadminMakefiledefdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/gildas/files/patch-admin-Makefile.def.diff (143119 => 143120)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gildas/files/patch-admin-Makefile.def.diff 2015-12-04 16:33:01 UTC (rev 143119)
+++ trunk/dports/science/gildas/files/patch-admin-Makefile.def.diff 2015-12-04 16:50:37 UTC (rev 143120)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><del>---- gildas-src-may15a/admin/Makefile.def.orig 2015-03-17 10:55:49.000000000 +0100
-+++ gildas-src-may15a/admin/Makefile.def 2015-05-21 23:36:25.000000000 +0200
</del><ins>+--- gildas-src-dec15a/admin/Makefile.def.orig 2015-11-30 13:25:52.000000000 +0100
++++ gildas-src-dec15a/admin/Makefile.def 2015-12-04 16:19:05.000000000 +0100
</ins><span class="cx"> @@ -72,12 +72,12 @@
</span><span class="cx"> # The following variables are provided to the user so that he can override
</span><span class="cx"> # the preprocessing, compilation and linking options defined by default
</span><span class="lines">@@ -28,16 +28,7 @@
</span><span class="cx">
</span><span class="cx"> # Preprocessor generic flags
</span><span class="cx"> GLOBAL_CPPFLAGS += -P -traditional -C
</span><del>-@@ -335,7 +335,7 @@
- # C++ compilation
-
- # C++ compiler name
--CXX = g++
-+CXX = @CXX@
- ifdef GAG_COMPILER_CXXEXE
- CXX = $(GAG_COMPILER_CXXEXE)
- endif
-@@ -538,7 +538,7 @@
</del><ins>+@@ -551,7 +551,7 @@
</ins><span class="cx"> SIC_SYS_LIBS =
</span><span class="cx"> SIC_LIB_DEPENDS += $(_GAG_LIBS) $(LEGACY_LIBS)
</span><span class="cx"> ifeq ($(PYTHON_PRESENT),yes)
</span><span class="lines">@@ -45,4 +36,4 @@
</span><span class="cx"> + SIC_SYS_LIBS += $(shell @PYTHON@ $(gagadmdir)/python-config-ldflags.py)
</span><span class="cx"> endif
</span><span class="cx"> ifeq ($(CFITSIO_PRESENT),yes)
</span><del>- SIC_LIB_DEPENDS += -lcfitsio
</del><span class="cx">\ No newline at end of file
</span><ins>+ SIC_LIB_DEPENDS += -lcfitsio
</ins></span></pre></div>
<a id="trunkdportssciencegildasfilespatchadminMakefilestdcxxlibdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/science/gildas/files/patch-admin-Makefile.stdcxxlib.diff (143119 => 143120)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gildas/files/patch-admin-Makefile.stdcxxlib.diff 2015-12-04 16:33:01 UTC (rev 143119)
+++ trunk/dports/science/gildas/files/patch-admin-Makefile.stdcxxlib.diff 2015-12-04 16:50:37 UTC (rev 143120)
</span><span class="lines">@@ -1,22 +0,0 @@
</span><del>---- gildas-src-may15a/admin/Makefile.build.orig 2015-03-03 17:31:08.000000000 +0100
-+++ gildas-src-may15a/admin/Makefile.build 2015-05-26 09:58:20.000000000 +0200
-@@ -396,6 +396,8 @@
- # Required by ASDM libs:
- -lstdc++:
-
-+-lc++:
-+
- ###########################################################################
-
- endif # _MAKEFILE_BUILD_
---- gildas-src-may15a/admin/Makefile.def.orig 2015-05-26 09:53:50.000000000 +0200
-+++ gildas-src-may15a/admin/Makefile.def 2015-05-26 09:59:26.000000000 +0200
-@@ -491,7 +491,7 @@
- # Compilation in 32 bits mode
- GAG_32BITS_SWITCH = "-m32"
- endif
--STDCpp_LIB += $(shell g++ $(GAG_32BITS_SWITCH) -print-file-name=libstdc++.$(LIB_CXX_EXT))
-+STDCpp_LIB += @STDCXXLIB@
-
- ###########################################################################
- # Kernel libraries
</del></span></pre></div>
<a id="trunkdportssciencegildasfilespatchadmingildasenvshdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/gildas/files/patch-admin-gildas-env.sh.diff (143119 => 143120)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gildas/files/patch-admin-gildas-env.sh.diff 2015-12-04 16:33:01 UTC (rev 143119)
+++ trunk/dports/science/gildas/files/patch-admin-gildas-env.sh.diff 2015-12-04 16:50:37 UTC (rev 143120)
</span><span class="lines">@@ -1,15 +1,6 @@
</span><del>---- gildas-src-may15a/admin/gildas-env.sh.orig 2014-12-09 11:45:14.000000000 +0100
-+++ gildas-src-may15a/admin/gildas-env.sh 2015-05-26 10:12:21.000000000 +0200
-@@ -426,7 +426,7 @@
- fi
- #
- # Check availability of g++. This only has an impact on ATM2009
-- if \which g++ > /dev/null 2>&1; then
-+ if \which @CXX@ > /dev/null 2>&1; then
- ATM2009_PRESENT=yes
- else
- gagenv_message "g++ not found in your \$PATH"
-@@ -443,34 +443,34 @@
</del><ins>+--- gildas-src-dec15a/admin/gildas-env.sh.orig 2015-11-30 13:25:52.000000000 +0100
++++ gildas-src-dec15a/admin/gildas-env.sh 2015-12-04 17:04:00.000000000 +0100
+@@ -442,34 +442,34 @@
</ins><span class="cx"> NUMPY_PRESENT=no
</span><span class="cx"> NUMERIC_PRESENT=no
</span><span class="cx"> SQLITE3_PRESENT=no
</span><span class="lines">@@ -53,7 +44,7 @@
</span><span class="cx"> SQLITE3_PRESENT=yes
</span><span class="cx"> fi
</span><span class="cx"> fi
</span><del>-@@ -546,11 +546,11 @@
</del><ins>+@@ -545,11 +545,11 @@
</ins><span class="cx"> ATM2003_PRESENT=yes
</span><span class="cx"> ATM2003_LIB_DIR=$DIR
</span><span class="cx"> fi
</span><span class="lines">@@ -67,7 +58,7 @@
</span><span class="cx"> BLAS_PRESENT=yes
</span><span class="cx"> BLAS_LIB_DIR=$DIR
</span><span class="cx"> fi
</span><del>-@@ -558,13 +558,13 @@
</del><ins>+@@ -557,13 +557,13 @@
</ins><span class="cx"> SLATEC_PRESENT=yes
</span><span class="cx"> SLATEC_LIB_DIR=$DIR
</span><span class="cx"> fi
</span><span class="lines">@@ -88,7 +79,7 @@
</span><span class="cx"> if file_present "libasdmStandalone." "${DIR}"; then
</span><span class="cx"> SDM_PRESENT=yes
</span><span class="cx"> if [ "$SDM_PRESENT" = "yes" ]; then
</span><del>-@@ -598,6 +598,8 @@
</del><ins>+@@ -597,6 +597,8 @@
</ins><span class="cx"> XML_PRESENT="yes"
</span><span class="cx"> #
</span><span class="cx"> unset GAG_LIB_DEP_PATH GAG_INC_DEP_PATH
</span></span></pre>
</div>
</div>
</body>
</html>