Update to 5.3.

2011-01-14 tim <gyunaev@ulduzsoft.com>
    - Version 5.3 released.
    - Fixed spelling error (thx Razvan Visan)
    - Changed encodings order for Chinese and Japanese languages
    (thanks Kai-Chieh Ku)
    - Added Ukrainian localization (thanks Olexander Yatsenko)
    - Added Brazilian localization (thanks Márcio Moraes)
    - Fixed some grammatical errors (thanks Robin 'cheese' Lee)
    - Fixed webkit engine for buggy CHMs which do not have all
    content, as well as cases when external references cannot be
    loaded. Thanks to Kai-Chieh Ku
    - Added Mac support (thanks Serge Weinstock)

6 files changed, 64 insertions, 16 deletions

diff --git a/misc/kchmviewer/Makefile b/misc/kchmviewer/Makefile
index f449b00b7b0..3313d98d656 100644
--- a/misc/kchmviewer/Makefile
+++ b/misc/kchmviewer/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2011/01/13 13:38:46 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2011/01/21 22:30:46 wiz Exp $
 #
 
-DISTNAME=		kchmviewer-5.2
-PKGREVISION=		4
+DISTNAME=		kchmviewer-5.3
 CATEGORIES=		misc x11
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=kchmviewer/}
 
@@ -13,8 +12,6 @@ LICENSE=		gnu-gpl-v3
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-WRKSRC=			${WRKDIR}/build-5.2
-
 USE_TOOLS+=		gmake
 USE_PKGLOCALEDIR=	YES
 USE_LANGUAGES=		c c++
diff --git a/misc/kchmviewer/PLIST b/misc/kchmviewer/PLIST
index 8b11b2f9aa0..65745ba07b3 100644
--- a/misc/kchmviewer/PLIST
+++ b/misc/kchmviewer/PLIST
@@ -1,8 +1,15 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:07:23 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2011/01/21 22:30:46 wiz Exp $
 bin/kchmviewer
-${PLIST.kde4}lib/kde4/kio_msits.so
 ${PLIST.kde4}share/applications/kde4/kchmviewer.desktop
-${PLIST.kde4}share/icons/crystalsvg/128x128/apps/kchmviewer.png
-${PLIST.kde4}share/icons/crystalsvg/48x48/apps/kchmviewer.png
-${PLIST.kde4}share/icons/crystalsvg/64x64/apps/kchmviewer.png
-${PLIST.kde4}share/kde4/services/msits.protocol
+${PLIST.kde4}share/locale/cs/LC_MESSAGES/kchmviewer.mo
+${PLIST.kde4}share/locale/fr/LC_MESSAGES/kchmviewer.mo
+${PLIST.kde4}share/locale/hu/LC_MESSAGES/kchmviewer.mo
+${PLIST.kde4}share/locale/it/LC_MESSAGES/kchmviewer.mo
+${PLIST.kde4}share/locale/nl/LC_MESSAGES/kchmviewer.mo
+${PLIST.kde4}share/locale/pt_BR/LC_MESSAGES/kchmviewer.mo
+${PLIST.kde4}share/locale/ru/LC_MESSAGES/kchmviewer.mo
+${PLIST.kde4}share/locale/sv/LC_MESSAGES/kchmviewer.mo
+${PLIST.kde4}share/locale/tr/LC_MESSAGES/kchmviewer.mo
+${PLIST.kde4}share/locale/uk/LC_MESSAGES/kchmviewer.mo
+${PLIST.kde4}share/locale/zh_CN/LC_MESSAGES/kchmviewer.mo
+${PLIST.kde4}share/locale/zh_TW/LC_MESSAGES/kchmviewer.mo
diff --git a/misc/kchmviewer/distinfo b/misc/kchmviewer/distinfo
index 2d329fff3d6..b40707e016f 100644
--- a/misc/kchmviewer/distinfo
+++ b/misc/kchmviewer/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.6 2010/05/02 11:29:23 wiz Exp $
+$NetBSD: distinfo,v 1.7 2011/01/21 22:30:46 wiz Exp $
 
-SHA1 (kchmviewer-5.2.tar.gz) = bba7c5ff141e224cbbcc306f8c07d08708ec386f
-RMD160 (kchmviewer-5.2.tar.gz) = 596ecd96c94f1a33c180869ec91b5e774e1f5e12
-Size (kchmviewer-5.2.tar.gz) = 283874 bytes
+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
diff --git a/misc/kchmviewer/options.mk b/misc/kchmviewer/options.mk
index 66321453bb7..a9741158ff8 100644
--- a/misc/kchmviewer/options.mk
+++ b/misc/kchmviewer/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2009/10/31 01:38:30 wiz Exp $
+# $NetBSD: options.mk,v 1.6 2011/01/21 22:30:46 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.kchmviewer
 PKG_SUPPORTED_OPTIONS=	kde4
@@ -13,6 +13,7 @@ BUILD_DEPENDS+=		automoc4-[0-9]*:../../devel/automoc4
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../meta-pkgs/kde4/kde4.mk"
 .include "../../x11/kdelibs4/buildlink3.mk"
+.include "../../graphics/kdegraphics4/buildlink3.mk"
 PLIST.kde4=		yes
 .else
 
diff --git a/misc/kchmviewer/patches/patch-aa b/misc/kchmviewer/patches/patch-aa
new file mode 100644
index 00000000000..740bb3c5a7e
--- /dev/null
+++ b/misc/kchmviewer/patches/patch-aa
@@ -0,0 +1,27 @@
+$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
new file mode 100644
index 00000000000..4f7944837f5
--- /dev/null
+++ b/misc/kchmviewer/patches/patch-ab
@@ -0,0 +1,14 @@
+$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 )