update eo 4.8.3

changes:
-MacOS support improvements
-webkit update to 2.2.3
-bugfixes

7 files changed, 55 insertions, 61 deletions

diff --git a/x11/qt4-libs/Makefile b/x11/qt4-libs/Makefile
index 1d7aa5b01b4..143204d874b 100644
--- a/x11/qt4-libs/Makefile
+++ b/x11/qt4-libs/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.76 2012/09/12 17:02:50 jaapb Exp $
+# $NetBSD: Makefile,v 1.77 2012/09/15 08:18:49 drochner Exp $
 
 PKGNAME=	qt4-libs-${QTVERSION}
 COMMENT=	C++ X GUI toolkit
-PKGREVISION=	1
 
 .include "../../x11/qt4-libs/Makefile.common"
 
diff --git a/x11/qt4-libs/Makefile.common b/x11/qt4-libs/Makefile.common
index 598abef34c7..5cfe738be3b 100644
--- a/x11/qt4-libs/Makefile.common
+++ b/x11/qt4-libs/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.32 2012/05/24 08:07:33 adam Exp $
+# $NetBSD: Makefile.common,v 1.33 2012/09/15 08:18:49 drochner Exp $
 # used by x11/qt4-docs/Makefile
 # used by x11/qt4-libs/Makefile
 # used by x11/qt4-mng/Makefile
@@ -11,6 +11,7 @@
 DISTNAME=	qt-everywhere-opensource-src-${QTVERSION}
 CATEGORIES=	x11
 MASTER_SITES=	http://releases.qt-project.org/qt4/source/
+EXTRACT_USING=	gtar
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo
index 3ad4457f235..2d535aa8dd8 100644
--- a/x11/qt4-libs/distinfo
+++ b/x11/qt4-libs/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.77 2012/09/12 17:02:50 jaapb Exp $
+$NetBSD: distinfo,v 1.78 2012/09/15 08:18:49 drochner Exp $
 
-SHA1 (qt-everywhere-opensource-src-4.8.2.tar.gz) = e1e2edef1d63ed677d6534d32800c2e1f7ad0e73
-RMD160 (qt-everywhere-opensource-src-4.8.2.tar.gz) = 6a15077aee1e84076380787127b80c7bb97ebe86
-Size (qt-everywhere-opensource-src-4.8.2.tar.gz) = 239108331 bytes
+SHA1 (qt-everywhere-opensource-src-4.8.3.tar.gz) = bc352a283610e0cd2fe0dbedbc45613844090fcb
+RMD160 (qt-everywhere-opensource-src-4.8.3.tar.gz) = fe56e5da874503a79d6f84a1e15460eba5a6feae
+Size (qt-everywhere-opensource-src-4.8.3.tar.gz) = 233635127 bytes
 SHA1 (patch-aa) = 9b5f8bd980d8c3f38fd3c541380fd42d2a93a609
 SHA1 (patch-ab) = 447a888cbc784a54935f23d1005d6977374a484d
 SHA1 (patch-ac) = 078ddafefc719f248740f40e2063dae07cd601e5
@@ -36,8 +36,6 @@ SHA1 (patch-bg) = 76175e659be041ba02c1c07fe8e8fceb029e6759
 SHA1 (patch-ca) = 8b69cb6201f624f43df7d766ff1967253bb22430
 SHA1 (patch-cb) = 13e1b0ffb171637e1ff84a548ef83cf4e006c207
 SHA1 (patch-cg) = 2519fe525237167f10dffb9294c861f4d7063f31
-SHA1 (patch-ci) = bc85adf9ea17be24f92897b960517941f5b28ab7
-SHA1 (patch-cj) = 4f6d3546e3bc04ca2034af21645fc6f27bc82eef
 SHA1 (patch-qmake_generators_makefile.cpp) = d163cfbf8e598123dd1ed2f9bb5e6935b4e5bf64
 SHA1 (patch-src-tools-mocmain.cpp-QTBUG-22829) = 79ffa61f856d657be054d1ea2fcab3a90740621e
 SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_heap_MachineStackMarker.cpp) = cbce2e10307d26163a76266c0ceee315a609d63d
