[82220] trunk/dports/aqua/qt4-mac-devel/files
michaelld at macports.org
michaelld at macports.org
Wed Aug 10 10:01:35 PDT 2011
Revision: 82220
http://trac.macports.org/changeset/82220
Author: michaelld at macports.org
Date: 2011-08-10 10:01:32 -0700 (Wed, 10 Aug 2011)
Log Message:
-----------
qt4-mac-devel: add patch files.
Added Paths:
-----------
trunk/dports/aqua/qt4-mac-devel/files/patch-PluginView-no-carbon.diff
trunk/dports/aqua/qt4-mac-devel/files/patch-QtHelp_10.4_only.diff
trunk/dports/aqua/qt4-mac-devel/files/patch-config.tests_unix_compile.test.diff
trunk/dports/aqua/qt4-mac-devel/files/patch-configure-arch.diff
trunk/dports/aqua/qt4-mac-devel/files/patch-darwin-g++.diff
trunk/dports/aqua/qt4-mac-devel/files/patch-macosx-deployment-target.diff
trunk/dports/aqua/qt4-mac-devel/files/patch-mkspecs-features-moc.prf.diff
trunk/dports/aqua/qt4-mac-devel/files/patch-mkspecs-features-qt.prf.diff
trunk/dports/aqua/qt4-mac-devel/files/patch-mkspecs-features-qt_functions.prf.diff
trunk/dports/aqua/qt4-mac-devel/files/patch-mkspecs-macx-g++-qmake.prf.diff
trunk/dports/aqua/qt4-mac-devel/files/patch-mkspecs_common_g++-base.conf.diff
trunk/dports/aqua/qt4-mac-devel/files/patch-mkspecs_common_mac.conf.diff
trunk/dports/aqua/qt4-mac-devel/files/patch-mkspecs_darwin-g++_qmake.conf.diff
trunk/dports/aqua/qt4-mac-devel/files/patch-src-plugins-bearer-corewlan-corewlan.pro.diff
Added: trunk/dports/aqua/qt4-mac-devel/files/patch-PluginView-no-carbon.diff
===================================================================
--- trunk/dports/aqua/qt4-mac-devel/files/patch-PluginView-no-carbon.diff (rev 0)
+++ trunk/dports/aqua/qt4-mac-devel/files/patch-PluginView-no-carbon.diff 2011-08-10 17:01:32 UTC (rev 82220)
@@ -0,0 +1,24 @@
+--- src/3rdparty/webkit/WebCore/plugins/PluginView.h.orig 2011-04-02 12:26:20.000000000 -0400
++++ src/3rdparty/webkit/WebCore/plugins/PluginView.h 2011-04-02 12:26:42.000000000 -0400
+@@ -360,7 +360,9 @@
+
+ Point m_lastMousePos;
+ void setNPWindowIfNeeded();
++#ifndef NP_NO_CARBON
+ void nullEventTimerFired(Timer<PluginView>*);
++#endif
+ Point globalMousePosForPlugin() const;
+ Point mousePosForPlugin(MouseEvent* event = 0) const;
+ #endif
+--- src/3rdparty/webkit/WebCore/plugins/mac/PluginViewMac.mm.orig 2011-04-02 12:26:06.000000000 -0400
++++ src/3rdparty/webkit/WebCore/plugins/mac/PluginViewMac.mm 2011-04-02 12:30:07.000000000 -0400
+@@ -233,7 +233,9 @@
+ setNPWindowIfNeeded();
+
+ // TODO: Implement null timer throttling depending on plugin activation
++#ifndef NP_NO_CARBON
+ m_nullEventTimer.set(new Timer<PluginView>(this, &PluginView::nullEventTimerFired));
++#endif
+ m_nullEventTimer->startRepeating(0.02);
+
+ m_lastMousePos.h = m_lastMousePos.v = 0;
Added: trunk/dports/aqua/qt4-mac-devel/files/patch-QtHelp_10.4_only.diff
===================================================================
--- trunk/dports/aqua/qt4-mac-devel/files/patch-QtHelp_10.4_only.diff (rev 0)
+++ trunk/dports/aqua/qt4-mac-devel/files/patch-QtHelp_10.4_only.diff 2011-08-10 17:01:32 UTC (rev 82220)
@@ -0,0 +1,145 @@
+--- tools/assistant/tools/assistant/assistant.pro.orig 2011-01-10 09:05:05.000000000 -0500
++++ tools/assistant/tools/assistant/assistant.pro 2011-01-10 09:05:55.000000000 -0500
+@@ -116,3 +116,30 @@
+ DEFINES += USE_STATIC_SQLITE_PLUGIN
+ }
+ }
++
++qclucene = QtCLucene$${QT_LIBINFIX}
++if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
++ mac:qclucene = $${qclucene}_debug
++ win32:qclucene = $${qclucene}d
++}
++linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qclucene
++LIBS_PRIVATE += -l$$qclucene
++
++qcnetwork = QtNetwork$${QT_LIBINFIX}
++if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
++ mac:qcnetwork = $${qcnetwork}_debug
++ win32:qcnetwork = $${qcnetwork}d
++}
++linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qcnetwork
++LIBS_PRIVATE += -l$$qcnetwork
++
++qcwebkit = QtWebKit$${QT_LIBINFIX}
++if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
++ mac:qcwebkit = $${qcwebkit}_debug
++ win32:qcwebkit = $${qcwebkit}d
++}
++linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qcwebkit
++LIBS_PRIVATE += -l$$qcwebkit
++
++
++
+--- tools/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro.orig 2011-01-10 09:05:05.000000000 -0500
++++ tools/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro 2011-01-10 09:05:55.000000000 -0500
+@@ -15,3 +15,27 @@
+ ../shared/collectionconfiguration.cpp
+ HEADERS += ../shared/helpgenerator.h \
+ ../shared/collectionconfiguration.h
++
++qclucene = QtCLucene$${QT_LIBINFIX}
++if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
++ mac:qclucene = $${qclucene}_debug
++ win32:qclucene = $${qclucene}d
++}
++linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qclucene
++LIBS_PRIVATE += -l$$qclucene
++
++qcnetwork = QtNetwork$${QT_LIBINFIX}
++if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
++ mac:qcnetwork = $${qcnetwork}_debug
++ win32:qcnetwork = $${qcnetwork}d
++}
++linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qcnetwork
++LIBS_PRIVATE += -l$$qcnetwork
++
++qcwebkit = QtWebKit$${QT_LIBINFIX}
++if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
++ mac:qcwebkit = $${qcwebkit}_debug
++ win32:qcwebkit = $${qcwebkit}d
++}
++linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qcwebkit
++LIBS_PRIVATE += -l$$qcwebkit
+--- tools/assistant/tools/qhelpconverter/qhelpconverter.pro.orig 2011-01-10 09:05:05.000000000 -0500
++++ tools/assistant/tools/qhelpconverter/qhelpconverter.pro 2011-01-10 09:05:55.000000000 -0500
+@@ -45,3 +45,27 @@
+ outputpage.ui
+
+ RESOURCES += qhelpconverter.qrc
++
++qclucene = QtCLucene$${QT_LIBINFIX}
++if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
++ mac:qclucene = $${qclucene}_debug
++ win32:qclucene = $${qclucene}d
++}
++linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qclucene
++LIBS_PRIVATE += -l$$qclucene
++
++qcnetwork = QtNetwork$${QT_LIBINFIX}
++if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
++ mac:qcnetwork = $${qcnetwork}_debug
++ win32:qcnetwork = $${qcnetwork}d
++}
++linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qcnetwork
++LIBS_PRIVATE += -l$$qcnetwork
++
++qcwebkit = QtWebKit$${QT_LIBINFIX}
++if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
++ mac:qcwebkit = $${qcwebkit}_debug
++ win32:qcwebkit = $${qcwebkit}d
++}
++linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qcwebkit
++LIBS_PRIVATE += -l$$qcwebkit
+--- tools/assistant/tools/qhelpgenerator/qhelpgenerator.pro.orig 2011-01-10 09:05:05.000000000 -0500
++++ tools/assistant/tools/qhelpgenerator/qhelpgenerator.pro 2011-01-10 09:05:55.000000000 -0500
+@@ -12,3 +12,27 @@
+ main.cpp
+
+ HEADERS += ../shared/helpgenerator.h
++
++qclucene = QtCLucene$${QT_LIBINFIX}
++if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
++ mac:qclucene = $${qclucene}_debug
++ win32:qclucene = $${qclucene}d
++}
++linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qclucene
++LIBS_PRIVATE += -l$$qclucene
++
++qcnetwork = QtNetwork$${QT_LIBINFIX}
++if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
++ mac:qcnetwork = $${qcnetwork}_debug
++ win32:qcnetwork = $${qcnetwork}d
++}
++linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qcnetwork
++LIBS_PRIVATE += -l$$qcnetwork
++
++qcwebkit = QtWebKit$${QT_LIBINFIX}
++if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
++ mac:qcwebkit = $${qcwebkit}_debug
++ win32:qcwebkit = $${qcwebkit}d
++}
++linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qcwebkit
++LIBS_PRIVATE += -l$$qcwebkit
+--- tools/designer/src/plugins/qwebview/qwebview.pro.orig 2011-01-10 09:05:05.000000000 -0500
++++ tools/designer/src/plugins/qwebview/qwebview.pro 2011-01-10 09:05:55.000000000 -0500
+@@ -13,3 +13,19 @@
+ SOURCES += qwebview_plugin.cpp
+ HEADERS += qwebview_plugin.h
+ RESOURCES += qwebview_plugin.qrc
++
++qcnetwork = QtNetwork$${QT_LIBINFIX}
++if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
++ mac:qcnetwork = $${qcnetwork}_debug
++ win32:qcnetwork = $${qcnetwork}d
++}
++linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qcnetwork
++LIBS_PRIVATE += -l$$qcnetwork
++
++qcwebkit = QtWebKit$${QT_LIBINFIX}
++if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
++ mac:qcwebkit = $${qcwebkit}_debug
++ win32:qcwebkit = $${qcwebkit}d
++}
++linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qcwebkit
++LIBS_PRIVATE += -l$$qcwebkit
Added: trunk/dports/aqua/qt4-mac-devel/files/patch-config.tests_unix_compile.test.diff
===================================================================
--- trunk/dports/aqua/qt4-mac-devel/files/patch-config.tests_unix_compile.test.diff (rev 0)
+++ trunk/dports/aqua/qt4-mac-devel/files/patch-config.tests_unix_compile.test.diff 2011-08-10 17:01:32 UTC (rev 82220)
@@ -0,0 +1,11 @@
+--- config.tests/unix/compile.test.orig 2010-11-01 10:05:07.000000000 -0400
++++ config.tests/unix/compile.test 2010-11-01 10:05:41.000000000 -0400
+@@ -68,7 +68,7 @@
+ # Make sure output from possible previous tests is gone
+ rm -f "$EXE" "${EXE}.exe"
+
+-"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "CONFIG-=debug_and_release" "LIBS*=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
++"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "CONFIG-=debug_and_release app_bundle" "LIBS*=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CFLAGS*=$CXXFLAGS" "QMAKE_CFLAGS+=$MAC_ARCH_CXXFLAGS" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
+
+ if [ "$VERBOSE" = "yes" ]; then
+ $MAKE
Added: trunk/dports/aqua/qt4-mac-devel/files/patch-configure-arch.diff
===================================================================
--- trunk/dports/aqua/qt4-mac-devel/files/patch-configure-arch.diff (rev 0)
+++ trunk/dports/aqua/qt4-mac-devel/files/patch-configure-arch.diff 2011-08-10 17:01:32 UTC (rev 82220)
@@ -0,0 +1,28 @@
+--- configure_orig 2010-10-13 21:13:01.000000000 -0400
++++ configure 2010-10-13 21:15:36.000000000 -0400
+@@ -4893,20 +4893,11 @@
+ EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(CARBON_CFLAGS)"
+ EXTRA_OBJS="qsettings_mac.o qcore_mac.o"
+ EXTRA_SRCS="\"$relpath/src/corelib/io/qsettings_mac.cpp\" \"$relpath/src/corelib/kernel/qcore_mac.cpp\""
+- if echo "$CFG_MAC_ARCHS" | grep x86 > /dev/null 2>&1; then # matches both x86 and x86_64
+- X86_CFLAGS="-arch i386"
+- X86_LFLAGS="-arch i386"
+- EXTRA_CFLAGS="$X86_CFLAGS $EXTRA_CFLAGS"
+- EXTRA_CXXFLAGS="$X86_CFLAGS $EXTRA_CXXFLAGS"
+- EXTRA_LFLAGS="$EXTRA_LFLAGS $X86_LFLAGS"
+- fi
+- if echo "$CFG_MAC_ARCHS" | grep ppc > /dev/null 2>&1; then # matches both ppc and ppc64
+- PPC_CFLAGS="-arch ppc"
+- PPC_LFLAGS="-arch ppc"
+- EXTRA_CFLAGS="$PPC_CFLAGS $EXTRA_CFLAGS"
+- EXTRA_CXXFLAGS="$PPC_CFLAGS $EXTRA_CXXFLAGS"
+- EXTRA_LFLAGS="$EXTRA_LFLAGS $PPC_LFLAGS"
+- fi
++ ARCH_CFLAGS="-arch @ARCHES@"
++ ARCH_LFLAGS="-arch @ARCHES@"
++ EXTRA_CFLAGS="$ARCH_CFLAGS $EXTRA_CFLAGS"
++ EXTRA_CXXFLAGS="$ARCH_CFLAGS $EXTRA_CXXFLAGS"
++ EXTRA_LFLAGS="$EXTRA_LFLAGS $ARCH_LFLAGS"
+ if [ '!' -z "$CFG_SDK" ]; then
+ echo "SDK_LFLAGS =-Wl,-syslibroot,$CFG_SDK" >>"$mkfile"
+ echo "SDK_CFLAGS =-isysroot $CFG_SDK" >>"$mkfile"
Added: trunk/dports/aqua/qt4-mac-devel/files/patch-darwin-g++.diff
===================================================================
--- trunk/dports/aqua/qt4-mac-devel/files/patch-darwin-g++.diff (rev 0)
+++ trunk/dports/aqua/qt4-mac-devel/files/patch-darwin-g++.diff 2011-08-10 17:01:32 UTC (rev 82220)
@@ -0,0 +1,20 @@
+--- configure_orig 2010-10-13 21:13:01.000000000 -0400
++++ configure 2010-10-13 21:15:36.000000000 -0400
+@@ -4558,7 +4558,7 @@
+ EXTRA_LFLAGS="\$(QMAKE_LFLAGS_RPATH)\"$rpath\" $EXTRA_LFLAGS"
+ done
+ fi
+- if [ "$PLATFORM_MAC" = "yes" ]; then
++ if [ "$PLATFORM_MAC" = "yes" -o "$PLATFORM" = "darwin-g++" ]; then
+ echo "export MACOSX_DEPLOYMENT_TARGET = @MACOSX_DEPLOYMENT_TARGET@" >> "$mkfile"
+ echo "CARBON_LFLAGS =-framework ApplicationServices" >>"$mkfile"
+ echo "CARBON_CFLAGS =-fconstant-cfstrings" >>"$mkfile"
+@@ -6739,7 +6730,7 @@
+ [ '!' -z "$L_FLAGS" ] && QMakeVar add QMAKE_LIBDIR_FLAGS "$L_FLAGS"
+ [ '!' -z "$l_FLAGS" ] && QMakeVar add LIBS "$l_FLAGS"
+
+-if [ "$PLATFORM_MAC" = "yes" ]; then
++if [ "$PLATFORM_MAC" = "yes" -o "$PLATFORM" = "darwin-g++" ]; then
+ if [ "$CFG_RPATH" = "yes" ]; then
+ QMAKE_CONFIG="$QMAKE_CONFIG absolute_library_soname"
+ fi
Added: trunk/dports/aqua/qt4-mac-devel/files/patch-macosx-deployment-target.diff
===================================================================
--- trunk/dports/aqua/qt4-mac-devel/files/patch-macosx-deployment-target.diff (rev 0)
+++ trunk/dports/aqua/qt4-mac-devel/files/patch-macosx-deployment-target.diff 2011-08-10 17:01:32 UTC (rev 82220)
@@ -0,0 +1,120 @@
+--- configure_orig 2010-10-13 09:42:43.000000000 -0400
++++ configure 2010-10-12 09:44:40.000000000 -0400
+@@ -4885,7 +4885,7 @@
+ done
+ fi
+ if [ "$BUILD_ON_MAC" = "yes" ]; then
+- echo "export MACOSX_DEPLOYMENT_TARGET = 10.5" >> "$mkfile"
++ echo "export MACOSX_DEPLOYMENT_TARGET = @MACOSX_DEPLOYMENT_TARGET@" >> "$mkfile"
+ echo "CARBON_LFLAGS =-framework ApplicationServices" >>"$mkfile"
+ echo "CARBON_CFLAGS =-fconstant-cfstrings" >>"$mkfile"
+ EXTRA_LFLAGS="$EXTRA_LFLAGS \$(CARBON_LFLAGS)"
+@@ -6965,16 +6965,7 @@
+
+ # set the global Mac deployment target. This is overridden on an arch-by-arch basis
+ # in some cases, see code further down
+-case "$PLATFORM,$CFG_MAC_COCOA" in
+- macx*,yes)
+- # Cocoa
+- QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.5
+- ;;
+- macx*,no)
+- # gcc, Carbon
+- QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.4
+- ;;
+-esac
++QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET @MACOSX_DEPLOYMENT_TARGET@
+
+ # disable Qt 3 support on VxWorks and Symbian
+ case "$XPLATFORM" in
+@@ -7696,28 +7678,28 @@
+ # env. variable.
+ if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_XARCH" != "no" ] ; then
+ if echo "$CFG_MAC_ARCHS" | grep '\<x86\>' > /dev/null 2>&1; then
+- QMakeVar add QMAKE_CFLAGS "-Xarch_i386 -mmacosx-version-min=10.4"
+- QMakeVar add QMAKE_CXXFLAGS "-Xarch_i386 -mmacosx-version-min=10.4"
+- QMakeVar add QMAKE_LFLAGS "-Xarch_i386 -mmacosx-version-min=10.4"
+- QMakeVar add QMAKE_OBJECTIVE_CFLAGS_X86 "-arch i386 -Xarch_i386 -mmacosx-version-min=10.4"
++ QMakeVar add QMAKE_CFLAGS "-Xarch_i386 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
++ QMakeVar add QMAKE_CXXFLAGS "-Xarch_i386 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
++ QMakeVar add QMAKE_LFLAGS "-Xarch_i386 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
++ QMakeVar add QMAKE_OBJECTIVE_CFLAGS_X86 "-arch i386 -Xarch_i386 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
+ fi
+ if echo "$CFG_MAC_ARCHS" | grep '\<ppc\>' > /dev/null 2>&1; then
+- QMakeVar add QMAKE_CFLAGS "-Xarch_ppc -mmacosx-version-min=10.4"
+- QMakeVar add QMAKE_CXXFLAGS "-Xarch_ppc -mmacosx-version-min=10.4"
+- QMakeVar add QMAKE_LFLAGS "-Xarch_ppc -mmacosx-version-min=10.4"
+- QMakeVar add QMAKE_OBJECTIVE_CFLAGS_PPC "-arch ppc -Xarch_ppc -mmacosx-version-min=10.4"
++ QMakeVar add QMAKE_CFLAGS "-Xarch_ppc -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
++ QMakeVar add QMAKE_CXXFLAGS "-Xarch_ppc -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
++ QMakeVar add QMAKE_LFLAGS "-Xarch_ppc -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
++ QMakeVar add QMAKE_OBJECTIVE_CFLAGS_PPC "-arch ppc -Xarch_ppc -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
+ fi
+ if echo "$CFG_MAC_ARCHS" | grep '\<x86_64\>' > /dev/null 2>&1; then
+- QMakeVar add QMAKE_CFLAGS "-Xarch_x86_64 -mmacosx-version-min=10.5"
+- QMakeVar add QMAKE_CXXFLAGS "-Xarch_x86_64 -mmacosx-version-min=10.5"
+- QMakeVar add QMAKE_LFLAGS "-Xarch_x86_64 -mmacosx-version-min=10.5"
+- QMakeVar add QMAKE_OBJECTIVE_CFLAGS_X86_64 "-arch x86_64 -Xarch_x86_64 -mmacosx-version-min=10.5"
++ QMakeVar add QMAKE_CFLAGS "-Xarch_x86_64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
++ QMakeVar add QMAKE_CXXFLAGS "-Xarch_x86_64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
++ QMakeVar add QMAKE_LFLAGS "-Xarch_x86_64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
++ QMakeVar add QMAKE_OBJECTIVE_CFLAGS_X86_64 "-arch x86_64 -Xarch_x86_64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
+ fi
+ if echo "$CFG_MAC_ARCHS" | grep '\<ppc64\>' > /dev/null 2>&1; then
+- QMakeVar add QMAKE_CFLAGS "-Xarch_ppc64 -mmacosx-version-min=10.5"
+- QMakeVar add QMAKE_CXXFLAGS "-Xarch_ppc64 -mmacosx-version-min=10.5"
+- QMakeVar add QMAKE_LFLAGS "-Xarch_ppc64 -mmacosx-version-min=10.5"
+- QMakeVar add QMAKE_OBJECTIVE_CFLAGS_PPC_64 "-arch ppc64 -Xarch_ppc64 -mmacosx-version-min=10.5"
++ QMakeVar add QMAKE_CFLAGS "-Xarch_ppc64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
++ QMakeVar add QMAKE_CXXFLAGS "-Xarch_ppc64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
++ QMakeVar add QMAKE_LFLAGS "-Xarch_ppc64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
++ QMakeVar add QMAKE_OBJECTIVE_CFLAGS_PPC_64 "-arch ppc64 -Xarch_ppc64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@"
+ fi
+ fi
+
+--- mkspecs/common/g++-macx.conf_orig 2010-10-13 09:42:49.000000000 -0400
++++ mkspecs/common/g++-macx.conf 2010-10-12 09:39:33.000000000 -0400
+@@ -16,8 +16,8 @@
+
+ QMAKE_LFLAGS_STATIC_LIB += -all_load
+
+-QMAKE_CFLAGS_X86_64 += -Xarch_x86_64 -mmacosx-version-min=10.5
+-QMAKE_CFLAGS_PPC_64 += -Xarch_ppc64 -mmacosx-version-min=10.5
++QMAKE_CFLAGS_X86_64 += -Xarch_x86_64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@
++QMAKE_CFLAGS_PPC_64 += -Xarch_ppc64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@
+
+ QMAKE_CXXFLAGS_X86_64 = $$QMAKE_CFLAGS_X86_64
+ QMAKE_CXXFLAGS_PPC_64 = $$QMAKE_CFLAGS_PPC_64
+--- mkspecs/common/mac.conf_orig 2010-10-13 09:42:49.000000000 -0400
++++ mkspecs/common/mac.conf 2010-10-12 09:38:52.000000000 -0400
+@@ -38,7 +38,7 @@
+ QMAKE_DEL_DIR = rmdir
+ QMAKE_CHK_DIR_EXISTS = test -d
+ QMAKE_MKDIR = mkdir -p
+-QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4 # overridden to 10.5 for Cocoa on the compiler command line
++QMAKE_MACOSX_DEPLOYMENT_TARGET = @MACOSX_DEPLOYMENT_TARGET@
+
+
+ include(unix.conf)
+--- qmake/qmake.pri_orig 2010-10-13 09:42:50.000000000 -0400
++++ qmake/qmake.pri 2010-10-13 10:04:18.000000000 -0400
+@@ -134,7 +134,7 @@
+ mac {
+ SOURCES += qfilesystemengine_mac.cpp
+ SOURCES += qcore_mac.cpp qsettings_mac.cpp
+- QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4 #enables weak linking for 10.4 (exported)
++ QMAKE_MACOSX_DEPLOYMENT_TARGET = @MACOSX_DEPLOYMENT_TARGET@
+ LIBS += -framework ApplicationServices
+ }
+ } else:win32 {
+--- src/tools/bootstrap/bootstrap.pro_orig 2010-10-13 09:42:57.000000000 -0400
++++ src/tools/bootstrap/bootstrap.pro 2010-10-13 10:04:19.000000000 -0400
+@@ -104,7 +104,7 @@
+ else:win32:SOURCES += ../../corelib/tools/qlocale_win.cpp
+
+ macx: {
+- QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4 #enables weak linking for 10.4 (exported)
++ QMAKE_MACOSX_DEPLOYMENT_TARGET = @MACOSX_DEPLOYMENT_TARGET@
+ SOURCES += ../../corelib/io/qfilesystemengine_mac.cpp
+ SOURCES += ../../corelib/kernel/qcore_mac.cpp
+ LIBS += -framework CoreServices
Added: trunk/dports/aqua/qt4-mac-devel/files/patch-mkspecs-features-moc.prf.diff
===================================================================
--- trunk/dports/aqua/qt4-mac-devel/files/patch-mkspecs-features-moc.prf.diff (rev 0)
+++ trunk/dports/aqua/qt4-mac-devel/files/patch-mkspecs-features-moc.prf.diff 2011-08-10 17:01:32 UTC (rev 82220)
@@ -0,0 +1,18 @@
+--- mkspecs/features/moc.prf 2010-09-10 05:04:49.000000000 -0400
++++ /opt/local/share/qt4/mkspecs/features/moc.prf 2010-10-30 21:39:56.000000000 -0400
+@@ -83,8 +83,13 @@
+ #make sure we can include these files
+ moc_dir_short = $$MOC_DIR
+ contains(QMAKE_HOST.os,Windows):moc_dir_short ~= s,^.:,/,
+-contains(moc_dir_short, ^[/\\\\].*):INCLUDEPATH += $$MOC_DIR
+-else:INCLUDEPATH += $$OUT_PWD/$$MOC_DIR
++
++# order the local moc path -before- the others, since its headers
++# should -always be found locally so we want that path first.
++contains(moc_dir_short, ^[/\\\\].*):INCLUDEPATH = $$MOC_DIR $$INCLUDEPATH
++else:INCLUDEPATH = $$OUT_PWD/$$MOC_DIR $$INCLUDEPATH
++
++# message(MOC_DIR is $$MOC_DIR)
+
+ # Backwards compatibility: Make shadow builds with default MOC_DIR work
+ # if the user did not add the source dir explicitly.
Added: trunk/dports/aqua/qt4-mac-devel/files/patch-mkspecs-features-qt.prf.diff
===================================================================
--- trunk/dports/aqua/qt4-mac-devel/files/patch-mkspecs-features-qt.prf.diff (rev 0)
+++ trunk/dports/aqua/qt4-mac-devel/files/patch-mkspecs-features-qt.prf.diff 2011-08-10 17:01:32 UTC (rev 82220)
@@ -0,0 +1,62 @@
+--- mkspecs/features/qt.prf.orig 2010-09-10 05:04:49.000000000 -0400
++++ mkspecs/features/qt.prf 2010-11-02 14:28:24.000000000 -0400
+@@ -131,7 +131,15 @@
+ #specific module settings
+ !isEmpty(QT_BUILD_TREE):QMAKE_LIBDIR = $$QT_BUILD_TREE/lib $$QMAKE_LIBDIR #as above, prepending prevents us from picking up "stale" libs
+ QMAKE_LIBDIR += $$QMAKE_LIBDIR_QT
++
+ for(QTLIB, $$list($$lower($$unique(QT)))) {
++
++# message('LIBS' qt before $$QTLIB is '$${LIBS}')
++# message('INCLUDEPATH' qt before $$QTLIB is '$${INCLUDEPATH}')
++# message('QMAKE_LFLAGS' qt before $$QTLIB is '$${QMAKE_LFLAGS}')
++# message('QMAKE_CFLAGS' qt before $$QTLIB is '$${QMAKE_CFLAGS}')
++# message('QMAKE_CXXFLAGS' qt before $$QTLIB is '$${QMAKE_CXXFLAGS}')
++
+ unset(qlib_style)
+ !qt_debug:!qt_release {
+ CONFIG(debug, debug|release):qlib_style = debug
+@@ -191,8 +199,43 @@
+ qtAddLibrary($$qlib)
+ }
+ }
++# message('LIBS' qt after $$QTLIB is '$${LIBS}')
++# message('INCLUDEPATH' qt after $$QTLIB is '$${INCLUDEPATH}')
++# message('QMAKE_LFLAGS' qt after $$QTLIB is '$${QMAKE_LFLAGS}')
++# message('QMAKE_CFLAGS' qt after $$QTLIB is '$${QMAKE_CFLAGS}')
++# message('QMAKE_CXXFLAGS' qt after $$QTLIB is '$${QMAKE_CXXFLAGS}')
++}
++
++# remove Qt's libdir from various flags; it is already part of LIBS,
++# and should be used only to find Qt's libraries. Qt puts LIBDIR
++# before all other paths, so it is critical that this variable not
++# contain anything questionable.
++QMAKE_LIBDIR -= $$QMAKE_LIBDIR_QT
++QMAKE_LFLAGS -= -L$$QMAKE_LIBDIR_QT
++!isEqual($$QMAKE_LIBDIR_QT, $$[QT_INSTALL_PREFIX]/lib) {
++ QMAKE_LFLAGS -= -L$$[QT_INSTALL_PREFIX]/lib
++}
++
++# remove Qt's incdir from various flags; it is already part of
++# INCLUDEPATH. C*FLAGS come before the INCPATH build from
++# INCLUDEPATH, so they should never have this -I in it (or, reall, any
++# other -I but instead just remove the the obvious choices)
++QMAKE_CFLAGS -= -I$$QMAKE_INCDIR_QT
++QMAKE_CXXFLAGS -= -I$$QMAKE_INCDIR_QT
++QMAKE_OBJECTIVE_CFLAGS -= -I$$QMAKE_INCDIR_QT
++QMAKE_OBJECTIVE_CXXFLAGS -= -I$$QMAKE_INCDIR_QT
++!isEqual($$QMAKE_INCDIR_QT, $$[QT_INSTALL_PREFIX]/include) {
++ QMAKE_CFLAGS -= -I$$[QT_INSTALL_PREFIX]/include
++ QMAKE_CXXFLAGS -= -I$$[QT_INSTALL_PREFIX]/include
++ QMAKE_OBJECTIVE_CFLAGS -= -I$$[QT_INSTALL_PREFIX]/include
++ QMAKE_OBJECTIVE_CXXFLAGS -= -I$$[QT_INSTALL_PREFIX]/include
+ }
+
++#message(QMAKE_CFLAGS at end is $${QMAKE_CFLAGS})
++#message(QMAKE_CXXFLAGS at end is $${QMAKE_CXXFLAGS})
++#message(QMAKE_OBJECTIVE_CFLAGS at end is $${QMAKE_OBJECTIVE_CFLAGS})
++#message(QMAKE_OBJECTIVE_CXXFLAGS at end is $${QMAKE_OBJECTIVE_CXXFLAGS})
++
+ qt_compat {
+ !qt_compat_no_warning:QTDIR_build:warning(***USE of COMPAT inside of QTDIR!**) #just for us
+ INCLUDEPATH *= $$QMAKE_INCDIR_QT/Qt
Added: trunk/dports/aqua/qt4-mac-devel/files/patch-mkspecs-features-qt_functions.prf.diff
===================================================================
--- trunk/dports/aqua/qt4-mac-devel/files/patch-mkspecs-features-qt_functions.prf.diff (rev 0)
+++ trunk/dports/aqua/qt4-mac-devel/files/patch-mkspecs-features-qt_functions.prf.diff 2011-08-10 17:01:32 UTC (rev 82220)
@@ -0,0 +1,32 @@
+--- mkspecs/features/qt_functions.prf.orig 2010-09-10 05:04:49.000000000 -0400
++++ mkspecs/features/qt_functions.prf 2010-11-02 14:23:13.000000000 -0400
+@@ -16,8 +16,18 @@
+ }
+
+ defineTest(qtAddLibrary) {
++# message('LIBS' before $$1 is '$${LIBS}')
++# message('INCLUDEPATH' before $$1 is '$${INCLUDEPATH}')
++# message('QMAKE_LFLAGS' before $$1 is '$${QMAKE_LFLAGS}')
++
++ # reorder the includes path: user, this library, Qt headers
++ INCLUDEPATH -= $$QMAKE_INCDIR_QT
+ INCLUDEPATH -= $$QMAKE_INCDIR_QT/$$1
+- INCLUDEPATH = $$QMAKE_INCDIR_QT/$$1 $$INCLUDEPATH
++ INCLUDEPATH += $$QMAKE_INCDIR_QT/$$1 $$QMAKE_INCDIR_QT
++
++ # first time through, append the path for Qt's installed libraries:
++ # -after- all of the other necessary libraries and paths
++ !contains(LIBS,-L$$QMAKE_LIBDIR_QT):LIBS = $$LIBS -L$$QMAKE_LIBDIR_QT
+
+ LIB_NAME = $$1
+ unset(LINKAGE)
+@@ -85,6 +95,9 @@
+ QMAKE_LFLAGS *= --lsb-shared-libs=$${LIB_NAME}$${QT_LIBINFIX}
+ }
+ LIBS += $$LINKAGE
++# message('LIBS' after $$1 is now '$${LIBS}')
++# message('INCLUDEPATH' after $$1 is now '$${INCLUDEPATH}')
++# message('QMAKE_LFLAGS' after $$1 is now '$${QMAKE_LFLAGS}')
+ export(LIBS)
+ export(INCLUDEPATH)
+ export(QMAKE_FRAMEWORKPATH)
Added: trunk/dports/aqua/qt4-mac-devel/files/patch-mkspecs-macx-g++-qmake.prf.diff
===================================================================
--- trunk/dports/aqua/qt4-mac-devel/files/patch-mkspecs-macx-g++-qmake.prf.diff (rev 0)
+++ trunk/dports/aqua/qt4-mac-devel/files/patch-mkspecs-macx-g++-qmake.prf.diff 2011-08-10 17:01:32 UTC (rev 82220)
@@ -0,0 +1,11 @@
+--- mkspecs/macx-g++/qmake.conf.orig 2010-10-31 13:46:05.000000000 -0400
++++ mkspecs/macx-g++/qmake.conf 2010-10-31 13:46:08.000000000 -0400
+@@ -9,7 +9,7 @@
+ MAKEFILE_GENERATOR = UNIX
+ TARGET_PLATFORM = macx
+ TEMPLATE = app
+-CONFIG += qt warn_on release app_bundle incremental global_init_link_order lib_version_first plugin_no_soname link_prl
++CONFIG += qt warn_on release app_bundle incremental global_init_link_order lib_version_first plugin_no_soname link_prl absolute_library_soname
+ QT += core gui
+ QMAKE_INCREMENTAL_STYLE = sublib
+
Added: trunk/dports/aqua/qt4-mac-devel/files/patch-mkspecs_common_g++-base.conf.diff
===================================================================
--- trunk/dports/aqua/qt4-mac-devel/files/patch-mkspecs_common_g++-base.conf.diff (rev 0)
+++ trunk/dports/aqua/qt4-mac-devel/files/patch-mkspecs_common_g++-base.conf.diff 2011-08-10 17:01:32 UTC (rev 82220)
@@ -0,0 +1,19 @@
+--- mkspecs/common/g++-base.conf.orig 2011-08-09 01:57:28.000000000 -0400
++++ mkspecs/common/g++-base.conf 2011-08-09 01:57:34.000000000 -0400
+@@ -8,14 +8,14 @@
+ # you can use the manual test in tests/manual/mkspecs.
+ #
+
+-QMAKE_CC = gcc
++QMAKE_CC = @CONFIGURE_CC@
+
+ QMAKE_LINK_C = $$QMAKE_CC
+ QMAKE_LINK_C_SHLIB = $$QMAKE_CC
+
+ QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -O2 -g
+
+-QMAKE_CXX = g++
++QMAKE_CXX = @CONFIGURE_CXX@
+
+ QMAKE_LINK = $$QMAKE_CXX
+ QMAKE_LINK_SHLIB = $$QMAKE_CXX
Added: trunk/dports/aqua/qt4-mac-devel/files/patch-mkspecs_common_mac.conf.diff
===================================================================
--- trunk/dports/aqua/qt4-mac-devel/files/patch-mkspecs_common_mac.conf.diff (rev 0)
+++ trunk/dports/aqua/qt4-mac-devel/files/patch-mkspecs_common_mac.conf.diff 2011-08-10 17:01:32 UTC (rev 82220)
@@ -0,0 +1,12 @@
+--- mkspecs/common/mac.conf.orig 2010-11-02 10:44:30.000000000 -0400
++++ mkspecs/common/mac.conf 2010-11-02 10:48:37.000000000 -0400
+@@ -40,5 +40,9 @@
+ QMAKE_MKDIR = mkdir -p
+ QMAKE_MACOSX_DEPLOYMENT_TARGET = @MACOSX_DEPLOYMENT_TARGET@
+
++# allow CC and CXX to use CCACHE;
++# use "make CCACHE=ccache" when building
++QMAKE_CC = $(CCACHE) $$QMAKE_CC
++QMAKE_CXX = $(CCACHE) $$QMAKE_CXX
+
+ include(unix.conf)
Added: trunk/dports/aqua/qt4-mac-devel/files/patch-mkspecs_darwin-g++_qmake.conf.diff
===================================================================
--- trunk/dports/aqua/qt4-mac-devel/files/patch-mkspecs_darwin-g++_qmake.conf.diff (rev 0)
+++ trunk/dports/aqua/qt4-mac-devel/files/patch-mkspecs_darwin-g++_qmake.conf.diff 2011-08-10 17:01:32 UTC (rev 82220)
@@ -0,0 +1,113 @@
+--- mkspecs/darwin-g++/qmake.conf.orig 2010-10-04 16:26:47.000000000 -0400
++++ mkspecs/darwin-g++/qmake.conf 2010-10-04 16:59:03.000000000 -0400
+@@ -1,21 +1,22 @@
+ #
+ # qmake configuration for darwin-g++
+ #
+-# Written for Qt/X11 on Darwin and XFree86
++# Written for Qt/X11 on Darwin only
+ #
+
+ MAKEFILE_GENERATOR = UNIX
+ TARGET_PLATFORM = macx
+ TEMPLATE = app
+-CONFIG += qt warn_on release link_prl native_precompiled_headers
++CONFIG += qt warn_on release incremental global_init_link_order lib_version_first plugin_no_soname link_prl
+ QT += core gui
+ DEFINES += __USE_WS_X11__
+
++QMAKE_COMPILER_DEFINES += __APPLE__ __GNUC__
++QMAKE_RESOURCE = /Developer/Tools/Rez
++QMAKE_FIX_RPATH = install_name_tool -id
++QMAKE_MACOSX_DEPLOYMENT_TARGET = @MACOSX_DEPLOYMENT_TARGET@
++
+ QMAKE_CC = cc
+-QMAKE_LEX = flex
+-QMAKE_LEXFLAGS =
+-QMAKE_YACC = yacc
+-QMAKE_YACCFLAGS = -d
+ QMAKE_CFLAGS = -pipe
+ QMAKE_CFLAGS_DEPS = -M
+ QMAKE_CFLAGS_WARN_ON = -Wall -W
+@@ -24,12 +25,16 @@
+ QMAKE_CFLAGS_DEBUG = -g
+ QMAKE_CFLAGS_SHLIB = -fPIC
+ QMAKE_CFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_SHLIB
+-QMAKE_EXTENSION_SHLIB = dylib
+-QMAKE_EXTENSION_PLUGIN = so
++#QMAKE_EXTENSION_SHLIB = dylib
++#QMAKE_EXTENSION_PLUGIN = so
+ QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses
+ QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden
+-QMAKE_CFLAGS_THREAD =
+-QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
++QMAKE_CFLAGS_PPC_64 += -arch ppc64 -Xarch_ppc64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@
++QMAKE_CFLAGS_X86_64 += -arch x86_64 -Xarch_x86_64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@
++QMAKE_CFLAGS_PPC += -arch ppc
++QMAKE_CFLAGS_X86 += -arch i386
++QMAKE_CFLAGS_DWARF2 += -gdwarf-2
++QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
+ QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE}
+
+ QMAKE_CXX = c++
+@@ -43,7 +48,25 @@
+ QMAKE_CXXFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_STATIC_LIB
+ QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC
+ QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden
+-QMAKE_CXXFLAGS_THREAD =
++QMAKE_CXXFLAGS_PPC_64 += -arch ppc64 -Xarch_ppc64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@
++QMAKE_CXXFLAGS_X86_64 += -arch x86_64 -Xarch_x86_64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@
++QMAKE_CXXFLAGS_PPC += -arch ppc
++QMAKE_CXXFLAGS_X86 += -arch i386
++QMAKE_CXXFLAGS_DWARF2 += $$QMAKE_CFLAGS_DWARF2
++QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
++QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
++
++QMAKE_OBJECTIVE_CFLAGS_PPC_64 += -arch ppc64 -Xarch_ppc64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@
++QMAKE_OBJECTIVE_CFLAGS_X86_64 += -arch x86_64 -Xarch_x86_64 -mmacosx-version-min=@MACOSX_DEPLOYMENT_TARGET@
++QMAKE_OBJECTIVE_CFLAGS_PPC += -arch ppc
++QMAKE_OBJECTIVE_CFLAGS_X86 += -arch i386
++QMAKE_OBJCFLAGS_PRECOMPILE += -x objective-c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
++QMAKE_OBJCFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
++
++QMAKE_OBJCXXFLAGS_PRECOMPILE += -x objective-c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
++QMAKE_OBJCXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
++
++QMAKE_PCH_OUTPUT_EXT = .gch
+
+ QMAKE_INCDIR =
+ QMAKE_LIBDIR =
+@@ -76,7 +99,6 @@
+ QMAKE_LIBS_X11SM = -lSM -lICE
+ QMAKE_LIBS_OPENGL = -lGL
+ QMAKE_LIBS_OPENGL_QT = -lGL
+-QMAKE_LIBS_THREAD =
+
+ QMAKE_MOC = $$[QT_INSTALL_BINS]/moc
+ QMAKE_UIC = $$[QT_INSTALL_BINS]/uic
+@@ -88,19 +110,19 @@
+ QMAKE_TAR = tar -cf
+ QMAKE_GZIP = gzip -9f
+
++QMAKE_LEX = flex
++QMAKE_LEXFLAGS =
++QMAKE_YACC = yacc
++QMAKE_YACCFLAGS = -d
++
+ QMAKE_COPY = cp -f
+ QMAKE_COPY_FILE = $$QMAKE_COPY
+-QMAKE_COPY_DIR = $$QMAKE_COPY -r
++QMAKE_COPY_DIR = $$QMAKE_COPY -R
+ QMAKE_MOVE = mv -f
+ QMAKE_DEL_FILE = rm -f
+ QMAKE_DEL_DIR = rmdir
+ QMAKE_CHK_DIR_EXISTS = test -d
+ QMAKE_MKDIR = mkdir -p
+
+-QMAKE_PCH_OUTPUT_EXT = .gch
+-
+-QMAKE_CXXFLAGS_PRECOMPILE += -x objective-c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
+-QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
+-
+ include(../common/unix.conf)
+ load(qt_config)
Added: trunk/dports/aqua/qt4-mac-devel/files/patch-src-plugins-bearer-corewlan-corewlan.pro.diff
===================================================================
--- trunk/dports/aqua/qt4-mac-devel/files/patch-src-plugins-bearer-corewlan-corewlan.pro.diff (rev 0)
+++ trunk/dports/aqua/qt4-mac-devel/files/patch-src-plugins-bearer-corewlan-corewlan.pro.diff 2011-08-10 17:01:32 UTC (rev 82220)
@@ -0,0 +1,14 @@
+--- src/plugins/bearer/corewlan/corewlan.pro.orig 2011-08-04 21:23:52.000000000 -0400
++++ src/plugins/bearer/corewlan/corewlan.pro 2011-08-04 21:24:31.000000000 -0400
+@@ -5,9 +5,9 @@
+ LIBS += -framework Foundation -framework SystemConfiguration
+
+ contains(QT_CONFIG, corewlan) {
+- isEmpty(QMAKE_MAC_SDK)|contains(QMAKE_MAC_SDK, "/Developer/SDKs/MacOSX10.6.sdk") {
++ isEmpty(QMAKE_MAC_SDK)|contains(QMAKE_MAC_SDK, "@DEVELOPER_DIR@/SDKs/MacOSX10. at MACOSX_VERSION_MINOR@.sdk") {
+ LIBS += -framework CoreWLAN -framework Security
+- DEFINES += MAC_SDK_10_6
++ DEFINES += MAC_SDK_10_ at MACOSX_VERSION_MINOR@
+ }
+ }
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110810/b1d06839/attachment-0001.html>
More information about the macports-changes
mailing list