<!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>[144377] 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/144377">144377</a></dd>
<dt>Author</dt> <dd>aronnax@macports.org</dd>
<dt>Date</dt> <dd>2016-01-06 22:47:30 -0800 (Wed, 06 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>ds9: update to 7.4, add Aqua support</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsscienceds9Portfile">trunk/dports/science/ds9/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsscienceds9filespatchds9_library_ds9tcldiff">trunk/dports/science/ds9/files/patch-ds9_library_ds9.tcl.diff</a></li>
<li><a href="#trunkdportsscienceds9filespatchds9_macosx_Makefileindiff">trunk/dports/science/ds9/files/patch-ds9_macosx_Makefile.in.diff</a></li>
<li><a href="#trunkdportsscienceds9filespatchds9_unix_Makefileindiff">trunk/dports/science/ds9/files/patch-ds9_unix_Makefile.in.diff</a></li>
<li><a href="#trunkdportsscienceds9filespatchds9_unix_ds9Cdiff">trunk/dports/science/ds9/files/patch-ds9_unix_ds9.C.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<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>
<li><a href="#trunkdportsscienceds9filespatchds9_ds9unixdiff">trunk/dports/science/ds9/files/patch-ds9_ds9.unix.diff</a></li>
<li><a href="#trunkdportsscienceds9filespatchsrc_ds9tcldiff">trunk/dports/science/ds9/files/patch-src_ds9.tcl.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 (144376 => 144377)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/ds9/Portfile 2016-01-07 06:47:29 UTC (rev 144376)
+++ trunk/dports/science/ds9/Portfile 2016-01-07 06:47:30 UTC (rev 144377)
</span><span class="lines">@@ -4,8 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name ds9
</span><del>-version 7.3.2
-revision 3
</del><ins>+version 7.4
</ins><span class="cx"> categories science
</span><span class="cx"> platforms darwin
</span><span class="cx"> maintainers aronnax
</span><span class="lines">@@ -21,78 +20,70 @@
</span><span class="cx"> homepage http://hea-www.harvard.edu/RD/ds9
</span><span class="cx"> master_sites http://hea-www.harvard.edu/RD/ds9/download/source
</span><span class="cx"> distname ${name}.${version}
</span><del>-checksums sha1 0348b733923871ef1d36da653dd3fd90d33a4c20 \
- rmd160 e75938b87863b305983527d9ce1b70f4520a7a2f
</del><ins>+checksums sha256 e91a3aa1d8e4f5b85df0a09400b29043e2412a14c76e6712fde5942dc554433f \
+ rmd160 b7bb69b603c25fefb2b2b8de082a8d45553c47c0
</ins><span class="cx">
</span><del>-depends_lib port:xorg-libX11 \
- port:xorg-libXext \
- port:xorg-libXt \
- port:Xft2 \
- port:xrender \
- port:xorg-libXScrnSaver \
- port:fontconfig \
</del><ins>+depends_lib port:fontconfig \
</ins><span class="cx"> port:freetype \
</span><ins>+ port:funtools \
</ins><span class="cx"> port:libxml2 \
</span><span class="cx"> port:libiconv \
</span><span class="cx"> port:jbigkit \
</span><span class="cx"> port:zlib \
</span><del>- port:libzip
-
-# FIXME: all of these libraries are statically linked
-depends_build-append port:ast \
- port:funtools \
</del><ins>+ port:libzip \
</ins><span class="cx"> port:xpa
</span><span class="cx">
</span><ins>+# FIXME: these libraries are statically linked
+depends_build-append port:ast
+
</ins><span class="cx"> universal_variant no
</span><span class="cx">
</span><span class="cx"> worksrcdir saods9
</span><span class="cx">
</span><del>-# Inside pre-fetch so that 'port sync' does not fail (#46041)
-pre-fetch {
- platform darwin {
- if {${os.major} <= 10} {
- ui_error "$name requires Mac OS X Lion or later."
- error "unsupported platform"
- }
- }
</del><ins>+patchfiles patch-ds9_macosx_Makefile.in.diff \
+ patch-ds9_unix_Makefile.in.diff \
+ patch-ds9_unix_ds9.C.diff \
+ patch-ds9_library_ds9.tcl.diff
+
+post-patch {
+ # FIXME: Prefix has to be embedded in source and Makefiles in some places.
+ reinplace "s|@prefix@|${prefix}|g" \
+ ${worksrcpath}/ds9/macosx/Makefile.in \
+ ${worksrcpath}/ds9/unix/Makefile.in \
+ ${worksrcpath}/ds9/unix/ds9.C \
+ ${worksrcpath}/ds9/library/ds9.tcl
</ins><span class="cx"> }
</span><del>-platform darwin {
- if {${os.major} <= 10} {
- depends_lib
- depends_run
- } elseif {${os.major} == 11} {
- set ds9platform lion
- } elseif {${os.major} == 12} {
- set ds9platform mountainlion
- } elseif {${os.major} >= 13} {
- # The upstream tarball contains Makefiles for each Mac OS version.
- # Currently, the newest Makefile is for Mavericks. Check this when
- # a new upstream version is available.
- set ds9platform mavericks
</del><ins>+
+variant x11 conflicts aqua description {Enable X11 GUI} {
+ configure.cmd unix/configure
+
+ destroot {
+ xinstall ${worksrcpath}/bin/ds9 ${destroot}${prefix}/bin
+ copy ${worksrcpath}/ds9/unix/zipdir/zvfsmntpt ${destroot}${prefix}/share/ds9
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-patchfiles patch-Makefile.unix.diff \
- patch-ds9_Makefile.unix.diff \
- patch-ds9_ds9.unix.diff \
- patch-src_ds9.tcl.diff
</del><ins>+variant aqua conflicts x11 description {Enable Mac OS X GUI} {
+ depends_lib-append port:xorg-libX11 \
+ port:xorg-libXext \
+ port:xorg-libXt \
+ port:Xft2 \
+ port:xrender \
+ port:xorg-libXScrnSaver \
</ins><span class="cx">
</span><del>-post-patch {
- # 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.unix \
- ${worksrcpath}/ds9/ds9.unix \
- ${worksrcpath}/src/ds9.tcl
</del><ins>+ configure.cmd macosx/configure
+
+ destroot {
+ copy ${worksrcpath}/bin/SAOImage\ DS9.app ${destroot}${applications_dir}/SAOImage\ DS9.app
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-# The 'configure' stage for ds9 consists of copying or symbolically linking a
-# platform-specific file to 'make.include'.
-configure {
- file copy ${worksrcpath}/make.darwin${ds9platform} ${worksrcpath}/make.include
</del><ins>+if {![variant_isset x11] && ![variant_isset aqua]} {
+ default_variants +aqua
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+configure.cmd unix/configure
+
</ins><span class="cx"> use_parallel_build no
</span><span class="cx"> build.args-append JOBS=${build.jobs} \
</span><span class="cx"> CC=${configure.cc} \
</span><span class="lines">@@ -100,12 +91,8 @@
</span><span class="cx"> X11INCLUDE=${prefix}/include \
</span><span class="cx"> X11LIB=${prefix}/lib \
</span><span class="cx"> XFT_LIBS="-lXft -lfontconfig" \
</span><del>- CODESIGN=/usr/bin/true
</del><ins>+ -o xpa -o funtools -o ast -o zvfs
</ins><span class="cx">
</span><del>-destroot {
- xinstall ${worksrcpath}/bin/ds9 ${destroot}${prefix}/bin
- copy ${worksrcpath}/ds9/zipdir/zvfsmntpt ${destroot}${prefix}/share/ds9
-}
</del><span class="cx">
</span><span class="cx"> livecheck.url ${homepage}/site/Download.html
</span><span class="cx"> livecheck.regex {DS9 Version (\d+(\.\d+)+)}
</span></span></pre></div>
<a id="trunkdportsscienceds9filespatchMakefileunixdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/science/ds9/files/patch-Makefile.unix.diff (144376 => 144377)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/ds9/files/patch-Makefile.unix.diff 2016-01-07 06:47:29 UTC (rev 144376)
+++ trunk/dports/science/ds9/files/patch-Makefile.unix.diff 2016-01-07 06:47:30 UTC (rev 144377)
</span><span class="lines">@@ -1,30 +0,0 @@
</span><del>---- 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 \
- tktable tkcon xmlrpc tkblt \
- tclxml tkimg tkmpeg tkhtml \
-- xpa tcliis tclcheckdns signal funtools \
-- ast wcssubs \
-+ tcliis tclcheckdns signal \
-+ wcssubs \
- rice hcompress plio \
-- saotk zvfs ds9
-+ saotk ds9
-
- tcl : FORCE
- @echo "Installing Tcl..."
-@@ -112,10 +112,10 @@
- distclean : tclclean tkclean \
- tktableclean tkbltclean \
- tclxmlclean tkimgclean tkmpegclean tkhtmlclean \
-- xpaclean tcliisclean tclcheckdnsclean signalclean funtoolsclean \
-- astclean wcssubsclean \
-+ tcliisclean tclcheckdnsclean signalclean \
-+ wcssubsclean \
- riceclean hcompressclean plioclean \
-- saotkclean zvfsclean ds9clean srcclean \
-+ saotkclean ds9clean srcclean \
- filesclean dirsclean
-
- #--------------------------distribution
</del></span></pre></div>
<a id="trunkdportsscienceds9filespatchds9_Makefileunixdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/science/ds9/files/patch-ds9_Makefile.unix.diff (144376 => 144377)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/ds9/files/patch-ds9_Makefile.unix.diff 2016-01-07 06:47:29 UTC (rev 144376)
+++ trunk/dports/science/ds9/files/patch-ds9_Makefile.unix.diff 2016-01-07 06:47:30 UTC (rev 144377)
</span><span class="lines">@@ -1,83 +0,0 @@
</span><del>---- 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 \
- ../lib/librice.a \
- ../lib/libhcomp.a \
- ../lib/libplio.a \
-- ../lib/libast.a \
-- ../lib/libast_err.a \
-- ../lib/libast_pal.a \
- ../lib/libsaotk.a \
- ../lib/libwcs.a \
-- ../lib/libzvfs.a \
-- ../lib/libxpa.a \
- ../lib/$(TCLIISDIR)/libtcliis1.0.a \
- ../lib/$(TCLCHECKDNSDIR)/libtclcheckdns1.1.a \
- ../lib/libsignal_ext.a \
-@@ -104,8 +98,6 @@
- strip ds9Base
- cp ds9Base ds9
- cp ds9 ../bin/.
-- cp ds9.zip ../bin/.
-- cd ../bin; $(CODESIGN) -s "SAOImage DS9" ds9
-
- debug : ds9Base ds9.zip
- $(RM) $@
-@@ -114,9 +106,43 @@
- ds9Base : $(OBJS) $(LIBS)
- $(RM) $@
- $(CXX) ${OPTS} \
-- -o $@ $(OBJS) $(LIBS) \
-+ -o $@ $(OBJS) \
-+ ../lib/libsaotk.a \
-+ ../lib/libtkhtml.a \
-+ ../lib/$(TKMPEGDIR)/libtkmpeg1.0.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)/libtkimgwindow1.4.a \
-+ ../lib/$(TKIMGVER)/libzlibtcl1.2.5.a \
-+ ../lib/$(TKIMGVER)/libtkimg1.4.a \
-+ ../lib/libtiff.a \
-+ -lfuntools \
-+ ../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 \
-+ -lxpa \
-+ ../lib/$(TCLIISDIR)/libtcliis1.0.a \
-+ ../lib/$(TCLCHECKDNSDIR)/libtclcheckdns1.1.a \
-+ ../lib/libsignal_ext.a \
-+ ../lib/$(TKBLTDIR)/libtkblt3.0.a \
-+ ../lib/libtk8.6.a \
-+ ../lib/libtkstub8.6.a \
-+ ../lib/libtcl8.6.a \
-+ ../lib/libtclstub8.6.a \
- -L$(X11LIB) -lX11 -lXext -lXft -lXrender -lXss -lfontconfig -lfreetype \
-- -lxml2
-+ -lxml2 -ljbig
-
- endif
-
-@@ -152,7 +178,6 @@
-
- ds9.zip : $(FILES)
- cd zipdir; find . -depth -name "CVS" -exec rm -r {} \;
-- cd zipdir; zip -r ../ds9.zip *
-
- zipdir :
- mkdir zipdir
</del></span></pre></div>
<a id="trunkdportsscienceds9filespatchds9_ds9unixdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/science/ds9/files/patch-ds9_ds9.unix.diff (144376 => 144377)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/ds9/files/patch-ds9_ds9.unix.diff 2016-01-07 06:47:29 UTC (rev 144376)
+++ trunk/dports/science/ds9/files/patch-ds9_ds9.unix.diff 2016-01-07 06:47:30 UTC (rev 144377)
</span><span class="lines">@@ -1,55 +0,0 @@
</span><del>---- ds9/ds9.unix.orig 2014-11-28 11:26:55.000000000 -0800
-+++ ds9/ds9.unix 2014-11-28 11:26:58.000000000 -0800
-@@ -70,11 +70,11 @@
-
- // so that tcl and tk know where to find their libs
- // we do it here before InitLibraryPath is called
-- putenv((char*)"TCL_LIBRARY=./zvfsmntpt/tcl8.6");
-- putenv((char*)"TK_LIBRARY=./zvfsmntpt/tk8.6");
-+ putenv((char*)"TCL_LIBRARY=@prefix@/share/ds9/tcl8.6");
-+ putenv((char*)"TK_LIBRARY==@prefix@/share/ds9/tk8.6");
-
- // startup script
-- Tcl_Obj *path = Tcl_NewStringObj("./zvfsmntpt/src/ds9.tcl",-1);
-+ Tcl_Obj *path = Tcl_NewStringObj("@prefix@/share/ds9/src/ds9.tcl",-1);
- Tcl_SetStartupScript(path, NULL);
-
- return TCL_OK;
-@@ -85,37 +85,6 @@
- // save interp for cputs function
- global_interp = interp;
-
-- // We have to initialize the virtual filesystem before calling
-- // Tcl_Init(). Otherwise, Tcl_Init() will not be able to find
-- // its startup script files.
-- if (Zvfs_Init(interp) == TCL_ERROR)
-- return TCL_ERROR;
-- Tcl_StaticPackage (interp, "zvfs", Zvfs_Init, (Tcl_PackageInitProc*)NULL);
--
-- // find current working directory, and set as mount point
-- {
-- Tcl_DString pwd;
-- Tcl_DStringInit(&pwd);
-- Tcl_GetCwd(interp, &pwd);
--
--#ifdef ZIPFILE
-- ostringstream str;
-- str << (char *)Tcl_GetNameOfExecutable()
-- << ".zip"
-- << ends;
-- if( Zvfs_Mount(interp, (char*)str.str().c_str(), Tcl_DStringValue(&pwd)) != TCL_OK ){
-- char str[] = "ERROR: Unable to open the auxiliary ds9 file 'ds9.zip'. If you moved the ds9 program from its original location, please also move the zip file to the same place.";
--
-- cerr << str << endl;
-- exit(1);
-- }
--#else
-- Zvfs_Mount(interp, (char *)Tcl_GetNameOfExecutable(),
-- Tcl_DStringValue(&pwd));
--#endif
-- Tcl_DStringFree(&pwd);
-- }
--
- // Tcl
- if (Tcl_Init(interp) == TCL_ERROR)
- return TCL_ERROR;
</del></span></pre></div>
<a id="trunkdportsscienceds9filespatchds9_library_ds9tcldiff"></a>
<div class="addfile"><h4>Added: trunk/dports/science/ds9/files/patch-ds9_library_ds9.tcl.diff (0 => 144377)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/ds9/files/patch-ds9_library_ds9.tcl.diff (rev 0)
+++ trunk/dports/science/ds9/files/patch-ds9_library_ds9.tcl.diff 2016-01-07 06:47:30 UTC (rev 144377)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- ds9/library/ds9.tcl.orig 2016-01-07 00:09:58.000000000 -0500
++++ ds9/library/ds9.tcl 2016-01-07 00:09:33.000000000 -0500
+@@ -198,7 +198,7 @@
+ x11 {
+ # set to absolute path so that if -cd command is used,
+ # so we can still find our files
+- set ds9(root) [file normalize [file join [pwd] zvfsmntpt]]
++ set ds9(root) "@prefix@/share/ds9"
+
+ if {![namespace exists msgcat]} {
+ source $ds9(root)/tcl8/8.5/msgcat-1.5.2.tm
</ins></span></pre></div>
<a id="trunkdportsscienceds9filespatchds9_macosx_Makefileindiff"></a>
<div class="addfile"><h4>Added: trunk/dports/science/ds9/files/patch-ds9_macosx_Makefile.in.diff (0 => 144377)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/ds9/files/patch-ds9_macosx_Makefile.in.diff (rev 0)
+++ trunk/dports/science/ds9/files/patch-ds9_macosx_Makefile.in.diff 2016-01-07 06:47:30 UTC (rev 144377)
</span><span class="lines">@@ -0,0 +1,75 @@
</span><ins>+--- ds9/macosx/Makefile.in.orig 2016-01-07 00:20:21.000000000 -0500
++++ ds9/macosx/Makefile.in 2016-01-07 01:21:40.000000000 -0500
+@@ -36,10 +36,6 @@
+
+ LLIBS = \
+ ../../lib/$(TKSAODIR)/libtksao1.0.a \
+- ../../lib/$(TKSAODIR)/libfuntools.a \
+- ../../lib/$(TKSAODIR)/libast.a \
+- ../../lib/$(TKSAODIR)/libast_err.a \
+- ../../lib/$(TKSAODIR)/libast_pal.a \
+ ../../lib/$(TKHTMLDIR)/libtkhtml1.0.a \
+ ../../lib/$(TKMPEGDIR)/libtkmpeg1.0.a \
+ ../../lib/$(TCLXMLVER)/libTclxml3.2.a \
+@@ -55,7 +51,6 @@
+ ../../lib/$(TKIMGVER)/libzlibtcl1.2.5.a \
+ ../../lib/$(TKIMGVER)/libtkimg1.4.a \
+ ../../lib/libtiff.a \
+- ../../lib/libxpa.a \
+ ../../lib/$(TCLIISDIR)/libtcliis1.0.a \
+ ../../lib/$(TCLCHECKDNSDIR)/libtclcheckdns1.1.a \
+ ../../lib/$(TCLSIGNALDIR)/libtclsignal1.4.a \
+@@ -72,7 +67,7 @@
+
+ #--------------------------main
+
+-ds9 : ds9base appdir framework tcl tk tcllib tkcon xmlrpc tkblt xpa compiler
++ds9 : ds9base appdir framework tcl tk tcllib tkcon xmlrpc tkblt compiler
+ cp -p ds9base $(APPDIR)/Contents/MacOS/ds9
+ strip $(APPDIR)/Contents/MacOS/ds9
+ install_name_tool -change \
+@@ -83,7 +78,7 @@
+ /Library/Frameworks/Tk.framework/Versions/8.6/Tk \
+ @executable_path/../Frameworks/Tk.framework/Tk \
+ $(APPDIR)/Contents/MacOS/ds9
+- cd ../../bin; codesign --deep -f -s "SAOImage DS9" SAOImage\ DS9.app
++ cd ../../bin
+
+ debug : ds9base appdir framework tcl tk tcllib tkcon xmlrpc tkblt xpa compiler
+ cp -p ds9base $(APPDIR)/Contents/MacOS/ds9
+@@ -107,8 +102,33 @@
+ ds9base : $(OBJS) $(LLIBS)
+ $(RM) $@
+ $(CXX) -o $@ $(OBJS) \
+- $(LLIBS) \
+- $(LIBS) \
++ ../../lib/$(TKSAODIR)/libtksao1.0.a \
++ -lfuntools \
++ @prefix@/lib/libast.a \
++ @prefix@/lib/libast_err.a \
++ @prefix@/lib/libast_pal.a \
++ ../../lib/$(TKHTMLDIR)/libtkhtml1.0.a \
++ ../../lib/$(TKMPEGDIR)/libtkmpeg1.0.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)/libtkimgwindow1.4.a \
++ ../../lib/$(TKIMGVER)/libzlibtcl1.2.5.a \
++ ../../lib/$(TKIMGVER)/libtkimg1.4.a \
++ ../../lib/libtiff.a \
++ -lxpa \
++ ../../lib/$(TCLIISDIR)/libtcliis1.0.a \
++ ../../lib/$(TCLCHECKDNSDIR)/libtclcheckdns1.1.a \
++ ../../lib/$(TCLSIGNALDIR)/libtclsignal1.4.a \
++ ../../lib/$(TKBLTDIR)/libtkblt3.0.a \
++ ../../lib/$(TKMACOSXDIR)/libtkmacosx1.0.a \
++ $(LIBS) -ljbig \
+ $(TK_STUB_LIB_SPEC) $(TK_LIB_SPEC) \
+ $(TCL_STUB_LIB_SPEC) $(TCL_LIB_SPEC) \
+ $(TK_LIBS)
</ins></span></pre></div>
<a id="trunkdportsscienceds9filespatchds9_unix_Makefileindiff"></a>
<div class="addfile"><h4>Added: trunk/dports/science/ds9/files/patch-ds9_unix_Makefile.in.diff (0 => 144377)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/ds9/files/patch-ds9_unix_Makefile.in.diff (rev 0)
+++ trunk/dports/science/ds9/files/patch-ds9_unix_Makefile.in.diff 2016-01-07 06:47:30 UTC (rev 144377)
</span><span class="lines">@@ -0,0 +1,79 @@
</span><ins>+--- ds9/unix/Makefile.in.orig 2016-01-07 00:02:12.000000000 -0500
++++ ds9/unix/Makefile.in 2016-01-07 01:08:35.000000000 -0500
+@@ -52,10 +52,6 @@
+
+ LLIBS = \
+ ../../lib/$(TKSAODIR)/libtksao1.0.a \
+- ../../lib/$(TKSAODIR)/libfuntools.a \
+- ../../lib/$(TKSAODIR)/libast.a \
+- ../../lib/$(TKSAODIR)/libast_err.a \
+- ../../lib/$(TKSAODIR)/libast_pal.a \
+ ../../lib/$(TKSAODIR)/libtksao1.0.a \
+ ../../lib/$(TKHTMLDIR)/libtkhtml1.0.a \
+ ../../lib/$(TKMPEGDIR)/libtkmpeg1.0.a \
+@@ -73,7 +69,6 @@
+ ../../lib/$(TKIMGVER)/libtkimg1.4.a \
+ ../../lib/libtiff.a \
+ ../../lib/$(TCLZVFSDIR)/libtclzvfs1.0.a \
+- ../../lib/libxpa.a \
+ ../../lib/$(TCLIISDIR)/libtcliis1.0.a \
+ ../../lib/$(TCLCHECKDNSDIR)/libtclcheckdns1.1.a \
+ ../../lib/$(TCLSIGNALDIR)/libtclsignal1.4.a \
+@@ -112,29 +107,51 @@
+ strip ds9Base
+ cp ds9Base ds9
+ cp ds9 ../../bin/.
+- cp ds9.zip ../../bin/.
+- cd ../../bin; codesign -s "SAOImage DS9" ds9
+
+ dds9zip: ds9Base ds9.zip
+ $(RM) $@
+ cp ds9Base ds9
+ cp ds9 ../../bin/.
+ cp ds9.zip ../../bin/.
+- cd ../../bin; codesign -s "SAOImage DS9" ds9
+
+ ds9Base : $(OBJS) $(LLIBS)
+ $(RM) $@
+ $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ \
+ $(OBJS) \
+- $(LLIBS) \
+- $(LIBS) \
++ ../../lib/$(TKSAODIR)/libtksao1.0.a \
++ -lfuntools \
++ @prefix@/lib/libast.a \
++ @prefix@/lib/libast_err.a \
++ @prefix@/lib/libast_pal.a \
++ ../../lib/$(TKSAODIR)/libtksao1.0.a \
++ ../../lib/$(TKHTMLDIR)/libtkhtml1.0.a \
++ ../../lib/$(TKMPEGDIR)/libtkmpeg1.0.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)/libtkimgwindow1.4.a \
++ ../../lib/$(TKIMGVER)/libzlibtcl1.2.5.a \
++ ../../lib/$(TKIMGVER)/libtkimg1.4.a \
++ ../../lib/libtiff.a \
++ ../../lib/$(TCLZVFSDIR)/libtclzvfs1.0.a \
++ -lxpa \
++ ../../lib/$(TCLIISDIR)/libtcliis1.0.a \
++ ../../lib/$(TCLCHECKDNSDIR)/libtclcheckdns1.1.a \
++ ../../lib/$(TCLSIGNALDIR)/libtclsignal1.4.a \
++ ../../lib/$(TKBLTDIR)/libtkblt3.0.a \
++ $(LIBS) -ljbig \
+ $(TK_STUB_LIB_SPEC) $(TK_LIB_SPEC) \
+ $(TCL_STUB_LIB_SPEC) $(TCL_LIB_SPEC) \
+ $(TK_LIBS)
+
+ ds9.zip : $(FILES)
+ cd zipdir; find . -depth -name "CVS" -exec rm -r {} \;
+- cd zipdir; zip -r ../ds9.zip *
+
+ zipdir :
+ mkdir zipdir
</ins></span></pre></div>
<a id="trunkdportsscienceds9filespatchds9_unix_ds9Cdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/science/ds9/files/patch-ds9_unix_ds9.C.diff (0 => 144377)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/ds9/files/patch-ds9_unix_ds9.C.diff (rev 0)
+++ trunk/dports/science/ds9/files/patch-ds9_unix_ds9.C.diff 2016-01-07 06:47:30 UTC (rev 144377)
</span><span class="lines">@@ -0,0 +1,55 @@
</span><ins>+--- ds9/unix/ds9.C.orig 2016-01-07 00:07:58.000000000 -0500
++++ ds9/unix/ds9.C 2016-01-07 01:27:45.000000000 -0500
+@@ -70,11 +70,11 @@
+
+ // so that tcl and tk know where to find their libs
+ // we do it here before InitLibraryPath is called
+- putenv((char*)"TCL_LIBRARY=./zvfsmntpt/tcl8.6");
+- putenv((char*)"TK_LIBRARY=./zvfsmntpt/tk8.6");
++ putenv((char*)"TCL_LIBRARY=@prefix@/share/ds9/tcl8.6");
++ putenv((char*)"TK_LIBRARY==@prefix@/share/ds9/tk8.6");
+
+ // startup script
+- Tcl_Obj *path = Tcl_NewStringObj("./zvfsmntpt/library/ds9.tcl",-1);
++ Tcl_Obj *path = Tcl_NewStringObj("@prefix@/share/ds9/library/ds9.tcl",-1);
+ Tcl_SetStartupScript(path, NULL);
+
+ return TCL_OK;
+@@ -85,37 +85,6 @@
+ // save interp for cputs function
+ global_interp = interp;
+
+- // We have to initialize the virtual filesystem before calling
+- // Tcl_Init(). Otherwise, Tcl_Init() will not be able to find
+- // its startup script files.
+- if (Zvfs_Init(interp) == TCL_ERROR)
+- return TCL_ERROR;
+- Tcl_StaticPackage (interp, "zvfs", Zvfs_Init, (Tcl_PackageInitProc*)NULL);
+-
+- // find current working directory, and set as mount point
+- {
+- Tcl_DString pwd;
+- Tcl_DStringInit(&pwd);
+- Tcl_GetCwd(interp, &pwd);
+-
+-#ifdef ZIPFILE
+- ostringstream str;
+- str << (char *)Tcl_GetNameOfExecutable()
+- << ".zip"
+- << ends;
+- if( Zvfs_Mount(interp, (char*)str.str().c_str(), Tcl_DStringValue(&pwd)) != TCL_OK ){
+- char str[] = "ERROR: Unable to open the auxiliary ds9 file 'ds9.zip'. If you moved the ds9 program from its original location, please also move the zip file to the same place.";
+-
+- cerr << str << endl;
+- exit(1);
+- }
+-#else
+- Zvfs_Mount(interp, (char *)Tcl_GetNameOfExecutable(),
+- Tcl_DStringValue(&pwd));
+-#endif
+- Tcl_DStringFree(&pwd);
+- }
+-
+ // Tcl
+ if (Tcl_Init(interp) == TCL_ERROR)
+ return TCL_ERROR;
</ins></span></pre></div>
<a id="trunkdportsscienceds9filespatchsrc_ds9tcldiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/science/ds9/files/patch-src_ds9.tcl.diff (144376 => 144377)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/ds9/files/patch-src_ds9.tcl.diff 2016-01-07 06:47:29 UTC (rev 144376)
+++ trunk/dports/science/ds9/files/patch-src_ds9.tcl.diff 2016-01-07 06:47:30 UTC (rev 144377)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>---- src/ds9.tcl.orig 2014-11-28 11:28:10.000000000 -0800
-+++ src/ds9.tcl 2014-11-28 11:28:46.000000000 -0800
-@@ -200,7 +200,7 @@
- x11 {
- # set to absolute path so that if -cd command is used,
- # so we can still find our files
-- set ds9(root) [file normalize [file join [pwd] zvfsmntpt]]
-+ set ds9(root) "@prefix@/share/ds9"
-
- if {![namespace exists msgcat]} {
- source $ds9(root)/tcl8/8.5/msgcat-1.5.2.tm
</del></span></pre>
</div>
</div>
</body>
</html>