Changes between Initial Version and Version 1 of Ticket #53651, comment 4


Ignore:
Timestamp:
Mar 10, 2017, 7:33:19 PM (7 years ago)
Author:
casr (Chris Rawnsley)
Comment:

Legend:

Unmodified
Added
Removed
Modified

  • Ticket #53651, comment 4

    initial v1  
    1717 PortGroup                   compiler_blacklist_versions 1.0
    1818 
    19  # Please keep the wine, wine-devel and wine-crossover ports as similar
    20 @@ -15,13 +16,14 @@ name                        wine
     19 # Please keep the wine, wine-devel and wine-crossover ports as similar as possible.
     20@@ -13,12 +14,14 @@ name                        wine
    2121 conflicts                   wine-devel wine-crossover
    2222 set my_name                 wine
    2323 version                     2.0
    24 -revision                    1
    25 +revision                    3
     24+revision                    1
    2625 set branch                  [lindex [split ${version} .] 0].0
    2726 license                     LGPL-2.1+
    … …  
    3433 distname                    ${my_name}-${version}
    3534 dist_subdir                 ${my_name}
    36 @@ -94,6 +96,16 @@ patchfiles                  patch-BOOL.diff \
    37                              patch-fix_flicker.diff \
    38                              patch-mach_machine.diff
     35@@ -95,6 +98,16 @@ patchfiles                  BOOL.patch \
     36                             mach_machine.patch \
     37                             tiger-shell.patch
    3938 
    4039+pre-configure {
    … …  
    5150 # directories; /usr/bin/install doesn't.
    5251 # http://bugs.winehq.org/show_bug.cgi?id=35310
    53 @@ -113,6 +125,11 @@ configure.args              --without-alsa \
    54                              --without-v4l \
    55                              --without-x
     52@@ -141,9 +154,10 @@ configure.args              --without-alsa \
     53                             --x-include=${prefix}/include \
     54                             --x-lib=${prefix}/lib
    5655 
     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
    5759+configure.universal_args
    5860+
    5961+set merger_configure_args(x86_64) --enable-win64
    6062+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 optional
    63  variant x11 {
    64    depends_lib-append          port:libGLU \
    65 @@ -136,11 +153,9 @@ variant x11 {
    66                                --x-lib=${prefix}/lib
    67  }
    6863 
    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
    8066}}}