<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/6f7270b7041c123b90a35e87b0fb35277b9b5014">https://github.com/macports/macports-ports/commit/6f7270b7041c123b90a35e87b0fb35277b9b5014</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 6f7270b ds9: update to 7.6
</span>6f7270b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6f7270b7041c123b90a35e87b0fb35277b9b5014
</span>Author: Leo Singer <aronnax@macports.org>
AuthorDate: Tue Dec 4 15:56:47 2018 +0530
<span style='display:block; white-space:pre;color:#404040;'> ds9: update to 7.6
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also switch default variant to x11 because the aqua variant was
</span><span style='display:block; white-space:pre;color:#404040;'> showing up as a completely black window.
</span>---
science/ds9/Portfile | 17 ++++++++++-------
science/ds9/files/patch-tksao_configure.diff | 11 +++++++++++
2 files changed, 21 insertions(+), 7 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 e9d51ee..d258097 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/ds9/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/ds9/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,8 +3,7 @@
</span> PortSystem 1.0
name ds9
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 7.6b8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 7.6
</span> categories science graphics
platforms darwin
maintainers {aronnax @lpsinger}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,8 +25,9 @@ license_noconflict openssl
</span> homepage http://ds9.si.edu/
master_sites ${homepage}/download/source
distname ${name}.${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums sha256 63818177d1acc28d3a4ee196cf4485e769235cd8b07b256974a0c643d481c189 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 f6e5199db5ba5b0c1a49a9a547d6261953297a88
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums sha256 07c7396e220d9763d4a9edd18f5ba0edf8030a1bddbf1c65b33b962d37a97677 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 0c80027a4d5c5c42e0a50c996063d5e4509beee6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 84727405
</span>
depends_lib port:fontconfig \
port:freetype \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,13 +41,15 @@ universal_variant no
</span> worksrcdir SAOImageDS9
patchfiles patch-ds9_unix_ds9.C.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-ds9_library_ds9.tcl.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-ds9_library_ds9.tcl.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-tksao_configure.diff
</span>
post-patch {
# FIXME: Prefix has to be embedded in source and Makefiles in some places.
reinplace "s|@prefix@|${prefix}|g" \
${worksrcpath}/ds9/unix/ds9.C \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/ds9/library/ds9.tcl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/ds9/library/ds9.tcl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/tksao/configure
</span> }
variant x11 conflicts aqua description {Enable X11 GUI} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -75,7 +77,7 @@ variant aqua conflicts x11 description {Enable Mac OS X GUI} {
</span> }
if {![variant_isset x11] && ![variant_isset aqua]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +aqua
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +x11
</span> }
configure.cmd unix/configure
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -85,6 +87,7 @@ build.args-append JOBS=${build.jobs} \
</span> CXX=${configure.cxx} \
X11INCLUDE=${prefix}/include \
X11LIB=${prefix}/lib \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ XML_INCLUDEDIR=${prefix}/include/libxml2 \
</span> XFT_LIBS="-lXft -lfontconfig" \
-o zvfs
<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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..f4c8795
</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.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;'>+--- tksao/configure.orig 2018-12-04 15:13:45.000000000 +0530
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tksao/configure 2018-12-04 15:14:20.000000000 +0530
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6024,7 +6024,7 @@
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- vars="-I/usr/include/libxml2"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ vars="-I@prefix@/include/libxml2"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for i in $vars; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_INCLUDES="$PKG_INCLUDES $i"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ done
</span></pre><pre style='margin:0'>
</pre>