5 files changed, 113 insertions, 20 deletions

diff --git a/devel/qmake4/Makefile b/devel/qmake4/Makefile
index f92f4d4592b2..56ae69a69427 100644
--- a/devel/qmake4/Makefile
+++ b/devel/qmake4/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	qmake
 PORTVERSION=	${QT4_VERSION}
-PORTREVISION=	0
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt4-
 
@@ -17,13 +16,13 @@ COMMENT=	The build utility of the Qt project
 QT_NONSTANDARD=	yes
 QT_DIST=	yes
 REINPLACE_ARGS=	-i ""
-WRKSRC=		${WRKDIR}/${DISTNAME}/qmake
+WRKSRC=		${WRKDIR}/${DISTNAME}/${PORTNAME}
 MAKEFILE=	${FILESDIR}/Makefile.bsd
 MAKE_ENV+=	FILESDIR="${FILESDIR}"
 MAKE_JOBS_SAFE=	yes
+TODAY_CMD=		/bin/date +%Y-%m-%d
 
 EXTRACT_AFTER_ARGS=| ${TAR} -xf - \
-	'${DISTNAME}/config.tests/unix/padstring' \
 	'${DISTNAME}/mkspecs' \
 	'${DISTNAME}/include/*/*' \
 	'${DISTNAME}/src/*/*.h' \
@@ -33,15 +32,14 @@ EXTRACT_AFTER_ARGS=| ${TAR} -xf - \
 	'${DISTNAME}/src/corelib/global' \
 	'${DISTNAME}/src/corelib/plugin' \
 	'${DISTNAME}/src/corelib/kernel' \
-	'${DISTNAME}/src/script' \
+	'${DISTNAME}/src/corelib/codecs' \
+	'${DISTNAME}/src/corelib/xml' \
 	'${DISTNAME}/src/3rdparty/md4' \
 	'${DISTNAME}/src/3rdparty/md5' \
 	'${DISTNAME}/src/3rdparty/sha1'
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O2|${CXXFLAGS}|' \
-		-e 's|gcc.*|${CC}|' \
-		-e 's|g++.*|${CXX}|' \
 		-e 's|/usr/local|${LOCALBASE}|' \
 		-e 's|/usr/X11R6|${LOCALBASE}|' \
 		-e 's|release|release thread|' \
@@ -53,12 +51,11 @@ post-patch:
 		${WRKSRC}/../mkspecs/freebsd-g++34/qmake.conf \
 		${WRKSRC}/../mkspecs/freebsd-g++40/qmake.conf \
 		${WRKSRC}/../mkspecs/freebsd-icc/qmake.conf
-	@${REINPLACE_CMD} -e 's|include(../common/c++|include(../common/g++.conf)|' \
-		${WRKSRC}/../mkspecs/freebsd-g++/qmake.conf 
 	@${REINPLACE_CMD} -e 's|@QMAKE_QTOBJS@||g' ${WRKSRC}/Makefile.unix
 
 do-configure:
 	${SED} -e 's|/usr/local|${PREFIX}|g' \
+		-e "s|TODAY|$$(${TODAY_CMD})|g" \
 		< ${FILESDIR}/qconfig.cpp \
 		> ${WRKSRC:H}/src/corelib/global/qconfig.cpp
 	${ECHO} '/* empty */' > ${WRKSRC}/qconfig.h
diff --git a/devel/qmake4/files/Makefile.bsd b/devel/qmake4/files/Makefile.bsd
index 08ccc6fb6d8c..9d6eac70db42 100644
--- a/devel/qmake4/files/Makefile.bsd
+++ b/devel/qmake4/files/Makefile.bsd
@@ -9,19 +9,20 @@ NO_MAN=	true	# qmake.1 anyone?
 
 .PATH:	${.CURDIR} ${.CURDIR:H}/src/corelib/tools ${.CURDIR:H}/src/corelib/io \
 	${.CURDIR:H}/src/corelib/global ${.CURDIR:H}/src/corelib/plugin \
