Update to 4.0 (qt4/KDE4 release):

2008-12-01 tim <gyunaev@ulduzsoft.com>
    - Version changed to 4.0 (release);
    - Released version 4.0.

2008-11-30 tim <gyunaev@ulduzsoft.com>
    - Integrate Fedora .desktop fixes (thx Patrice Dumas)
    - Implemented binary TOC and index tables (thx Razvan Cojocaru <razvanco@gmx.net>, the author of xchm). Speed up loading files more than twice!
    - Now showing 'waiting' cursor while loading chm table of contents or index.
    - Fixed QTextBrowser by providing workaround for "empty" books.
    - More compatibility fixes with KDE 4.1
    - Added Swedish translation (thx Daniel Nylander)
    - Fixed handling files with file:// prefix.
    - Added D-BUS support for Qt and KDE builds, the application could now be controlled remotely from other applications or scripts.
    - Restored KDE translations.

2008-06-18 tim <gyunaev@ulduzsoft.com>
    - Version changed to 4.0b4;
    - Added WebKit support (requires QtWebKit module). WebKit browser is default for a system where QtWebKit is present;
    - Added support for Right-To-Left application and text layouts;
    - Added support for disabling automatic encoding detection for browsers which could detect it themselves (KHTMLPart and Webkit);

2008-06-06 tim <gyunaev@ulduzsoft.com>
    - Version changed to 4.0b3;
    - Added KDE4 support;
    - Fixed several compatibility issues with qt-4.4.0;
    - Added keyboard shortcuts to move to the next and previous entries in TOC: Ctrl+Right arrow
      and Ctrl+Left arrow;
    - Added manifest for the Windows version (thanks Cristian Adam);
    - Windows version should not rely on mingw DLL anymore;
    - Toolbars are now named;
    - Fixed parallel build (thanks Patrice Dumas);

2008-02-10 tim <gyunaev@ulduzsoft.com>
    - Version changed to 4.0b2 (this is Qt4-only release);
    - Added a command-line option to search through table of contents (--stoc);
    - Added Italian translation (thanks to Emilio Scalise);
    - Fixed crash on incorrectly compressed CHM file (thanks Albert Astals Cid);
    - Fixed kio-msits so it now works with KDE4 (thanks Albert Astals Cid);
    - Fixed FSF mailing address everywhere (thanks Albert Astals Cid);
    - Fixed handling of improperly formatted CHM files like Audigy help;
    - Added heuristics to support for improperly formatted CHMs which have toc and index,
      but do not specify so in the project file;
    - Fixed handling of CHM files which have local links in form of MS-ITS: urls;
    - Search engine has been integrated into libchmfile;
    - Search indexes are now stored in a single file, which should make it easier to make
      search available through the indexing application;

2007-08-26 tim <gyunaev@ulduzsoft.com>
    - Application ported to Qt4.
    - Recent files reworked.
    - Search on page is now done via toolbar (like FireFox), activated by Ctrl-F and /.
    - After switching tabs (either with mouse or Alt+<number> the focus is moved to the browser widget,
      so you don't have to click on it to navigate using keyboard.
    - Enchanced browser context menu.

4 files changed, 48 insertions, 28 deletions

diff --git a/misc/kchmviewer/Makefile b/misc/kchmviewer/Makefile
index 4f43dd16b1a..ad003bbfba2 100644
--- a/misc/kchmviewer/Makefile
+++ b/misc/kchmviewer/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2008/07/14 12:56:08 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2009/01/08 12:02:44 wiz Exp $
 #
 
-DISTNAME=		kchmviewer-3.1
-PKGREVISION=		3
+DISTNAME=		kchmviewer-4.0
 CATEGORIES=		misc x11
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=kchmviewer/}
 
@@ -16,12 +15,11 @@ USE_TOOLS+=		gmake
 USE_PKGLOCALEDIR=	YES
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		YES
-GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--with-kde
+
+.include "options.mk"
 
 .include "../../devel/chmlib/buildlink3.mk"
