<pre style='margin:0'>
Rainer Müller (raimue) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/85383ac1d3b949194b92ad3af0fe9402833ae587">https://github.com/macports/macports-ports/commit/85383ac1d3b949194b92ad3af0fe9402833ae587</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 85383ac1d3b949194b92ad3af0fe9402833ae587
</span>Author: Chris Rawnsley <chris@puny.agency>
AuthorDate: Sat Apr 22 15:43:58 2017 +0100

<span style='display:block; white-space:pre;color:#404040;'>    wine: add 64-bit support
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Re: https://trac.macports.org/ticket/53651
</span>---
 x11/wine/Portfile                   | 24 +++++++++++++++++++++---
 x11/wine/files/patch-configure.diff | 19 +++++++++++++++++++
 2 files changed, 40 insertions(+), 3 deletions(-)

<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 b44c861..c861c72 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;'>@@ -1,6 +1,7 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 
 PortSystem                  1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup                   muniversal 1.0
</span> PortGroup                   compiler_blacklist_versions 1.0
 
 # Please keep the wine, wine-devel and wine-crossover ports as similar as possible.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,6 +20,7 @@ categories                  x11
</span> maintainers                 {ryandesign @ryandesign} openmaintainer
 homepage                    https://www.winehq.org
 platforms                   darwin
<span style='display:block; white-space:pre;background:#e0ffe0;'>+supported_archs             i386 x86_64
</span> use_xz                      yes
 distname                    ${my_name}-${version}
 dist_subdir                 ${my_name}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -90,10 +92,21 @@ depends_build               port:bison \
</span>                             port:pkgconfig
 
 patchfiles                  BOOL.patch \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                            patch-configure.diff \
</span>                             cups_headers.patch \
                             fix-flicker.patch \
                             mach_machine.patch
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {[variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        foreach arch ${universal_archs_to_use} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            file mkdir ${worksrcpath}-${arch}
</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;'>+        configure.cmd ${worksrcpath}/configure
</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;'>+
</span> # Wine requires the program specified in INSTALL to create intermediate
 # directories; /usr/bin/install doesn't.
 # http://bugs.winehq.org/show_bug.cgi?id=35310
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -191,9 +204,14 @@ variant x11 {
</span> 
 default_variants            +x11
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# 64-bit Wine exists for Linux, but does not work on OS X.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# http://www.winehq.org/pipermail/wine-devel/2014-February/103074.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-supported_archs             i386
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.universal_args
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set merger_configure_args(x86_64) "--enable-win64 --libdir=${prefix}/lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set merger_configure_args(i386)   --with-wine64=${workpath}/${worksrcdir}-x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${build_arch} eq "x86_64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    default_variants            +universal
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> 
 # error: Xcode 3.x cannot build 16-bit code correctly
 compiler.blacklist-append   {gcc-4.2 < 5600}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/wine/files/patch-configure.diff b/x11/wine/files/patch-configure.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..6cc1ab2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/wine/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Output DLLs to different directories so that we don't have a clash when
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# they're merged back together
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7320,7 +7320,12 @@
</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;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-dlldir="\${libdir}/wine"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if test "x$enable_win64" = "xyes"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  dlldir="\${libdir}/wine64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  dlldir="\${libdir}/wine"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DLLFLAGS="-D_REENTRANT"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span></pre><pre style='margin:0'>

</pre>