<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/4281bddb1e2ccf1ab4a91260dc035849ebaacf22">https://github.com/macports/macports-ports/commit/4281bddb1e2ccf1ab4a91260dc035849ebaacf22</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 4281bddb1e2ccf1ab4a91260dc035849ebaacf22
</span>Author: Chris Rawnsley <chris@puny.agency>
AuthorDate: Wed Apr 26 08:39:36 2017 +0100

<span style='display:block; white-space:pre;color:#404040;'>    wine*: Be explicit with requested flags
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    See: https://github.com/macports/macports-ports/pull/374#discussion_r111519785
</span><span style='display:block; white-space:pre;color:#404040;'>    See: https://github.com/macports/macports-ports/pull/374#issuecomment-297138106
</span>---
 x11/wine-crossover/Portfile | 43 +++++++++++++++++++++++++++++++++++++------
 x11/wine-devel/Portfile     | 43 +++++++++++++++++++++++++++++++++++++------
 x11/wine/Portfile           | 43 +++++++++++++++++++++++++++++++++++++------
 3 files changed, 111 insertions(+), 18 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 9aa5304..73a1376 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;'>@@ -103,29 +103,48 @@ configure.args              --without-alsa \
</span>                             --with-coreaudio \
                             --with-cups \
                             --with-curses \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --without-dbus \
</span>                             --with-fontconfig \
                             --with-freetype \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --without-gettext \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --without-gettextpo \
</span>                             --without-gphoto \
                             --with-glu \
                             --with-gnutls \
                             --without-gsm \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --with-gstreamer \
</span>                             --without-hal \
                             --with-jpeg \
                             --without-ldap \
                             --without-mpg123 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --without-netapi \
</span>                             --with-openal \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --with-opencl \
</span>                             --with-opengl \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --without-osmesa \
</span>                             --without-oss \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                            --without-pulse \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --with-pcap \
</span>                             --with-png \
                             --with-pthread \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --without-pulse \
</span>                             --without-sane \
                             --with-tiff \
                             --without-udev \
                             --without-v4l \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                            --without-x \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --without-xcomposite \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --without-xcursor \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --without-xinerama \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --without-xinput \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --without-xinput2 \
</span>                             --with-xml \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                            --with-xslt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --without-xrandr \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --without-xrender \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --without-xshape \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --without-xshm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --with-xslt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --without-xxf86vm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --with-zlib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --without-x
</span> 
 # Wine has a native macOS driver since 1.5.26 so X11 is optional
 variant x11 {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -143,9 +162,19 @@ variant x11 {
</span>                                 port:xorg-xf86vidmodeproto \
                                 port:xrender
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.args-delete       --without-x
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.args-append       --with-xcomposite \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.args-delete       --without-osmesa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                --without-xcomposite \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                --without-xcursor \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                --without-xinerama \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                --without-xinput \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                --without-xrandr \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                --without-xrender \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                --without-xshape \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                --without-xxf86vm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                --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-osmesa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                --with-xcomposite \
</span>                                 --with-xcursor \
                                 --with-xinerama \
                                 --with-xinput \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -181,10 +210,12 @@ platform darwin {
</span>     # On macOS, Core Text is used instead of fontconfig since Wine 1.5.10
     depends_lib-delete          port:fontconfig
     configure.args-delete       --with-fontconfig
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.args-append       --without-fontconfig
</span> 
     # Wine uses the native Security framework on macOS since Wine 1.3.16
     depends_lib-delete          port:gnutls
     configure.args-delete       --with-gnutls
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.args-append       --without-gnutls
</span> 
     notes {
         When using the Mac Driver, it might be useful to enable RetinaMode\
<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 1ed4dd1..c94243b 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;'>@@ -102,29 +102,48 @@ configure.args              --without-alsa \
</span>                             --with-coreaudio \
                             --with-cups \
                             --with-curses \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --without-dbus \
</span>                             --with-fontconfig \
                             --with-freetype \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --without-gettext \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --without-gettextpo \
</span>                             --without-gphoto \
                             --with-glu \
                             --with-gnutls \
                             --without-gsm \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --with-gstreamer \
</span>                             --without-hal \
                             --with-jpeg \
                             --without-ldap \
                             --without-mpg123 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --without-netapi \
</span>                             --with-openal \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --with-opencl \
</span>                             --with-opengl \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --without-osmesa \
</span>                             --without-oss \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                            --without-pulse \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --with-pcap \
</span>                             --with-png \
                             --with-pthread \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --without-pulse \
</span>                             --without-sane \
                             --with-tiff \
                             --without-udev \
                             --without-v4l \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                            --without-x \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --without-xcomposite \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --without-xcursor \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --without-xinerama \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --without-xinput \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --without-xinput2 \
</span>                             --with-xml \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                            --with-xslt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --without-xrandr \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --without-xrender \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --without-xshape \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --without-xshm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --with-xslt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --without-xxf86vm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --with-zlib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --without-x
</span> 
 # Wine has a native macOS driver since 1.5.26 so X11 is optional
 variant x11 {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -142,9 +161,19 @@ variant x11 {
</span>                                 port:xorg-xf86vidmodeproto \
                                 port:xrender
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.args-delete       --without-x
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.args-append       --with-xcomposite \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.args-delete       --without-osmesa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                --without-xcomposite \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                --without-xcursor \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                --without-xinerama \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                --without-xinput \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                --without-xrandr \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                --without-xrender \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                --without-xshape \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                --without-xxf86vm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                --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-osmesa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                --with-xcomposite \
</span>                                 --with-xcursor \
                                 --with-xinerama \
                                 --with-xinput \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -180,10 +209,12 @@ platform darwin {
</span>     # On macOS, Core Text is used instead of fontconfig since Wine 1.5.10
     depends_lib-delete          port:fontconfig
     configure.args-delete       --with-fontconfig
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.args-append       --without-fontconfig
</span> 
     # Wine uses the native Security framework on macOS since Wine 1.3.16
     depends_lib-delete          port:gnutls
     configure.args-delete       --with-gnutls
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.args-append       --without-gnutls
</span> 
     notes {
         When using the Mac Driver, it might be useful to enable RetinaMode\
<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 0df74c4..84e5c1e 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;'>@@ -102,29 +102,48 @@ configure.args              --without-alsa \
</span>                             --with-coreaudio \
                             --with-cups \
                             --with-curses \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --without-dbus \
</span>                             --with-fontconfig \
                             --with-freetype \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --without-gettext \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --without-gettextpo \
</span>                             --without-gphoto \
                             --with-glu \
                             --with-gnutls \
                             --without-gsm \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --with-gstreamer \
</span>                             --without-hal \
                             --with-jpeg \
                             --without-ldap \
                             --without-mpg123 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --without-netapi \
</span>                             --with-openal \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --with-opencl \
</span>                             --with-opengl \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --without-osmesa \
</span>                             --without-oss \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                            --without-pulse \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --with-pcap \
</span>                             --with-png \
                             --with-pthread \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --without-pulse \
</span>                             --without-sane \
                             --with-tiff \
                             --without-udev \
                             --without-v4l \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                            --without-x \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --without-xcomposite \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --without-xcursor \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --without-xinerama \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --without-xinput \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --without-xinput2 \
</span>                             --with-xml \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                            --with-xslt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --without-xrandr \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --without-xrender \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --without-xshape \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --without-xshm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --with-xslt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --without-xxf86vm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --with-zlib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            --without-x
</span> 
 # Wine has a native macOS driver since 1.5.26 so X11 is optional
 variant x11 {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -142,9 +161,19 @@ variant x11 {
</span>                                 port:xorg-xf86vidmodeproto \
                                 port:xrender
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.args-delete       --without-x
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.args-append       --with-xcomposite \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.args-delete       --without-osmesa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                --without-xcomposite \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                --without-xcursor \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                --without-xinerama \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                --without-xinput \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                --without-xrandr \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                --without-xrender \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                --without-xshape \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                --without-xxf86vm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                --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-osmesa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                --with-xcomposite \
</span>                                 --with-xcursor \
                                 --with-xinerama \
                                 --with-xinput \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -180,10 +209,12 @@ platform darwin {
</span>     # On macOS, Core Text is used instead of fontconfig since Wine 1.5.10
     depends_lib-delete          port:fontconfig
     configure.args-delete       --with-fontconfig
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.args-append       --without-fontconfig
</span> 
     # Wine uses the native Security framework on macOS since Wine 1.3.16
     depends_lib-delete          port:gnutls
     configure.args-delete       --with-gnutls
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.args-append       --without-gnutls
</span> 
     notes {
         When using the Mac Driver, it might be useful to enable RetinaMode\
</pre><pre style='margin:0'>

</pre>