-	${.CURDIR:H}/src/corelib/kernel ${.CURDIR:H}/src/3rdparty/md5 \
-	${.CURDIR:H}/src/3rdparty/md4 ${.CURDIR:H}/src/3rdparty/sha1 \
-	${.CURDIR:H}/src/script
+	${.CURDIR:H}/src/corelib/kernel ${.CURDIR:H}/src/corelib/codecs \
+	${.CURDIR:H}/src/corelib/xml ${.CURDIR:H}/src/3rdparty/md4 \
+	${.CURDIR:H}/src/3rdparty/md5 ${.CURDIR:H}/src/3rdparty/sha1
 
 CXXFLAGS+=-I${.CURDIR:H}/mkspecs/freebsd-g++
 
-.for s in src/corelib/arch/generic src/global src/tools src/kernel src/codecs \
+.for s in src/corelib/arch/generic src/corelib/global src/corelib/tools \
+		src/corelib/kernel src/corelib/codecs \
 		src/3rdparty/md5 src/3rdparty/md4 src/3rdparty/sha1 \
-		src/script include/QtCore include
+		include/QtCore include
 CXXFLAGS+=-I${.CURDIR:H}/$s
 .endfor
 
-.for g in /. /unix /win32 /mac
+.for g in /. /unix /win32 /mac /symbian
 .PATH:	${.CURDIR}/generators$g
 CXXFLAGS+=-I${.CURDIR}/generators$g
 .endfor
@@ -30,7 +31,8 @@ CXXFLAGS+=-I. -I"${FILESDIR}"
 
 CXXFLAGS+=-DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_NO_COMPONENT \
 	-DQT_NO_STL -DQT_BUILD_QMAKE -DQT_NO_COMPRESS -DHAVE_QCONFIG_CPP \
-	-DQT_NO_THREAD -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQMAKE_OPENSOURCE_EDITION
+	-DQT_NO_THREAD -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT \
+	-DQT_BOOTSTRAPPED -DQMAKE_OPENSOURCE_EDITION
 
 # I guess, qconfig.cpp used to be optional, but no longer is -- due to
 # bit-rot in Qt sources. So we still have to compile it, but, by not
diff --git a/devel/qmake4/files/qconfig.cpp b/devel/qmake4/files/qconfig.cpp
index d662b424fce0..bcbbe10ff17b 100644
--- a/devel/qmake4/files/qconfig.cpp
+++ b/devel/qmake4/files/qconfig.cpp
@@ -4,6 +4,9 @@
  * The default prefix (/ usr / local) is dynamicly replaced
  * at configure time.
  */
+/* Installation date */
+static const char qt_configure_installation          [12+11]    = "qt_instdate=TODAY";
+
 #define QT_CONFIGURE_LICENSEE "Open Source";
 #define QT_CONFIGURE_LICENSED_PRODUCTS "OpenSource";
 #define QT_CONFIGURE_PREFIX_PATH "/usr/local";
diff --git a/devel/qmake4/pkg-descr b/devel/qmake4/pkg-descr
index eccbc5d9c1e0..3ea2b0626dcc 100644
--- a/devel/qmake4/pkg-descr
+++ b/devel/qmake4/pkg-descr
@@ -5,4 +5,4 @@ source code.
 Qmake is a project and makefile creating utility, that is part of Qt.
 For ease of maintainance it is split out into a port of its own.
 
-WWW: http://www.trolltech.com/products/qt/index.html
+WWW: http://qt.nokia.com/products/qt/index.html
diff --git a/devel/qmake4/pkg-plist b/devel/qmake4/pkg-plist
index fda1a09e3087..2d0f68521217 100644
--- a/devel/qmake4/pkg-plist
+++ b/devel/qmake4/pkg-plist
@@ -14,8 +14,12 @@ share/qt4/mkspecs/common/mac-g++.conf
 share/qt4/mkspecs/common/mac-llvm.conf
 share/qt4/mkspecs/common/mac.conf
 share/qt4/mkspecs/common/qws.conf
+share/qt4/mkspecs/common/symbian/qplatformdefs.h
+share/qt4/mkspecs/common/symbian/stl-off/new
+share/qt4/mkspecs/common/symbian/symbian.conf
 share/qt4/mkspecs/common/unix.conf
-share/qt4/mkspecs/common/wince.conf
+share/qt4/mkspecs/common/wince/qmake.conf
+share/qt4/mkspecs/common/wince/qplatformdefs.h
 share/qt4/mkspecs/cygwin-g++/qmake.conf
 share/qt4/mkspecs/cygwin-g++/qplatformdefs.h
 share/qt4/mkspecs/darwin-g++/qmake.conf
