- Update Qt to 4.7.4.

- Make sure internal paths are added before system ones.
- Remove phonon-gstreamer dependency from qt4-webkit.
- Remove qt4-gui dependency from qt4-dbus.

8 files changed, 79 insertions, 34 deletions

diff --git a/devel/dbus-qt4/Makefile b/devel/dbus-qt4/Makefile
index f0dc2c65a651..882cde4917c5 100644
--- a/devel/dbus-qt4/Makefile
+++ b/devel/dbus-qt4/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Qt4 bindings for the D-BUS messaging system
 LIB_DEPENDS=	dbus-1.3:${PORTSDIR}/devel/dbus
 
 USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build moc_build rcc_build corelib gui xml
+QT_COMPONENTS=	qmake_build moc_build rcc_build corelib xml
 QT_NONSTANDARD=	yes
 QT_DIST=	yes
 MAKE_JOBS_UNSAFE=	yes
@@ -48,9 +48,14 @@ INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
 EXTRA_PATCHES=	${.CURDIR}/../../devel/qt4/files/patch-configure
 
+.include <bsd.port.pre.mk>
+
+CONFIGURE_ARGS+=	--no-gui \
+			--no-phonon
+
 pre-configure:
-	${REINPLACE_CMD} -e 's|qdbusviewer||g' ${BUILD_WRKSRC}/qdbus.pro
-	${REINPLACE_CMD} -e 's|SUBDIRS = qdbus|SUBDIRS = ../../src/${PORTNAME} qdbus|g' ${BUILD_WRKSRC}/qdbus.pro
+	${REINPLACE_CMD} -e 's|SUBDIRS = qdbus|SUBDIRS = ../../src/${PORTNAME} qdbus|g' \
+		${BUILD_WRKSRC}/qdbus.pro
 	${REINPLACE_CMD} -e 's|"/moc"|"/moc-qt4"|' \
 		${BUILD_WRKSRC}/qdbuscpp2xml/qdbuscpp2xml.cpp
 	${MKDIR} ${WRKSRC}/mkspecs
@@ -64,4 +69,4 @@ post-configure:
 			-E -e 's|(.*location=).*moc|\1${PREFIX}/bin/moc-qt4|g' \
 		${WRKSRC}/lib/pkgconfig/QtDBus.pc
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/devel/qmake4/Makefile b/devel/qmake4/Makefile
index 2d1f008a0bc0..88bab7969901 100644
--- a/devel/qmake4/Makefile
+++ b/devel/qmake4/Makefile
@@ -55,6 +55,11 @@ post-patch:
 	@${CP} ${WRKSRC}/../mkspecs/common/g++.conf ${WRKSRC}/../mkspecs/common/clang.conf
 	@${REINPLACE_CMD} -e 's|gcc|clang|g' -e 's|g++|clang++|g' \
 		${WRKSRC}/../mkspecs/common/clang.conf
