[62679] trunk/dports/x11

[ryandesign at macports.org]

Revision: 62679
          http://trac.macports.org/changeset/62679
Author:   ryandesign at macports.org
Date:     2010-01-13 13:34:43 -0800 (Wed, 13 Jan 2010)
Log Message:
-----------
wine, wine-devel: prevent /usr/local/include/dispatch/dispatch.h (see #22342) or /Library/Frameworks/OpenAL.framework (see #23222) from interfering with the build

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

Modified: trunk/dports/x11/wine/Portfile
===================================================================
--- trunk/dports/x11/wine/Portfile	2010-01-13 21:25:54 UTC (rev 62678)
+++ trunk/dports/x11/wine/Portfile	2010-01-13 21:34:43 UTC (rev 62679)
@@ -104,6 +104,16 @@
     }
 }
 
+pre-configure {
+    foreach badfile {/usr/local/include/dispatch/dispatch.h /Library/Frameworks/OpenAL.framework} {
+        if {[file exists ${badfile}]} {
+            ui_error "You have a copy of [file tail ${badfile}] in [file dirname ${badfile}] that will prevent"
+            ui_error "${name} from building properly. Please remove it before trying again."
+            return -code error "incompatible file"
+        }
+    }
+}
+
 post-destroot {
     xinstall -d ${destroot}${prefix}/libexec/wine
     file rename ${destroot}${prefix}/bin/wine ${destroot}${prefix}/libexec/wine/wine

Modified: trunk/dports/x11/wine-devel/Portfile
===================================================================
--- trunk/dports/x11/wine-devel/Portfile	2010-01-13 21:25:54 UTC (rev 62678)
+++ trunk/dports/x11/wine-devel/Portfile	2010-01-13 21:34:43 UTC (rev 62679)
@@ -103,6 +103,16 @@
     }
 }
 
+pre-configure {
+    foreach badfile {/usr/local/include/dispatch/dispatch.h /Library/Frameworks/OpenAL.framework} {
+        if {[file exists ${badfile}]} {
+            ui_error "You have a copy of [file tail ${badfile}] in [file dirname ${badfile}] that will prevent"
+            ui_error "${name} from building properly. Please remove it before trying again."
+            return -code error "incompatible file"
+        }
+    }
+}
+
 post-destroot {
     xinstall -d ${destroot}${prefix}/libexec/wine
     file rename ${destroot}${prefix}/bin/wine ${destroot}${prefix}/libexec/wine/wine
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100113/e7ce47f6/attachment-0001.html>