16 files changed, 9 insertions, 23 deletions

diff --git a/devel/dbus-qt4/Makefile b/devel/dbus-qt4/Makefile
index 79fa3256f003..f5fb5df3341f 100644
--- a/devel/dbus-qt4/Makefile
+++ b/devel/dbus-qt4/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	dbus
 PORTVERSION=	${QT4_VERSION}
-PORTREVISION=	1
 CATEGORIES?=	devel
 PKGNAMEPREFIX=	qt4-
 
diff --git a/devel/qmake4/pkg-plist b/devel/qmake4/pkg-plist
index 2d0f68521217..7a750191ac72 100644
--- a/devel/qmake4/pkg-plist
+++ b/devel/qmake4/pkg-plist
@@ -72,6 +72,8 @@ 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/def_files.prf
+share/qt4/mkspecs/features/symbian/def_files_disabled.prf
 share/qt4/mkspecs/features/symbian/default_post.prf
 share/qt4/mkspecs/features/symbian/default_pre.prf
 share/qt4/mkspecs/features/symbian/epocallowdlldata.prf
diff --git a/devel/qt4-assistant-adp/Makefile b/devel/qt4-assistant-adp/Makefile
index 4b3282343308..f9fe3e889a97 100644
--- a/devel/qt4-assistant-adp/Makefile
+++ b/devel/qt4-assistant-adp/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	assistant
 PORTVERSION=	${QT4_VERSION}
-PORTREVISION=	1
 CATEGORIES?=	devel
 PKGNAMEPREFIX=	qt4-
 PKGNAMESUFFIX=	-adp
diff --git a/devel/qt4-assistant/Makefile b/devel/qt4-assistant/Makefile
index dc79111f095e..15a108183fb0 100644
--- a/devel/qt4-assistant/Makefile
+++ b/devel/qt4-assistant/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	assistant
 PORTVERSION=	${QT4_VERSION}
-PORTREVISION=	1
 CATEGORIES?=	devel
 PKGNAMEPREFIX=	qt4-
 
diff --git a/devel/qt4-designer/Makefile b/devel/qt4-designer/Makefile
index 8e2e67297f46..3dd7e55f2c3e 100644
--- a/devel/qt4-designer/Makefile
+++ b/devel/qt4-designer/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	designer
 PORTVERSION=	${QT4_VERSION}
-PORTREVISION=	1
 CATEGORIES?=	devel
 PKGNAMEPREFIX=	qt4-
 
diff --git a/devel/qt4-help-tools/Makefile b/devel/qt4-help-tools/Makefile
index 81895ea11f37..dc9beaccfa69 100644
--- a/devel/qt4-help-tools/Makefile
+++ b/devel/qt4-help-tools/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	help
 PORTVERSION=	${QT4_VERSION}
-PORTREVISION=	1
 CATEGORIES?=	devel
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
diff --git a/devel/qt4-help/Makefile b/devel/qt4-help/Makefile
index 607ea7123d6d..ce0f55d9d9f3 100644
--- a/devel/qt4-help/Makefile
+++ b/devel/qt4-help/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	help
 PORTVERSION=	${QT4_VERSION}
-PORTREVISION=	1
 CATEGORIES?=	devel
 PKGNAMEPREFIX=	qt4-
 
diff --git a/devel/qt4-libqtassistantclient/Makefile b/devel/qt4-libqtassistantclient/Makefile
index 4882bf881976..23c7e069f0d3 100644
--- a/devel/qt4-libqtassistantclient/Makefile
+++ b/devel/qt4-libqtassistantclient/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	libQtAssistantClient
 PORTVERSION=	${QT4_VERSION}
-PORTREVISION=	1
 CATEGORIES?=	devel
 PKGNAMEPREFIX=	qt4-
 
diff --git a/devel/qt4-linguist/Makefile b/devel/qt4-linguist/Makefile
index e37fddc0c0fa..da647b6fb122 100644
--- a/devel/qt4-linguist/Makefile
+++ b/devel/qt4-linguist/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	linguist
 PORTVERSION=	${QT4_VERSION}
-PORTREVISION=	1
 CATEGORIES?=	devel
 PKGNAMEPREFIX=	qt4-
 