@@ -31,6 +35,7 @@ share/qt4/mkspecs/features/default_post.prf
 share/qt4/mkspecs/features/default_pre.prf
 share/qt4/mkspecs/features/designer.prf
 share/qt4/mkspecs/features/dll.prf
+share/qt4/mkspecs/features/egl.prf
 share/qt4/mkspecs/features/exclusive_builds.prf
 share/qt4/mkspecs/features/help.prf
 share/qt4/mkspecs/features/include_source_dir.prf
@@ -64,6 +69,17 @@ share/qt4/mkspecs/features/silent.prf
 share/qt4/mkspecs/features/static.prf
 share/qt4/mkspecs/features/static_and_shared.prf
 share/qt4/mkspecs/features/staticlib.prf
+share/qt4/mkspecs/features/symbian/application_icon.prf
+share/qt4/mkspecs/features/symbian/armcc_warnings.prf
+share/qt4/mkspecs/features/symbian/data_caging_paths.prf
+share/qt4/mkspecs/features/symbian/default_post.prf
+share/qt4/mkspecs/features/symbian/default_pre.prf
+share/qt4/mkspecs/features/symbian/epocallowdlldata.prf
+share/qt4/mkspecs/features/symbian/moc.prf
+share/qt4/mkspecs/features/symbian/platform_paths.prf
+share/qt4/mkspecs/features/symbian/qt.prf
+share/qt4/mkspecs/features/symbian/stl.prf
+share/qt4/mkspecs/features/symbian/stl_off.prf
 share/qt4/mkspecs/features/uic.prf
 share/qt4/mkspecs/features/uitools.prf
 share/qt4/mkspecs/features/unix/bsymbolic_functions.prf
@@ -71,6 +87,7 @@ share/qt4/mkspecs/features/unix/dylib.prf
 share/qt4/mkspecs/features/unix/hide_symbols.prf
 share/qt4/mkspecs/features/unix/largefile.prf
 share/qt4/mkspecs/features/unix/opengl.prf
+share/qt4/mkspecs/features/unix/openvg.prf
 share/qt4/mkspecs/features/unix/separate_debug_info.prf
 share/qt4/mkspecs/features/unix/thread.prf
 share/qt4/mkspecs/features/unix/x11.prf
@@ -78,6 +95,7 @@ share/qt4/mkspecs/features/unix/x11inc.prf
 share/qt4/mkspecs/features/unix/x11lib.prf
 share/qt4/mkspecs/features/unix/x11sm.prf
 share/qt4/mkspecs/features/use_c_linker.prf
+share/qt4/mkspecs/features/vxworks.prf
 share/qt4/mkspecs/features/warn_off.prf
 share/qt4/mkspecs/features/warn_on.prf
 share/qt4/mkspecs/features/win32/console.prf
@@ -90,6 +108,7 @@ share/qt4/mkspecs/features/win32/exceptions.prf
 share/qt4/mkspecs/features/win32/exceptions_off.prf
 share/qt4/mkspecs/features/win32/ltcg.prf
 share/qt4/mkspecs/features/win32/opengl.prf
+share/qt4/mkspecs/features/win32/openvg.prf
 share/qt4/mkspecs/features/win32/qaxcontainer.prf
 share/qt4/mkspecs/features/win32/qaxserver.prf
 share/qt4/mkspecs/features/win32/qt_dll.prf
@@ -143,6 +162,8 @@ share/qt4/mkspecs/linux-g++-32/qmake.conf
 share/qt4/mkspecs/linux-g++-32/qplatformdefs.h
 share/qt4/mkspecs/linux-g++-64/qmake.conf
 share/qt4/mkspecs/linux-g++-64/qplatformdefs.h
+share/qt4/mkspecs/linux-g++-maemo/qmake.conf
+share/qt4/mkspecs/linux-g++-maemo/qplatformdefs.h
 share/qt4/mkspecs/linux-g++/qmake.conf
 share/qt4/mkspecs/linux-g++/qplatformdefs.h
 share/qt4/mkspecs/linux-icc-32/qmake.conf
@@ -165,6 +186,10 @@ share/qt4/mkspecs/macx-g++/Info.plist.app
 share/qt4/mkspecs/macx-g++/Info.plist.lib
 share/qt4/mkspecs/macx-g++/qmake.conf
 share/qt4/mkspecs/macx-g++/qplatformdefs.h