-.include "../../x11/qt3-libs/buildlink3.mk"
-.include "../../x11/qt3-tools/buildlink3.mk"
-.include "../../x11/kdelibs3/buildlink3.mk"
-.include "../../meta-pkgs/kde3/kde3.mk"
+.include "../../x11/qt4-libs/buildlink3.mk"
+.include "../../x11/qt4-qdbus/buildlink3.mk"
+.include "../../x11/qt4-tools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/kchmviewer/PLIST b/misc/kchmviewer/PLIST
index b9c8c8e54a1..3708b9a2731 100644
--- a/misc/kchmviewer/PLIST
+++ b/misc/kchmviewer/PLIST
@@ -1,16 +1,15 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/09/16 17:08:39 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/01/08 12:02:44 wiz Exp $
 bin/kchmviewer
-lib/kde3/kio_msits.la
-lib/libchmfile.a
-lib/libkdeextra.a
-share/icons/crystalsvg/128x128/apps/kchmviewer.png
-share/icons/crystalsvg/48x48/apps/kchmviewer.png
-share/icons/crystalsvg/64x64/apps/kchmviewer.png
-share/kde/applnk/kchmviewer.desktop
-share/kde/services/msits.protocol
-share/locale/cs/LC_MESSAGES/kchmviewer.mo
-share/locale/du/LC_MESSAGES/kchmviewer.mo
-share/locale/fr/LC_MESSAGES/kchmviewer.mo
-share/locale/ru/LC_MESSAGES/kchmviewer.mo
-share/locale/tr/LC_MESSAGES/kchmviewer.mo
-share/locale/zh_CN/LC_MESSAGES/kchmviewer.mo
+${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
+@comment in kde: @dirrm share/kde4/services
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor
+@comment in kde: @dirrm share/icons/crystalsvg/64x64/apps
+@comment in kde: @dirrm share/icons/crystalsvg/48x48/apps
+@comment in kde: @dirrm share/icons/crystalsvg/128x128/apps
+@comment in kde: @dirrm share/applications/kde4
+@comment in kde: @dirrm lib/kde4
diff --git a/misc/kchmviewer/distinfo b/misc/kchmviewer/distinfo
index 951aef653e8..48a387476e1 100644
--- a/misc/kchmviewer/distinfo
+++ b/misc/kchmviewer/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/09/16 17:08:39 wiz Exp $
+$NetBSD: distinfo,v 1.2 2009/01/08 12:02:44 wiz Exp $
 
-SHA1 (kchmviewer-3.1.tar.gz) = aa685216fc0ccec486d43db9531698ab1fb21152
-RMD160 (kchmviewer-3.1.tar.gz) = d55070b77bf516acaa56d35f58b52d070e2ee957
-Size (kchmviewer-3.1.tar.gz) = 944014 bytes
+SHA1 (kchmviewer-4.0.tar.gz) = 313f07307ab7157ca65977b60a8417379941db56
+RMD160 (kchmviewer-4.0.tar.gz) = b097a320ed2c5e7431d02f1382e1124176a50eef
+Size (kchmviewer-4.0.tar.gz) = 225883 bytes
diff --git a/misc/kchmviewer/options.mk b/misc/kchmviewer/options.mk
new file mode 100644
index 00000000000..b202b583f9f
--- /dev/null
+++ b/misc/kchmviewer/options.mk
@@ -0,0 +1,23 @@
+# $NetBSD: options.mk,v 1.1 2009/01/08 12:02:44 wiz Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.kchmviewer
+PKG_SUPPORTED_OPTIONS=	kde4
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+=		kde4
+.if !empty(PKG_OPTIONS:Mkde4)
+USE_CMAKE=		yes
+BUILD_DEPENDS+=		automoc4-[0-9]*:../../devel/automoc4
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../wip/kdelibs4/buildlink3.mk"
+.include "../../wip/kde4/kde4.mk"
+PLIST.kde4=		yes
+.else
+do-build:
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${QTDIR}/bin/qmake
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE}
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/kchmviewer ${DESTDIR}${PREFIX}/bin
+.endif