<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e6768f27fc43101a68a4fb27644b51d717371e46">https://github.com/macports/macports-ports/commit/e6768f27fc43101a68a4fb27644b51d717371e46</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 e6768f2  xephem: use bundled motif
</span>e6768f2 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit e6768f27fc43101a68a4fb27644b51d717371e46
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Mon Feb 24 19:37:49 2020 -0800

<span style='display:block; white-space:pre;color:#404040;'>    xephem: use bundled motif
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    the current openmotif in MacPorts uses a two-level namespace
</span><span style='display:block; white-space:pre;color:#404040;'>    which causes some ports to fail to run
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    use the bundled motif library (and the bundled libpng)
</span><span style='display:block; white-space:pre;color:#404040;'>    until xephem is updated to work with the current openmotif
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    closes: https://trac.macports.org/ticket/60122
</span>---
 science/xephem/Portfile                  | 16 +++++++++++++---
 science/xephem/files/patch-Makefile.diff |  9 +++++++++
 2 files changed, 22 insertions(+), 3 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/xephem/Portfile b/science/xephem/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 48ba001..97ee932 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/xephem/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/xephem/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,6 +4,7 @@ PortSystem          1.0
</span> 
 name                xephem
 version             3.7.7
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            1
</span> categories          science
 maintainers         nomaintainer
 license             Restrictive/Distributable
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,15 +20,24 @@ homepage            http://www.clearskyinstitute.com/xephem/
</span> platforms           darwin
 master_sites        http://www.clearskyinstitute.com/xephem/
 checksums           rmd160  8cda6208a8d6990703c1fc49c371ff9a5bb710d2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  fb0b889218322c1cc0b994da7125e624e4f0112d9da1c468936600d1179e55de
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  fb0b889218322c1cc0b994da7125e624e4f0112d9da1c468936600d1179e55de \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    18128521
</span> extract.suffix      .tgz
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib         lib:libXm:openmotif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib         port:xorg-libXp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:xorg-libXt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:xorg-libXext \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:xorg-libXmu \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:xorg-libX11
</span> worksrcdir          ${distname}/GUI/xephem
 
 patchfiles          patch-Makefile.diff
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# we need to use the included libpng as the included motif is built against it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# the included libpng is not reliably built in time with parallel building
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_parallel_build  no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> use_configure       no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args          MOTIFI=${prefix}/include MOTIFL=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args          MOTIF=../../libXm/osx \
</span>                     CC=${configure.cc}
 build.target
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/xephem/files/patch-Makefile.diff b/science/xephem/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 41610d9..40a499d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/xephem/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/xephem/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,14 @@
</span> --- Makefile.orig 2015-08-09 16:36:50.000000000 -0500
 +++ Makefile   2016-12-26 15:26:20.000000000 -0600
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -12,7 +12,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # These -I and -L flags point to the supporting XEphem libraries
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBINC = -I../../libastro -I../../libip -I../../liblilxml -I../../libjpegd -I../../libpng -I../../libz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBLNK = -L../../libastro -L../../libip -L../../liblilxml -L../../libjpegd -L../../libpng -L../../libz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LIBLIB = -lastro -lip -llilxml -ljpegd -lpng -lz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LIBLIB = -lastro -lip -llilxml -ljpegd ../../libpng/libpng.a -lz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # MOTIFI is the directory containing the Xm directory of include files.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # MOTIFL is the directory containing the libXm.a library.
</span> @@ -32,8 +32,8 @@
  # for linux and Apple OS X
  CC = gcc
</pre><pre style='margin:0'>

</pre>