<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/5f64515ab893fb63aff60e43d90c08775de9ef94">https://github.com/macports/macports-ports/commit/5f64515ab893fb63aff60e43d90c08775de9ef94</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 5f64515 ds9: build against openssl 1.0, fix numerous other issues
</span>5f64515 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5f64515ab893fb63aff60e43d90c08775de9ef94
</span>Author: Leo Singer <aronnax@macports.org>
AuthorDate: Fri Nov 15 13:55:57 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> ds9: build against openssl 1.0, fix numerous other issues
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/59692
</span>---
science/ds9/Portfile | 31 +++++++++++++++++++---
.../ds9/files/patch-ds9_macos_configure.ac.diff | 11 ++++++++
science/ds9/files/patch-ds9_unix_configure.ac.diff | 11 ++++++++
science/ds9/files/patch-tksao_Makefile.in.diff | 29 ++++++++++++++++++++
science/ds9/files/patch-tksao_configure.ac.diff | 19 +++++++++++++
science/ds9/files/patch-tksao_configure.diff | 11 --------
6 files changed, 97 insertions(+), 15 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 755b88f..33e2c5e 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,6 +4,7 @@ PortSystem 1.0
</span>
name ds9
version 7.6
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories science graphics
platforms darwin
maintainers {aronnax @lpsinger}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,7 +36,7 @@ depends_lib-append port:fontconfig \
</span> port:freetype \
port:libxml2 \
port:libiconv \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:openssl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:openssl10 \
</span> port:zlib \
port:libzip
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,16 +44,21 @@ universal_variant no
</span>
worksrcdir SAOImageDS9
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-ds9_unix_ds9.C.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-ds9_macos_configure.ac.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-ds9_unix_configure.ac.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-ds9_unix_ds9.C.diff \
</span> patch-ds9_library_ds9.tcl.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-tksao_configure.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-tksao_configure.ac.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-tksao_Makefile.in.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:#e0ffe0;'>+ ${worksrcpath}/ds9/macos/configure.ac \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/ds9/unix/configure.ac \
</span> ${worksrcpath}/ds9/unix/ds9.C \
${worksrcpath}/ds9/library/ds9.tcl \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/tksao/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/tksao/configure.ac
</span> }
variant x11 conflicts aqua description {Enable X11 GUI} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -83,11 +89,28 @@ if {![variant_isset x11] && ![variant_isset aqua]} {
</span> default_variants +x11
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Regenerate build system for tksao because we patched its configure.ac.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach subdir {tksao ds9/macos ds9/unix} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath}/${subdir} "autoreconf"
</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;'>+compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cxxflags-append -std=c++11
</span> configure.cmd unix/configure
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# FIXME: ds9 does not build against openssl 1.1.0.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Remove this once it does.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args-append SSL_INCLUDE_DIR="${prefix}/include/openssl-1.0" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SSL_INCLUDE_DIR_NATIVE="${prefix}/include/openssl-1.0" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SSL_LIB_DIR="${prefix}/lib/openssl-1.0" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SSL_LIB_DIR_NATIVE="${prefix}/lib/openssl-1.0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> build.args-append JOBS=${build.jobs} \
CC=${configure.cc} \
CXX=${configure.cxx} \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXXFLAGS="${configure.cxxflags}" \
</span> XINCLUDES=-I${prefix}/include \
XML_INCLUDEDIR=${prefix}/include/libxml2 \
XFT_LIBS="-lXft -lfontconfig" \
<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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..0e74b39
</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-ds9_macos_configure.ac.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;'>+--- ds9/macos/configure.ac.orig 2019-11-15 13:34:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ds9/macos/configure.ac 2019-11-15 13:35:47.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -143,7 +143,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #TEA_ADD_STUB_SOURCES([])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #TEA_ADD_TCL_SOURCES([])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-SSLLIBS="/opt/local/lib/libssl.a /opt/local/lib/libcrypto.a"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SSLLIBS="@prefix@/lib/openssl-1.0/libssl.a @prefix@/lib/openssl-1.0/libcrypto.a"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_SUBST(SSLLIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_CHECK_LIB([xml2],[xmlInitParser])
</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_unix_configure.ac.diff b/science/ds9/files/patch-ds9_unix_configure.ac.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..14e06f2
</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-ds9_unix_configure.ac.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;'>+--- ds9/unix/configure.ac.orig 2019-11-15 13:34:51.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ds9/unix/configure.ac 2019-11-15 13:36:10.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -148,7 +148,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Darwin*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_DEFINE([ZIPFILE])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SSLLIBS="/opt/local/lib/libssl.a /opt/local/lib/libcrypto.a"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SSLLIBS="@prefix@/lib/openssl-1.0/libssl.a @prefix@/lib/openssl-1.0/libcrypto.a"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_SUBST(SSLLIBS)
</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;color:#808080;'>diff --git a/science/ds9/files/patch-tksao_Makefile.in.diff b/science/ds9/files/patch-tksao_Makefile.in.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..6a7f68c
</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-tksao_Makefile.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,29 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tksao/Makefile.in.orig 2019-11-15 11:48:14.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tksao/Makefile.in 2019-11-15 11:49:56.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -96,6 +96,7 @@
</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,7 +166,9 @@
</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) $(CFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++COMPILE_CXX = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .SUFFIXES: .c .C .$(OBJEXT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -372,7 +375,7 @@
</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;color:#808080;'>diff --git a/science/ds9/files/patch-tksao_configure.ac.diff b/science/ds9/files/patch-tksao_configure.ac.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..b4fe5f6
</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-tksao_configure.ac.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tksao/configure.ac.orig 2019-11-15 11:07:34.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tksao/configure.ac 2019-11-15 11:09:31.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -59,6 +59,7 @@
</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;'>+@@ -325,7 +326,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #TEA_ADD_SOURCES([unix/unixFile.c])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #TEA_ADD_LIBS([-lsuperfly])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TEA_ADD_INCLUDES([-I/usr/include/libxml2])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ TEA_ADD_INCLUDES([-I@prefix@/include/libxml2])
</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;color:#808080;'>diff --git a/science/ds9/files/patch-tksao_configure.diff b/science/ds9/files/patch-tksao_configure.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f4c8795..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/ds9/files/patch-tksao_configure.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;'>---- tksao/configure.orig 2018-12-04 15:13:45.000000000 +0530
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tksao/configure 2018-12-04 15:14:20.000000000 +0530
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6024,7 +6024,7 @@
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- vars="-I/usr/include/libxml2"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vars="-I@prefix@/include/libxml2"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for i in $vars; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PKG_INCLUDES="$PKG_INCLUDES $i"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- done
</span></pre><pre style='margin:0'>
</pre>