diff --git a/x11/qt4-libs/patches/patch-ci b/x11/qt4-libs/patches/patch-ci
deleted file mode 100644
index 1fb88b640d3..00000000000
--- a/x11/qt4-libs/patches/patch-ci
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ci,v 1.3 2012/01/12 22:59:58 adam Exp $
-
-Avoid error when compiling with Clang.
-
---- src/plugins/bearer/corewlan/qcorewlanengine.mm.orig	2011-03-02 13:32:05.000000000 +0000
-+++ src/plugins/bearer/corewlan/qcorewlanengine.mm
-@@ -73,7 +73,7 @@ inline QString qt_NSStringToQString(cons
- { return QCFString::toQString(reinterpret_cast<const CFStringRef>(nsstr)); }
- 
- inline NSString *qt_QStringToNSString(const QString &qstr)
--{ return [reinterpret_cast<const NSString *>(QCFString::toCFStringRef(qstr)) autorelease]; }
-+{ return (NSString *)[reinterpret_cast<const NSString *>(QCFString::toCFStringRef(qstr)) autorelease]; }
- 
- 
- @interface QT_MANGLE_NAMESPACE(QNSListener) : NSObject
diff --git a/x11/qt4-libs/patches/patch-cj b/x11/qt4-libs/patches/patch-cj
deleted file mode 100644
index 8fe74fa7560..00000000000
--- a/x11/qt4-libs/patches/patch-cj
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-cj,v 1.2 2012/01/12 22:59:58 adam Exp $
-
-Avoid error when compiling with Clang.
-
---- src/gui/kernel/qt_cocoa_helpers_mac_p.h.orig	2011-08-11 11:42:47.000000000 +0000
-+++ src/gui/kernel/qt_cocoa_helpers_mac_p.h
-@@ -215,7 +215,7 @@ inline QString qt_mac_NSStringToQString(
- { return QCFString::toQString(reinterpret_cast<const CFStringRef>(nsstr)); }
- 
- inline NSString *qt_mac_QStringToNSString(const QString &qstr)
--{ return [reinterpret_cast<const NSString *>(QCFString::toCFStringRef(qstr)) autorelease]; }
-+{ return (NSString *)[reinterpret_cast<const NSString *>(QCFString::toCFStringRef(qstr)) autorelease]; }
- 
- #ifdef QT_MAC_USE_COCOA
- class QCocoaPostMessageArgs {
diff --git a/x11/qt4-tools/PLIST b/x11/qt4-tools/PLIST
index 186ebe3d970..4a924d68153 100644
--- a/x11/qt4-tools/PLIST
+++ b/x11/qt4-tools/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.30 2012/05/24 08:07:33 adam Exp $
+@comment $NetBSD: PLIST,v 1.31 2012/09/15 08:18:48 drochner Exp $
 lib/pkgconfig/QtCLucene.pc
 lib/pkgconfig/QtDesigner.pc
 lib/pkgconfig/QtDesignerComponents.pc
@@ -148,6 +148,10 @@ qt4/mkspecs/aix-xlc-64/qmake.conf
 qt4/mkspecs/aix-xlc-64/qplatformdefs.h
 qt4/mkspecs/aix-xlc/qmake.conf
 qt4/mkspecs/aix-xlc/qplatformdefs.h
+qt4/mkspecs/blackberry-armv7le-qcc/qmake.conf
+qt4/mkspecs/blackberry-armv7le-qcc/qplatformdefs.h
+qt4/mkspecs/blackberry-x86-qcc/qmake.conf
+qt4/mkspecs/blackberry-x86-qcc/qplatformdefs.h
 qt4/mkspecs/common/aix/qplatformdefs.h
 qt4/mkspecs/common/armcc.conf
 qt4/mkspecs/common/c89/qplatformdefs.h
@@ -156,11 +160,22 @@ qt4/mkspecs/common/g++-base.conf
 qt4/mkspecs/common/g++-macx.conf
 qt4/mkspecs/common/g++-unix.conf
 qt4/mkspecs/common/g++.conf
+qt4/mkspecs/common/gcc-base-ios.conf
 qt4/mkspecs/common/gcc-base-macx.conf
 qt4/mkspecs/common/gcc-base-unix.conf
 qt4/mkspecs/common/gcc-base.conf
 qt4/mkspecs/common/ghs-base-integrity.conf
 qt4/mkspecs/common/integrity/qplatformdefs.h
+qt4/mkspecs/common/ios.conf
+qt4/mkspecs/common/ios/GLES/gl.h
+qt4/mkspecs/common/ios/GLES2/gl2.h
+qt4/mkspecs/common/ios/arch.conf
+qt4/mkspecs/common/ios/clang.conf
+qt4/mkspecs/common/ios/g++.conf
+qt4/mkspecs/common/ios/llvm.conf
+qt4/mkspecs/common/ios/qmake.conf
+qt4/mkspecs/common/ios/qplatformdefs.h
+qt4/mkspecs/common/ios/versions.conf
 qt4/mkspecs/common/linux.conf
 qt4/mkspecs/common/llvm.conf
 qt4/mkspecs/common/mac.conf
@@ -220,6 +235,7 @@ qt4/mkspecs/features/declarative_debug.prf
 qt4/mkspecs/features/default_post.prf
 qt4/mkspecs/features/default_pre.prf
 qt4/mkspecs/features/designer.prf
+qt4/mkspecs/features/device_config.prf
 qt4/mkspecs/features/dll.prf
 qt4/mkspecs/features/egl.prf
 qt4/mkspecs/features/enable_backup.prf
@@ -427,17 +443,11 @@ qt4/mkspecs/netbsd-g++/qplatformdefs.h
 qt4/mkspecs/openbsd-g++/qmake.conf
 qt4/mkspecs/openbsd-g++/qplatformdefs.h
 qt4/mkspecs/qconfig.pri
-qt4/mkspecs/qpa/common/g++-base-macx-iphone.conf
-qt4/mkspecs/qpa/common/g++-base-macx-iphonedevice.conf
-qt4/mkspecs/qpa/macx-iphonedevice-g++-armv6/qmake.conf
-qt4/mkspecs/qpa/macx-iphonedevice-g++-armv6/qplatformdefs.h
-qt4/mkspecs/qpa/macx-iphonedevice-g++-armv7-nothumb/qmake.conf
-qt4/mkspecs/qpa/macx-iphonedevice-g++-armv7-nothumb/qplatformdefs.h
-qt4/mkspecs/qpa/macx-iphonedevice-g++/qmake.conf
-qt4/mkspecs/qpa/macx-iphonedevice-g++/qplatformdefs.h
-qt4/mkspecs/qpa/macx-iphonesimulator-g++/qmake.conf
-qt4/mkspecs/qpa/macx-iphonesimulator-g++/qplatformdefs.h
-qt4/mkspecs/qpa/qmake.conf
+qt4/mkspecs/qdevice.pri
+qt4/mkspecs/qnx-armv7le-qcc/qmake.conf
+qt4/mkspecs/qnx-armv7le-qcc/qplatformdefs.h
+qt4/mkspecs/qnx-x86-qcc/qmake.conf
+qt4/mkspecs/qnx-x86-qcc/qplatformdefs.h
 qt4/mkspecs/qws/freebsd-generic-g++/qmake.conf
 qt4/mkspecs/qws/freebsd-generic-g++/qplatformdefs.h
 qt4/mkspecs/qws/integrity-arm-cxarm/qmake.conf
@@ -543,10 +553,6 @@ qt4/mkspecs/unixware-cc/qmake.conf
 qt4/mkspecs/unixware-cc/qplatformdefs.h
 qt4/mkspecs/unixware-g++/qmake.conf
 qt4/mkspecs/unixware-g++/qplatformdefs.h
-qt4/mkspecs/unsupported/blackberry-armv7le-qcc/qmake.conf
-qt4/mkspecs/unsupported/blackberry-armv7le-qcc/qplatformdefs.h
-qt4/mkspecs/unsupported/blackberry-x86-qcc/qmake.conf
-qt4/mkspecs/unsupported/blackberry-x86-qcc/qplatformdefs.h
 qt4/mkspecs/unsupported/linux-armcc/qmake.conf
 qt4/mkspecs/unsupported/linux-armcc/qplatformdefs.h
 qt4/mkspecs/unsupported/linux-clang/qmake.conf
@@ -559,13 +565,33 @@ qt4/mkspecs/unsupported/macx-clang/Info.plist.app
 qt4/mkspecs/unsupported/macx-clang/Info.plist.lib
 qt4/mkspecs/unsupported/macx-clang/qmake.conf
 qt4/mkspecs/unsupported/macx-clang/qplatformdefs.h
+qt4/mkspecs/unsupported/macx-iosdevice-clang-legacy/qmake.conf
+qt4/mkspecs/unsupported/macx-iosdevice-clang-legacy/qplatformdefs.h
+qt4/mkspecs/unsupported/macx-iosdevice-clang/qmake.conf
+qt4/mkspecs/unsupported/macx-iosdevice-clang/qplatformdefs.h
+qt4/mkspecs/unsupported/macx-iosdevice-g++-legacy/qmake.conf
+qt4/mkspecs/unsupported/macx-iosdevice-g++-legacy/qplatformdefs.h
+qt4/mkspecs/unsupported/macx-iosdevice-g++/qmake.conf
+qt4/mkspecs/unsupported/macx-iosdevice-g++/qplatformdefs.h
+qt4/mkspecs/unsupported/macx-iosdevice-llvm-legacy/qmake.conf
+qt4/mkspecs/unsupported/macx-iosdevice-llvm-legacy/qplatformdefs.h
+qt4/mkspecs/unsupported/macx-iosdevice-llvm/qmake.conf
+qt4/mkspecs/unsupported/macx-iosdevice-llvm/qplatformdefs.h
+qt4/mkspecs/unsupported/macx-iossimulator-clang-legacy/qmake.conf
+qt4/mkspecs/unsupported/macx-iossimulator-clang-legacy/qplatformdefs.h
+qt4/mkspecs/unsupported/macx-iossimulator-clang/qmake.conf
+qt4/mkspecs/unsupported/macx-iossimulator-clang/qplatformdefs.h
+qt4/mkspecs/unsupported/macx-iossimulator-g++-legacy/qmake.conf
+qt4/mkspecs/unsupported/macx-iossimulator-g++-legacy/qplatformdefs.h
+qt4/mkspecs/unsupported/macx-iossimulator-g++/qmake.conf
+qt4/mkspecs/unsupported/macx-iossimulator-g++/qplatformdefs.h
+qt4/mkspecs/unsupported/macx-iossimulator-llvm-legacy/qmake.conf
+qt4/mkspecs/unsupported/macx-iossimulator-llvm-legacy/qplatformdefs.h
+qt4/mkspecs/unsupported/macx-iossimulator-llvm/qmake.conf
+qt4/mkspecs/unsupported/macx-iossimulator-llvm/qplatformdefs.h
 qt4/mkspecs/unsupported/qmake.conf
 qt4/mkspecs/unsupported/qnx-X11-g++/qmake.conf
 qt4/mkspecs/unsupported/qnx-X11-g++/qplatformdefs.h
-qt4/mkspecs/unsupported/qnx-armv7le-qcc/qmake.conf
-qt4/mkspecs/unsupported/qnx-armv7le-qcc/qplatformdefs.h
-qt4/mkspecs/unsupported/qnx-x86-qcc/qmake.conf
-qt4/mkspecs/unsupported/qnx-x86-qcc/qplatformdefs.h
 qt4/mkspecs/unsupported/qws/integrity-x86-cx86/qmake.conf
 qt4/mkspecs/unsupported/qws/integrity-x86-cx86/qplatformdefs.h
 qt4/mkspecs/unsupported/qws/linux-x86-openkode-g++/qmake.conf
diff --git a/x11/qt4/Makefile.common b/x11/qt4/Makefile.common
index b36db36884d..6df3920284b 100644
--- a/x11/qt4/Makefile.common
+++ b/x11/qt4/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.29 2012/05/24 08:07:33 adam Exp $
+# $NetBSD: Makefile.common,v 1.30 2012/09/15 08:18:48 drochner Exp $
 # used by x11/qt4-libs/Makefile.common
 # used by x11/qt4-tools/Makefile
 
-QTVERSION=	4.8.2
+QTVERSION=	4.8.3
 
 MAINTAINER?=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://qt.nokia.com/