<pre style='margin:0'>
Leo Singer (lpsinger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b6e9ef6699007c6712a991826870e7b2e158a765">https://github.com/macports/macports-ports/commit/b6e9ef6699007c6712a991826870e7b2e158a765</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new b6e9ef6 ds9: update to 7.5
</span>b6e9ef6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b6e9ef6699007c6712a991826870e7b2e158a765
</span>Author: Leo Singer <leo.singer@ligo.org>
AuthorDate: Thu Dec 22 13:40:50 2016 -0500
<span style='display:block; white-space:pre;color:#404040;'> ds9: update to 7.5
</span>---
science/ds9/Portfile | 12 +--
.../ds9/files/patch-ds9_macosx_Makefile.in.diff | 110 ++++++++++----------
science/ds9/files/patch-ds9_unix_Makefile.in.diff | 114 ++++++++++-----------
science/ds9/files/patch-make.include.diff | 11 ++
4 files changed, 127 insertions(+), 120 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/ds9/Portfile b/science/ds9/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 41f39e4..ec96ff1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/ds9/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/ds9/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,8 +4,7 @@
</span> PortSystem 1.0
name ds9
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 7.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 7.5
</span> categories science graphics
platforms darwin
maintainers aronnax
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,8 +20,8 @@ long_description \
</span> homepage http://ds9.si.edu/
master_sites ${homepage}/download/source
distname ${name}.${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums sha256 e91a3aa1d8e4f5b85df0a09400b29043e2412a14c76e6712fde5942dc554433f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 b7bb69b603c25fefb2b2b8de082a8d45553c47c0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums sha256 8ae0876472aea2d1d616595f7efcedc4ad8f5edd249721b1e4929fe317ddee3e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 7edce96b00389b49dedf7e57639306dd30088682
</span>
depends_lib port:fontconfig \
port:freetype \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,7 +43,8 @@ worksrcdir saods9
</span> patchfiles patch-ds9_macosx_Makefile.in.diff \
patch-ds9_unix_Makefile.in.diff \
patch-ds9_unix_ds9.C.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-ds9_library_ds9.tcl.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-ds9_library_ds9.tcl.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-make.include.diff
</span>
post-patch {
# FIXME: Prefix has to be embedded in source and Makefiles in some places.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,7 +60,7 @@ variant x11 conflicts aqua description {Enable X11 GUI} {
</span>
destroot {
xinstall ${worksrcpath}/bin/ds9 ${destroot}${prefix}/bin
<span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${worksrcpath}/ds9/unix/zipdir/zvfsmntpt ${destroot}${prefix}/share/ds9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${worksrcpath}/ds9/unix/zvfsmntpt ${destroot}${prefix}/share/ds9
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/ds9/files/patch-ds9_macosx_Makefile.in.diff b/science/ds9/files/patch-ds9_macosx_Makefile.in.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 81457a4..4d5dce3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/ds9/files/patch-ds9_macosx_Makefile.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/ds9/files/patch-ds9_macosx_Makefile.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,75 +1,75 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ds9/macosx/Makefile.in.orig 2016-01-07 00:20:21.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ds9/macosx/Makefile.in 2016-01-07 01:21:40.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -36,10 +36,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ds9/macosx/Makefile.in.orig 2016-12-22 13:01:26.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ds9/macosx/Makefile.in 2016-12-22 13:02:01.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -38,10 +38,6 @@
</span>
LLIBS = \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ../../lib/$(TKSAODIR)/libtksao1.0.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ../../lib/$(TKSAODIR)/libfuntools.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ../../lib/$(TKSAODIR)/libast.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ../../lib/$(TKSAODIR)/libast_err.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ../../lib/$(TKSAODIR)/libast_pal.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ../../lib/$(TKHTMLDIR)/libtkhtml1.0.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ../../lib/$(TKMPEGDIR)/libtkmpeg1.0.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ../../lib/$(TCLXMLVER)/libTclxml3.2.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -55,7 +51,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ../../lib/$(TKIMGVER)/libzlibtcl1.2.5.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ../../lib/$(TKIMGVER)/libtkimg1.4.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ../../lib/libtiff.a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ../../lib/tksao$(TKSAOVER)/libtksao$(TKSAOVER).a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ../../lib/libfuntools.a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ../../lib/libast.a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ../../lib/libast_err.a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ../../lib/libast_pal.a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ../../lib/tksao$(TKSAOVER)/libtksao$(TKSAOVER).a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ../../lib/tkhtml1$(TKHTMLVER)/libtkhtml1$(TKHTMLVER).a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ../../lib/tkmpeg$(TKMPEGVER)/libtkmpeg$(TKMPEGVER).a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -57,7 +53,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ../../lib/Img$(TKIMGVER)/libtkimgwindow1.4.2.a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ../../lib/Img$(TKIMGVER)/libzlibtcl1.2.8.a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ../../lib/Img$(TKIMGVER)/libtkimg1.4.2.a \
</span> - ../../lib/libxpa.a \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ../../lib/$(TCLIISDIR)/libtcliis1.0.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ../../lib/$(TCLCHECKDNSDIR)/libtclcheckdns1.1.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ../../lib/$(TCLSIGNALDIR)/libtclsignal1.4.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -72,7 +67,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ../../lib/tcliis$(TCLIISVER)/libtcliis$(TCLIISVER).a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ../../lib/tclcheckdns$(TCLCHECKDNSVER)/libtclcheckdns$(TCLCHECKDNSVER).a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ../../lib/tclsignal$(TCLSIGNALVER)/libtclsignal$(TCLSIGNALVER).a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -79,7 +74,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .PHONY : ds9 debug appdir framework tcl tcl_debug tk tk_debug tcllib tkcon
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .PHONY : tkblt xpa compiler cleanup
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #--------------------------main
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ds9 : ds9base appdir framework tcl tk tcllib tkcon xmlrpc tkblt xpa compiler
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ds9 : ds9base appdir framework tcl tk tcllib tkcon xmlrpc tkblt compiler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ds9 : ds9base appdir framework tcl tk tcllib tkcon tkblt xpa compiler cleanup
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ds9 : ds9base appdir framework tcl tk tcllib tkcon tkblt compiler cleanup
</span> cp -p ds9base $(APPDIR)/Contents/MacOS/ds9
strip $(APPDIR)/Contents/MacOS/ds9
install_name_tool -change \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -83,7 +78,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -90,7 +85,6 @@
</span> /Library/Frameworks/Tk.framework/Versions/8.6/Tk \
@executable_path/../Frameworks/Tk.framework/Tk \
$(APPDIR)/Contents/MacOS/ds9
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- cd ../../bin; codesign --deep -f -s "SAOImage DS9" SAOImage\ DS9.app
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cd ../../bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cd ../../bin; codesign --deep -f -s "$(ID)" SAOImage\ DS9.app
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- debug : ds9base appdir framework tcl tk tcllib tkcon xmlrpc tkblt xpa compiler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ debug : ds9base appdir framework tcl tk tcllib tkcon tkblt xpa compiler cleanup
</span> cp -p ds9base $(APPDIR)/Contents/MacOS/ds9
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -107,8 +102,33 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ds9base : $(OBJS) $(LLIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -115,8 +109,34 @@
</span> $(RM) $@
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $(CXX) -o $@ $(OBJS) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CC) $(CFLAGS) -o $@ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(OBJS) \
</span> - $(LLIBS) \
- $(LIBS) \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/$(TKSAODIR)/libtksao1.0.a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ../../lib/tksao$(TKSAOVER)/libtksao$(TKSAOVER).a \
</span> + -lfuntools \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @prefix@/lib/libast.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @prefix@/lib/libast_err.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @prefix@/lib/libast_pal.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/$(TKHTMLDIR)/libtkhtml1.0.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/$(TKMPEGDIR)/libtkmpeg1.0.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/$(TCLXMLVER)/libTclxml3.2.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/$(TKTABLEVER)/libTktable2.10.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/$(TKIMGVER)/libtkimgpng1.4.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/$(TKIMGVER)/libpngtcl1.4.3.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/$(TKIMGVER)/libtkimgtiff1.4.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/$(TKIMGVER)/libtifftcl3.9.4.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/$(TKIMGVER)/libtkimgjpeg1.4.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/$(TKIMGVER)/libjpegtcl8.2.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/$(TKIMGVER)/libtkimggif1.4.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/$(TKIMGVER)/libtkimgwindow1.4.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/$(TKIMGVER)/libzlibtcl1.2.5.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/$(TKIMGVER)/libtkimg1.4.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/libtiff.a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /opt/local/lib/libast.a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /opt/local/lib/libast_err.a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /opt/local/lib/libast_pal.a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ../../lib/tksao$(TKSAOVER)/libtksao$(TKSAOVER).a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ../../lib/tkhtml1$(TKHTMLVER)/libtkhtml1$(TKHTMLVER).a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ../../lib/tkmpeg$(TKMPEGVER)/libtkmpeg$(TKMPEGVER).a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ../../lib/Tclxml$(TCLXMLVER)/libTclxml$(TCLXMLVER).a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ../../lib/Tktable$(TKTABLEVER)/libTktable$(TKTABLEVER).a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ../../lib/Img$(TKIMGVER)/libtkimgpng1.4.2.a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ../../lib/Img$(TKIMGVER)/libpngtcl1.4.12.a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ../../lib/Img$(TKIMGVER)/libtkimgtiff1.4.2.a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ../../lib/Img$(TKIMGVER)/libtifftcl3.9.4.a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ../../lib/Img$(TKIMGVER)/libtkimgjpeg1.4.2.a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ../../lib/Img$(TKIMGVER)/libjpegtcl8.4.a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ../../lib/Img$(TKIMGVER)/libtkimggif1.4.2.a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ../../lib/Img$(TKIMGVER)/libtkimgwindow1.4.2.a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ../../lib/Img$(TKIMGVER)/libzlibtcl1.2.8.a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ../../lib/Img$(TKIMGVER)/libtkimg1.4.2.a \
</span> + -lxpa \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/$(TCLIISDIR)/libtcliis1.0.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/$(TCLCHECKDNSDIR)/libtclcheckdns1.1.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/$(TCLSIGNALDIR)/libtclsignal1.4.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/$(TKBLTDIR)/libtkblt3.0.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/$(TKMACOSXDIR)/libtkmacosx1.0.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(LIBS) -ljbig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ../../lib/tcliis$(TCLIISVER)/libtcliis$(TCLIISVER).a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ../../lib/tclcheckdns$(TCLCHECKDNSVER)/libtclcheckdns$(TCLCHECKDNSVER).a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ../../lib/tclsignal$(TCLSIGNALVER)/libtclsignal$(TCLSIGNALVER).a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ../../lib/tkblt$(TKBLTVER)/libtkbltstub$(TKBLTVER).a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ../../lib/tkblt$(TKBLTVER)/libtkblt$(TKBLTVER).a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ../../lib/tkmacosx$(TKMACOSXVER)/libtkmacosx$(TKMACOSXVER).a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(LIBS)$ -ljbig \
</span> $(TK_STUB_LIB_SPEC) $(TK_LIB_SPEC) \
$(TCL_STUB_LIB_SPEC) $(TCL_LIB_SPEC) \
$(TK_LIBS)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/ds9/files/patch-ds9_unix_Makefile.in.diff b/science/ds9/files/patch-ds9_unix_Makefile.in.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 122c01b..146d29b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/ds9/files/patch-ds9_unix_Makefile.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/ds9/files/patch-ds9_unix_Makefile.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,79 +1,75 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ds9/unix/Makefile.in.orig 2016-01-07 00:02:12.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ds9/unix/Makefile.in 2016-01-07 01:08:35.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -52,10 +52,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ds9/unix/Makefile.in.orig 2016-12-20 13:00:21.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ds9/unix/Makefile.in 2016-12-20 13:03:39.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -54,10 +54,6 @@
</span>
LLIBS = \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ../../lib/$(TKSAODIR)/libtksao1.0.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ../../lib/$(TKSAODIR)/libfuntools.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ../../lib/$(TKSAODIR)/libast.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ../../lib/$(TKSAODIR)/libast_err.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ../../lib/$(TKSAODIR)/libast_pal.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ../../lib/$(TKSAODIR)/libtksao1.0.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ../../lib/$(TKHTMLDIR)/libtkhtml1.0.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ../../lib/$(TKMPEGDIR)/libtkmpeg1.0.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -73,7 +69,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ../../lib/$(TKIMGVER)/libtkimg1.4.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ../../lib/libtiff.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ../../lib/$(TCLZVFSDIR)/libtclzvfs1.0.a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ../../lib/tksao$(TKSAOVER)/libtksao$(TKSAOVER).a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ../../lib/libfuntools.a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ../../lib/libast.a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ../../lib/libast_err.a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ../../lib/libast_pal.a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ../../lib/tksao$(TKSAOVER)/libtksao$(TKSAOVER).a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ../../lib/tkhtml1$(TKHTMLVER)/libtkhtml1$(TKHTMLVER).a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ../../lib/tkmpeg$(TKMPEGVER)/libtkmpeg$(TKMPEGVER).a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -74,7 +70,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ../../lib/Img$(TKIMGVER)/libzlibtcl1.2.8.a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ../../lib/Img$(TKIMGVER)/libtkimg1.4.2.a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ../../lib/tclzvfs$(TCLZVFSVER)/libtclzvfs$(TCLZVFSVER).a \
</span> - ../../lib/libxpa.a \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ../../lib/$(TCLIISDIR)/libtcliis1.0.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ../../lib/$(TCLCHECKDNSDIR)/libtclcheckdns1.1.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ../../lib/$(TCLSIGNALDIR)/libtclsignal1.4.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -112,29 +107,51 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- strip ds9Base
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cp ds9Base ds9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ../../lib/tcliis$(TCLIISVER)/libtcliis$(TCLIISVER).a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ../../lib/tclcheckdns$(TCLCHECKDNSVER)/libtclcheckdns$(TCLCHECKDNSVER).a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ../../lib/tclsignal$(TCLSIGNALVER)/libtclsignal$(TCLSIGNALVER).a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -110,8 +105,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strip ds9base
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cp ds9base ds9
</span> cp ds9 ../../bin/.
- cp ds9.zip ../../bin/.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- cd ../../bin; codesign -s "SAOImage DS9" ds9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cd ../../bin; codesign -s "$(ID)" ds9
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- dds9zip: ds9Base ds9.zip
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ debug: ds9base ds9.zip
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(RM) ds9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -126,8 +119,34 @@
</span> $(RM) $@
<span style='display:block; white-space:pre;background:#ffe0e0;'>- cp ds9Base ds9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cp ds9 ../../bin/.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cp ds9.zip ../../bin/.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cd ../../bin; codesign -s "SAOImage DS9" ds9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ds9Base : $(OBJS) $(LLIBS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(RM) $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CC) $(CFLAGS) -o $@ \
</span> $(OBJS) \
- $(LLIBS) \
- $(LIBS) \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/$(TKSAODIR)/libtksao1.0.a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ../../lib/tksao$(TKSAOVER)/libtksao$(TKSAOVER).a \
</span> + -lfuntools \
+ @prefix@/lib/libast.a \
+ @prefix@/lib/libast_err.a \
+ @prefix@/lib/libast_pal.a \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/$(TKSAODIR)/libtksao1.0.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/$(TKHTMLDIR)/libtkhtml1.0.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/$(TKMPEGDIR)/libtkmpeg1.0.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/$(TCLXMLVER)/libTclxml3.2.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/$(TKTABLEVER)/libTktable2.10.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/$(TKIMGVER)/libtkimgpng1.4.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/$(TKIMGVER)/libpngtcl1.4.3.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/$(TKIMGVER)/libtkimgtiff1.4.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/$(TKIMGVER)/libtifftcl3.9.4.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/$(TKIMGVER)/libtkimgjpeg1.4.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/$(TKIMGVER)/libjpegtcl8.2.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/$(TKIMGVER)/libtkimggif1.4.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/$(TKIMGVER)/libtkimgwindow1.4.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/$(TKIMGVER)/libzlibtcl1.2.5.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/$(TKIMGVER)/libtkimg1.4.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/libtiff.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/$(TCLZVFSDIR)/libtclzvfs1.0.a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ../../lib/tksao$(TKSAOVER)/libtksao$(TKSAOVER).a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ../../lib/tkhtml1$(TKHTMLVER)/libtkhtml1$(TKHTMLVER).a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ../../lib/tkmpeg$(TKMPEGVER)/libtkmpeg$(TKMPEGVER).a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ../../lib/Tclxml$(TCLXMLVER)/libTclxml$(TCLXMLVER).a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ../../lib/Tktable$(TKTABLEVER)/libTktable$(TKTABLEVER).a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ../../lib/Img$(TKIMGVER)/libtkimgpng1.4.2.a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ../../lib/Img$(TKIMGVER)/libpngtcl1.4.12.a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ../../lib/Img$(TKIMGVER)/libtkimgtiff1.4.2.a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ../../lib/Img$(TKIMGVER)/libtifftcl3.9.4.a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ../../lib/Img$(TKIMGVER)/libtkimgjpeg1.4.2.a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ../../lib/Img$(TKIMGVER)/libjpegtcl8.4.a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ../../lib/Img$(TKIMGVER)/libtkimggif1.4.2.a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ../../lib/Img$(TKIMGVER)/libtkimgwindow1.4.2.a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ../../lib/Img$(TKIMGVER)/libzlibtcl1.2.8.a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ../../lib/Img$(TKIMGVER)/libtkimg1.4.2.a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ../../lib/tclzvfs$(TCLZVFSVER)/libtclzvfs$(TCLZVFSVER).a \
</span> + -lxpa \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/$(TCLIISDIR)/libtcliis1.0.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/$(TCLCHECKDNSDIR)/libtclcheckdns1.1.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/$(TCLSIGNALDIR)/libtclsignal1.4.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/$(TKBLTDIR)/libtkblt3.0.a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ../../lib/tcliis$(TCLIISVER)/libtcliis$(TCLIISVER).a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ../../lib/tclcheckdns$(TCLCHECKDNSVER)/libtclcheckdns$(TCLCHECKDNSVER).a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ../../lib/tclsignal$(TCLSIGNALVER)/libtclsignal$(TCLSIGNALVER).a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ../../lib/tkblt$(TKBLTVER)/libtkbltstub$(TKBLTVER).a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ../../lib/tkblt$(TKBLTVER)/libtkblt$(TKBLTVER).a \
</span> + $(LIBS) -ljbig \
$(TK_STUB_LIB_SPEC) $(TK_LIB_SPEC) \
$(TCL_STUB_LIB_SPEC) $(TCL_LIB_SPEC) \
$(TK_LIBS)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -135,7 +154,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ds9.zip : $(ZDIR) $(FILES)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(RM) $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find $(ZDIR) -depth -name "CVS" -exec rm -r {} \;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- zip -r ds9.zip $(ZDIR)
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ds9.zip : $(FILES)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cd zipdir; find . -depth -name "CVS" -exec rm -r {} \;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cd zipdir; zip -r ../ds9.zip *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- zipdir :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mkdir zipdir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tkAppInit.o : tkAppInit.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(COMPILE) -DTK_LOCAL_APPINIT=SAOAppInit \
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/ds9/files/patch-make.include.diff b/science/ds9/files/patch-make.include.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..dc73259
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/ds9/files/patch-make.include.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- make.include.orig 2016-12-22 12:18:41.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ make.include 2016-12-22 12:19:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -260,7 +260,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(WITHTK) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --prefix $(ROOT) --exec-prefix $(ROOT) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-shared --enable-symbols \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(CACHE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CPPFLAGS=$(shell pkg-config --cflags funtools)/funtools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #-------------------------- ast
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>