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

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f43b6afee863b5fa1daa1fa3231a55829778dece">https://github.com/macports/macports-ports/commit/f43b6afee863b5fa1daa1fa3231a55829778dece</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 f43b6af  emacs: make imagemagick variant require either +x11 or emacs-app
</span>f43b6af is described below

<span style='display:block; white-space:pre;color:#808000;'>commit f43b6afee863b5fa1daa1fa3231a55829778dece
</span>Author: Dan R. K. Ports <dports@macports.org>
AuthorDate: Fri Feb 17 22:36:41 2017 -0800

<span style='display:block; white-space:pre;color:#404040;'>    emacs: make imagemagick variant require either +x11 or emacs-app
</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/53315
</span>---
 editors/emacs/Portfile | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/emacs/Portfile b/editors/emacs/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c6b77c0..fa93b9c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/emacs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/emacs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,7 +37,7 @@ subport emacs-app-devel {
</span> 
 if {$subport eq $name || $subport eq "emacs-app"} {
     version         25.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    revision        4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    revision        5
</span>     
     checksums       rmd160  d29ddba846024c7df3e1dc02ac32690f3650e7b9 \
                     sha256  763344b90db4d40e9fe90c5d14748a9dbd201ce544e2cf0835ab48a0aa4a1c67
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,7 +48,7 @@ if {$subport eq $name || $subport eq "emacs-app"} {
</span> 
 if {$subport eq "emacs-devel" || $subport eq "emacs-app-devel"} {
     version         20161031
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    revision        4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    revision        5
</span> 
     fetch.type      git
     git.url         git://git.savannah.gnu.org/emacs.git
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -159,6 +159,13 @@ if {${subport} eq "emacs" || ${subport} eq "emacs-devel"} {
</span>         require_active_variants gtk2 x11
     }
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    # imagemagick variant requires either x11 or quartz, so we have to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # define it twice; see #53315
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    variant imagemagick requires x11 description {Use ImageMagick} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        depends_lib-append  port:ImageMagick
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        configure.args-append --with-imagemagick
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     post-destroot {
         xinstall -m 755 -d ${destroot}${prefix}/include/emacs
         xinstall -m 644 ${worksrcpath}/src/emacs-module.h \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -172,11 +179,6 @@ variant dbus description {Builds emacs with D-Bus support} {
</span>     depends_lib-append      port:dbus
 }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant imagemagick description {Use ImageMagick} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append  port:ImageMagick
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.args-append --with-imagemagick
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> 
 if {$subport eq "emacs-app" || $subport eq "emacs-app-devel"} {
     categories-append   aqua
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -220,5 +222,10 @@ if {$subport eq "emacs-app" || $subport eq "emacs-app-devel"} {
</span>         build.target        bootstrap
     }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-   default_variants +inline
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    variant imagemagick description {Use ImageMagick} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        depends_lib-append  port:ImageMagick
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        configure.args-append --with-imagemagick
</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;'>+    default_variants +inline
</span> }
</pre><pre style='margin:0'>

</pre>