<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/6641a5273e4d3a4fa33f21433152d09d3aa55cc8">https://github.com/macports/macports-ports/commit/6641a5273e4d3a4fa33f21433152d09d3aa55cc8</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 6641a5273e4d3a4fa33f21433152d09d3aa55cc8
</span>Author: Rainer Müller <raimue@macports.org>
AuthorDate: Mon Mar 19 19:11:30 2018 +0100

<span style='display:block; white-space:pre;color:#404040;'>    wine-devel: Merge 64-bit support from wine
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Use a slightly different approach to modify `dlldir` for 64-bit, as it
</span><span style='display:block; white-space:pre;color:#404040;'>    is no longer set in the configure script.
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    See: https://trac.macports.org/ticket/53651
</span>---
 x11/wine-devel/Portfile | 42 ++++++++++++++++++++++++++++++++++++------
 1 file changed, 36 insertions(+), 6 deletions(-)

<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 c725a32..9eb36a3 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;'>@@ -1,30 +1,35 @@
</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:#ffe0e0;'>-# When updating the version of wine, update wine_gecko to a compatible version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# per the table at http://wiki.winehq.org/Gecko and update wine-mono as well;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# see http://wiki.winehq.org/Mono and http://sourceforge.net/projects/wine/files/Wine%20Mono/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# When updating the version of wine, update wine_gecko and wine_mono to compatible versions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# as referenced in the source code. Check here by replacing X.Y with the version:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://source.winehq.org/git/wine.git/blob/refs/tags/wine-X.Y:/dlls/appwiz.cpl/addons.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see also http://wiki.winehq.org/Gecko and http://wiki.winehq.org/Mono
</span> 
 name                        wine-devel
 conflicts                   wine wine-crossover
 set my_name                 wine
 version                     3.4
 set branch                  [lindex [split ${version} .] 0].x
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision                    1
</span> license                     LGPL-2.1+
 categories                  x11
 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}
 set wine_distfile           ${distname}${extract.suffix}
 set wine_gecko_version      2.47
 set wine_gecko_distfile     wine_gecko-${wine_gecko_version}-x86.msi
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set wine_gecko64_distfile   wine_gecko-${wine_gecko_version}-x86_64.msi
</span> set wine_mono_version       4.7.1
 set wine_mono_distfile      wine-mono-${wine_mono_version}.msi
 use_parallel_build          yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,6 +57,7 @@ extract.only                ${wine_distfile}
</span> 
 distfiles                   ${wine_distfile}:winesource \
                             ${wine_gecko_distfile}:winegecko \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                            ${wine_gecko64_distfile}:winegecko \
</span>                             ${wine_mono_distfile}:winemono
 
 checksums                   ${wine_distfile} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,6 +68,10 @@ checksums                   ${wine_distfile} \
</span>                             rmd160  abf7cc78b49dd0623bc8fe87ae0e32bb8694e13d \
                             sha256  3b8a361f5d63952d21caafd74e849a774994822fb96c5922b01d554f1677643a \
                             size    49266176 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                            ${wine_gecko64_distfile} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            rmd160  254da21cb2503f20d065167b385b3e83ea3ab327 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            sha256  c565ea25e50ea953937d4ab01299e4306da4a556946327d253ea9b28357e4a7d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            size    50806272 \
</span>                             ${wine_mono_distfile} \
                             rmd160  3e2932960dabff8283f02b32dc573b0dda6adfac \
                             sha256  2c8d5db7f833c3413b2519991f5af1f433d59a927564ec6f38a3f1f8b2c629aa \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -94,6 +104,16 @@ patchfiles                  BOOL.patch \
</span>                             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 +211,16 @@ 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_build_args(x86_64)     "dlldir=\\\\\${libdir}/wine64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set merger_destroot_args(x86_64)  "dlldir=\\\\\${libdir}/wine64"
</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;background:#e0e0e0;'>@@ -263,6 +290,9 @@ post-destroot {
</span>     xinstall -d ${destroot}${prefix}/share/wine/gecko
     xinstall -m 644 ${distpath}/${wine_gecko_distfile} ${destroot}${prefix}/share/wine/gecko
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    xinstall -d ${destroot}${prefix}/share/wine/gecko
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    xinstall -m 644 ${distpath}/${wine_gecko64_distfile} ${destroot}${prefix}/share/wine/gecko
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     xinstall -d ${destroot}${prefix}/share/wine/mono
     xinstall -m 644 ${distpath}/${wine_mono_distfile} ${destroot}${prefix}/share/wine/mono
 
</pre><pre style='margin:0'>

</pre>