<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/3f19fdc9ba7d4e27228d7de1ed93c22952c296cc">https://github.com/macports/macports-ports/commit/3f19fdc9ba7d4e27228d7de1ed93c22952c296cc</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 3f19fdc ds9: update to 8.1
</span>3f19fdc is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3f19fdc9ba7d4e27228d7de1ed93c22952c296cc
</span>Author: Leo Singer <aronnax@macports.org>
AuthorDate: Mon Nov 18 20:49:03 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> ds9: update to 8.1
</span>---
science/ds9/Portfile | 50 +++----
...MacPorts-share-directory-instead-of-zipfs.patch | 68 ++++++++++
.../0002-Use-CXX-to-build-tksao-C-files.patch | 61 +++++++++
...-1.0-from-MacPorts-instead-of-bundled-ope.patch | 150 +++++++++++++++++++++
science/ds9/files/patch-ds9_library_ds9.tcl.diff | 11 --
.../ds9/files/patch-ds9_macos_configure.ac.diff | 11 --
science/ds9/files/patch-ds9_unix_configure.ac.diff | 11 --
science/ds9/files/patch-ds9_unix_ds9.C.diff | 55 --------
science/ds9/files/patch-tksao_Makefile.in.diff | 29 ----
science/ds9/files/patch-tksao_configure.ac.diff | 19 ---
10 files changed, 297 insertions(+), 168 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 33e2c5e..5b8bb3f 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;'>@@ -1,10 +1,10 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; truncate-lines: t; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup SAOImageDS9 SAOImageDS9 8.1 v
</span> name ds9
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 7.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span> categories science graphics
platforms darwin
maintainers {aronnax @lpsinger}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,11 +24,10 @@ long_description \
</span> license_noconflict openssl
homepage http://ds9.si.edu/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites ${homepage}/download/source
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname ${name}.${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums sha256 07c7396e220d9763d4a9edd18f5ba0edf8030a1bddbf1c65b33b962d37a97677 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 0c80027a4d5c5c42e0a50c996063d5e4509beee6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 84727405
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 ef2121bf3953df204c6c3a98b5a8e6222a969135 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 11d17fe3cb2895c419ac6dbcf53cadc2d9603b3d96c9a5209b1fc2ac2123db7d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 75256849
</span>
depends_build-append port:autoconf
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,21 +43,19 @@ universal_variant no
</span>
worksrcdir SAOImageDS9
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-ds9_macos_configure.ac.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-ds9_unix_configure.ac.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-tksao_configure.ac.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-tksao_Makefile.in.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles 0001-Use-MacPorts-share-directory-instead-of-zipfs.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0002-Use-CXX-to-build-tksao-C-files.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0003-Use-openssl-1.0-from-MacPorts-instead-of-bundled-ope.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patch.pre_args -p1
</span>
post-patch {
# FIXME: Prefix has to be embedded in source and Makefiles in some places.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@prefix@|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/ds9/macos/configure.ac \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/ds9/unix/configure.ac \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@macports_prefix@|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/ds9/macos/Makefile.in \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/ds9/unix/Makefile.in \
</span> ${worksrcpath}/ds9/unix/ds9.C \
${worksrcpath}/ds9/library/ds9.tcl \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/tksao/configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/tls/aclocal.m4
</span> }
variant x11 conflicts aqua description {Enable X11 GUI} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,7 +70,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/zvfsmntpt ${destroot}${prefix}/share/ds9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${worksrcpath}/ds9/unix/mntpt ${destroot}${prefix}/share/ds9
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -90,8 +87,8 @@ if {![variant_isset x11] && ![variant_isset aqua]} {
</span> }
pre-configure {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Regenerate build system for tksao because we patched its configure.ac.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach subdir {tksao ds9/macos ds9/unix} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Regenerate build system for these subdirectories because we patched configure.ac.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach subdir {tksao tls} {
</span> system -W ${worksrcpath}/${subdir} "autoreconf"
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -100,21 +97,10 @@ compiler.cxx_standard 2011
</span> configure.cxxflags-append -std=c++11
configure.cmd unix/configure
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# FIXME: ds9 does not build against openssl 1.1.0.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Remove this once it does.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args-append SSL_INCLUDE_DIR="${prefix}/include/openssl-1.0" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SSL_INCLUDE_DIR_NATIVE="${prefix}/include/openssl-1.0" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SSL_LIB_DIR="${prefix}/lib/openssl-1.0" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SSL_LIB_DIR_NATIVE="${prefix}/lib/openssl-1.0"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> build.args-append JOBS=${build.jobs} \
CC=${configure.cc} \
CXX=${configure.cxx} \
CXXFLAGS="${configure.cxxflags}" \
XINCLUDES=-I${prefix}/include \
XML_INCLUDEDIR=${prefix}/include/libxml2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- XFT_LIBS="-lXft -lfontconfig" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -o zvfs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url ${homepage}/site/Download.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex {DS9 Version (\d+(\.\d+)+)}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XFT_LIBS="-lXft -lfontconfig"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/ds9/files/0001-Use-MacPorts-share-directory-instead-of-zipfs.patch b/science/ds9/files/0001-Use-MacPorts-share-directory-instead-of-zipfs.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..ecc897c
</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/0001-Use-MacPorts-share-directory-instead-of-zipfs.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,68 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From a702174273e2e04eda32f0e8cbb0a467ea28ca8f Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Leo Singer <leo.singer@ligo.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 18 Nov 2019 15:07:35 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1/3] Use MacPorts share directory instead of zipfs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ds9/library/ds9.tcl | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ds9/unix/ds9.C | 22 +++-------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 4 insertions(+), 20 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/ds9/library/ds9.tcl b/ds9/library/ds9.tcl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 8e543dcd..b381c404 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/ds9/library/ds9.tcl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ds9/library/ds9.tcl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -175,7 +175,7 @@ set ds9(app) [file tail [info nameofexecutable]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # pre package load
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ switch $ds9(wm) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ x11 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set ds9(root) "[::tcl::zipfs::root]mntpt"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set ds9(root) "@macports_prefix@/share/ds9"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set auto_path [list $ds9(root) $ds9(root)/tcl8.6 $ds9(root)/tk8.6 $ds9(root)/tk8.6/ttk]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ aqua {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/ds9/unix/ds9.C b/ds9/unix/ds9.C
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 6642cecc..d3018c50 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/ds9/unix/ds9.C
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ds9/unix/ds9.C
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -60,11 +60,11 @@ int SAOLocalMainHook(int* argcPtr, char*** argvPtr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // so that tcl and tk know where to find their libs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // we do it here before InitLibraryPath is called
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- putenv((char*)"TCL_LIBRARY=zipfs:/mntpt/tcl8.6");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- putenv((char*)"TK_LIBRARY=zipfs:/mntpt/tk8.6");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ putenv((char*)"TCL_LIBRARY=@macports_prefix@/share/ds9/tcl8.6");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ putenv((char*)"TK_LIBRARY=@macports_prefix@/share/ds9/tcl8.6");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // startup script
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Tcl_Obj *path = Tcl_NewStringObj("zipfs:/mntpt/library/ds9.tcl",-1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Tcl_Obj *path = Tcl_NewStringObj("@macports_prefix@/share/ds9/library/ds9.tcl",-1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_SetStartupScript(path, NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_OK;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -84,22 +84,6 @@ int SAOAppInit(Tcl_Interp *interp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_StaticPackage (interp, "zipfs", TclZipfs_Init,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (Tcl_PackageInitProc*)NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // find current working directory, and set as mount point
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef ZIPFILE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ostringstream str;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- str << (char *)Tcl_GetNameOfExecutable()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- << ".zip"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- << ends;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(TclZipfs_Mount(interp, "", (const char*)str.str().c_str(), NULL) != TCL_OK ){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cerr << "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." << endl;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- exit(1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TclZipfs_Mount(interp, "", (const char *)Tcl_GetNameOfExecutable(), NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Tcl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (Tcl_Init(interp) == TCL_ERROR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.24.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/ds9/files/0002-Use-CXX-to-build-tksao-C-files.patch b/science/ds9/files/0002-Use-CXX-to-build-tksao-C-files.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..479d067
</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/0002-Use-CXX-to-build-tksao-C-files.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,61 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From ecbdedc6c05c1d8a6259e55fb36ea501f3b379a5 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Leo Singer <leo.singer@ligo.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 18 Nov 2019 15:10:27 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 2/3] Use CXX to build tksao C++ files
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tksao/Makefile.in | 6 +++++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tksao/configure.ac | 1 +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 6 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mode change 100644 => 100755 tksao/configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/tksao/Makefile.in b/tksao/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 2120066f..55306071 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/tksao/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/tksao/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -96,6 +96,7 @@ INSTALL_LIBRARY = ${INSTALL_DATA}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PACKAGE_NAME = @PACKAGE_NAME@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PACKAGE_VERSION = @PACKAGE_VERSION@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CC = @CC@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CXX = @CXX@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS_DEFAULT = @CFLAGS_DEFAULT@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS_WARNING = @CFLAGS_WARNING@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EXEEXT = @EXEEXT@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -165,8 +166,11 @@ CPPFLAGS = @CPPFLAGS@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBS = @PKG_LIBS@ @LIBS@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AR = @AR@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS = @CFLAGS@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CXXFLAGS = @CXXFLAGS@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CFLAGS_DEFAULT) $(CFLAGS_WARNING) $(SHLIB_CFLAGS) $(CFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++COMPILE_CXX = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(CFLAGS_DEFAULT) $(CFLAGS_WARNING) $(SHLIB_CFLAGS) $(CXXFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GDB = gdb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VALGRIND = valgrind
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -382,7 +386,7 @@ VPATH = $(srcdir):$(srcdir)/generic:$(srcdir)/unix:$(srcdir)/win:$(srcdir)/macos
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(COMPILE) -c `@CYGPATH@ $<` -o $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .C.@OBJEXT@:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(COMPILE) -c `@CYGPATH@ $<` -o $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(COMPILE_CXX) -c `@CYGPATH@ $<` -o $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #========================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Distribution creation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/tksao/configure.ac b/tksao/configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+old mode 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+new mode 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 129faf39..4159f185
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/tksao/configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/tksao/configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -59,6 +59,7 @@ TEA_PREFIX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # necessary to compile executables.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #-----------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AC_PROG_CXX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TEA_SETUP_COMPILER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #-----------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.24.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/ds9/files/0003-Use-openssl-1.0-from-MacPorts-instead-of-bundled-ope.patch b/science/ds9/files/0003-Use-openssl-1.0-from-MacPorts-instead-of-bundled-ope.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..91efeaa
</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/0003-Use-openssl-1.0-from-MacPorts-instead-of-bundled-ope.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,150 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 59f1563882727a48f2967842b06adb82b82d03e0 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Leo Singer <leo.singer@ligo.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 18 Nov 2019 17:39:06 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 3/3] Use openssl-1.0 from MacPorts instead of bundled openssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ds9/macos/Makefile.in | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ds9/unix/Makefile.in | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ make.include | 12 +--------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tls/aclocal.m4 | 63 ++-----------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4 files changed, 5 insertions(+), 74 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/ds9/macos/Makefile.in b/ds9/macos/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d13d1d89..c7043054 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/ds9/macos/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ds9/macos/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -175,7 +175,7 @@ ds9base : $(OBJS) $(LLIBS)
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(LLIBS) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -L $(prefix)/openssl -lssl -lcrypto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -L @macports_prefix@/lib/openssl-1.0 -lssl -lcrypto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(TK_LIB_SPEC) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(TCL_LIB_SPEC) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(TK_LIBS) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/ds9/unix/Makefile.in b/ds9/unix/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b730b4b8..f66ff675 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/ds9/unix/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ds9/unix/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -176,7 +176,7 @@ ds9base : $(OBJS) $(LLIBS)
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(LLIBS) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -L $(prefix)/openssl -lssl -lcrypto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -L @macports_prefix@/lib/openssl-1.0 -lssl -lcrypto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(TK_LIBS) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/make.include b/make.include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 066c256a..f45619c1 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/make.include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/make.include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -101,16 +101,7 @@ ds9/$(OS)/Makefile :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #--------------------------openssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-openssl : openssl/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- @echo ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- @echo "*** $@ ***"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(MAKE) -C openssl -j $(JOBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-openssl/Makefile:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- @echo ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- @echo "*** $@ ***"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cd openssl; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(SSLCONFIG) --prefix=$(prefix)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++openssl :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #-------------------------- tcliis
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -161,7 +152,6 @@ tls/Makefile :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @echo "*** $@ ***"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd tls; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ./configure \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- --with-ssl-dir=$(prefix)/openssl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(TLSFLAGS) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(WITHTCL) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(PREFIX) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/tls/aclocal.m4 b/tls/aclocal.m4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ff62b04b..152b3143 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/tls/aclocal.m4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/tls/aclocal.m4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -29,72 +29,13 @@ builtin(include,tclconfig/tcl.m4)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_DEFUN(TLS_CHECK_SSL, [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #--------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # If the variable OPENSSL is set, we will build with the OpenSSL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # libraries. If it is not set, then we will use RSA BSAFE SSL-C
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # libraries instead of the default OpenSSL libaries.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #--------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_ARG_ENABLE(bsafe, [ --enable-bsafe Use RSA BSAFE SSL-C libs. Default is to use OpenSSL libs], OPENSSL="", OPENSSL="1")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #--------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Establish the location of the root directory for OpenSSL.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # If we're not using OpenSSL, set the root for BSAFE SSL-C.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # If we're using BSAFE, define the BSAFE compiler flag.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # The "FLAT_INC" flag is used in the BSAFE ssl.h header file and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # doesn't seem to be referenced anywhere else.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #--------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if test -n "${OPENSSL}"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SSL_DIR='/usr /usr/local'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_DEFINE(NO_IDEA)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_DEFINE(NO_RC5)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SSL_DIR='/usr/sslc /usr/local/sslc'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_DEFINE(BSAFE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_DEFINE(FLAT_INC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_CHECKING([for SSL directory])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_ARG_WITH(ssl-dir, [ --with-ssl-dir=DIR SSL root directory], with_ssldir=${withval})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_CACHE_VAL(ac_cv_c_ssldir, [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Use the value from --with-ssl-dir, if it was given
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if test x"${with_ssldir}" != x ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if test -d "${with_ssldir}" ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ac_cv_c_ssldir=${with_ssldir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_ERROR([${with_ssldir} is not a valid directory])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- list="`ls -d ${SSL_DIR} 2>/dev/null`"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for i in $list ; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if test -d "$i" ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ac_cv_c_ssldir=$i
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Print a message based on how we determined the include path
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if test x"${ac_cv_c_ssldir}" = x ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_ERROR([Could not find SSL directory.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-Please specify its location with --with-ssl-dir])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SSL_DIR=${ac_cv_c_ssldir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_RESULT([${SSL_DIR}])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #--------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The OpenSSL and BSAFE SSL-C directory structures differ.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #--------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test -n "${OPENSSL}"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SSL_LIB_DIR=${SSL_DIR}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SSL_INCLUDE_DIR=${SSL_DIR}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SSL_LIB_DIR=@macports_prefix@/lib/openssl-1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SSL_INCLUDE_DIR=@macports_prefix@/include/openssl-1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test ! -f "${SSL_INCLUDE_DIR}/openssl/opensslv.h"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_ERROR([bad ssl-dir: cannot find openssl/opensslv.h under ${SSL_INCLUDE_DIR}])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.24.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/ds9/files/patch-ds9_library_ds9.tcl.diff b/science/ds9/files/patch-ds9_library_ds9.tcl.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index fbdd2c4..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/ds9/files/patch-ds9_library_ds9.tcl.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;'>---- ds9/library/ds9.tcl.orig 2016-01-07 00:09:58.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ds9/library/ds9.tcl 2016-01-07 00:09:33.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -198,7 +198,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- x11 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # set to absolute path so that if -cd command is used,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # so we can still find our files
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set ds9(root) [file normalize [file join [pwd] zvfsmntpt]]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set ds9(root) "@prefix@/share/ds9"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![namespace exists msgcat]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- source $ds9(root)/tcl8/8.5/msgcat-1.5.2.tm
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/ds9/files/patch-ds9_macos_configure.ac.diff b/science/ds9/files/patch-ds9_macos_configure.ac.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0e74b39..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/ds9/files/patch-ds9_macos_configure.ac.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;'>---- ds9/macos/configure.ac.orig 2019-11-15 13:34:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ds9/macos/configure.ac 2019-11-15 13:35:47.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -143,7 +143,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #TEA_ADD_STUB_SOURCES([])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #TEA_ADD_TCL_SOURCES([])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--SSLLIBS="/opt/local/lib/libssl.a /opt/local/lib/libcrypto.a"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SSLLIBS="@prefix@/lib/openssl-1.0/libssl.a @prefix@/lib/openssl-1.0/libcrypto.a"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_SUBST(SSLLIBS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_CHECK_LIB([xml2],[xmlInitParser])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/ds9/files/patch-ds9_unix_configure.ac.diff b/science/ds9/files/patch-ds9_unix_configure.ac.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 14e06f2..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/ds9/files/patch-ds9_unix_configure.ac.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;'>---- ds9/unix/configure.ac.orig 2019-11-15 13:34:51.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ds9/unix/configure.ac 2019-11-15 13:36:10.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -148,7 +148,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Darwin*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_DEFINE([ZIPFILE])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SSLLIBS="/opt/local/lib/libssl.a /opt/local/lib/libcrypto.a"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SSLLIBS="@prefix@/lib/openssl-1.0/libssl.a @prefix@/lib/openssl-1.0/libcrypto.a"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_SUBST(SSLLIBS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/ds9/files/patch-ds9_unix_ds9.C.diff b/science/ds9/files/patch-ds9_unix_ds9.C.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7d6fa19..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/ds9/files/patch-ds9_unix_ds9.C.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,55 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ds9/unix/ds9.C.orig 2016-01-07 00:07:58.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ds9/unix/ds9.C 2016-01-07 01:27:45.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -70,11 +70,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // so that tcl and tk know where to find their libs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // we do it here before InitLibraryPath is called
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- putenv((char*)"TCL_LIBRARY=./zvfsmntpt/tcl8.6");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- putenv((char*)"TK_LIBRARY=./zvfsmntpt/tk8.6");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ putenv((char*)"TCL_LIBRARY=@prefix@/share/ds9/tcl8.6");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ putenv((char*)"TK_LIBRARY==@prefix@/share/ds9/tk8.6");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // startup script
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- Tcl_Obj *path = Tcl_NewStringObj("./zvfsmntpt/library/ds9.tcl",-1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Tcl_Obj *path = Tcl_NewStringObj("@prefix@/share/ds9/library/ds9.tcl",-1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Tcl_SetStartupScript(path, NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return TCL_OK;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -85,37 +85,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // save interp for cputs function
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- global_interp = interp;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- // We have to initialize the virtual filesystem before calling
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- // Tcl_Init(). Otherwise, Tcl_Init() will not be able to find
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- // its startup script files.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (Zvfs_Init(interp) == TCL_ERROR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return TCL_ERROR;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- Tcl_StaticPackage (interp, "zvfs", Zvfs_Init, (Tcl_PackageInitProc*)NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- // find current working directory, and set as mount point
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- Tcl_DString pwd;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- Tcl_DStringInit(&pwd);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- Tcl_GetCwd(interp, &pwd);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef ZIPFILE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ostringstream str;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- str << (char *)Tcl_GetNameOfExecutable()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- << ".zip"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- << ends;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if( Zvfs_Mount(interp, (char*)str.str().c_str(), Tcl_DStringValue(&pwd)) != TCL_OK ){
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 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.";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cerr << str << endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- exit(1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- Zvfs_Mount(interp, (char *)Tcl_GetNameOfExecutable(),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- Tcl_DStringValue(&pwd));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- Tcl_DStringFree(&pwd);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Tcl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (Tcl_Init(interp) == TCL_ERROR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return TCL_ERROR;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/ds9/files/patch-tksao_Makefile.in.diff b/science/ds9/files/patch-tksao_Makefile.in.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 6a7f68c..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/ds9/files/patch-tksao_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,29 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tksao/Makefile.in.orig 2019-11-15 11:48:14.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tksao/Makefile.in 2019-11-15 11:49:56.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -96,6 +96,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PACKAGE_NAME = @PACKAGE_NAME@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PACKAGE_VERSION = @PACKAGE_VERSION@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CC = @CC@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CXX = @CXX@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS_DEFAULT = @CFLAGS_DEFAULT@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS_WARNING = @CFLAGS_WARNING@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXEEXT = @EXEEXT@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -165,7 +166,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBS = @PKG_LIBS@ @LIBS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AR = @AR@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS = @CFLAGS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CXXFLAGS = @CXXFLAGS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+COMPILE_CXX = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .SUFFIXES: .c .C .$(OBJEXT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -372,7 +375,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(COMPILE) -c `@CYGPATH@ $<` -o $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .C.@OBJEXT@:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(COMPILE) -c `@CYGPATH@ $<` -o $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(COMPILE_CXX) -c `@CYGPATH@ $<` -o $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #========================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Distribution creation
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/ds9/files/patch-tksao_configure.ac.diff b/science/ds9/files/patch-tksao_configure.ac.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b4fe5f6..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/ds9/files/patch-tksao_configure.ac.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,19 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tksao/configure.ac.orig 2019-11-15 11:07:34.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tksao/configure.ac 2019-11-15 11:09:31.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -59,6 +59,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # necessary to compile executables.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #-----------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+AC_PROG_CXX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TEA_SETUP_COMPILER
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #-----------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -325,7 +326,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #TEA_ADD_SOURCES([unix/unixFile.c])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #TEA_ADD_LIBS([-lsuperfly])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- TEA_ADD_INCLUDES([-I/usr/include/libxml2])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ TEA_ADD_INCLUDES([-I@prefix@/include/libxml2])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #--------------------------------------------------------------------
</span></pre><pre style='margin:0'>
</pre>