[42114] trunk/dports/x11/qt4-x11

mcalhoun at macports.org mcalhoun at macports.org
Sat Nov 15 09:38:23 PST 2008


Revision: 42114
          http://trac.macports.org/changeset/42114
Author:   mcalhoun at macports.org
Date:     2008-11-15 09:38:21 -0800 (Sat, 15 Nov 2008)
Log Message:
-----------
qt4-x11: version update 4.4.0 -> 4.4.3; added phonon support

Modified Paths:
--------------
    trunk/dports/x11/qt4-x11/Portfile

Added Paths:
-----------
    trunk/dports/x11/qt4-x11/files/patch-compile.test.diff
    trunk/dports/x11/qt4-x11/files/patch-configure.diff

Modified: trunk/dports/x11/qt4-x11/Portfile
===================================================================
--- trunk/dports/x11/qt4-x11/Portfile	2008-11-15 13:51:40 UTC (rev 42113)
+++ trunk/dports/x11/qt4-x11/Portfile	2008-11-15 17:38:21 UTC (rev 42114)
@@ -1,12 +1,11 @@
-# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
 PortSystem          1.0
 
 name                qt4-x11
-version             4.4.0
-revision            1
-categories	    x11
+version             4.4.3
+categories	        x11
 maintainers         mcalhoun
 homepage            http://www.trolltech.com/
 platforms           darwin
@@ -17,77 +16,96 @@
                     http://ftp.ntua.gr/pub/X11/Qt/qt/source/ \
                     http://wftp.tu-chemnitz.de/pub/Qt/qt/source/
 distname            qt-x11-opensource-src-${version}
+
 checksums           \
-    md5    f13ad0aa75efad314715930e663bad55          \
-    sha1   f5e5cae003e2fb18eba147686b07f03078ef185e  \
-    rmd160 7006f672c4ea9985ace6c57bbb1f710a1e444c7f
-depends_lib          \
-    port:zlib        \
-    port:libungif    \
-    port:tiff        \
-    port:libpng      \
-    port:libmng      \
-    port:jpeg        \
-    port:libiconv    \
-    port:glib2       \
-    port:dbus        \
-    port:unixODBC    \
-    port:mysql5      \
-    port:sqlite3     \
-    port:openssl     \
-    port:fontconfig  \
-    port:gettext     \
-    port:xrender     \
-    lib:libX11:XFree86
+    md5    376c003317c4417326ba2116370227d0          \
+    sha1   a883e913e69a418e3cfcfecefe4f82c4e091c4bd  \
+    rmd160 49de53663a86785f88236bdeca6db8ee96a37db8
 
-configure.cmd       "echo yes | ./configure"
-configure.env       OPENSOURCE_CXXFLAGS=-D__USE_WS_X11__
+depends_lib                                \
+    port:zlib                              \
+    port:giflib                            \
+    port:tiff                              \
+    port:libpng                            \
+    port:libmng                            \
+    port:jpeg                              \
+    port:libiconv                          \
+    path:lib/pkgconfig/glib-2.0.pc:glib2   \
+    port:dbus                              \
+    port:unixODBC                          \
+    port:mysql5                            \
+    port:postgresql83                      \
+    port:sqlite3                           \
+    port:openssl                           \
+    port:fontconfig                        \
+    port:gettext                           \
+    port:xrender                           \
+    port:gstreamer                         \
+    port:gst-plugins-base
 
+patchfiles  patch-compile.test.diff
+
 # --prefix is not recognized
-configure.pre_args
-
-# -I and -L must be set in the configure script
-#    (or else a few generated Makefiles will not seem them).
+configure.pre_args-delete  --prefix=${prefix}
+# -I${prefix}/include and -L${prefix}/lib must be set in ${configure.args}
+#    or else some generated Makefiles will not seem them
 configure.cppflags
 configure.ldflags
 
+configure.env-append \
+    OPENSOURCE_CXXFLAGS=-D__USE_WS_X11__
+
+set qt_dir ${prefix}/libexec/${name}
+
+# -I${prefix}/include should be set in ${configure.args}, but
+#    we instead patch -isystem ${prefix}/include into the configure
+#    script to avoid conflicts with other ports (e.g. PCRE).
 configure.args                                                 \
     -v                                                         \
