Update to 6.0. Patches have been integrated upstream.

2011-12-18 tim <gyunaev@ulduzsoft.com>
    - Version 6.0 released
    - Removed outdated and buggy QTextBrowser support.
    - Removed unneeded KHTMLPart support. Only QWebKit is now supported.
    - Fixed zoom and "select all".
    - Fixed storing scrollbar position.
    - Added browser options to control JavaScript, Java and HTML5 features, which now apply to Webkit
    - Fixed crash on start when the number of recent files was set to zero
    - Added support for opening the specific page on startup using the --url switch
    - Fixed scrolling at the same page when links are clicked
    - Fixed the "Locate in content tree" which was broken for QWebKit
    - For CHM entries with an URL but no name use the URL as name
    - Updated copyrights

4 files changed, 6 insertions, 50 deletions

diff --git a/misc/kchmviewer/Makefile b/misc/kchmviewer/Makefile
index 67162255f77..1b45a0ff9a4 100644
--- a/misc/kchmviewer/Makefile
+++ b/misc/kchmviewer/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2011/11/01 06:02:05 sbd Exp $
+# $NetBSD: Makefile,v 1.20 2012/01/08 15:10:19 wiz Exp $
 #
 
-DISTNAME=		kchmviewer-5.3
-PKGREVISION=		2
+DISTNAME=		kchmviewer-6.0
 CATEGORIES=		misc x11
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=kchmviewer/}
 
diff --git a/misc/kchmviewer/distinfo b/misc/kchmviewer/distinfo
index b40707e016f..30590003332 100644
--- a/misc/kchmviewer/distinfo
+++ b/misc/kchmviewer/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.7 2011/01/21 22:30:46 wiz Exp $
+$NetBSD: distinfo,v 1.8 2012/01/08 15:10:19 wiz Exp $
 
-SHA1 (kchmviewer-5.3.tar.gz) = 86d2fac3b2cb37965f68f0b8aa306d797d160dc5
-RMD160 (kchmviewer-5.3.tar.gz) = a7654c14c25054ddf1a839b43744e929b79f6777
-Size (kchmviewer-5.3.tar.gz) = 317201 bytes
-SHA1 (patch-aa) = c2653ee5514744b074d1702d259a5932cd697143
-SHA1 (patch-ab) = c141d94d51c3297491610f9291a5dae7c493ec36
+SHA1 (kchmviewer-6.0.tar.gz) = 91657ba4b95bf0457c7a5d1ec3c9939a1a5a2669
+RMD160 (kchmviewer-6.0.tar.gz) = 2ec456783c054de9258dfd558a9a67434e5f948c
+Size (kchmviewer-6.0.tar.gz) = 310642 bytes
diff --git a/misc/kchmviewer/patches/patch-aa b/misc/kchmviewer/patches/patch-aa
deleted file mode 100644
index 740bb3c5a7e..00000000000
--- a/misc/kchmviewer/patches/patch-aa
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2011/01/21 22:30:47 wiz Exp $
-
-Remove default values so msgfmt doesn't complain.
-Sent upstream.
-
---- po/kchmviewer_it.po.orig	2011-01-13 09:28:42.000000000 +0000
-+++ po/kchmviewer_it.po
-@@ -1,15 +1,15 @@
--# SOME DESCRIPTIVE TITLE.
-+# Italian translation for kchmviewer.
- # This file is put in the public domain.
--# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-+# Emilio Scalise <emisca(at)email.it>, 2007
- #
- msgid ""
- msgstr ""
--"Project-Id-Version: PACKAGE VERSION\n"
-+"Project-Id-Version: kchmviewer\n"
- "Report-Msgid-Bugs-To: kchmviewer@ulduzsoft.com\n"
- "POT-Creation-Date: 2009-07-19 20:41-0700\n"
- "PO-Revision-Date: 2007-09-09 23:11+0100\n"
- "Last-Translator: Emilio Scalise <emisca(at)email.it>\n"
--"Language-Team: LANGUAGE <LL@li.org>\n"
-+"Language-Team: Italian <emisca(at)email.it>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
diff --git a/misc/kchmviewer/patches/patch-ab b/misc/kchmviewer/patches/patch-ab
deleted file mode 100644
index 4f7944837f5..00000000000
--- a/misc/kchmviewer/patches/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2011/01/21 22:30:47 wiz Exp $
-
-Avoid conflict with kdegraphics4. Asked upstream.
-
---- CMakeLists.txt.orig	2011-01-21 22:24:14.000000000 +0000
-+++ CMakeLists.txt
-@@ -18,7 +18,6 @@ ADD_DEFINITIONS( -DUSE_KDE )
- 
- # Run in those subdirectories
- ADD_SUBDIRECTORY( lib/libchmfile )
--ADD_SUBDIRECTORY( lib/kio-msits )
- ADD_SUBDIRECTORY( src )
- ADD_SUBDIRECTORY( po )
- ADD_SUBDIRECTORY( packages )