Update to 7.2.1. Switch to qt5.

2014-12-23  tim <gyunaev@ulduzsoft.com>
    - Version 7.2 released
    - Ported to Qt5 (but still builds and works with Qt4)
    - Added support for 3rd party integration
    - Fixed some minor issues

5 files changed, 31 insertions, 48 deletions

diff --git a/misc/kchmviewer/Makefile b/misc/kchmviewer/Makefile
index 2491d786823..01e56dc42fc 100644
--- a/misc/kchmviewer/Makefile
+++ b/misc/kchmviewer/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.45 2014/11/27 15:32:38 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2015/01/16 10:46:00 wiz Exp $
 
-DISTNAME=		kchmviewer-7.1
+DISTNAME=		kchmviewer-7.2.1
 CATEGORIES=		misc x11
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=kchmviewer/}
 
@@ -14,18 +14,18 @@ USE_PKGLOCALEDIR=	YES
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		YES
 
+WRKSRC=			${WRKDIR}/kchmviewer-7.2
+
 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
 
+CHECK_PORTABILITY_SKIP=	build-win32-mingw.sh
+
 .include "options.mk"
 
 .include "../../devel/chmlib/buildlink3.mk"
-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 4ff9fafaa6b..9793a0837f8 100644
--- a/misc/kchmviewer/distinfo
+++ b/misc/kchmviewer/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.11 2014/11/27 15:32:54 wiz Exp $
+$NetBSD: distinfo,v 1.12 2015/01/16 10:46:00 wiz Exp $
 
-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) = 7156f5fcc3985fdcd0536b6f3c8df18e48f8a4cb
-SHA1 (patch-po_kchmviewer_it.po) = 8c29ac0490b5e220988e23cba6f02234db10d986
+SHA1 (kchmviewer-7.2.1.tar.gz) = 2234ae47e7915aa673cda7e31efe3569cd6c5ddc
+RMD160 (kchmviewer-7.2.1.tar.gz) = a8e5c18082eb34d9b76abe783494cdeb6bdad4ca
+Size (kchmviewer-7.2.1.tar.gz) = 342665 bytes
+SHA1 (patch-po_kchmviewer_it.po) = beca7d046ed0409c2391660b12de5202160bd623
diff --git a/misc/kchmviewer/options.mk b/misc/kchmviewer/options.mk
index 02298933397..6b8d0f6a223 100644
--- a/misc/kchmviewer/options.mk
+++ b/misc/kchmviewer/options.mk
@@ -1,7 +1,9 @@
-# $NetBSD: options.mk,v 1.8 2014/11/27 15:32:38 wiz Exp $
+# $NetBSD: options.mk,v 1.9 2015/01/16 10:46:00 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.kchmviewer
-PKG_SUPPORTED_OPTIONS=	kde4
+PKG_OPTIONS_REQUIRED_GROUPS=	gui
+PKG_OPTIONS_GROUP.gui=	qt4 kde4 qt5
+PKG_SUGGESTED_OPTIONS=	qt5
 
 .include "../../mk/bsd.options.mk"
 
@@ -29,3 +31,16 @@ do-build:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/kchmviewer ${DESTDIR}${PREFIX}/bin
 .endif
+
+.if !empty(PKG_OPTIONS:Mqt4)
+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"
+.endif
+
+.if !empty(PKG_OPTIONS:Mqt5)
+.include "../../x11/qt5-dbus/buildlink3.mk"
+.include "../../x11/qt5-qtbase/buildlink3.mk"
+.include "../../x11/qt5-qtwebkit/buildlink3.mk"
+.endif
diff --git a/misc/kchmviewer/patches/patch-build-release.sh b/misc/kchmviewer/patches/patch-build-release.sh
deleted file mode 100644
index 8c856317331..00000000000
--- a/misc/kchmviewer/patches/patch-build-release.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-$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 4a46534ed91..adc163b8d87 100644
--- a/misc/kchmviewer/patches/patch-po_kchmviewer_it.po
+++ b/misc/kchmviewer/patches/patch-po_kchmviewer_it.po
@@ -1,4 +1,6 @@
-$NetBSD: patch-po_kchmviewer_it.po,v 1.2 2014/11/27 15:32:38 wiz Exp $
+$NetBSD: patch-po_kchmviewer_it.po,v 1.3 2015/01/16 10:46:00 wiz Exp $
+
+Add missing tag.
 
 --- po/kchmviewer_it.po.orig	2011-12-19 07:22:45.000000000 +0000
 +++ po/kchmviewer_it.po