[92215] trunk/dports/x11

[jeremyhu at macports.org]

Revision: 92215
          https://trac.macports.org/changeset/92215
Author:   jeremyhu at macports.org
Date:     2012-04-21 23:18:31 -0700 (Sat, 21 Apr 2012)
Log Message:
-----------
wine*: Fix a possible build failure due to type collision

Modified Paths:
--------------
    trunk/dports/x11/wine/Portfile
    trunk/dports/x11/wine-crossover/Portfile
    trunk/dports/x11/wine-devel/Portfile

Added Paths:
-----------
    trunk/dports/x11/wine/files/mach_machine.patch
    trunk/dports/x11/wine-crossover/files/mach_machine.patch
    trunk/dports/x11/wine-devel/files/mach_machine.patch

Modified: trunk/dports/x11/wine/Portfile
===================================================================
--- trunk/dports/x11/wine/Portfile	2012-04-22 05:52:55 UTC (rev 92214)
+++ trunk/dports/x11/wine/Portfile	2012-04-22 06:18:31 UTC (rev 92215)
@@ -96,7 +96,8 @@
                             port:flex \
                             port:pkgconfig
 
-patchfiles BOOL.patch
+patchfiles                  BOOL.patch \
+                            mach_machine.patch
 
 configure.ldflags-append    -framework CoreServices \
                             -lz

Added: trunk/dports/x11/wine/files/mach_machine.patch
===================================================================
--- trunk/dports/x11/wine/files/mach_machine.patch	                        (rev 0)
+++ trunk/dports/x11/wine/files/mach_machine.patch	2012-04-22 06:18:31 UTC (rev 92215)
@@ -0,0 +1,12 @@
+--- ./dlls/ntdll/nt.c.orig	2012-04-21 23:03:51.000000000 -0700
++++ ./dlls/ntdll/nt.c	2012-04-21 23:04:14.000000000 -0700
+@@ -34,7 +34,9 @@
+ # include <machine/cpu.h>
+ #endif
+ #ifdef HAVE_MACH_MACHINE_H
++# define cpu_type_t mach_cpu_type_t
+ # include <mach/machine.h>
++#undef cpu_type_t
+ #endif
+ 
+ #include <ctype.h>

Modified: trunk/dports/x11/wine-crossover/Portfile
===================================================================
--- trunk/dports/x11/wine-crossover/Portfile	2012-04-22 05:52:55 UTC (rev 92214)
+++ trunk/dports/x11/wine-crossover/Portfile	2012-04-22 06:18:31 UTC (rev 92215)
@@ -98,7 +98,8 @@
 # interferes with the wine build (which uses parts of them if present).
 extract.post_args-append    wine
 
-patchfiles                  BOOL.patch
+patchfiles                  BOOL.patch \
+                            mach_machine.patch
 
 configure.ldflags-append    -framework CoreServices \
                             -lz

Added: trunk/dports/x11/wine-crossover/files/mach_machine.patch
===================================================================
--- trunk/dports/x11/wine-crossover/files/mach_machine.patch	                        (rev 0)
+++ trunk/dports/x11/wine-crossover/files/mach_machine.patch	2012-04-22 06:18:31 UTC (rev 92215)
@@ -0,0 +1,12 @@
+--- ./dlls/ntdll/nt.c.orig	2012-04-21 23:03:51.000000000 -0700
++++ ./dlls/ntdll/nt.c	2012-04-21 23:04:14.000000000 -0700
+@@ -34,7 +34,9 @@
+ # include <machine/cpu.h>
+ #endif
+ #ifdef HAVE_MACH_MACHINE_H
++# define cpu_type_t mach_cpu_type_t
+ # include <mach/machine.h>
++#undef cpu_type_t
+ #endif
+ 
+ #include <ctype.h>

Modified: trunk/dports/x11/wine-devel/Portfile
===================================================================
--- trunk/dports/x11/wine-devel/Portfile	2012-04-22 05:52:55 UTC (rev 92214)
+++ trunk/dports/x11/wine-devel/Portfile	2012-04-22 06:18:31 UTC (rev 92215)
@@ -96,6 +96,7 @@
                             port:pkgconfig
 
 patchfiles                  BOOL.patch \
+                            mach_machine.patch \
                             tiger-shell.patch
 
 configure.ldflags-append    -framework CoreServices \

Added: trunk/dports/x11/wine-devel/files/mach_machine.patch
===================================================================
--- trunk/dports/x11/wine-devel/files/mach_machine.patch	                        (rev 0)
+++ trunk/dports/x11/wine-devel/files/mach_machine.patch	2012-04-22 06:18:31 UTC (rev 92215)
@@ -0,0 +1,12 @@
+--- ./dlls/ntdll/nt.c.orig	2012-04-21 23:03:51.000000000 -0700
++++ ./dlls/ntdll/nt.c	2012-04-21 23:04:14.000000000 -0700
+@@ -34,7 +34,9 @@
+ # include <machine/cpu.h>
+ #endif
+ #ifdef HAVE_MACH_MACHINE_H
++# define cpu_type_t mach_cpu_type_t
+ # include <mach/machine.h>
++#undef cpu_type_t
+ #endif
+ 
+ #include <ctype.h>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120421/322d82c9/attachment-0001.html>