<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/536b034b8b0547fe29c4430a8793527d38717021">https://github.com/macports/macports-ports/commit/536b034b8b0547fe29c4430a8793527d38717021</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 536b034 ds9: link against ast from MacPorts, not bundled version
</span>536b034 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 536b034b8b0547fe29c4430a8793527d38717021
</span>Author: Leo Singer <aronnax@macports.org>
AuthorDate: Mon Nov 18 21:37:09 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> ds9: link against ast from MacPorts, not bundled version
</span>---
science/ds9/Portfile | 7 +-
...MacPorts-share-directory-instead-of-zipfs.patch | 2 +-
.../0002-Use-CXX-to-build-tksao-C-files.patch | 2 +-
...-1.0-from-MacPorts-instead-of-bundled-ope.patch | 2 +-
science/ds9/files/0004-Use-ast-from-MacPorts.patch | 122 +++++++++++++++++++++
5 files changed, 130 insertions(+), 5 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 5b8bb3f..60f5b8c 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;'>@@ -5,6 +5,7 @@ PortGroup github 1.0
</span>
github.setup SAOImageDS9 SAOImageDS9 8.1 v
name ds9
<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;'>@@ -31,7 +32,8 @@ checksums rmd160 ef2121bf3953df204c6c3a98b5a8e6222a969135 \
</span>
depends_build-append port:autoconf
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:fontconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:ast \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:fontconfig \
</span> port:freetype \
port:libxml2 \
port:libiconv \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,7 +47,8 @@ worksrcdir SAOImageDS9
</span>
patchfiles 0001-Use-MacPorts-share-directory-instead-of-zipfs.patch \
0002-Use-CXX-to-build-tksao-C-files.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 0003-Use-openssl-1.0-from-MacPorts-instead-of-bundled-ope.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;'>+ 0004-Use-ast-from-MacPorts.patch
</span> patch.pre_args -p1
post-patch {
<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><span style='display:block; white-space:pre;color:#808080;'>index ecc897c..40d36f3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/ds9/files/0001-Use-MacPorts-share-directory-instead-of-zipfs.patch
</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;'>@@ -1,7 +1,7 @@
</span> From a702174273e2e04eda32f0e8cbb0a467ea28ca8f Mon Sep 17 00:00:00 2001
From: Leo Singer <leo.singer@ligo.org>
Date: Mon, 18 Nov 2019 15:07:35 -0500
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1/3] Use MacPorts share directory instead of zipfs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1/4] Use MacPorts share directory instead of zipfs
</span>
---
ds9/library/ds9.tcl | 2 +-
<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><span style='display:block; white-space:pre;color:#808080;'>index 479d067..017c31b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/ds9/files/0002-Use-CXX-to-build-tksao-C-files.patch
</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;'>@@ -1,7 +1,7 @@
</span> From ecbdedc6c05c1d8a6259e55fb36ea501f3b379a5 Mon Sep 17 00:00:00 2001
From: Leo Singer <leo.singer@ligo.org>
Date: Mon, 18 Nov 2019 15:10:27 -0500
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 2/3] Use CXX to build tksao C++ files
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 2/4] Use CXX to build tksao C++ files
</span>
---
tksao/Makefile.in | 6 +++++-
<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><span style='display:block; white-space:pre;color:#808080;'>index 91efeaa..21ad82e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/ds9/files/0003-Use-openssl-1.0-from-MacPorts-instead-of-bundled-ope.patch
</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;'>@@ -1,7 +1,7 @@
</span> From 59f1563882727a48f2967842b06adb82b82d03e0 Mon Sep 17 00:00:00 2001
From: Leo Singer <leo.singer@ligo.org>
Date: Mon, 18 Nov 2019 17:39:06 -0500
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 3/3] Use openssl-1.0 from MacPorts instead of bundled openssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 3/4] Use openssl-1.0 from MacPorts instead of bundled openssl
</span>
---
ds9/macos/Makefile.in | 2 +-
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/ds9/files/0004-Use-ast-from-MacPorts.patch b/science/ds9/files/0004-Use-ast-from-MacPorts.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..894acd2
</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/0004-Use-ast-from-MacPorts.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,122 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 0b1287649ea6893614d32cba44bd8430758f9ae4 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 20:51:14 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 4/4] Use ast from MacPorts
</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 | 6 +++---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ds9/unix/Makefile.in | 6 +++---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ make.include | 49 +------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3 files changed, 7 insertions(+), 54 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 c7043054..f1fb472c 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;'>+@@ -105,9 +105,6 @@ SPECS = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LLIBS = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(libdir)/libfuntools.a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(libdir)/libast.a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(libdir)/libast_err.a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(libdir)/libast_pal.a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(libdir)/libxpa.a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(subst /$(space),/,$(patsubst -L%,%/,$(patsubst -l%,lib%.a,$(SPECS))))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -174,6 +171,9 @@ ds9base : $(OBJS) $(LLIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(RM) $@
</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;'>++ -last \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -last_err \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -last_pal \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(LLIBS) \
</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;'>+diff --git a/ds9/unix/Makefile.in b/ds9/unix/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f66ff675..9867d0ec 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;'>+@@ -105,9 +105,6 @@ SPECS = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LLIBS = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(subst /$(space),/,$(patsubst -L%,%/,$(patsubst -l%,lib%.a,$(tksao_LIB_SPEC)))) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(libdir)/libfuntools.a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(libdir)/libast.a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(libdir)/libast_err.a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(libdir)/libast_pal.a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(libdir)/libxpa.a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(subst /$(space),/,$(patsubst -L%,%/,$(patsubst -l%,lib%.a,$(SPECS))))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -175,6 +172,9 @@ ds9base : $(OBJS) $(LLIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(RM) $@
</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;'>++ -last \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -last_err \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -last_pal \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(LLIBS) \
</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;'>+diff --git a/make.include b/make.include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f45619c1..4490edfe 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;'>+@@ -306,54 +306,7 @@ tksao/Makefile :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #-------------------------- ast
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ast : ast/Makefile ast/ast.h ast/.libs/libast.a ast/.libs/libast_err.a ast/.libs/libast_pal.a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ast/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 ast; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ./configure \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(ASTFLAGS) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- --without-pthreads --enable-shared=no \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- star_cv_cnf_trail_type=long star_cv_cnf_f2c_compatible=no \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(CONFIGFLAGS) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(PREFIX) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- --disable-shared
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cd ast; touch configure.ac aclocal.m4 configure Makefile.am Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ast/ast.h :
</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 ast -j ast.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(MAKE) -C ast -j $(JOBS) libast.la
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(MAKE) -C ast -j $(JOBS) libast_err.la
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(MAKE) -C ast -j $(JOBS) libast_pal.la
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cp ast/ast.h $(includedir)/.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cp ast/grf.h $(includedir)/.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cp ast/grf3d.h $(includedir)/.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cp ast/.libs/libast.a $(libdir)/.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cp ast/.libs/libast_err.a $(libdir)/.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cp ast/.libs/libast_pal.a $(libdir)/.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ast/.libs/libast.a :
</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 ast -j ast.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cp ast/ast.h $(includedir)/.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cp ast/grf.h $(includedir)/.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cp ast/grf3d.h $(includedir)/.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ast/.libs/libast_err.a :
</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 ast -j $(JOBS) libast_err.la
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cp ast/.libs/libast_err.a $(libdir)/.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ast/.libs/libast_pal.a :
</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 ast -j $(JOBS) libast_pal.la
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cp ast/.libs/libast_pal.a $(libdir)/.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ast :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #-------------------------- funtools
</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></pre><pre style='margin:0'>
</pre>