Changes 4.6.2:

This is a bug-fix release. It maintains both forward and backward
compatibility (source and binary) with Qt 4.6.0 and 4.6.1.

6 files changed, 12 insertions, 13 deletions

diff --git a/x11/qt4-libs/Makefile b/x11/qt4-libs/Makefile
index 1929cf12ae1..2a60bcc0ea1 100644
--- a/x11/qt4-libs/Makefile
+++ b/x11/qt4-libs/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.44 2010/02/08 10:49:07 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2010/02/16 13:08:09 adam Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../x11/qt4-libs/Makefile.common"
 
 PKGNAME=	qt4-libs-${QTVERSION}
-PKGREVISION=	4
 COMMENT=	C++ X GUI toolkit
 
 # XXX this is to test what really gets installed when 'do-install' is disabled
diff --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo
index b25d136a512..4ca1c30421a 100644
--- a/x11/qt4-libs/distinfo
+++ b/x11/qt4-libs/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.39 2010/02/08 10:49:07 wiz Exp $
+$NetBSD: distinfo,v 1.40 2010/02/16 13:08:09 adam Exp $
 
-SHA1 (qt-everywhere-opensource-src-4.6.1.tar.gz) = d3b44ae6d9bc9c44fc57f32e545b92daf0b54775
-RMD160 (qt-everywhere-opensource-src-4.6.1.tar.gz) = 7365dfe3c688df36002d2c9aaef6b79ba8175402
-Size (qt-everywhere-opensource-src-4.6.1.tar.gz) = 160197277 bytes
+SHA1 (qt-everywhere-opensource-src-4.6.2.tar.gz) = 977c10b88a2230e96868edc78a9e3789c0fcbf70
+RMD160 (qt-everywhere-opensource-src-4.6.2.tar.gz) = 5f3fea120f2dba274c4150b02162bba40b65a872
+Size (qt-everywhere-opensource-src-4.6.2.tar.gz) = 160601949 bytes
 SHA1 (patch-aa) = 899242f5a3b9101db98f2e87fa1a38f3bffdb262
 SHA1 (patch-ab) = c19f854a08c3c5ce1791d6fbd63443144d8f1fc8
 SHA1 (patch-ac) = db39e471fb43ee820556983ebf9108658ce11e84
diff --git a/x11/qt4-pgsql/Makefile b/x11/qt4-pgsql/Makefile
index 6bcb1da0ebc..4223ca5e9e2 100644
--- a/x11/qt4-pgsql/Makefile
+++ b/x11/qt4-pgsql/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.14 2010/02/10 19:34:08 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2010/02/16 13:08:09 adam Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../x11/qt4-libs/Makefile.common"
 
 PKGNAME=	qt4-pgsql-${QTVERSION}
-PKGREVISION=	1
 COMMENT=	QT postgresql driver
 
 CONFIGURE_ARGS+=	-I${QTDIR}/include
diff --git a/x11/qt4-tools/Makefile b/x11/qt4-tools/Makefile
index 8e1559f5088..b239d629dda 100644
--- a/x11/qt4-tools/Makefile
+++ b/x11/qt4-tools/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.30 2010/02/02 14:06:00 adam Exp $
+# $NetBSD: Makefile,v 1.31 2010/02/16 13:08:09 adam Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../x11/qt4-libs/Makefile.common"
 
 PKGNAME=	qt4-tools-${QTVERSION}
-PKGREVISION=	1
 COMMENT=	QT GUI (WYSIWYG) builder and other tools
 
 DEPENDS+=	libtool-base-[0-9]*:../../devel/libtool-base
diff --git a/x11/qt4-tools/PLIST b/x11/qt4-tools/PLIST
index ae83f713da6..552d2f2479d 100644
--- a/x11/qt4-tools/PLIST
+++ b/x11/qt4-tools/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2010/01/29 18:19:10 adam Exp $
+@comment $NetBSD: PLIST,v 1.21 2010/02/16 13:08:09 adam Exp $
 lib/pkgconfig/QtAssistantClient.pc
 lib/pkgconfig/QtCLucene.pc
 lib/pkgconfig/QtDesigner.pc
@@ -216,6 +216,8 @@ qt4/mkspecs/features/staticlib.prf
 qt4/mkspecs/features/symbian/application_icon.prf
 qt4/mkspecs/features/symbian/armcc_warnings.prf
 qt4/mkspecs/features/symbian/data_caging_paths.prf
+qt4/mkspecs/features/symbian/def_files.prf
+qt4/mkspecs/features/symbian/def_files_disabled.prf
 qt4/mkspecs/features/symbian/default_post.prf
 qt4/mkspecs/features/symbian/default_pre.prf
 qt4/mkspecs/features/symbian/epocallowdlldata.prf
diff --git a/x11/qt4/Makefile.common b/x11/qt4/Makefile.common
index 10ab2c31d5e..d0597a56708 100644
--- a/x11/qt4/Makefile.common
+++ b/x11/qt4/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.20 2010/02/02 14:05:59 adam Exp $
+# $NetBSD: Makefile.common,v 1.21 2010/02/16 13:08:09 adam Exp $
 # used by x11/qt4-libs/Makefile.common
 # used by x11/qt4-tools/Makefile
 
-QTVERSION=	4.6.1
+QTVERSION=	4.6.2
 
 MAINTAINER?=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://qt.nokia.com/