<!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>[119151] trunk/dports/science/ds9</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/119151">119151</a></dd>
<dt>Author</dt> <dd>aronnax@macports.org</dd>
<dt>Date</dt> <dd>2014-04-18 01:22:28 -0700 (Fri, 18 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>ds9: enable plotting grids by correctly linking libast and libsaotk, closes #40928</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsscienceds9Portfile">trunk/dports/science/ds9/Portfile</a></li>
<li><a href="#trunkdportsscienceds9filespatchds9_Makefilediff">trunk/dports/science/ds9/files/patch-ds9_Makefile.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsscienceds9Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/ds9/Portfile (119150 => 119151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/ds9/Portfile 2014-04-18 08:21:45 UTC (rev 119150)
+++ trunk/dports/science/ds9/Portfile 2014-04-18 08:22:28 UTC (rev 119151)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx">
</span><span class="cx"> name ds9
</span><span class="cx"> version 7.2
</span><del>-revision 4
</del><ins>+revision 5
</ins><span class="cx"> categories science
</span><span class="cx"> platforms darwin
</span><span class="cx"> maintainers aronnax
</span><span class="lines">@@ -43,7 +43,8 @@
</span><span class="cx"> port:zlib \
</span><span class="cx"> port:libzip \
</span><span class="cx"> port:zip \
</span><del>- port:ast
</del><ins>+ port:ast \
+ port:pgplot
</ins><span class="cx">
</span><span class="cx"> universal_variant no
</span><span class="cx">
</span><span class="lines">@@ -99,6 +100,11 @@
</span><span class="cx"> # included upstream
</span><span class="cx"> file copy ${filespath}/make.darwin64x86mavericks ${worksrcpath}
</span><span class="cx"> reinplace "s|@prefix@|${prefix}|g" ${worksrcpath}/Makefile
</span><ins>+
+ # FIXME: We have to statically link libast because libast needs to call
+ # functions that are defined in the static libsaotk. Probably best to
+ # eventually make libsaotk a dynamic library.
+ reinplace "s|@prefix@|${prefix}|g" ${worksrcpath}/ds9/Makefile
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # Buggy C++
</span></span></pre></div>
<a id="trunkdportsscienceds9filespatchds9_Makefilediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/ds9/files/patch-ds9_Makefile.diff (119150 => 119151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/ds9/files/patch-ds9_Makefile.diff 2014-04-18 08:21:45 UTC (rev 119150)
+++ trunk/dports/science/ds9/files/patch-ds9_Makefile.diff 2014-04-18 08:22:28 UTC (rev 119151)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><del>---- ds9/Makefile.orig 2013-05-16 18:53:44.000000000 -0700
-+++ ds9/Makefile 2013-05-16 21:39:17.000000000 -0700
</del><ins>+--- ds9/Makefile.orig 2014-04-18 00:11:43.000000000 -0700
++++ ds9/Makefile 2014-04-18 01:17:01.000000000 -0700
</ins><span class="cx"> @@ -50,14 +50,9 @@
</span><span class="cx"> ../lib/librice.a \
</span><span class="cx"> ../lib/libhcomp.a \
</span><span class="lines">@@ -24,13 +24,53 @@
</span><span class="cx">
</span><span class="cx"> else
</span><span class="cx">
</span><del>-@@ -376,7 +371,8 @@
</del><ins>+@@ -374,9 +369,47 @@
+ ds9Base : $(OBJS) $(LIBS)
+ $(RM) $@
</ins><span class="cx"> $(CXX) ${OPTS} \
</span><del>- -o $@ $(OBJS) $(LIBS) \
</del><ins>+- -o $@ $(OBJS) $(LIBS) \
++ -o $@ $(OBJS) \
++ ../lib/libsaotk.a \
++ ../lib/libtkhtml.a \
++ ../lib/libtkmpeg.a \
++ ../lib/$(TCLXMLVER)/libTclxml3.2.a \
++ ../lib/$(TKTABLEVER)/libTktable2.10.a \
++ ../lib/$(TKIMGVER)/libtkimgpng1.4.a \
++ ../lib/$(TKIMGVER)/libpngtcl1.4.3.a \
++ ../lib/$(TKIMGVER)/libtkimgtiff1.4.a \
++ ../lib/$(TKIMGVER)/libtifftcl3.9.4.a \
++ ../lib/$(TKIMGVER)/libtkimgjpeg1.4.a \
++ ../lib/$(TKIMGVER)/libjpegtcl8.2.a \
++ ../lib/$(TKIMGVER)/libtkimggif1.4.a \
++ ../lib/$(TKIMGVER)/libtkimgppm1.4.a \
++ ../lib/$(TKIMGVER)/libtkimgwindow1.4.a \
++ ../lib/$(TKIMGVER)/libzlibtcl1.2.5.a \
++ ../lib/$(TKIMGVER)/libtkimg1.4.a \
++ ../lib/libtiff.a \
++ ../lib/libfuntools.a \
++ ../lib/librice.a \
++ ../lib/libhcomp.a \
++ ../lib/libplio.a \
++ @prefix@/lib/libast.a \
++ @prefix@/lib/libast_err.a \
++ @prefix@/lib/libast_pal.a \
++ ../lib/libsaotk.a \
++ ../lib/libwcs.a \
++ ../lib/libzvfs.a \
++ -lzip \
++ -lz \
++ ../lib/libxpa.a \
++ ../lib/libiis.a \
++ ../lib/libcheckdns.a \
++ ../lib/libsignal_ext.a \
++ ../lib/libxxlib.a \
++ ../lib/libBLTX30.a \
++ ../lib/libBLTCore30.a \
++ ../lib/libtk8.5.a \
++ ../lib/libtcl8.5.a \
</ins><span class="cx"> -L$(X11LIB) -lX11 -lXext -lXft -lXrender -lXss -lfontconfig -lfreetype \
</span><span class="cx"> - -lxml2 \
</span><del>-+ -lxml2 -ljbig -lz -lzip \
-+ -last -last_err -last_ems -last_drama -last_grf3d -last_grf_2.0 -last_grf_3.2 -last_grf_5.6 -last_pgplot -last_pgplot3d \
</del><ins>++ -lxml2 -ljbig \
</ins><span class="cx"> -lstdc++ -liconv
</span><span class="cx"> endif
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>