Update to 7.1:

2014-10-12  tim <gyunaev@ulduzsoft.com>
    - Version 7.1 released
    - Added support for creating kchmviewer as a portable app
    - Fixed a crash when indexing (in search) certain malformed HTML files
    - Fixed parsing CHM files whose filenames contained URL-encoded characters

2014-03-26 tim <gyunaev@ulduzsoft.com>
    - Version 6.1 released
    - Keyboard usability improved thanks to the Giuseppe "Cowo" Corbelli.
    - The focus is now moved to the content page once the link is clicked, so the keyboard navigation is available immediately. You can switch the focus back by pressing Ctrl+(1-4).
    - Added extended keyboard shortcuts for FindNext and FindPrevious; F3 still works.
    - Navigation tab window activation (Contents, Search, Index, Bookmarks) now automatically focus the proper element.
    - The items in the navigation page now reacts on onItemActivated, and hence act on <Return> key and follow the DE policy (such as respecting KDE single click).
    - Upon successful search, the focus moves to the results list.
    - Titles are now space-trimmed.
    - Fixed binary TOC parser check which led to crashes for some CHM files.
    - Fixed incorrect settings file storage name when the CHM file contains multiple dots.
    - Fixed the Ctrl+click and Shift+click when the release event was intercepted by other applications (i.e. GoldenDict)
    - 'Esc' closes the search dialog and restores focus in the content  window.

5 files changed, 57 insertions, 14 deletions

diff --git a/misc/kchmviewer/Makefile b/misc/kchmviewer/Makefile
index e1840fb5987..2491d786823 100644
--- a/misc/kchmviewer/Makefile
+++ b/misc/kchmviewer/Makefile
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.44 2014/11/07 19:39:36 adam Exp $
-#
+# $NetBSD: Makefile,v 1.45 2014/11/27 15:32:38 wiz Exp $
 
-DISTNAME=		kchmviewer-6.0
-PKGREVISION=		23
+DISTNAME=		kchmviewer-7.1
 CATEGORIES=		misc x11
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=kchmviewer/}
 
@@ -16,6 +14,12 @@ USE_PKGLOCALEDIR=	YES
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		YES
 
+SUBST_CLASSES+=		zip
+SUBST_SED.zip+=		-e 's,-I${PREFIX}/include,-I${PREFIX}/include -I${PREFIX}/lib/libzip/include,'
+SUBST_MESSAGE.zip=	Add missing header search path.
+SUBST_FILES.zip+=	lib/libebook/Makefile
+SUBST_STAGE.zip=	post-configure
+
 .include "options.mk"
 
 .include "../../devel/chmlib/buildlink3.mk"
@@ -23,4 +27,5 @@ BUILDLINK_API_DEPENDS.qt4-libs+=	qt4-libs>=4.5.0
 .include "../../x11/qt4-libs/buildlink3.mk"
 .include "../../x11/qt4-qdbus/buildlink3.mk"
 .include "../../x11/qt4-tools/buildlink3.mk"
+.include "../../archivers/libzip/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/kchmviewer/distinfo b/misc/kchmviewer/distinfo
index 8749d79d670..11957947498 100644
--- a/misc/kchmviewer/distinfo
+++ b/misc/kchmviewer/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.9 2012/03/29 08:44:41 markd Exp $
+$NetBSD: distinfo,v 1.10 2014/11/27 15:32:38 wiz Exp $
 
-SHA1 (kchmviewer-6.0.tar.gz) = 91657ba4b95bf0457c7a5d1ec3c9939a1a5a2669
-RMD160 (kchmviewer-6.0.tar.gz) = 2ec456783c054de9258dfd558a9a67434e5f948c
-Size (kchmviewer-6.0.tar.gz) = 310642 bytes
-SHA1 (patch-po_kchmviewer_it.po) = 1b3d445c665944a17e71456467e9ad420330b538
+SHA1 (kchmviewer-7.1.tar.gz) = e596bff926ce4a99154a6aa65f58a3ec45380e41
+RMD160 (kchmviewer-7.1.tar.gz) = 64dd41fe0615d231f5344d186ea889e24aabe5b0
+Size (kchmviewer-7.1.tar.gz) = 340934 bytes
+SHA1 (patch-build-release.sh) = 1c9b253cce0898731899703c6c072df01976651c
+SHA1 (patch-po_kchmviewer_it.po) = 8c29ac0490b5e220988e23cba6f02234db10d986
diff --git a/misc/kchmviewer/options.mk b/misc/kchmviewer/options.mk
index 5a83c61bff0..02298933397 100644
--- a/misc/kchmviewer/options.mk
+++ b/misc/kchmviewer/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2012/03/29 08:44:41 markd Exp $
+# $NetBSD: options.mk,v 1.8 2014/11/27 15:32:38 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.kchmviewer
 PKG_SUPPORTED_OPTIONS=	kde4
