Changes 4.8.2:

* Over 100 functional improvements
* WebKit updated to version 2.2.2
* libpng updated to version 1.5.10
* Thirty improvements to documentation and tools

4 files changed, 12 insertions, 13 deletions

diff --git a/x11/qt4-libs/Makefile b/x11/qt4-libs/Makefile
index a7e8e9cad3b..b981ec45f68 100644
--- a/x11/qt4-libs/Makefile
+++ b/x11/qt4-libs/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.74 2012/04/10 18:45:28 abs Exp $
+# $NetBSD: Makefile,v 1.75 2012/05/24 08:07:33 adam Exp $
 
 PKGNAME=	qt4-libs-${QTVERSION}
-PKGREVISION=	1
 COMMENT=	C++ X GUI toolkit
 
 .include "../../x11/qt4-libs/Makefile.common"
diff --git a/x11/qt4-libs/Makefile.common b/x11/qt4-libs/Makefile.common
index c51f76eb54f..598abef34c7 100644
--- a/x11/qt4-libs/Makefile.common
+++ b/x11/qt4-libs/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.31 2012/02/17 14:11:23 hans Exp $
+# $NetBSD: Makefile.common,v 1.32 2012/05/24 08:07:33 adam Exp $
 # used by x11/qt4-docs/Makefile
 # used by x11/qt4-libs/Makefile
 # used by x11/qt4-mng/Makefile
@@ -10,7 +10,7 @@
 
 DISTNAME=	qt-everywhere-opensource-src-${QTVERSION}
 CATEGORIES=	x11
-MASTER_SITES=	ftp://ftp.qt.nokia.com/qt/source/
+MASTER_SITES=	http://releases.qt-project.org/qt4/source/
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo
index ff4e3471dc9..8b47ac5effe 100644
--- a/x11/qt4-libs/distinfo
+++ b/x11/qt4-libs/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.74 2012/04/10 18:45:29 abs Exp $
+$NetBSD: distinfo,v 1.75 2012/05/24 08:07:33 adam Exp $
 
-SHA1 (qt-everywhere-opensource-src-4.8.1.tar.gz) = a074d0f605f009e23c63e0a4cb9b71c978146ffc
-RMD160 (qt-everywhere-opensource-src-4.8.1.tar.gz) = 538e626fae80ca8ca5aac575919f469a9827ad4f
-Size (qt-everywhere-opensource-src-4.8.1.tar.gz) = 239606696 bytes
+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 (patch-aa) = 9b5f8bd980d8c3f38fd3c541380fd42d2a93a609
 SHA1 (patch-ab) = 447a888cbc784a54935f23d1005d6977374a484d
 SHA1 (patch-ac) = 078ddafefc719f248740f40e2063dae07cd601e5
@@ -38,7 +38,7 @@ SHA1 (patch-cb) = 13e1b0ffb171637e1ff84a548ef83cf4e006c207
 SHA1 (patch-cg) = 2519fe525237167f10dffb9294c861f4d7063f31
 SHA1 (patch-ci) = bc85adf9ea17be24f92897b960517941f5b28ab7
 SHA1 (patch-cj) = 4f6d3546e3bc04ca2034af21645fc6f27bc82eef
-SHA1 (patch-qmake_generators_makefile.cpp) = b985fa61c5fe8cc9edbf2502109e3883a81faa85
+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
 SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_jit_JITStubs.cpp) = bfe38ea1e26fef02dd78e40c95c000cb0cc32a04
diff --git a/x11/qt4-libs/patches/patch-qmake_generators_makefile.cpp b/x11/qt4-libs/patches/patch-qmake_generators_makefile.cpp
index 118263c4933..b72cd17dc57 100644
--- a/x11/qt4-libs/patches/patch-qmake_generators_makefile.cpp
+++ b/x11/qt4-libs/patches/patch-qmake_generators_makefile.cpp
@@ -1,6 +1,6 @@
-$NetBSD: patch-qmake_generators_makefile.cpp,v 1.2 2012/04/09 09:12:49 adam Exp $
+$NetBSD: patch-qmake_generators_makefile.cpp,v 1.3 2012/05/24 08:07:33 adam Exp $
 
---- qmake/generators/makefile.cpp.orig	2012-03-14 14:01:12.000000000 +0000
+--- qmake/generators/makefile.cpp.orig	2012-05-24 05:03:21.000000000 +0000
 +++ qmake/generators/makefile.cpp
 @@ -3256,7 +3256,7 @@ MakefileGenerator::writePkgConfigFile()
              bundle = bundle.left(suffix);
@@ -9,5 +9,5 @@ $NetBSD: patch-qmake_generators_makefile.cpp,v 1.2 2012/04/09 09:12:49 adam Exp
 -        pkgConfiglibDir = "-L${libdir}";
 +        pkgConfiglibDir = "-Wl,-R${libdir} -L${libdir}";
          pkgConfiglibName = "-l" + lname.left(lname.length()-Option::libtool_ext.length());
-         pkgConfiglibName += project->first("TARGET_VERSION_EXT");
-     }
+         if (project->isActiveConfig("shared"))
+             pkgConfiglibName += project->first("TARGET_VERSION_EXT");