+share/qt4/mkspecs/macx-g++40/Info.plist.app
+share/qt4/mkspecs/macx-g++40/Info.plist.lib
+share/qt4/mkspecs/macx-g++40/qmake.conf
+share/qt4/mkspecs/macx-g++40/qplatformdefs.h
 share/qt4/mkspecs/macx-g++42/Info.plist.app
 share/qt4/mkspecs/macx-g++42/Info.plist.lib
 share/qt4/mkspecs/macx-g++42/qmake.conf
@@ -212,8 +237,8 @@ share/qt4/mkspecs/qws/linux-lsb-g++/qmake.conf
 share/qt4/mkspecs/qws/linux-lsb-g++/qplatformdefs.h
 share/qt4/mkspecs/qws/linux-mips-g++/qmake.conf
 share/qt4/mkspecs/qws/linux-mips-g++/qplatformdefs.h
-share/qt4/mkspecs/qws/linux-ppc-g++/qmake.conf
-share/qt4/mkspecs/qws/linux-ppc-g++/qplatformdefs.h
+share/qt4/mkspecs/qws/linux-powerpc-g++/qmake.conf
+share/qt4/mkspecs/qws/linux-powerpc-g++/qplatformdefs.h
 share/qt4/mkspecs/qws/linux-sh-g++/qmake.conf
 share/qt4/mkspecs/qws/linux-sh-g++/qplatformdefs.h
 share/qt4/mkspecs/qws/linux-sh4al-g++/qmake.conf
@@ -234,14 +259,25 @@ share/qt4/mkspecs/sco-cc/qmake.conf
 share/qt4/mkspecs/sco-cc/qplatformdefs.h
 share/qt4/mkspecs/sco-g++/qmake.conf
 share/qt4/mkspecs/sco-g++/qplatformdefs.h
+share/qt4/mkspecs/solaris-cc-64-stlport/qmake.conf
+share/qt4/mkspecs/solaris-cc-64-stlport/qplatformdefs.h
 share/qt4/mkspecs/solaris-cc-64/qmake.conf
 share/qt4/mkspecs/solaris-cc-64/qplatformdefs.h
+share/qt4/mkspecs/solaris-cc-stlport/qmake.conf
+share/qt4/mkspecs/solaris-cc-stlport/qplatformdefs.h
 share/qt4/mkspecs/solaris-cc/qmake.conf
 share/qt4/mkspecs/solaris-cc/qplatformdefs.h
 share/qt4/mkspecs/solaris-g++-64/qmake.conf
 share/qt4/mkspecs/solaris-g++-64/qplatformdefs.h
 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-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
+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/tru64-cxx/qmake.conf
 share/qt4/mkspecs/tru64-cxx/qplatformdefs.h
 share/qt4/mkspecs/tru64-g++/qmake.conf
@@ -250,6 +286,26 @@ share/qt4/mkspecs/unixware-cc/qmake.conf
 share/qt4/mkspecs/unixware-cc/qplatformdefs.h
 share/qt4/mkspecs/unixware-g++/qmake.conf
 share/qt4/mkspecs/unixware-g++/qplatformdefs.h
+share/qt4/mkspecs/unsupported/linux-host-g++/qmake.conf
+share/qt4/mkspecs/unsupported/linux-host-g++/qplatformdefs.h
+share/qt4/mkspecs/unsupported/linux-scratchbox2-g++/qmake.conf
+share/qt4/mkspecs/unsupported/linux-scratchbox2-g++/qplatformdefs.h
+share/qt4/mkspecs/unsupported/qnx-g++/qmake.conf
+share/qt4/mkspecs/unsupported/qnx-g++/qplatformdefs.h
+share/qt4/mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf
+share/qt4/mkspecs/unsupported/qws/qnx-generic-g++/qplatformdefs.h
+share/qt4/mkspecs/unsupported/qws/qnx-i386-g++/qmake.conf
+share/qt4/mkspecs/unsupported/qws/qnx-i386-g++/qplatformdefs.h
+share/qt4/mkspecs/unsupported/qws/qnx-ppc-g++/qmake.conf
+share/qt4/mkspecs/unsupported/qws/qnx-ppc-g++/qplatformdefs.h
+share/qt4/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf
+share/qt4/mkspecs/unsupported/vxworks-ppc-dcc/qplatformdefs.h
+share/qt4/mkspecs/unsupported/vxworks-ppc-g++/qmake.conf
+share/qt4/mkspecs/unsupported/vxworks-ppc-g++/qplatformdefs.h
+share/qt4/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf
+share/qt4/mkspecs/unsupported/vxworks-simpentium-dcc/qplatformdefs.h
+share/qt4/mkspecs/unsupported/vxworks-simpentium-g++/qmake.conf
+share/qt4/mkspecs/unsupported/vxworks-simpentium-g++/qplatformdefs.h
 share/qt4/mkspecs/win32-borland/qmake.conf
 share/qt4/mkspecs/win32-borland/qplatformdefs.h
 share/qt4/mkspecs/win32-g++/qmake.conf
