<!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>[128902] 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/128902">128902</a></dd>
<dt>Author</dt> <dd>aronnax@macports.org</dd>
<dt>Date</dt> <dd>2014-11-29 11:43:13 -0800 (Sat, 29 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>ds9: build against non-bundled versions of more libraries</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsscienceds9Portfile">trunk/dports/science/ds9/Portfile</a></li>
<li><a href="#trunkdportsscienceds9filespatchMakefileunixdiff">trunk/dports/science/ds9/files/patch-Makefile.unix.diff</a></li>
<li><a href="#trunkdportsscienceds9filespatchds9_Makefileunixdiff">trunk/dports/science/ds9/files/patch-ds9_Makefile.unix.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 (128901 => 128902)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/ds9/Portfile 2014-11-29 19:41:33 UTC (rev 128901)
+++ trunk/dports/science/ds9/Portfile 2014-11-29 19:43:13 UTC (rev 128902)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx">
</span><span class="cx"> name ds9
</span><span class="cx"> version 7.3.2
</span><del>-revision 2
</del><ins>+revision 3
</ins><span class="cx"> categories science
</span><span class="cx"> platforms darwin
</span><span class="cx"> maintainers aronnax
</span><span class="lines">@@ -38,8 +38,10 @@
</span><span class="cx"> port:zlib \
</span><span class="cx"> port:libzip
</span><span class="cx">
</span><del>-# FIXME: ast is currently statically linked
-depends_build-append port:ast
</del><ins>+# FIXME: all of these libraries are statically linked
+depends_build-append port:ast \
+ port:funtools \
+ port:xpa
</ins><span class="cx">
</span><span class="cx"> universal_variant no
</span><span class="cx">
</span><span class="lines">@@ -102,7 +104,7 @@
</span><span class="cx">
</span><span class="cx"> destroot {
</span><span class="cx"> xinstall ${worksrcpath}/bin/ds9 ${destroot}${prefix}/bin
</span><del>- exec cp -r ${worksrcpath}/ds9/zipdir/zvfsmntpt ${destroot}${prefix}/share/ds9
</del><ins>+ copy ${worksrcpath}/ds9/zipdir/zvfsmntpt ${destroot}${prefix}/share/ds9
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> livecheck.url ${homepage}/site/Download.html
</span></span></pre></div>
<a id="trunkdportsscienceds9filespatchMakefileunixdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/ds9/files/patch-Makefile.unix.diff (128901 => 128902)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/ds9/files/patch-Makefile.unix.diff 2014-11-29 19:41:33 UTC (rev 128901)
+++ trunk/dports/science/ds9/files/patch-Makefile.unix.diff 2014-11-29 19:43:13 UTC (rev 128902)
</span><span class="lines">@@ -1,20 +1,30 @@
</span><del>---- Makefile.unix.orig 2014-11-27 14:40:14.000000000 -0800
-+++ Makefile.unix 2014-11-27 14:40:53.000000000 -0800
-@@ -10,7 +10,7 @@
</del><ins>+--- Makefile.unix.orig 2014-11-29 01:42:56.000000000 -0800
++++ Makefile.unix 2014-11-29 01:43:15.000000000 -0800
+@@ -9,10 +9,10 @@
+ tcl tk \
</ins><span class="cx"> tktable tkcon xmlrpc tkblt \
</span><span class="cx"> tclxml tkimg tkmpeg tkhtml \
</span><del>- xpa tcliis tclcheckdns signal funtools \
</del><ins>+- xpa tcliis tclcheckdns signal funtools \
</ins><span class="cx"> - ast wcssubs \
</span><ins>++ tcliis tclcheckdns signal \
</ins><span class="cx"> + wcssubs \
</span><span class="cx"> rice hcompress plio \
</span><del>- saotk zvfs ds9
</del><ins>+- saotk zvfs ds9
++ saotk ds9
</ins><span class="cx">
</span><del>-@@ -113,7 +113,7 @@
</del><ins>+ tcl : FORCE
+ @echo "Installing Tcl..."
+@@ -112,10 +112,10 @@
+ distclean : tclclean tkclean \
</ins><span class="cx"> tktableclean tkbltclean \
</span><span class="cx"> tclxmlclean tkimgclean tkmpegclean tkhtmlclean \
</span><del>- xpaclean tcliisclean tclcheckdnsclean signalclean funtoolsclean \
</del><ins>+- xpaclean tcliisclean tclcheckdnsclean signalclean funtoolsclean \
</ins><span class="cx"> - astclean wcssubsclean \
</span><ins>++ tcliisclean tclcheckdnsclean signalclean \
</ins><span class="cx"> + wcssubsclean \
</span><span class="cx"> riceclean hcompressclean plioclean \
</span><del>- saotkclean zvfsclean ds9clean srcclean \
</del><ins>+- saotkclean zvfsclean ds9clean srcclean \
++ saotkclean ds9clean srcclean \
</ins><span class="cx"> filesclean dirsclean
</span><ins>+
+ #--------------------------distribution
</ins></span></pre></div>
<a id="trunkdportsscienceds9filespatchds9_Makefileunixdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/ds9/files/patch-ds9_Makefile.unix.diff (128901 => 128902)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/ds9/files/patch-ds9_Makefile.unix.diff 2014-11-29 19:41:33 UTC (rev 128901)
+++ trunk/dports/science/ds9/files/patch-ds9_Makefile.unix.diff 2014-11-29 19:43:13 UTC (rev 128902)
</span><span class="lines">@@ -1,6 +1,10 @@
</span><del>---- ds9/Makefile.unix.orig 2014-11-28 11:38:57.000000000 -0800
-+++ ds9/Makefile.unix 2014-11-28 11:39:43.000000000 -0800
-@@ -43,9 +43,6 @@
</del><ins>+--- ds9/Makefile.unix.orig 2014-11-29 01:44:37.000000000 -0800
++++ ds9/Makefile.unix 2014-11-29 01:45:19.000000000 -0800
+@@ -39,17 +39,11 @@
+ ../lib/$(TKIMGVER)/libzlibtcl1.2.5.a \
+ ../lib/$(TKIMGVER)/libtkimg1.4.a \
+ ../lib/libtiff.a \
+- ../lib/libfuntools.a \
</ins><span class="cx"> ../lib/librice.a \
</span><span class="cx"> ../lib/libhcomp.a \
</span><span class="cx"> ../lib/libplio.a \
</span><span class="lines">@@ -9,8 +13,12 @@
</span><span class="cx"> - ../lib/libast_pal.a \
</span><span class="cx"> ../lib/libsaotk.a \
</span><span class="cx"> ../lib/libwcs.a \
</span><del>- ../lib/libzvfs.a \
-@@ -104,8 +101,6 @@
</del><ins>+- ../lib/libzvfs.a \
+- ../lib/libxpa.a \
+ ../lib/$(TCLIISDIR)/libtcliis1.0.a \
+ ../lib/$(TCLCHECKDNSDIR)/libtclcheckdns1.1.a \
+ ../lib/libsignal_ext.a \
+@@ -104,8 +98,6 @@
</ins><span class="cx"> strip ds9Base
</span><span class="cx"> cp ds9Base ds9
</span><span class="cx"> cp ds9 ../bin/.
</span><span class="lines">@@ -19,7 +27,7 @@
</span><span class="cx">
</span><span class="cx"> debug : ds9Base ds9.zip
</span><span class="cx"> $(RM) $@
</span><del>-@@ -114,9 +109,44 @@
</del><ins>+@@ -114,9 +106,43 @@
</ins><span class="cx"> ds9Base : $(OBJS) $(LIBS)
</span><span class="cx"> $(RM) $@
</span><span class="cx"> $(CXX) ${OPTS} \
</span><span class="lines">@@ -41,17 +49,16 @@
</span><span class="cx"> + ../lib/$(TKIMGVER)/libzlibtcl1.2.5.a \
</span><span class="cx"> + ../lib/$(TKIMGVER)/libtkimg1.4.a \
</span><span class="cx"> + ../lib/libtiff.a \
</span><del>-+ ../lib/libfuntools.a \
</del><ins>++ -lfuntools \
</ins><span class="cx"> + ../lib/librice.a \
</span><span class="cx"> + ../lib/libhcomp.a \
</span><span class="cx"> + ../lib/libplio.a \
</span><del>-+ /opt/local/lib/libast.a \
-+ /opt/local/lib/libast_err.a \
-+ /opt/local/lib/libast_pal.a \
</del><ins>++ @prefix@/lib/libast.a \
++ @prefix@/lib/libast_err.a \
++ @prefix@/lib/libast_pal.a \
</ins><span class="cx"> + ../lib/libsaotk.a \
</span><span class="cx"> + ../lib/libwcs.a \
</span><del>-+ ../lib/libzvfs.a \
-+ ../lib/libxpa.a \
</del><ins>++ -lxpa \
</ins><span class="cx"> + ../lib/$(TCLIISDIR)/libtcliis1.0.a \
</span><span class="cx"> + ../lib/$(TCLCHECKDNSDIR)/libtclcheckdns1.1.a \
</span><span class="cx"> + ../lib/libsignal_ext.a \
</span><span class="lines">@@ -66,7 +73,7 @@
</span><span class="cx">
</span><span class="cx"> endif
</span><span class="cx">
</span><del>-@@ -152,7 +182,6 @@
</del><ins>+@@ -152,7 +178,6 @@
</ins><span class="cx">
</span><span class="cx"> ds9.zip : $(FILES)
</span><span class="cx"> cd zipdir; find . -depth -name "CVS" -exec rm -r {} \;
</span></span></pre>
</div>
</div>
</body>
</html>