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

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/df1977479ee137435dbc8a42c48385e6e18dee5a">https://github.com/macports/macports-ports/commit/df1977479ee137435dbc8a42c48385e6e18dee5a</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit df1977479ee137435dbc8a42c48385e6e18dee5a
</span>Author: Chris Rawnsley <chris@puny.agency>
AuthorDate: Tue Mar 7 22:11:44 2017 +0000

<span style='display:block; white-space:pre;color:#404040;'>    wine*: X11 is an optional dependency
</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/49800
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/39085
</span>---
 x11/wine-crossover/Portfile | 59 +++++++++++++++++++++++++++------------------
 x11/wine-devel/Portfile     | 59 +++++++++++++++++++++++++++------------------
 x11/wine/Portfile           | 59 +++++++++++++++++++++++++++------------------
 3 files changed, 108 insertions(+), 69 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/wine-crossover/Portfile b/x11/wine-crossover/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 453b241..1e78da6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/wine-crossover/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/wine-crossover/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,17 +73,7 @@ depends_lib                 port:fontconfig \
</span>                             port:ncurses \
                             port:gnutls \
                             port:tiff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                            port:zlib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            port:xorg-libsm \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            port:xorg-libXcomposite \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            port:xorg-libXcursor \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            port:xorg-libXi \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            port:xorg-libXinerama \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            port:xorg-libXrandr \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            port:xorg-libXxf86vm \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            port:xrender \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            port:libGLU \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            port:mesa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            port:zlib
</span> 
 depends_build               port:bison \
                             port:flex \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -124,19 +114,42 @@ configure.args              --without-alsa \
</span>                             --without-sane \
                             --with-tiff \
                             --without-v4l \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                            --with-xcomposite \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            --with-xcursor \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            --with-xinerama \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            --with-xinput \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --without-x \
</span>                             --with-xml \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                            --with-xrandr \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            --with-xrender \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            --with-xshape \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            --with-xslt \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            --with-xxf86vm \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            --with-x \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            --x-include=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            --x-lib=${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --with-xslt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Wine has a native macOS driver since 1.5.26 so X11 is optional
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant x11 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append          port:libGLU \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                port:mesa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                port:xorg-libX11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                port:xorg-libXcomposite \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                port:xorg-libXcursor \
</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-libXi \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                port:xorg-libXinerama \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                port:xorg-libXrandr \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                port:xorg-libXxf86vm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                port:xorg-libsm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                port:xorg-xf86vidmodeproto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                port:xrender
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.args-delete       --without-x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.args-append       --with-xcomposite \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                --with-xcursor \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                --with-xinerama \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                --with-xinput \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                --with-xrandr \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                --with-xrender \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                --with-xshape \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                --with-xxf86vm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                --with-x \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                --x-include=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                --x-lib=${prefix}/lib
</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            +x11
</span> 
 # 64-bit Wine exists for Linux, but does not work on OS X.
 # http://www.winehq.org/pipermail/wine-devel/2014-February/103074.html
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/wine-devel/Portfile b/x11/wine-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 408364f..5db0ca5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/wine-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/wine-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,17 +72,7 @@ depends_lib                 port:fontconfig \
</span>                             port:ncurses \
                             port:gnutls \
                             port:tiff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                            port:zlib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            port:xorg-libsm \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            port:xorg-libXcomposite \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            port:xorg-libXcursor \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            port:xorg-libXi \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            port:xorg-libXinerama \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            port:xorg-libXrandr \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            port:xorg-libXxf86vm \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            port:xrender \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            port:libGLU \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            port:mesa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            port:zlib
</span> 
 depends_build               port:bison \
                             port:flex \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -122,19 +112,42 @@ configure.args              --without-alsa \
</span>                             --without-sane \
                             --with-tiff \
                             --without-v4l \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                            --with-xcomposite \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            --with-xcursor \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            --with-xinerama \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            --with-xinput \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --without-x \
</span>                             --with-xml \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                            --with-xrandr \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            --with-xrender \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            --with-xshape \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            --with-xslt \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            --with-xxf86vm \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            --with-x \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            --x-include=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            --x-lib=${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --with-xslt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Wine has a native macOS driver since 1.5.26 so X11 is optional
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant x11 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append          port:libGLU \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                port:mesa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                port:xorg-libX11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                port:xorg-libXcomposite \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                port:xorg-libXcursor \
</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-libXi \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                port:xorg-libXinerama \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                port:xorg-libXrandr \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                port:xorg-libXxf86vm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                port:xorg-libsm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                port:xorg-xf86vidmodeproto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                port:xrender
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.args-delete       --without-x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.args-append       --with-xcomposite \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                --with-xcursor \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                --with-xinerama \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                --with-xinput \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                --with-xrandr \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                --with-xrender \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                --with-xshape \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                --with-xxf86vm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                --with-x \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                --x-include=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                --x-lib=${prefix}/lib
</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            +x11
</span> 
 # 64-bit Wine exists for Linux, but does not work on OS X.
 # http://www.winehq.org/pipermail/wine-devel/2014-February/103074.html
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/wine/Portfile b/x11/wine/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f5c7f3d..2e22dfc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/wine/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/wine/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,17 +72,7 @@ depends_lib                 port:fontconfig \
</span>                             port:ncurses \
                             port:gnutls \
                             port:tiff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                            port:zlib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            port:xorg-libsm \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            port:xorg-libXcomposite \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            port:xorg-libXcursor \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            port:xorg-libXi \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            port:xorg-libXinerama \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            port:xorg-libXrandr \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            port:xorg-libXxf86vm \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            port:xrender \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            port:libGLU \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            port:mesa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            port:zlib
</span> 
 depends_build               port:bison \
                             port:flex \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -122,19 +112,42 @@ configure.args              --without-alsa \
</span>                             --without-sane \
                             --with-tiff \
                             --without-v4l \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                            --with-xcomposite \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            --with-xcursor \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            --with-xinerama \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            --with-xinput \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --without-x \
</span>                             --with-xml \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                            --with-xrandr \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            --with-xrender \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            --with-xshape \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            --with-xslt \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            --with-xxf86vm \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            --with-x \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            --x-include=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            --x-lib=${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --with-xslt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Wine has a native macOS driver since 1.5.26 so X11 is optional
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant x11 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append          port:libGLU \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                port:mesa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                port:xorg-libX11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                port:xorg-libXcomposite \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                port:xorg-libXcursor \
</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-libXi \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                port:xorg-libXinerama \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                port:xorg-libXrandr \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                port:xorg-libXxf86vm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                port:xorg-libsm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                port:xorg-xf86vidmodeproto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                port:xrender
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.args-delete       --without-x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.args-append       --with-xcomposite \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                --with-xcursor \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                --with-xinerama \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                --with-xinput \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                --with-xrandr \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                --with-xrender \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                --with-xshape \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                --with-xxf86vm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                --with-x \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                --x-include=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                --x-lib=${prefix}/lib
</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            +x11
</span> 
 # 64-bit Wine exists for Linux, but does not work on OS X.
 # http://www.winehq.org/pipermail/wine-devel/2014-February/103074.html
</pre><pre style='margin:0'>

</pre>