The KDE on FreeBSD team is happy to update Qt to its 4.8.2 release.

The upstream changelog can be seen in
<https://qt.gitorious.org/qt/qt/blobs/4.8/dist/changes-4.8.2>.

Relevant changes include a few patches having been integrated upstream
and thus removed from the ports tree and some improved work on USE_QT4
in bsd.qt.mk.

21 files changed, 25 insertions, 40 deletions

diff --git a/devel/qmake4/Makefile b/devel/qmake4/Makefile
index 8b482f26bd95..af6179986847 100644
--- a/devel/qmake4/Makefile
+++ b/devel/qmake4/Makefile
@@ -52,21 +52,22 @@ post-patch:
 		${WRKSRC}/../mkspecs/freebsd-*/qmake.conf
 	@${REINPLACE_CMD} -e 's|@QMAKE_QTOBJS@||g' ${WRKSRC}/Makefile.unix
 
-	# FIXME: This is ugly
+# FIXME: This is ugly
 	@${RM} ${WRKSRC}/../mkspecs/freebsd-g++/*.orig
-	@${RM} ${WRKSRC}/../mkspecs/freebsd-g++40/*.orig
+	@${RM} ${WRKSRC}/../mkspecs/freebsd-g++46/*.orig
 
 # Add mkspec for clang
-	@${CP} -PpR ${WRKSRC}/../mkspecs/freebsd-g++ ${WRKSRC}/../mkspecs/freebsd-clang
+	@${CP} -PpR ${WRKSRC}/../mkspecs/freebsd-g++46 ${WRKSRC}/../mkspecs/freebsd-clang
 	@${REINPLACE_CMD} -e 's|g++-unix.conf|clang.conf|g' \
+		-e 's|freebsd-g++|freebsd-clang|g' \
 		${WRKSRC}/../mkspecs/freebsd-clang/qmake.conf
+
 # Add mkspecs for the different GCC versions in the ports tree
-.for v in 42 44 46 47 48
-	@${CP} -PpR ${WRKSRC}/../mkspecs/freebsd-g++40 ${WRKSRC}/../mkspecs/freebsd-g++${v}
-	@${REINPLACE_CMD} -e 's|40|${v}|g' \
+.for v in 42 44 47 48
+	@${CP} -PpR ${WRKSRC}/../mkspecs/freebsd-g++46 ${WRKSRC}/../mkspecs/freebsd-g++${v}
+	@${REINPLACE_CMD} -e 's|46|${v}|g' \
 		${WRKSRC}/../mkspecs/freebsd-g++${v}/qmake.conf
 .endfor
-	@${RM} -r ${WRKSRC}/../mkspecs/freebsd-g++40
 
 do-configure:
 	${SED} -e 's|/usr/local|${PREFIX}|g' \
diff --git a/devel/qmake4/files/patch-qt4-before-ports-in-mkspecs.diff b/devel/qmake4/files/patch-qt4-before-ports-in-mkspecs.diff
index 9ae0c7fff3fd..f1778eb13706 100644
--- a/devel/qmake4/files/patch-qt4-before-ports-in-mkspecs.diff
+++ b/devel/qmake4/files/patch-qt4-before-ports-in-mkspecs.diff
@@ -11,8 +11,8 @@
  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
+--- ../mkspecs/freebsd-g++46/qmake.conf.old	2011-09-17 01:03:00.000000000 -0300
++++ ../mkspecs/freebsd-g++46/qmake.conf	2011-09-17 00:23:41.000000000 -0300
 @@ -37,8 +37,8 @@
  QMAKE_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
  
diff --git a/devel/qmake4/pkg-plist b/devel/qmake4/pkg-plist
index 1d069bab04f4..5d855583e660 100644
--- a/devel/qmake4/pkg-plist
+++ b/devel/qmake4/pkg-plist
@@ -187,8 +187,6 @@ share/qt4/mkspecs/freebsd-clang/qmake.conf
 share/qt4/mkspecs/freebsd-clang/qplatformdefs.h
 share/qt4/mkspecs/freebsd-g++/qmake.conf
 share/qt4/mkspecs/freebsd-g++/qplatformdefs.h
-share/qt4/mkspecs/freebsd-g++34/qmake.conf
-share/qt4/mkspecs/freebsd-g++34/qplatformdefs.h
 share/qt4/mkspecs/freebsd-g++42/qmake.conf
 share/qt4/mkspecs/freebsd-g++42/qplatformdefs.h
 share/qt4/mkspecs/freebsd-g++44/qmake.conf
@@ -227,6 +225,8 @@ share/qt4/mkspecs/irix-g++-64/qmake.conf
 share/qt4/mkspecs/irix-g++-64/qplatformdefs.h
 share/qt4/mkspecs/irix-g++/qmake.conf
 share/qt4/mkspecs/irix-g++/qplatformdefs.h
+share/qt4/mkspecs/linux-arm-gnueabi-g++/qmake.conf
+share/qt4/mkspecs/linux-arm-gnueabi-g++/qplatformdefs.h
 share/qt4/mkspecs/linux-cxx/qmake.conf
 share/qt4/mkspecs/linux-cxx/qplatformdefs.h
 share/qt4/mkspecs/linux-ecc-64/qmake.conf
@@ -401,6 +401,10 @@ 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/blackberry-armv7le-qcc/qmake.conf
+share/qt4/mkspecs/unsupported/blackberry-armv7le-qcc/qplatformdefs.h
+share/qt4/mkspecs/unsupported/blackberry-x86-qcc/qmake.conf
+share/qt4/mkspecs/unsupported/blackberry-x86-qcc/qplatformdefs.h
 share/qt4/mkspecs/unsupported/linux-armcc/qmake.conf
 share/qt4/mkspecs/unsupported/linux-armcc/qplatformdefs.h
 share/qt4/mkspecs/unsupported/linux-clang/qmake.conf
@@ -569,6 +573,8 @@ share/qt4/mkspecs/wincewm65professional-msvc2008/qplatformdefs.h
 @dirrm share/qt4/mkspecs/unsupported/linux-host-g++
 @dirrm share/qt4/mkspecs/unsupported/linux-clang
 @dirrm share/qt4/mkspecs/unsupported/linux-armcc
+@dirrm share/qt4/mkspecs/unsupported/blackberry-x86-qcc
+@dirrm share/qt4/mkspecs/unsupported/blackberry-armv7le-qcc
 @dirrm share/qt4/mkspecs/unsupported
 @dirrm share/qt4/mkspecs/unixware-g++
 @dirrm share/qt4/mkspecs/unixware-cc
@@ -654,6 +660,7 @@ share/qt4/mkspecs/wincewm65professional-msvc2008/qplatformdefs.h
 @dirrm share/qt4/mkspecs/linux-g++
 @dirrm share/qt4/mkspecs/linux-ecc-64
 @dirrm share/qt4/mkspecs/linux-cxx
+@dirrm share/qt4/mkspecs/linux-arm-gnueabi-g++
 @dirrm share/qt4/mkspecs/irix-g++-64
 @dirrm share/qt4/mkspecs/irix-g++
 @dirrm share/qt4/mkspecs/irix-cc-64
@@ -673,7 +680,6 @@ share/qt4/mkspecs/wincewm65professional-msvc2008/qplatformdefs.h
 @dirrm share/qt4/mkspecs/freebsd-g++46
 @dirrm share/qt4/mkspecs/freebsd-g++44
 @dirrm share/qt4/mkspecs/freebsd-g++42
-@dirrm share/qt4/mkspecs/freebsd-g++34
 @dirrm share/qt4/mkspecs/freebsd-g++
 @dirrm share/qt4/mkspecs/freebsd-clang
 @dirrm share/qt4/mkspecs/features/win32
diff --git a/devel/qt4-assistant-adp/Makefile b/devel/qt4-assistant-adp/Makefile
index e9d62351998b..78602bfc6338 100644
--- a/devel/qt4-assistant-adp/Makefile
+++ b/devel/qt4-assistant-adp/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	assistant
 PORTVERSION=	4.6.3
-PORTREVISION=	1
 CATEGORIES?=	devel
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
diff --git a/devel/qt4-assistant/Makefile b/devel/qt4-assistant/Makefile
index a216e850fa76..fc56b40af9bb 100644
--- a/devel/qt4-assistant/Makefile
+++ b/devel/qt4-assistant/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	assistant
 DISTVERSION=	${QT4_VERSION}
-PORTREVISION=	1
 CATEGORIES?=	devel
 PKGNAMEPREFIX=	qt4-
 
diff --git a/devel/qt4-declarative/Makefile b/devel/qt4-declarative/Makefile
index eb388063325b..2b5f2205468a 100644
--- a/devel/qt4-declarative/Makefile
+++ b/devel/qt4-declarative/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	declarative
 DISTVERSION=	${QT4_VERSION}
-PORTREVISION=	1
 CATEGORIES?=	devel
 PKGNAMEPREFIX=	qt4-
 
diff --git a/devel/qt4-designer/Makefile b/devel/qt4-designer/Makefile
index 8ba7ff24c7d2..1144032e10ee 100644
--- a/devel/qt4-designer/Makefile
+++ b/devel/qt4-designer/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	designer
 DISTVERSION=	${QT4_VERSION}
-PORTREVISION=	1
 CATEGORIES?=	devel
 PKGNAMEPREFIX=	qt4-
 
diff --git a/devel/qt4-help-tools/Makefile b/devel/qt4-help-tools/Makefile
index fe700249fc94..ad29da63574e 100644
--- a/devel/qt4-help-tools/Makefile
+++ b/devel/qt4-help-tools/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	help
 DISTVERSION=	${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 8490ebb6f1eb..65d6825c532d 100644
--- a/devel/qt4-help/Makefile
+++ b/devel/qt4-help/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	help
 DISTVERSION=	${QT4_VERSION}
-PORTREVISION=	1
 CATEGORIES?=	devel
 PKGNAMEPREFIX=	qt4-
 
diff --git a/devel/qt4-libqtassistantclient/Makefile b/devel/qt4-libqtassistantclient/Makefile
index e14df9fd3267..851ca9ba2e13 100644
--- a/devel/qt4-libqtassistantclient/Makefile
+++ b/devel/qt4-libqtassistantclient/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	libQtAssistantClient
 PORTVERSION=	4.6.3
-PORTREVISION=	1
 CATEGORIES?=	devel
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
diff --git a/devel/qt4-linguist/Makefile b/devel/qt4-linguist/Makefile
index 74d3086b21ec..b0a37da1ad5d 100644
--- a/devel/qt4-linguist/Makefile
+++ b/devel/qt4-linguist/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	linguist
 DISTVERSION=	${QT4_VERSION}
-PORTREVISION=	1
 CATEGORIES?=	devel
 PKGNAMEPREFIX=	qt4-
 
diff --git a/devel/qt4-makeqpf/Makefile b/devel/qt4-makeqpf/Makefile
index aa79fcd1a814..e6a183404b73 100644
--- a/devel/qt4-makeqpf/Makefile
+++ b/devel/qt4-makeqpf/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	makeqpf
 DISTVERSION=	${QT4_VERSION}
-PORTREVISION=	1
 CATEGORIES?=	devel
 PKGNAMEPREFIX=	qt4-
 
@@ -46,6 +45,10 @@ INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
 EXTRA_PATCHES=	${.CURDIR}/../../devel/qt4/files/patch-configure
 
+.if ${OSVERSION} < 802502
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-tools__makeqpf__qpf2.cpp
+.endif
+
 pre-configure:
 	${REINPLACE_CMD} -e 's|^TARGET[[:blank:]]*=[[:blank:]]*|TARGET=${PORTNAME}-qt4|g' \
 		${BUILD_WRKSRC}/${PORTNAME}.pro
diff --git a/devel/qt4-makeqpf/files/patch-tools-makeqpf-qpf2.cpp b/devel/qt4-makeqpf/files/extra-patch__tools__makeqpf__qpf2.cpp
index ab46d51ae6c7..ab46d51ae6c7 100644
--- a/devel/qt4-makeqpf/files/patch-tools-makeqpf-qpf2.cpp
+++ b/devel/qt4-makeqpf/files/extra-patch__tools__makeqpf__qpf2.cpp
diff --git a/devel/qt4-qdbusviewer/Makefile b/devel/qt4-qdbusviewer/Makefile
index cab8d623ca68..d62636ea063a 100644
--- a/devel/qt4-qdbusviewer/Makefile
+++ b/devel/qt4-qdbusviewer/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	qdbusviewer
 DISTVERSION=	${QT4_VERSION}
-PORTREVISION=	1
 CATEGORIES?=	devel
 PKGNAMEPREFIX=	qt4-
 
diff --git a/devel/qt4-qdoc3/Makefile b/devel/qt4-qdoc3/Makefile
index 306ea197bf94..0ebbdde8792b 100644
--- a/devel/qt4-qdoc3/Makefile
+++ b/devel/qt4-qdoc3/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	qdoc3
 DISTVERSION=	${QT4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	devel textproc
 PKGNAMEPREFIX=	qt4-
 
diff --git a/devel/qt4-qt3support/Makefile b/devel/qt4-qt3support/Makefile
index 823f3ce917d3..0eabf96da490 100644
--- a/devel/qt4-qt3support/Makefile
+++ b/devel/qt4-qt3support/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	qt3support
 DISTVERSION=	${QT4_VERSION}
-PORTREVISION=	1
 CATEGORIES?=	devel x11-toolkits
 PKGNAMEPREFIX=	qt4-
 
diff --git a/devel/qt4-qvfb/Makefile b/devel/qt4-qvfb/Makefile
index 50718cd1a6f2..b8fc3bd5e262 100644
--- a/devel/qt4-qvfb/Makefile
+++ b/devel/qt4-qvfb/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	qvfb
 DISTVERSION=	${QT4_VERSION}
-PORTREVISION=	1
 CATEGORIES?=	devel
 PKGNAMEPREFIX=	qt4-
 
diff --git a/devel/qt4-qvfb/files/patch-tools__qvfb__qvfb.pro b/devel/qt4-qvfb/files/patch-tools__qvfb__qvfb.pro
deleted file mode 100644
index db5b6d8a8623..000000000000
--- a/devel/qt4-qvfb/files/patch-tools__qvfb__qvfb.pro
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./tools/qvfb/qvfb.pro.orig	2012-01-08 16:32:17.921428981 +0100
-+++ ./tools/qvfb/qvfb.pro	2012-01-08 16:33:01.611355995 +0100
-@@ -38,8 +38,6 @@
- 
- !embedded {
-     DEFINES         += QT_NO_QWS_SIGNALHANDLER
--    HEADERS         += ../../src/gui/embedded/qlock_p.h
--    SOURCES         += ../../src/gui/embedded/qlock.cpp
- }
- 
- include(../shared/deviceskin/deviceskin.pri)
diff --git a/devel/qt4-scripttools/Makefile b/devel/qt4-scripttools/Makefile
index 6b351aaa3cbe..4b76c5b2967a 100644
--- a/devel/qt4-scripttools/Makefile
+++ b/devel/qt4-scripttools/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	scripttools
 DISTVERSION=	${QT4_VERSION}
-PORTREVISION=	1
 CATEGORIES?=	devel
 PKGNAMEPREFIX=	qt4-
 
diff --git a/devel/qt4-uic3/Makefile b/devel/qt4-uic3/Makefile
index 9397aede8767..de05ab3c6a3f 100644
--- a/devel/qt4-uic3/Makefile
+++ b/devel/qt4-uic3/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	uic3
 DISTVERSION=	${QT4_VERSION}
-PORTREVISION=	1
 CATEGORIES?=	devel
 PKGNAMEPREFIX=	qt4-
 
diff --git a/devel/qt4/distinfo b/devel/qt4/distinfo
index cb5f8a92998b..fbf29ccab5a5 100644
--- a/devel/qt4/distinfo
+++ b/devel/qt4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/qt-everywhere-opensource-src-4.8.1.tar.gz) = ef851a36aa41b4ad7a3e4c96ca27eaed2a629a6d2fa06c20f072118caed87ae8
-SIZE (KDE/qt-everywhere-opensource-src-4.8.1.tar.gz) = 239606696
+SHA256 (KDE/qt-everywhere-opensource-src-4.8.2.tar.gz) = 921b2a2d060934ceda65ae4615edec474cea13d3c893e7df19ad1262e7dc2379
+SIZE (KDE/qt-everywhere-opensource-src-4.8.2.tar.gz) = 239108331