[37147] trunk/dports/aqua/qt4-mac/Portfile

[erickt at macports.org]

Revision: 37147
          http://trac.macosforge.org/projects/macports/changeset/37147
Author:   erickt at macports.org
Date:     2008-05-27 12:27:26 -0700 (Tue, 27 May 2008)

Log Message:
-----------
Modify the qt4 include paths so it can be built with pcre and openjpeg installed.

Thanks mcalhoun from #15219!

Modified Paths:
--------------
    trunk/dports/aqua/qt4-mac/Portfile

Modified: trunk/dports/aqua/qt4-mac/Portfile
===================================================================
--- trunk/dports/aqua/qt4-mac/Portfile	2008-05-27 19:27:23 UTC (rev 37146)
+++ trunk/dports/aqua/qt4-mac/Portfile	2008-05-27 19:27:26 UTC (rev 37147)
@@ -35,15 +35,12 @@
 # (e.g. assistant.app) and the examples directory
 set bindir ${prefix}/libexec/${name}/bin
 
-pre-configure {
-    # conflict with pcre
-    if {[file exists ${prefix}/include/pcre.h]} {
-        return -code error "port:pcre may prevent building this port. Please uninstall (or deactivate) pcre and restart the build."
-    }
-    # conflict with openjpeg
-    if {[file exists ${prefix}/include/event.h]} {
-        return -code error "port:openjpeg may prevent building this port. Please uninstall (or deactivate) openjpeg and restart the build."
-    }
+post-configure {
+    # Assures local header is included instead of one from PCRE and OpenJPEG (and perhaps others).
+    reinplace "s|\$(CFLAGS) \$(INCPATH)|\$(INCPATH) \$(CFLAGS)|g" ${worksrcpath}/src/3rdparty/webkit/WebCore/Makefile.Release
+    reinplace "s|\$(CXXFLAGS) \$(INCPATH)|\$(INCPATH) \$(CXXFLAGS)|g" ${worksrcpath}/src/3rdparty/webkit/WebCore/Makefile.Release
+    reinplace "s|\$(CFLAGS) \$(INCPATH)|\$(INCPATH) \$(CFLAGS)|g" ${worksrcpath}/src/3rdparty/webkit/WebCore/Makefile.Debug
+    reinplace "s|\$(CXXFLAGS) \$(INCPATH)|\$(INCPATH) \$(CXXFLAGS)|g" ${worksrcpath}/src/3rdparty/webkit/WebCore/Makefile.Debug
 }
 
 # See

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080527/b7e6b9e3/attachment.htm