Changes between Initial Version and Version 1 of Ticket #53651, comment 4
- Timestamp:
- Mar 10, 2017, 7:33:19 PM (8 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
Ticket #53651, comment 4
initial v1 17 17 PortGroup compiler_blacklist_versions 1.0 18 18 19 # Please keep the wine, wine-devel and wine-crossover ports as similar 20 @@ -1 5,13 +16,14 @@ name wine19 # Please keep the wine, wine-devel and wine-crossover ports as similar as possible. 20 @@ -13,12 +14,14 @@ name wine 21 21 conflicts wine-devel wine-crossover 22 22 set my_name wine 23 23 version 2.0 24 -revision 1 25 +revision 3 24 +revision 1 26 25 set branch [lindex [split ${version} .] 0].0 27 26 license LGPL-2.1+ … … 34 33 distname ${my_name}-${version} 35 34 dist_subdir ${my_name} 36 @@ -9 4,6 +96,16 @@ patchfiles patch-BOOL.diff\37 patch-fix_flicker.diff\38 patch-mach_machine.diff35 @@ -95,6 +98,16 @@ patchfiles BOOL.patch \ 36 mach_machine.patch \ 37 tiger-shell.patch 39 38 40 39 +pre-configure { … … 51 50 # directories; /usr/bin/install doesn't. 52 51 # http://bugs.winehq.org/show_bug.cgi?id=35310 53 @@ -1 13,6 +125,11@@ configure.args --without-alsa \54 -- without-v4l\55 -- without-x52 @@ -141,9 +154,10 @@ configure.args --without-alsa \ 53 --x-include=${prefix}/include \ 54 --x-lib=${prefix}/lib 56 55 56 -# 64-bit Wine exists for Linux, but does not work on OS X. 57 -# http://www.winehq.org/pipermail/wine-devel/2014-February/103074.html 58 -supported_archs i386 57 59 +configure.universal_args 58 60 + 59 61 +set merger_configure_args(x86_64) --enable-win64 60 62 +set merger_configure_args(i386) --with-wine64=${workpath}/${worksrcdir}-x86_64 61 +62 # Wine has a native macOS driver since 1.5.26 so X11 is optional63 variant x11 {64 depends_lib-append port:libGLU \65 @@ -136,11 +153,9 @@ variant x11 {66 --x-lib=${prefix}/lib67 }68 63 69 -default_variants +x11 70 - 71 -# 64-bit Wine exists for Linux, but does not work on OS X. 72 -# http://www.winehq.org/pipermail/wine-devel/2014-February/103074.html 73 -supported_archs i386 74 +if {${build_arch} eq "x86_64"} { 75 + default_variants +universal 76 +} 77 78 # llvm-gcc-4.2 doesn't respect force_align_arg_pointer; wine builds but fails 79 # to run: 64 # llvm-gcc-4.2 doesn't respect force_align_arg_pointer; wine builds but fails to run 65 # http://bugs.winehq.org/show_bug.cgi?id=28030 80 66 }}}