[pkgsrc/trunk]: pkgsrc/inputmethod/fcitx fcitx: Remove the qt (qt4) build opt...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8feda00b7f98
branches:  trunk
changeset: 342961:8feda00b7f98
user:      kamil <kamil%pkgsrc.org@localhost>
date:      Mon Oct 28 09:46:18 2019 +0000

description:
fcitx: Remove the qt (qt4) build option (it was disabled by default)

diffstat:

 inputmethod/fcitx/Makefile   |   9 +++++----
 inputmethod/fcitx/options.mk |  22 ----------------------
 2 files changed, 5 insertions(+), 26 deletions(-)

diffs (59 lines):

diff -r 580822ccd666 -r 8feda00b7f98 inputmethod/fcitx/Makefile
--- a/inputmethod/fcitx/Makefile        Mon Oct 28 09:42:38 2019 +0000
+++ b/inputmethod/fcitx/Makefile        Mon Oct 28 09:46:18 2019 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2019/07/21 22:25:08 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2019/10/28 09:46:18 kamil Exp $
 #
 
 DISTNAME=              fcitx-4.2.9.6
-PKGREVISION=           5
+PKGREVISION=           6
 CATEGORIES=            inputmethod
 MASTER_SITES=          https://download.fcitx-im.org/fcitx/
 EXTRACT_SUFX=          .tar.xz
@@ -17,8 +17,6 @@
 
 EXTRACT_ONLY=          ${DEFAULT_DISTFILES}
 
-.include "options.mk"
-
 .for f in ${DATAFILES}
 SITES.${f}=            https://download.fcitx-im.org/data/
 DISTFILES+=            ${f}
@@ -42,6 +40,9 @@
 CMAKE_ARGS+=           -DENABLE_GIR=OFF
 CMAKE_ARGS+=           -DENABLE_GTK2_IM_MODULE=ON
 CMAKE_ARGS+=           -DENABLE_GTK3_IM_MODULE=ON
+CMAKE_ARGS+=           -DENABLE_QT=OFF
+CMAKE_ARGS+=           -DENABLE_QT_IM_MODULE=OFF
+CMAKE_ARGS+=           -DENABLE_QT_GUI=OFF
 
 BUILDLINK_DEPMETHOD.libXt?=    build
 
diff -r 580822ccd666 -r 8feda00b7f98 inputmethod/fcitx/options.mk
--- a/inputmethod/fcitx/options.mk      Mon Oct 28 09:42:38 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-# $NetBSD: options.mk,v 1.1 2019/04/27 03:20:32 ryoon Exp $
-
-PKG_OPTIONS_VAR=       PKG_OPTIONS.fcitx
-
-PKG_SUPPORTED_OPTIONS+=        qt4
-PLIST_VARS+=           qt4
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mqt4)
-BUILD_DEPENDS+=        automoc4-[0-9]*:../../devel/automoc4
-CMAKE_ARGS+=   -DENABLE_QT_IM_MODULE=ON
-CMAKE_ARGS+=   -DENABLE_QT_GUI=ON
-.include "../../x11/qt4-libs/buildlink3.mk"
-.include "../../x11/qt4-qdbus/buildlink3.mk"
-.include "../../x11/qt4-tools/buildlink3.mk"
-PLIST.qt4=     yes
-.else
-CMAKE_ARGS+=   -DENABLE_QT=OFF
-CMAKE_ARGS+=   -DENABLE_QT_IM_MODULE=OFF
-CMAKE_ARGS+=   -DENABLE_QT_GUI=OFF
-.endif