@@ -298,6 +354,8 @@ share/qt4/mkspecs/wince50standard-x86-msvc2008/qmake.conf
 share/qt4/mkspecs/wince50standard-x86-msvc2008/qplatformdefs.h
 share/qt4/mkspecs/wince60standard-armv4i-msvc2005/qmake.conf
 share/qt4/mkspecs/wince60standard-armv4i-msvc2005/qplatformdefs.h
+share/qt4/mkspecs/wince60standard-x86-msvc2005/qmake.conf
+share/qt4/mkspecs/wince60standard-x86-msvc2005/qplatformdefs.h
 share/qt4/mkspecs/wincewm50pocket-msvc2005/default_post.prf
 share/qt4/mkspecs/wincewm50pocket-msvc2005/qmake.conf
 share/qt4/mkspecs/wincewm50pocket-msvc2005/qplatformdefs.h
@@ -322,6 +380,14 @@ share/qt4/mkspecs/wincewm60standard-msvc2005/qplatformdefs.h
 share/qt4/mkspecs/wincewm60standard-msvc2008/default_post.prf
 share/qt4/mkspecs/wincewm60standard-msvc2008/qmake.conf
 share/qt4/mkspecs/wincewm60standard-msvc2008/qplatformdefs.h
+share/qt4/mkspecs/wincewm65professional-msvc2005/default_post.prf
+share/qt4/mkspecs/wincewm65professional-msvc2005/qmake.conf
+share/qt4/mkspecs/wincewm65professional-msvc2005/qplatformdefs.h
+share/qt4/mkspecs/wincewm65professional-msvc2008/default_post.prf
+share/qt4/mkspecs/wincewm65professional-msvc2008/qmake.conf
+share/qt4/mkspecs/wincewm65professional-msvc2008/qplatformdefs.h
+@dirrm share/qt4/mkspecs/wincewm65professional-msvc2008
+@dirrm share/qt4/mkspecs/wincewm65professional-msvc2005
 @dirrm share/qt4/mkspecs/wincewm60standard-msvc2008
 @dirrm share/qt4/mkspecs/wincewm60standard-msvc2005
 @dirrm share/qt4/mkspecs/wincewm60professional-msvc2008
@@ -330,6 +396,7 @@ share/qt4/mkspecs/wincewm60standard-msvc2008/qplatformdefs.h
 @dirrm share/qt4/mkspecs/wincewm50smart-msvc2005
 @dirrm share/qt4/mkspecs/wincewm50pocket-msvc2008
 @dirrm share/qt4/mkspecs/wincewm50pocket-msvc2005
+@dirrm share/qt4/mkspecs/wince60standard-x86-msvc2005
 @dirrm share/qt4/mkspecs/wince60standard-armv4i-msvc2005
 @dirrm share/qt4/mkspecs/wince50standard-x86-msvc2008
 @dirrm share/qt4/mkspecs/wince50standard-x86-msvc2005
@@ -351,12 +418,30 @@ share/qt4/mkspecs/wincewm60standard-msvc2008/qplatformdefs.h
 @dirrm share/qt4/mkspecs/win32-icc
 @dirrm share/qt4/mkspecs/win32-g++
 @dirrm share/qt4/mkspecs/win32-borland
