[pkgsrc/trunk]: pkgsrc/misc/kchmviewer kchmviewer: Drop qt4 and kde4 build op...

[kamil <kamil%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0dbb92d7ae76
branches:  trunk
changeset: 342933:0dbb92d7ae76
user:      kamil <kamil%pkgsrc.org@localhost>
date:      Sun Oct 27 17:23:34 2019 +0000

description:
kchmviewer: Drop qt4 and kde4 build options

Keep the qt5 option as the only one.

diffstat:

 misc/kchmviewer/Makefile   |  21 +++++++++++++++++----
 misc/kchmviewer/PLIST      |  15 +--------------
 misc/kchmviewer/options.mk |  45 ---------------------------------------------
 3 files changed, 18 insertions(+), 63 deletions(-)

diffs (106 lines):

diff -r 284d81e3afc4 -r 0dbb92d7ae76 misc/kchmviewer/Makefile
--- a/misc/kchmviewer/Makefile  Sun Oct 27 17:11:22 2019 +0000
+++ b/misc/kchmviewer/Makefile  Sun Oct 27 17:23:34 2019 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.91 2019/09/18 14:17:12 ryoon Exp $
+# $NetBSD: Makefile,v 1.92 2019/10/27 17:23:34 kamil Exp $
 
 DISTNAME=              kchmviewer-7.2.1
-PKGREVISION=           45
+PKGREVISION=           46
 CATEGORIES=            misc x11
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=kchmviewer/}
 
@@ -25,8 +25,21 @@
 
 CHECK_PORTABILITY_SKIP=        build-win32-mingw.sh
 
-.include "options.mk"
+INSTALLATION_DIRS=      bin
+
+do-configure:
+       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${QTDIR}/bin/qmake
+       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
+
+.include "../../archivers/libzip/buildlink3.mk"
 .include "../../devel/chmlib/buildlink3.mk"
-.include "../../archivers/libzip/buildlink3.mk"
+.include "../../x11/qt5-qtbase/buildlink3.mk"
+.include "../../x11/qt5-qtwebkit/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 284d81e3afc4 -r 0dbb92d7ae76 misc/kchmviewer/PLIST
--- a/misc/kchmviewer/PLIST     Sun Oct 27 17:11:22 2019 +0000
+++ b/misc/kchmviewer/PLIST     Sun Oct 27 17:23:34 2019 +0000
@@ -1,15 +1,2 @@
-@comment $NetBSD: PLIST,v 1.4 2011/01/21 22:30:46 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2019/10/27 17:23:34 kamil Exp $
 bin/kchmviewer
-${PLIST.kde4}share/applications/kde4/kchmviewer.desktop
-${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 -r 284d81e3afc4 -r 0dbb92d7ae76 misc/kchmviewer/options.mk
--- a/misc/kchmviewer/options.mk        Sun Oct 27 17:11:22 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-# $NetBSD: options.mk,v 1.10 2015/11/01 09:15:13 adam Exp $
-
-PKG_OPTIONS_VAR=       PKG_OPTIONS.kchmviewer
-PKG_OPTIONS_REQUIRED_GROUPS=   gui
-PKG_OPTIONS_GROUP.gui= qt4 kde4 qt5
-PKG_SUGGESTED_OPTIONS= qt5
-
-.include "../../mk/bsd.options.mk"
-
-PLIST_VARS+=           kde4
-.if !empty(PKG_OPTIONS:Mkde4)
-USE_CMAKE=             yes
-USE_TOOLS+=            msgfmt
-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"
-PLIST.kde4=            yes
-.else
-
-INSTALLATION_DIRS=     bin
-
-do-configure:
-       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${QTDIR}/bin/qmake
-       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
-.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-qtbase/buildlink3.mk"
-.include "../../x11/qt5-qtwebkit/buildlink3.mk"
-.endif