-    -prefix          ${prefix}                                 \
-    -docdir          ${prefix}/share/doc/${portname}           \
-    -headerdir       ${prefix}/include/${portname}             \
-    -plugindir       ${prefix}/lib/${portname}-plugins         \
-    -datadir         ${prefix}/share/${portname}               \
-    -translationdir  ${prefix}/share/${portname}/translations  \
-    -examplesdir     ${prefix}/share/${portname}/examples      \
-    -demosdir        ${prefix}/share/${portname}/demos         \
+    -confirm-license                                           \
+    -prefix          ${qt_dir}                                 \
+    -docdir          ${prefix}/share/doc/${name}               \
+    -examplesdir     ${prefix}/share/${name}/examples          \
+    -demosdir        ${prefix}/share/${name}/demos             \
     -system-sqlite                                             \
-    -I${prefix}/include                                        \
     -I${prefix}/include/mysql5/mysql                           \
+    -I${prefix}/include/postgresql83                           \
     -L${prefix}/lib                                            \
     -L${prefix}/lib/mysql5/mysql                               \
+    -L${prefix}/lib/postgresql83                               \
     -liconv                                                    \
     -lresolv                                                   \
-    -no-rpath                                                  \
-    -no-nas-sound
+    -I${prefix}/include/gstreamer-0.10                         \
+    -I${prefix}/include/glib-2.0                               \
+    -I${prefix}/lib/glib-2.0/include                           \
+    -I${prefix}/include/libxml2
 
+# default: -no-nas-sound
+# default: -nomake demos  -nomake examples
+# default: -iconv -svg -webkit -phonon -phonon-backend -xmlpatterns
+# default: -no-assistant-webkit
+
+universal_variant   no
+
 build.target        first
 use_parallel_build  yes
 
 destroot.destdir    INSTALL_ROOT="${destroot}"
 
-patchfiles \
-    patch-qprocess_unix.cpp.diff   \
-    patch-qlibrary_unix.cpp.diff   \
-    patch-q3process_unix.cpp.diff
+post-configure {
+    reinplace "s|= cc|= ${configure.cc}|g" \
+        ${worksrcpath}/mkspecs/darwin-g++/qmake.conf
+    reinplace "s|= c++|= ${configure.cxx}|g" \
+        ${worksrcpath}/mkspecs/darwin-g++/qmake.conf
+}
 
 platform darwin 7 {
     depends_build-append    port:cups-headers
 }
 
 platform darwin 9 {
-    # See http://trac.macports.org/wiki/LeopardProblems
     post-patch {
+        # See http://trac.macports.org/wiki/LeopardProblems
         set dylibFile \
             /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
         reinplace -E \
@@ -96,73 +114,156 @@
     }
 }
 