+@dirrm share/qt4/mkspecs/unsupported/vxworks-simpentium-g++
+@dirrm share/qt4/mkspecs/unsupported/vxworks-simpentium-dcc
+@dirrm share/qt4/mkspecs/unsupported/vxworks-ppc-g++
+@dirrm share/qt4/mkspecs/unsupported/vxworks-ppc-dcc
+@dirrm share/qt4/mkspecs/unsupported/qws/qnx-ppc-g++
+@dirrm share/qt4/mkspecs/unsupported/qws/qnx-i386-g++
+@dirrm share/qt4/mkspecs/unsupported/qws/qnx-generic-g++
+@dirrm share/qt4/mkspecs/unsupported/qws
+@dirrm share/qt4/mkspecs/unsupported/qnx-g++
+@dirrm share/qt4/mkspecs/unsupported/linux-scratchbox2-g++
+@dirrm share/qt4/mkspecs/unsupported/linux-host-g++
+@dirrm share/qt4/mkspecs/unsupported
 @dirrm share/qt4/mkspecs/unixware-g++
 @dirrm share/qt4/mkspecs/unixware-cc
 @dirrm share/qt4/mkspecs/tru64-g++
 @dirrm share/qt4/mkspecs/tru64-cxx
+@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-abld
 @dirrm share/qt4/mkspecs/solaris-g++-64
 @dirrm share/qt4/mkspecs/solaris-g++
+@dirrm share/qt4/mkspecs/solaris-cc-stlport
+@dirrm share/qt4/mkspecs/solaris-cc-64-stlport
 @dirrm share/qt4/mkspecs/solaris-cc-64
 @dirrm share/qt4/mkspecs/solaris-cc
 @dirrm share/qt4/mkspecs/sco-g++
@@ -369,7 +454,7 @@ share/qt4/mkspecs/wincewm60standard-msvc2008/qplatformdefs.h
 @dirrm share/qt4/mkspecs/qws/linux-sharp-g++
 @dirrm share/qt4/mkspecs/qws/linux-sh4al-g++
 @dirrm share/qt4/mkspecs/qws/linux-sh-g++
-@dirrm share/qt4/mkspecs/qws/linux-ppc-g++
+@dirrm share/qt4/mkspecs/qws/linux-powerpc-g++
 @dirrm share/qt4/mkspecs/qws/linux-mips-g++
 @dirrm share/qt4/mkspecs/qws/linux-lsb-g++
 @dirrm share/qt4/mkspecs/qws/linux-ipaq-g++
@@ -391,6 +476,7 @@ share/qt4/mkspecs/wincewm60standard-msvc2008/qplatformdefs.h
 @dirrm share/qt4/mkspecs/macx-llvm
 @dirrm share/qt4/mkspecs/macx-icc
 @dirrm share/qt4/mkspecs/macx-g++42
+@dirrm share/qt4/mkspecs/macx-g++40
 @dirrm share/qt4/mkspecs/macx-g++
 @dirrm share/qt4/mkspecs/lynxos-g++
 @dirrm share/qt4/mkspecs/linux-pgcc
@@ -400,6 +486,7 @@ share/qt4/mkspecs/wincewm60standard-msvc2008/qplatformdefs.h
 @dirrm share/qt4/mkspecs/linux-icc-64
 @dirrm share/qt4/mkspecs/linux-icc-32
 @dirrm share/qt4/mkspecs/linux-icc
+@dirrm share/qt4/mkspecs/linux-g++-maemo
 @dirrm share/qt4/mkspecs/linux-g++-64
 @dirrm share/qt4/mkspecs/linux-g++-32
 @dirrm share/qt4/mkspecs/linux-g++
@@ -424,10 +511,14 @@ share/qt4/mkspecs/wincewm60standard-msvc2008/qplatformdefs.h
 @dirrm share/qt4/mkspecs/freebsd-g++
 @dirrm share/qt4/mkspecs/features/win32
 @dirrm share/qt4/mkspecs/features/unix
+@dirrm share/qt4/mkspecs/features/symbian
 @dirrm share/qt4/mkspecs/features/mac
 @dirrmtry share/qt4/mkspecs/features
 @dirrm share/qt4/mkspecs/darwin-g++
 @dirrm share/qt4/mkspecs/cygwin-g++
+@dirrm share/qt4/mkspecs/common/wince
+@dirrm share/qt4/mkspecs/common/symbian/stl-off
+@dirrm share/qt4/mkspecs/common/symbian
 @dirrm share/qt4/mkspecs/common
 @dirrm share/qt4/mkspecs/aix-xlc-64
 @dirrm share/qt4/mkspecs/aix-xlc