diff --git a/devel/qt4-makeqpf/Makefile b/devel/qt4-makeqpf/Makefile
index 765de9536cc9..de50dc7462ee 100644
--- a/devel/qt4-makeqpf/Makefile
+++ b/devel/qt4-makeqpf/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	makeqpf
 PORTVERSION=	${QT4_VERSION}
-PORTREVISION=	1
 CATEGORIES?=	devel
 PKGNAMEPREFIX=	qt4-
 
diff --git a/devel/qt4-qdbusviewer/Makefile b/devel/qt4-qdbusviewer/Makefile
index 3522a34c92d9..83d61d8e604f 100644
--- a/devel/qt4-qdbusviewer/Makefile
+++ b/devel/qt4-qdbusviewer/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	qdbusviewer
 PORTVERSION=	${QT4_VERSION}
-PORTREVISION=	1
 CATEGORIES?=	devel
 PKGNAMEPREFIX=	qt4-
 
@@ -49,12 +48,10 @@ INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
 EXTRA_PATCHES=	${.CURDIR}/../../devel/qt4/files/patch-configure
 
-.include <bsd.port.pre.mk>
-
-pre-configure:
+post-patch:
 	${MKDIR} ${WRKSRC}/mkspecs
 	${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake
 	${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/bin/moc
 	${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/bin/rcc
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/qt4-qvfb/Makefile b/devel/qt4-qvfb/Makefile
index abaa7f7be921..23ee6b354887 100644
--- a/devel/qt4-qvfb/Makefile
+++ b/devel/qt4-qvfb/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	qvfb
 PORTVERSION=	${QT4_VERSION}
-PORTREVISION=	1
 CATEGORIES?=	devel
 PKGNAMEPREFIX=	qt4-
 
diff --git a/devel/qt4-scripttools/Makefile b/devel/qt4-scripttools/Makefile
index 3938dd067de8..89a8b889efdb 100644
--- a/devel/qt4-scripttools/Makefile
+++ b/devel/qt4-scripttools/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	scripttools
 PORTVERSION=	${QT4_VERSION}
-PORTREVISION=	1
 CATEGORIES?=	devel
 PKGNAMEPREFIX=	qt4-
 
diff --git a/devel/qt4-uic3/Makefile b/devel/qt4-uic3/Makefile
index f2cc25aa681c..9a35743c7efc 100644
--- a/devel/qt4-uic3/Makefile
+++ b/devel/qt4-uic3/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	uic3
 PORTVERSION=	${QT4_VERSION}
-PORTREVISION=	1
 CATEGORIES?=	devel
 PKGNAMEPREFIX=	qt4-
 
diff --git a/devel/qt4/Makefile b/devel/qt4/Makefile
index 04e615ec1ba6..544a028c1e49 100644
--- a/devel/qt4/Makefile
+++ b/devel/qt4/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	qt4
 PORTVERSION=	${QT4_VERSION}
-PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	# empty
 DISTFILES=	# none
@@ -32,7 +31,7 @@ QT_COMPONENTS=	accessible assistant assistant-adp assistantclient \
 
 NO_BUILD=	yes
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if !defined(WITHOUT_NLS)
 QT_COMPONENTS+=	l10n
@@ -69,4 +68,4 @@ do-patch:	#empty
 do-install:	#empty
 	${DO_NADA}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/qt4/distinfo b/devel/qt4/distinfo
index 6c9994b1a77e..312ec0de93d7 100644
--- a/devel/qt4/distinfo
+++ b/devel/qt4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-everywhere-opensource-src-4.6.1.tar.gz) = 0542a4be6425451ab5f668c6899cac36
-SHA256 (KDE/qt-everywhere-opensource-src-4.6.1.tar.gz) = 4c84b39b8a2546854ce9c0c9f761dd55da76dab2c33eeb876e3d17db1d2ea0c5
-SIZE (KDE/qt-everywhere-opensource-src-4.6.1.tar.gz) = 160197277
+MD5 (KDE/qt-everywhere-opensource-src-4.6.2.tar.gz) = eb651ee4b157c01696aa56777fc6e0e5
+SHA256 (KDE/qt-everywhere-opensource-src-4.6.2.tar.gz) = 176f51ddb06dce67ab4b2efc6b327dc21ed8f764c5d97acc15ff1f907c2affae
+SIZE (KDE/qt-everywhere-opensource-src-4.6.2.tar.gz) = 160601949