[79642] trunk/dports/x11/wine-crossover-games

[jeremyhu at macports.org]

Revision: 79642
          http://trac.macports.org/changeset/79642
Author:   jeremyhu at macports.org
Date:     2011-06-21 20:35:51 -0700 (Tue, 21 Jun 2011)
Log Message:
-----------
wine-crossover-games: Fixes for darwin11

Also fixed wine's reference to libwine and moved wineloader to libexec to match wine and wine-devel

Modified Paths:
--------------
    trunk/dports/x11/wine-crossover-games/Portfile
    trunk/dports/x11/wine-crossover-games/files/wine.in

Property Changed:
----------------
    trunk/dports/x11/wine-crossover-games/files/wine.in

Modified: trunk/dports/x11/wine-crossover-games/Portfile
===================================================================
--- trunk/dports/x11/wine-crossover-games/Portfile	2011-06-22 03:34:49 UTC (rev 79641)
+++ trunk/dports/x11/wine-crossover-games/Portfile	2011-06-22 03:35:51 UTC (rev 79642)
@@ -7,7 +7,7 @@
 name                        wine-crossover-games
 conflicts                   wine wine-devel
 version                     10.0.0
-revision                    1
+revision                    2
 license                     LGPL-2.1+
 categories                  x11
 maintainers                 jeremyhu openmaintainer
@@ -25,7 +25,7 @@
 
 minimum_xcodeversions       {8 2.5}
 
-description                 Wine Is Not an Emulator (1.2.1 with CodeWeavers modifications)
+description                 Wine Is Not an Emulator (1.3.9 with CodeWeavers modifications)
 
 long_description            Wine is an implementation of the Windows APIs on top of X11. \
                             This version contains the Codeweavers patches for Crossover Games
@@ -163,6 +163,19 @@
 platform darwin 11 {
     # _getdirentries_is_not_available_when_64_bit_inodes_are_in_effect dlls/ntdll/directory.o
     configure.cppflags-append -D_DARWIN_NO_64_BIT_INODE
+
+    # llvm-gcc does not respect force_align_arg_pointer
+    # clang fails due to CFI-foo (winebuild uses /usr/bin/as to assemble clang-generated assembly)
+    configure.compiler gcc-4.2
+
+    # I have a suspicion that this may be necessary, but leaving out for now:
+    #post-patch {
+    #    # Lion disallows heap execution.
+    #    reinplace "s:LDEXECFLAGS = :LDEXECFLAGS = -Wl,-allow_heap_execute :" ${worksrcpath}/loader/Makefile.in
+    #}
+
+    # Needed or wine will SIGBUS
+    configure.ldflags-append -Wl,-no_pie
 }
 
 pre-fetch {
@@ -173,6 +186,10 @@
 }
 
 post-destroot {
+    xinstall -d ${destroot}${prefix}/libexec/wine
+    file rename ${destroot}${prefix}/bin/wineloader ${destroot}${prefix}/libexec/wine/wine
+    system "install_name_tool -change @executable_path/../lib/libwine.1.dylib @executable_path/../../lib/libwine.1.dylib ${destroot}${prefix}/libexec/wine/wine"
+
     xinstall ${filespath}/wine.in ${destroot}${prefix}/bin/wine
     reinplace s|@PREFIX@|${prefix}|g ${destroot}${prefix}/bin/wine
     

Modified: trunk/dports/x11/wine-crossover-games/files/wine.in
===================================================================
--- trunk/dports/x11/wine-crossover-games/files/wine.in	2011-06-22 03:34:49 UTC (rev 79641)
+++ trunk/dports/x11/wine-crossover-games/files/wine.in	2011-06-22 03:35:51 UTC (rev 79642)
@@ -1,4 +1,5 @@
 #!/bin/sh
+# $Id$
 
 DYLD_FALLBACK_LIBRARY_PATH="@PREFIX@/lib" \
-"@PREFIX@/bin/wineloader" "$@"
+"@PREFIX@/libexec/wine/wine" "$@"


Property changes on: trunk/dports/x11/wine-crossover-games/files/wine.in
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110621/837ee9d0/attachment.html>