@@ -18,9 +18,13 @@ PLIST.kde4=		yes
 
 INSTALLATION_DIRS=	bin
 
-do-build:
+do-configure:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${QTDIR}/bin/qmake
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE}
+	cd ${WRKSRC}/lib && ${SETENV} ${MAKE_ENV} ${QTDIR}/bin/qmake
+	cd ${WRKSRC}/lib/libebook && ${SETENV} ${MAKE_ENV} ${QTDIR}/bin/qmake
+
+do-build:
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKEFLAGS}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/kchmviewer ${DESTDIR}${PREFIX}/bin
diff --git a/misc/kchmviewer/patches/patch-build-release.sh b/misc/kchmviewer/patches/patch-build-release.sh
new file mode 100644
index 00000000000..8c856317331
--- /dev/null
+++ b/misc/kchmviewer/patches/patch-build-release.sh
@@ -0,0 +1,33 @@
+$NetBSD: patch-build-release.sh,v 1.1 2014/11/27 15:32:38 wiz Exp $
+
+Fix unportable test(1) comparison operator.
+
+--- build-release.sh.orig	2014-04-13 08:04:55.000000000 +0000
++++ build-release.sh
+@@ -34,7 +34,7 @@ svn export . "$BUILDDIR/" || exit 1
+ tar zcf "$RELEASEDIR/$PACKAGE-$CURRENTVER.tar.gz" $BUILDDIR || exit 1
+ 
+ # Build 64-bit onr
+-if [ "$BUILD_RPM64" == 1 ]; then
++if [ "$BUILD_RPM64" = 1 ]; then
+ 
+ 	# Making the RPM root
+ 	rm -rf "$BUILDDIR/buildroot"
+@@ -57,7 +57,7 @@ if [ "$BUILD_RPM64" == 1 ]; then
+ fi
+ 
+ # Build 32-bit RPM
+-if [ "$BUILD_RPM32" == 1 ]; then
++if [ "$BUILD_RPM32" = 1 ]; then
+ 
+ 	# Clean up first
+ 	pushd "$BUILDDIR"
+@@ -97,7 +97,7 @@ if [ "$BUILD_RPM32" == 1 ]; then
+ fi
+ 
+ # win32
+-if [ "$BUILD_WINDOWS" == 1 ]; then
++if [ "$BUILD_WINDOWS" = 1 ]; then
+ 	sh build-win32-mingw.sh || exit 1
+ 	(cd nsis && sh create_installer.sh) || exit 1
+ 	mv nsis/InstallKchmviewer*.exe $RELEASEDIR
diff --git a/misc/kchmviewer/patches/patch-po_kchmviewer_it.po b/misc/kchmviewer/patches/patch-po_kchmviewer_it.po
index fc5693b90b8..4a46534ed91 100644
--- a/misc/kchmviewer/patches/patch-po_kchmviewer_it.po
+++ b/misc/kchmviewer/patches/patch-po_kchmviewer_it.po
@@ -1,6 +1,6 @@
-$NetBSD: patch-po_kchmviewer_it.po,v 1.1 2012/03/29 08:44:42 markd Exp $
+$NetBSD: patch-po_kchmviewer_it.po,v 1.2 2014/11/27 15:32:38 wiz Exp $
 
---- po/kchmviewer_it.po.orig	2012-03-29 08:35:14.000000000 +0000
+--- po/kchmviewer_it.po.orig	2011-12-19 07:22:45.000000000 +0000
 +++ po/kchmviewer_it.po
 @@ -9,6 +9,7 @@ msgstr ""
  "POT-Creation-Date: 2009-07-19 20:41-0700\n"