<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/a35931277c66595cdc1ece0e5b7d62af3874dfb3">https://github.com/macports/macports-ports/commit/a35931277c66595cdc1ece0e5b7d62af3874dfb3</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 a359312 ds9: update to 7.6b8
</span>a359312 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a35931277c66595cdc1ece0e5b7d62af3874dfb3
</span>Author: Leo Singer <leo.singer@ligo.org>
AuthorDate: Wed Dec 27 18:52:36 2017 -0500
<span style='display:block; white-space:pre;color:#404040;'> ds9: update to 7.6b8
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes #55219.
</span>---
science/ds9/Portfile | 44 ++++---------
.../ds9/files/patch-ds9_macosx_Makefile.in.diff | 75 ----------------------
science/ds9/files/patch-ds9_unix_Makefile.in.diff | 75 ----------------------
science/ds9/files/patch-make.include.diff | 11 ----
4 files changed, 12 insertions(+), 193 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 b13381c..6a2223b 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;'>@@ -3,8 +3,7 @@
</span> PortSystem 1.0
name ds9
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 7.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 7.6b8
</span> categories science graphics
platforms darwin
maintainers {aronnax @lpsinger}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,50 +20,33 @@ long_description \
</span> # dependency on cmake results in an indirect dependency on OpenSSL.
# However, there is no real conflict in the case of LALSuite because OpenSSL
# is only used to run cmake.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-license_noconflict openssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license_noconflict openssl
</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 8ae0876472aea2d1d616595f7efcedc4ad8f5edd249721b1e4929fe317ddee3e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 7edce96b00389b49dedf7e57639306dd30088682
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums sha256 63818177d1acc28d3a4ee196cf4485e769235cd8b07b256974a0c643d481c189 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 f6e5199db5ba5b0c1a49a9a547d6261953297a88
</span>
depends_lib port:fontconfig \
port:freetype \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:funtools \
</span> port:libxml2 \
port:libiconv \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:jbigkit \
</span> port:zlib \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libzip \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xpa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# FIXME: these libraries are statically linked
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append port:ast
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libzip
</span>
universal_variant no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir saods9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-ds9_macosx_Makefile.in.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-ds9_unix_Makefile.in.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-ds9_unix_ds9.C.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-ds9_library_ds9.tcl.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-make.include.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+worksrcdir SAOImageDS9
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# FIXME: The Tcl parallel build is broken. See
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://core.tcl.tk/tcl/tktview/7d0db7c388f52de81faf12da332bc97a24f7b9e5.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Remove this when the fixed version of Tcl is included with ds9.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_parallel_build no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-ds9_unix_ds9.C.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-ds9_library_ds9.tcl.diff
</span>
post-patch {
# FIXME: Prefix has to be embedded in source and Makefiles in some places.
reinplace "s|@prefix@|${prefix}|g" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/ds9/macosx/Makefile.in \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/ds9/unix/Makefile.in \
</span> ${worksrcpath}/ds9/unix/ds9.C \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/ds9/library/ds9.tcl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/make.include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/ds9/library/ds9.tcl
</span> }
variant x11 conflicts aqua description {Enable X11 GUI} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -84,10 +66,10 @@ variant aqua conflicts x11 description {Enable Mac OS X GUI} {
</span> port:xrender \
port:xorg-libXScrnSaver
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cmd macosx/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cmd macos/configure
</span>
destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${worksrcpath}/bin/SAOImage\ DS9.app ${destroot}${applications_dir}/SAOImage\ DS9.app
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${worksrcpath}/bin/SAOImageDS9.app ${destroot}${applications_dir}/SAOImage\ DS9.app
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -97,15 +79,13 @@ if {![variant_isset x11] && ![variant_isset aqua]} {
</span>
configure.cmd unix/configure
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_parallel_build no
</span> build.args-append JOBS=${build.jobs} \
CC=${configure.cc} \
CXX=${configure.cxx} \
X11INCLUDE=${prefix}/include \
X11LIB=${prefix}/lib \
XFT_LIBS="-lXft -lfontconfig" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -o xpa -o funtools -o ast -o zvfs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -o zvfs
</span>
livecheck.url ${homepage}/site/Download.html
livecheck.regex {DS9 Version (\d+(\.\d+)+)}
<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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 4d5dce3..0000000
</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;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,75 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ds9/macosx/Makefile.in.orig 2016-12-22 13:01:26.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ds9/macosx/Makefile.in 2016-12-22 13:02:01.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -38,10 +38,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LLIBS = \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ../../lib/tksao$(TKSAOVER)/libtksao$(TKSAOVER).a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ../../lib/libfuntools.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ../../lib/libast.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ../../lib/libast_err.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ../../lib/libast_pal.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ../../lib/tksao$(TKSAOVER)/libtksao$(TKSAOVER).a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ../../lib/tkhtml1$(TKHTMLVER)/libtkhtml1$(TKHTMLVER).a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ../../lib/tkmpeg$(TKMPEGVER)/libtkmpeg$(TKMPEGVER).a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -57,7 +53,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ../../lib/Img$(TKIMGVER)/libtkimgwindow1.4.2.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ../../lib/Img$(TKIMGVER)/libzlibtcl1.2.8.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ../../lib/Img$(TKIMGVER)/libtkimg1.4.2.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ../../lib/libxpa.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ../../lib/tcliis$(TCLIISVER)/libtcliis$(TCLIISVER).a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ../../lib/tclcheckdns$(TCLCHECKDNSVER)/libtclcheckdns$(TCLCHECKDNSVER).a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ../../lib/tclsignal$(TCLSIGNALVER)/libtclsignal$(TCLSIGNALVER).a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -79,7 +74,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .PHONY : ds9 debug appdir framework tcl tcl_debug tk tk_debug tcllib tkcon
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .PHONY : tkblt xpa compiler cleanup
</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 tkblt xpa compiler cleanup
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ds9 : ds9base appdir framework tcl tk tcllib tkcon tkblt compiler cleanup
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cp -p ds9base $(APPDIR)/Contents/MacOS/ds9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- strip $(APPDIR)/Contents/MacOS/ds9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install_name_tool -change \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -90,7 +85,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /Library/Frameworks/Tk.framework/Versions/8.6/Tk \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @executable_path/../Frameworks/Tk.framework/Tk \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(APPDIR)/Contents/MacOS/ds9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cd ../../bin; codesign --deep -f -s "$(ID)" SAOImage\ DS9.app
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- debug : ds9base appdir framework tcl tk tcllib tkcon tkblt xpa compiler cleanup
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cp -p ds9base $(APPDIR)/Contents/MacOS/ds9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -115,8 +109,34 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(RM) $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(CC) $(CFLAGS) -o $@ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(OBJS) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(LLIBS) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(LIBS) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/tksao$(TKSAOVER)/libtksao$(TKSAOVER).a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -lfuntools \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /opt/local/lib/libast.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /opt/local/lib/libast_err.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /opt/local/lib/libast_pal.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/tksao$(TKSAOVER)/libtksao$(TKSAOVER).a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/tkhtml1$(TKHTMLVER)/libtkhtml1$(TKHTMLVER).a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/tkmpeg$(TKMPEGVER)/libtkmpeg$(TKMPEGVER).a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/Tclxml$(TCLXMLVER)/libTclxml$(TCLXMLVER).a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/Tktable$(TKTABLEVER)/libTktable$(TKTABLEVER).a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/Img$(TKIMGVER)/libtkimgpng1.4.2.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/Img$(TKIMGVER)/libpngtcl1.4.12.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/Img$(TKIMGVER)/libtkimgtiff1.4.2.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/Img$(TKIMGVER)/libtifftcl3.9.4.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/Img$(TKIMGVER)/libtkimgjpeg1.4.2.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/Img$(TKIMGVER)/libjpegtcl8.4.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/Img$(TKIMGVER)/libtkimggif1.4.2.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/Img$(TKIMGVER)/libtkimgwindow1.4.2.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/Img$(TKIMGVER)/libzlibtcl1.2.8.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/Img$(TKIMGVER)/libtkimg1.4.2.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -lxpa \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/tcliis$(TCLIISVER)/libtcliis$(TCLIISVER).a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/tclcheckdns$(TCLCHECKDNSVER)/libtclcheckdns$(TCLCHECKDNSVER).a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/tclsignal$(TCLSIGNALVER)/libtclsignal$(TCLSIGNALVER).a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/tkblt$(TKBLTVER)/libtkbltstub$(TKBLTVER).a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/tkblt$(TKBLTVER)/libtkblt$(TKBLTVER).a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/tkmacosx$(TKMACOSXVER)/libtkmacosx$(TKMACOSXVER).a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(LIBS)$ -ljbig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(TK_STUB_LIB_SPEC) $(TK_LIB_SPEC) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(TCL_STUB_LIB_SPEC) $(TCL_LIB_SPEC) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(TK_LIBS)
</span><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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 146d29b..0000000
</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;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,75 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ds9/unix/Makefile.in.orig 2016-12-20 13:00:21.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ds9/unix/Makefile.in 2016-12-20 13:03:39.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -54,10 +54,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LLIBS = \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ../../lib/tksao$(TKSAOVER)/libtksao$(TKSAOVER).a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ../../lib/libfuntools.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ../../lib/libast.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ../../lib/libast_err.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ../../lib/libast_pal.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ../../lib/tksao$(TKSAOVER)/libtksao$(TKSAOVER).a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ../../lib/tkhtml1$(TKHTMLVER)/libtkhtml1$(TKHTMLVER).a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ../../lib/tkmpeg$(TKMPEGVER)/libtkmpeg$(TKMPEGVER).a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -74,7 +70,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ../../lib/Img$(TKIMGVER)/libzlibtcl1.2.8.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ../../lib/Img$(TKIMGVER)/libtkimg1.4.2.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ../../lib/tclzvfs$(TCLZVFSVER)/libtclzvfs$(TCLZVFSVER).a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ../../lib/libxpa.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ../../lib/tcliis$(TCLIISVER)/libtcliis$(TCLIISVER).a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ../../lib/tclcheckdns$(TCLCHECKDNSVER)/libtclcheckdns$(TCLCHECKDNSVER).a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ../../lib/tclsignal$(TCLSIGNALVER)/libtclsignal$(TCLSIGNALVER).a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -110,8 +105,6 @@
</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:#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 "$(ID)" ds9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- debug: ds9base ds9.zip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(RM) ds9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -126,8 +119,34 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(RM) $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(CC) $(CFLAGS) -o $@ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(OBJS) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(LLIBS) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(LIBS) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/tksao$(TKSAOVER)/libtksao$(TKSAOVER).a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -lfuntools \
</span><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/tksao$(TKSAOVER)/libtksao$(TKSAOVER).a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/tkhtml1$(TKHTMLVER)/libtkhtml1$(TKHTMLVER).a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/tkmpeg$(TKMPEGVER)/libtkmpeg$(TKMPEGVER).a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/Tclxml$(TCLXMLVER)/libTclxml$(TCLXMLVER).a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/Tktable$(TKTABLEVER)/libTktable$(TKTABLEVER).a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/Img$(TKIMGVER)/libtkimgpng1.4.2.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/Img$(TKIMGVER)/libpngtcl1.4.12.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/Img$(TKIMGVER)/libtkimgtiff1.4.2.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/Img$(TKIMGVER)/libtifftcl3.9.4.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/Img$(TKIMGVER)/libtkimgjpeg1.4.2.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/Img$(TKIMGVER)/libjpegtcl8.4.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/Img$(TKIMGVER)/libtkimggif1.4.2.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/Img$(TKIMGVER)/libtkimgwindow1.4.2.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/Img$(TKIMGVER)/libzlibtcl1.2.8.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/Img$(TKIMGVER)/libtkimg1.4.2.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/tclzvfs$(TCLZVFSVER)/libtclzvfs$(TCLZVFSVER).a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -lxpa \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/tcliis$(TCLIISVER)/libtcliis$(TCLIISVER).a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/tclcheckdns$(TCLCHECKDNSVER)/libtclcheckdns$(TCLCHECKDNSVER).a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/tclsignal$(TCLSIGNALVER)/libtclsignal$(TCLSIGNALVER).a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/tkblt$(TKBLTVER)/libtkbltstub$(TKBLTVER).a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ../../lib/tkblt$(TKBLTVER)/libtkblt$(TKBLTVER).a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(LIBS) -ljbig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(TK_STUB_LIB_SPEC) $(TK_LIB_SPEC) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(TCL_STUB_LIB_SPEC) $(TCL_LIB_SPEC) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(TK_LIBS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -135,7 +154,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ds9.zip : $(ZDIR) $(FILES)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(RM) $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find $(ZDIR) -depth -name "CVS" -exec rm -r {} \;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- zip -r ds9.zip $(ZDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tkAppInit.o : tkAppInit.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 4edace6..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/ds9/files/patch-make.include.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- make.include.orig 2016-12-22 12:18:41.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ make.include 2016-12-22 12:19:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -260,7 +260,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(WITHTK) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --prefix $(ROOT) --exec-prefix $(ROOT) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-shared --enable-symbols \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(CACHE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CPPFLAGS=-I@prefix@/include/funtools
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #-------------------------- ast
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>