-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
-    reinplace "s|\$(CXXFLAGS) \$(INCPATH)|\$(INCPATH) \$(CXXFLAGS)|g" ${worksrcpath}/src/3rdparty/webkit/WebCore/Makefile
-}
+post-patch {
+    reinplace -E "s|^I_FLAGS=\$|I_FLAGS=-isystem${prefix}/include|" \
+        ${worksrcpath}/configure
 
-post-patch {
-    reinplace "s|ARCH=macosx|ARCH=`uname -p`|g" ${worksrcpath}/configure
-    reinplace "s|/usr/X11R6/include|${x11prefix}/include|g" ${worksrcpath}/mkspecs/darwin-g++/qmake.conf
-    reinplace "s|/usr/X11R6/lib|${x11prefix}/lib|g" ${worksrcpath}/mkspecs/darwin-g++/qmake.conf
+    # macosx seems to be a special architecture to accommodate universal builds, but here is no
+    #    ${worksrcpath}/include/QtCore/qatomic_macosx.h file, which causes an error
+    reinplace "s|CFG_HOST_ARCH=macosx|CFG_HOST_ARCH=`uname -p`|g" ${worksrcpath}/configure
+
+    # Ensure the correct MacPorts X11 is used
+    reinplace "s|/usr/X11R6|${x11prefix}|g" ${worksrcpath}/mkspecs/darwin-g++/qmake.conf
+
+    # Avoid having to call "install_name_tool -change" after destroot.
     reinplace \
         "s|install_name\$\${LITERAL_WHITESPACE}|install_name\$\${LITERAL_WHITESPACE}\$\$\[QT_INSTALL_LIBS\]/|g" \
         ${worksrcpath}/mkspecs/darwin-g++/qmake.conf
-    reinplace "s|Q_OS_DARWIN|Q_WS_MAC|g" ${worksrcpath}/qmake/generators/mac/pbuilder_pbx.cpp
-    reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/src/corelib/tools/qstring.cpp
-    reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/src/corelib/global/qglobal.cpp
-    reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/src/corelib/io/qfsfileengine_unix.cpp
-    reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/src/corelib/global/qlibraryinfo.cpp
-    reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/src/corelib/tools/qlocale.cpp
-    reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/src/corelib/io/qsettings_p.h
-    reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/src/corelib/io/qsettings.cpp
-    reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/qmake/option.cpp
-    reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/src/corelib/plugin/qlibrary.cpp
-    reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/src/corelib/kernel/qcoreapplication.cpp
-    reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/src/corelib/thread/qthread_unix.cpp
-    reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/src/gui/dialogs/qprintdialog.h
-    reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/demos/mediaplayer/mediaplayer.cpp
-    reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/demos/qtdemo/colors.cpp
-    reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/demos/qtdemo/menumanager.cpp
-    reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/examples/dialogs/standarddialogs/dialog.cpp
-    reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/examples/help/remotecontrol/remotecontrol.cpp
-    reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/examples/help/simpletextviewer/assistant.cpp
-    reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/examples/tools/echoplugin/echowindow/echowindow.cpp
-    reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/examples/tools/plugandpaint/mainwindow.cpp
-    reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/src/corelib/codecs/qiconvcodec.cpp
-    reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/src/corelib/codecs/qiconvcodec_p.h
-    reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/src/corelib/io/qdir.cpp
-    reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/src/corelib/kernel/qcoreapplication_p.h
-    reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/src/corelib/tools/qpoint.h
-    reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/src/corelib/tools/qrect.h
-    reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/src/gui/text/qfont.cpp
-    reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/src/gui/text/qfontdatabase.cpp
-    reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/src/gui/widgets/qdockwidget.cpp
-    reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/src/plugins/accessible/widgets/simplewidgets.cpp
-    reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/src/qt3support/other/q3accel.cpp
-    reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/src/qt3support/other/q3polygonscanner.cpp
-    reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/src/qt3support/text/q3textedit.cpp
-    reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/src/sql/drivers/odbc/qsql_odbc.h
-    reinplace "s|(Q_OS_MAC)|(Q_WS_MAC)|g" ${worksrcpath}/src/tools/uic/cpp/cppwriteinitialization.cpp
-    reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/src/tools/uic/cpp/cppwriteinitialization.h
-    reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/tools/assistant/compat/lib/qassistantclient.cpp
-    reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/tools/assistant/lib/qhelpsearchresultwidget.cpp
-    reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/tools/designer/src/designer/assistantclient.cpp
-    reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/tools/designer/src/designer/qdesigner_actions.cpp
-    reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/tools/designer/src/lib/uilib/abstractformbuilder.cpp
-    reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/tools/linguist/linguist/trwindow.cpp
-    reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/tools/linguist/shared/proparserutils.h
-    reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/tools/shared/findwidget/findwidget.cpp
+
+    # Q_OS_MAC, Q_OS_MACX, and Q_OS_DARWIN is set for all Mac systems.
+    # Q_WS_MAC is NOT set for the X11 version of QT.
+    # It is not clear why so many of these had to be changed.
+    #
+    # Excluded:
+    #        ${worksrcpath}/src/corelib/global/qglobal.h
+    #        ${worksrcpath}/src/network/kernel/qhostinfo_unix.cpp
+    foreach file {
+        qmake/generators/mac/pbuilder_pbx.cpp
+        src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
+        src/corelib/global/qglobal.cpp
+        src/corelib/io/qfile.cpp
+        src/corelib/io/qfsfileengine_unix.cpp
+        src/corelib/plugin/qlibrary.cpp
+        src/corelib/thread/qthread_unix.cpp
+        src/corelib/tools/qlocale.cpp
+        src/network/ssl/qsslsocket_openssl_symbols.cpp
+        tools/porting/src/qt3headers1.resource
+        tools/qvfb/qlock.cpp
+    } {
+        reinplace "s|Q_OS_DARWIN|Q_WS_MAC|g" ${worksrcpath}/${file}
+    }
+    # Excluded:
+    #        ${worksrcpath}/src/corelib/global/qglobal.h
+    foreach file {
+        src/corelib/tools/qdumper.cpp
+        src/qt3support/other/q3accel.cpp
+        src/qt3support/other/q3process_unix.cpp
+        tools/porting/src/qt3headers1.resource
+        tools/porting/src/qt3headers3.resource
+    } {
+        reinplace "s|Q_OS_MACX|Q_WS_MAC|g" ${worksrcpath}/${file}
+    }
+    # Edited from command:
+    # grep -rl "\(Q_OS_MAC\$\|Q_OS_MAC[^X]\)" * | grep -v \.resource\$ | grep -v ^doc/ | grep -v src/corelib/global/qglobal.h
+    # Excluded:
+    #        ${worksrcpath}/src/corelib/global/qglobal.h
+    #        ${worksrcpath}/tools/assistant/lib/fulltextsearch/qclucene-config_p.h
+    #        ${worksrcpath}/src/script/qscriptengine_p.cpp
+    #        ${worksrcpath}/src/corelib/io/qprocess.cpp
+    #        ${worksrcpath}/src/corelib/io/qfilesystemwatcher.cpp
+    #        ${worksrcpath}/src/corelib/concurrent/qtconcurrentiteratekernel.cpp
+    foreach file {
+        demos/mediaplayer/mediaplayer.cpp
+        demos/qtdemo/colors.cpp
+        demos/qtdemo/menumanager.cpp
+        examples/dialogs/standarddialogs/dialog.cpp
+        examples/help/remotecontrol/remotecontrol.cpp
+        examples/help/simpletextviewer/assistant.cpp
+        examples/tools/echoplugin/echowindow/echowindow.cpp
+        examples/tools/plugandpaint/mainwindow.cpp
+        qmake/main.cpp
+        qmake/option.cpp
+        src/corelib/codecs/qiconvcodec.cpp
+        src/corelib/codecs/qiconvcodec_p.h
+        src/corelib/global/qglobal.cpp
+        src/corelib/global/qlibraryinfo.cpp
+        src/corelib/global/qnamespace.h
+        src/corelib/io/qdir.cpp
+        src/corelib/io/qfsfileengine_unix.cpp
+        src/corelib/io/qprocess_unix.cpp
+        src/corelib/io/qsettings.cpp
+        src/corelib/io/qsettings_p.h
+        src/corelib/kernel/qcoreapplication.cpp
+        src/corelib/kernel/qcoreapplication_p.h
+        src/corelib/plugin/qlibrary.cpp
+        src/corelib/plugin/qlibrary_unix.cpp
+        src/corelib/thread/qthread_unix.cpp
+        src/corelib/thread/qthread.cpp
+        src/corelib/tools/qlocale.cpp
+        src/corelib/tools/qpoint.h
+        src/corelib/tools/qrect.h
+        src/corelib/tools/qstring.cpp
+        src/corelib/xml/qxmlstream.h
+        src/gui/dialogs/qfilesystemmodel.cpp
+        src/gui/dialogs/qprintdialog.h
+        src/gui/itemviews/qdirmodel.cpp
+        src/gui/itemviews/qfileiconprovider.cpp
+        src/gui/kernel/qapplication.h
+        src/gui/kernel/qapplication_p.h
+        src/gui/text/qfont.cpp
+        src/gui/text/qfontdatabase.cpp
+        src/gui/widgets/qdockwidget.cpp
+        src/plugins/accessible/widgets/simplewidgets.cpp
+        src/qt3support/other/q3polygonscanner.cpp
+        src/qt3support/text/q3textedit.cpp
+        src/sql/drivers/odbc/qsql_odbc.h
+        src/tools/uic/cpp/cppwriteinitialization.cpp
+        src/tools/uic/cpp/cppwriteinitialization.h
+        tools/assistant/compat/lib/qassistantclient.cpp
+        tools/assistant/lib/qhelpsearchresultwidget.cpp
+        tools/assistant/tools/assistant/bookmarkmanager.cpp
+        tools/assistant/tools/assistant/centralwidget.cpp
+        tools/assistant/tools/assistant/indexwindow.cpp
+        tools/assistant/tools/assistant/mainwindow.cpp
+        tools/designer/src/designer/assistantclient.cpp
+        tools/designer/src/designer/qdesigner_actions.cpp
+        tools/designer/src/lib/uilib/abstractformbuilder.cpp
+        tools/linguist/linguist/trwindow.cpp
+        tools/linguist/shared/proparserutils.h
+        tools/shared/findwidget/findwidget.cpp
+    } {
+        reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/${file}
+    }
 }
 
 post-destroot {
-    foreach doc {INSTALL LICENSE.GPL2 LICENSE.GPL3 LICENSE.QPL OPENSOURCE-NOTICE.TXT README \
+    foreach doc {INSTALL LICENSE.GPL2 LICENSE.GPL3 OPENSOURCE-NOTICE.TXT README \
                      GPL_EXCEPTION_ADDENDUM.TXT GPL_EXCEPTION.TXT} {
         xinstall -c -m 644 ${worksrcpath}/$doc ${destroot}${prefix}/share/doc/${portname}
     }
+
+    # create link in ${prefix}/bin to executable files in ${qt_dir}/bin
+    foreach bin [glob -type f -directory ${destroot}${qt_dir}/bin *] {
+        system "ln -s ${qt_dir}/bin/[file tail ${bin}] ${destroot}${prefix}/bin"
+    }
+    # append -x11 to links in ${prefix}/bin to avoid conflict with qt4-mac
+    foreach bin [glob ${destroot}${prefix}/bin/*] {
+        file rename ${bin} ${bin}-x11
+    }
+
+    # Fix the .pc and .prl files by removing ${destroot}
+    foreach fixfile [glob -nocomplain -directory ${destroot} ${qt_dir}/lib/pkgconfig/*.pc ${qt_dir}/lib/*.prl ${prefix}/share/${name}/demos/shared/*.prl] {
+        reinplace  \
+            "s|-L${worksrcpath}/lib|-L${qt_dir}/lib|g" \
+            ${fixfile}
+    }
+
+    # move pkgconfig dir to another directory to avoid conflict with qt4-mac
+    # pkg-config should still find it, but qt4-mac will take precedence
+    xinstall -m 755 -d ${destroot}${prefix}/share/
+    move ${destroot}${qt_dir}/lib/pkgconfig ${destroot}${prefix}/share/
 }
 
 livecheck.check     regex
-livecheck.url       http://trolltech.com/developer/downloads/qt/x11
-livecheck.regex     "The current version of Qt/X11 Open Source Edition is (4(?:\\.\\d+)*)"
+livecheck.url       http://trolltech.com/downloads/opensource/appdev/linux-x11-cpp
+livecheck.regex     "qt-x11-opensource-src-(4(?:\\.\\d+)*)${extract.suffix}"

Added: trunk/dports/x11/qt4-x11/files/patch-compile.test.diff
===================================================================
--- trunk/dports/x11/qt4-x11/files/patch-compile.test.diff	                        (rev 0)
+++ trunk/dports/x11/qt4-x11/files/patch-compile.test.diff	2008-11-15 17:38:21 UTC (rev 42114)
@@ -0,0 +1,13 @@
+--- config.tests/unix/compile.test.orig	2008-10-31 13:17:24.000000000 -0400
++++ config.tests/unix/compile.test	2008-10-31 13:20:04.000000000 -0400
+@@ -28,6 +28,10 @@
+     -L*|-l*|-pthread)
+ 	LFLAGS="$LFLAGS $PARAM"
+ 	;;
++    -isystem*)
++        INC=`echo $PARAM | sed -e 's/^-isystem//'`
++        INCLUDEPATH="$INCLUDEPATH $INC"
++        ;;
+     -I*)
+         INC=`echo $PARAM | sed -e 's/^-I//'`
+         INCLUDEPATH="$INCLUDEPATH $INC"

Added: trunk/dports/x11/qt4-x11/files/patch-configure.diff
===================================================================
--- trunk/dports/x11/qt4-x11/files/patch-configure.diff	                        (rev 0)
+++ trunk/dports/x11/qt4-x11/files/patch-configure.diff	2008-11-15 17:38:21 UTC (rev 42114)
@@ -0,0 +1,10 @@
+--- configure.old	2008-09-27 04:58:41.000000000 -0400
++++ configure	2008-10-23 00:02:20.000000000 -0400
+@@ -3917,6 +3917,7 @@
+         if [ '!' -z "$D_FLAGS" ]; then
+             for DEF in $D_FLAGS; do
+                 EXTRA_CFLAGS="$EXTRA_CFLAGS \"-D${DEF}\""
++                EXTRA_CXXFLAGS="$EXTRA_CFLAGS \"-D${DEF}\""
+             done
+         fi
+         QMAKE_BIN_DIR="$QT_INSTALL_BINS"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081115/6cec985f/attachment.html>


More information about the macports-changes mailing list