+
+	# FIXME: This is ugly
+	@${RM} ${WRKSRC}/../mkspecs/freebsd-g++/*.orig
+	@${RM} ${WRKSRC}/../mkspecs/freebsd-g++40/*.orig
+
 .for c in clang llvm
 	@${CP} -PpR ${WRKSRC}/../mkspecs/freebsd-g++ ${WRKSRC}/../mkspecs/freebsd-${c}
 	@${REINPLACE_CMD} -e 's|g++|${c}|g' \
@@ -83,10 +88,6 @@ do-configure:
 CXXFLAGS+=	-mieee
 .endif
 
-.if ${OSVERSION} < 700042 && ${ARCH} == "amd64"
-CXXFLAGS+=	-fno-gcse
-.endif
-
 post-install:
 	${LN} -sf ${PREFIX}/share/qt4/mkspecs/freebsd-${QMAKE_BASE_COMPILER} ${PREFIX}/share/qt4/mkspecs/default
 
diff --git a/devel/qmake4/files/patch-qt4-before-ports-in-mkspecs.diff b/devel/qmake4/files/patch-qt4-before-ports-in-mkspecs.diff
new file mode 100644
index 000000000000..9ae0c7fff3fd
--- /dev/null
+++ b/devel/qmake4/files/patch-qt4-before-ports-in-mkspecs.diff
@@ -0,0 +1,26 @@
+--- ../mkspecs/freebsd-g++/qmake.conf.old	2011-09-17 01:02:43.000000000 -0300
++++ ../mkspecs/freebsd-g++/qmake.conf	2011-09-17 00:23:09.000000000 -0300
+@@ -13,8 +13,8 @@
+ QMAKE_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
+ 
+ # Addon software goes into /usr/local on the BSDs, by default we will look there
+-QMAKE_INCDIR		= /usr/local/include
+-QMAKE_LIBDIR		= /usr/local/lib
++QMAKE_INCDIR		= $$[QT_INSTALL_HEADERS] /usr/local/include
++QMAKE_LIBDIR		= $$[QT_INSTALL_LIBS] /usr/local/lib
+ QMAKE_INCDIR_X11	= /usr/X11R6/include
+ QMAKE_LIBDIR_X11	= /usr/X11R6/lib
+ QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
+--- ../mkspecs/freebsd-g++40/qmake.conf.old	2011-09-17 01:03:00.000000000 -0300
++++ ../mkspecs/freebsd-g++40/qmake.conf	2011-09-17 00:23:41.000000000 -0300
+@@ -37,8 +37,8 @@
+ QMAKE_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
+ 
+ # Addon software goes into /usr/local on the BSDs, by default we will look there
+-QMAKE_INCDIR		= /usr/local/include
+-QMAKE_LIBDIR		= /usr/local/lib
++QMAKE_INCDIR		= $$[QT_INSTALL_HEADERS] /usr/local/include
++QMAKE_LIBDIR		= $$[QT_INSTALL_LIBS] /usr/local/lib
+ QMAKE_INCDIR_X11	= /usr/X11R6/include
+ QMAKE_LIBDIR_X11	= /usr/X11R6/lib
+ QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
diff --git a/devel/qmake4/pkg-plist b/devel/qmake4/pkg-plist
index e05bc2c595d9..7e49b1999ba9 100644
--- a/devel/qmake4/pkg-plist
+++ b/devel/qmake4/pkg-plist
@@ -45,6 +45,8 @@ share/qt4/mkspecs/common/symbian/stl-off/new
 share/qt4/mkspecs/common/symbian/symbian-makefile.conf
 share/qt4/mkspecs/common/symbian/symbian-mmp.conf
 share/qt4/mkspecs/common/symbian/symbian.conf
+share/qt4/mkspecs/common/symbian/symbianincludes.h
+share/qt4/mkspecs/common/symbian/template.applite
 share/qt4/mkspecs/common/unix.conf
 share/qt4/mkspecs/common/wince/qmake.conf
 share/qt4/mkspecs/common/wince/qplatformdefs.h
@@ -113,6 +115,7 @@ share/qt4/mkspecs/features/symbian/moc.prf
 share/qt4/mkspecs/features/symbian/nested_exceptions.prf
 share/qt4/mkspecs/features/symbian/opengl.prf
 share/qt4/mkspecs/features/symbian/platform_paths.prf
+share/qt4/mkspecs/features/symbian/prepend_includepath.prf
 share/qt4/mkspecs/features/symbian/qt.prf
 share/qt4/mkspecs/features/symbian/qt_config.prf
 share/qt4/mkspecs/features/symbian/release.prf
@@ -120,6 +123,7 @@ share/qt4/mkspecs/features/symbian/run_on_phone.prf
 share/qt4/mkspecs/features/symbian/sis_targets.prf
 share/qt4/mkspecs/features/symbian/stl.prf
 share/qt4/mkspecs/features/symbian/stl_off.prf
+share/qt4/mkspecs/features/symbian/symbian_appbooster.prf
 share/qt4/mkspecs/features/symbian/symbian_building.prf
 share/qt4/mkspecs/features/symbian/thread.prf
 share/qt4/mkspecs/features/testcase.prf
@@ -332,6 +336,13 @@ share/qt4/mkspecs/solaris-g++/qmake.conf
 share/qt4/mkspecs/solaris-g++/qplatformdefs.h
 share/qt4/mkspecs/symbian-abld/qmake.conf
 share/qt4/mkspecs/symbian-abld/qplatformdefs.h
+share/qt4/mkspecs/symbian-armcc/features/default_post.prf
+share/qt4/mkspecs/symbian-armcc/qmake.conf
+share/qt4/mkspecs/symbian-armcc/qplatformdefs.h
+share/qt4/mkspecs/symbian-gcce/features/default_post.prf
+share/qt4/mkspecs/symbian-gcce/qmake.conf
+share/qt4/mkspecs/symbian-gcce/qplatformdefs.h
+share/qt4/mkspecs/symbian-sbsv2/flm/qt/qmake_clean.flm
 share/qt4/mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm
 share/qt4/mkspecs/symbian-sbsv2/flm/qt/qmake_extra_pre_targetdep.flm
 share/qt4/mkspecs/symbian-sbsv2/flm/qt/qmake_post_link.flm
@@ -339,12 +350,6 @@ share/qt4/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm
 share/qt4/mkspecs/symbian-sbsv2/flm/qt/qt.xml
 share/qt4/mkspecs/symbian-sbsv2/qmake.conf
 share/qt4/mkspecs/symbian-sbsv2/qplatformdefs.h
-share/qt4/mkspecs/symbian/linux-armcc/features/default_post.prf
-share/qt4/mkspecs/symbian/linux-armcc/qmake.conf
-share/qt4/mkspecs/symbian/linux-armcc/qplatformdefs.h
-share/qt4/mkspecs/symbian/linux-gcce/features/default_post.prf
-share/qt4/mkspecs/symbian/linux-gcce/qmake.conf
-share/qt4/mkspecs/symbian/linux-gcce/qplatformdefs.h
 share/qt4/mkspecs/tru64-cxx/qmake.conf
 share/qt4/mkspecs/tru64-cxx/qplatformdefs.h
 share/qt4/mkspecs/tru64-g++/qmake.conf
@@ -498,15 +503,14 @@ share/qt4/mkspecs/wincewm65professional-msvc2008/qplatformdefs.h
 @dirrm share/qt4/mkspecs/unixware-cc
 @dirrm share/qt4/mkspecs/tru64-g++
 @dirrm share/qt4/mkspecs/tru64-cxx
-@dirrm share/qt4/mkspecs/symbian/linux-gcce/features
-@dirrm share/qt4/mkspecs/symbian/linux-gcce
-@dirrm share/qt4/mkspecs/symbian/linux-armcc/features
-@dirrm share/qt4/mkspecs/symbian/linux-armcc
 @dirrm share/qt4/mkspecs/symbian-sbsv2/flm/qt
 @dirrm share/qt4/mkspecs/symbian-sbsv2/flm
 @dirrm share/qt4/mkspecs/symbian-sbsv2
+@dirrm share/qt4/mkspecs/symbian-gcce/features
+@dirrm share/qt4/mkspecs/symbian-gcce
+@dirrm share/qt4/mkspecs/symbian-armcc/features
+@dirrm share/qt4/mkspecs/symbian-armcc
 @dirrm share/qt4/mkspecs/symbian-abld
-@dirrm share/qt4/mkspecs/symbian
 @dirrm share/qt4/mkspecs/solaris-g++-64
 @dirrm share/qt4/mkspecs/solaris-g++
 @dirrm share/qt4/mkspecs/solaris-cc-stlport
diff --git a/devel/qt4-designer/pkg-plist b/devel/qt4-designer/pkg-plist
index aa3957c99c88..e67113b25bd0 100644
--- a/devel/qt4-designer/pkg-plist
+++ b/devel/qt4-designer/pkg-plist
@@ -104,9 +104,9 @@ lib/qt4/libQtUiTools.prl
 %%DEBUG%%%%QT_PLUGINDIR_REL%%/designer/libqt3supportwidgets.so.debug
 %%QT_PLUGINDIR_REL%%/designer/libqwebview.so
 %%DEBUG%%%%QT_PLUGINDIR_REL%%/designer/libqwebview.so.debug
-libdata/pkgconfig/QtUiTools.pc
 libdata/pkgconfig/QtDesigner.pc
 libdata/pkgconfig/QtDesignerComponents.pc
+libdata/pkgconfig/QtUiTools.pc
 @dirrmtry %%QT_PLUGINDIR_REL%%/designer
 @dirrmtry %%QT_PLUGINDIR_REL%%
 @dirrmtry lib/qt4
diff --git a/devel/qt4-qdoc3/Makefile b/devel/qt4-qdoc3/Makefile
index f25cb4112760..b7b6768b2166 100644
--- a/devel/qt4-qdoc3/Makefile
+++ b/devel/qt4-qdoc3/Makefile
@@ -14,23 +14,34 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt documentation generator
 
 USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build corelib xml
-QT_NONSTANDART=	yes
+QT_COMPONENTS=	qmake_build corelib gui xml
+QT_NONSTANDARD=	yes
 QT_DIST=	yes
 
 HAS_CONFIGURE=	yes
 
-EXTRACT_AFTER_ARGS=	| ${TAR} -xf - --include '${DISTNAME}/tools/${PORTNAME}'
+ALL_TARGET=	first
+CONFIGURE_ENV?=	QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
+MAKE_ENV?=	QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \
+		PATH=${WRKSRC}/bin:$$PATH
+DO_NOT_EXTRACT=	demos doc examples mkspecs qmake translations \
+		src/activeqt src/dbus src/multimedia src/opengl src/openvg \
+		src/s60installs src/s60main src/scripttools src/sql src/svg \
+		src/testlib src/winmain src/xmlpatterns
+EXTRACT_AFTER_ARGS=	| ${TAR} -xf -
+.for dne in ${DO_NOT_EXTRACT}
+EXTRACT_AFTER_ARGS+=	--exclude '${DISTNAME}/${dne}'
+.endfor
+
+EXTRA_PATCHES=	${.CURDIR}/../../devel/qt4/files/patch-configure
 
 PLIST_FILES=	bin/${PORTNAME}
 
-WRKSRC=	${WRKDIR}/${DISTNAME}/tools/${PORTNAME}
+BUILD_WRKSRC=	${WRKSRC}/tools/${PORTNAME}
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
-do-configure:
-	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
-		${QMAKE} -unix PREFIX=${PREFIX} ${PORTNAME}.pro
-
-do-install:
-	${INSTALL_PROGRAM} "${WRKSRC}/${PORTNAME}" "${PREFIX}/bin/${PORTNAME}"
+pre-configure:
+	${MKDIR} ${WRKSRC}/mkspecs/modules
+	${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake
 
 .include <bsd.port.mk>
diff --git a/devel/qt4/distinfo b/devel/qt4/distinfo
index 3a2ced9c0fb7..7bf2eed1f45b 100644
--- a/devel/qt4/distinfo
+++ b/devel/qt4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/qt-everywhere-opensource-src-4.7.3.tar.gz) = d02b6fd69d089c01f4a787aa18175d074ccaecf8980a5956e328c2991905937e
-SIZE (KDE/qt-everywhere-opensource-src-4.7.3.tar.gz) = 213659173
+SHA256 (KDE/qt-everywhere-opensource-src-4.7.4.tar.gz) = 97195ebce8a46f9929fb971d9ae58326d011c4d54425389e6e936514f540221e
+SIZE (KDE/qt-everywhere-opensource-src-4.7.4.tar.gz) = 220388303
diff --git a/devel/qt4/pkg-plist b/devel/qt4/pkg-plist
deleted file mode 100644
index 425093431e1f..000000000000
--- a/devel/qt4/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $FreeBSD$
-@comment This list intentionally empty