summaryrefslogtreecommitdiff
path: root/inputmethod
diff options
context:
space:
mode:
authorkamil <kamil@pkgsrc.org>2019-10-28 09:46:18 +0000
committerkamil <kamil@pkgsrc.org>2019-10-28 09:46:18 +0000
commitbc03c8192fbb27fe9f3798316882a33f4738c9c3 (patch)
tree04d0a8a2c4b3383f542ff1ad4da6c371da719917 /inputmethod
parent60041547e5ec18058ad2e8c9e2ef370e15100a32 (diff)
downloadpkgsrc-bc03c8192fbb27fe9f3798316882a33f4738c9c3.tar.gz
fcitx: Remove the qt (qt4) build option (it was disabled by default)
Diffstat (limited to 'inputmethod')
-rw-r--r--inputmethod/fcitx/Makefile9
-rw-r--r--inputmethod/fcitx/options.mk22
2 files changed, 5 insertions, 26 deletions
diff --git a/inputmethod/fcitx/Makefile b/inputmethod/fcitx/Makefile
index 9a2cee5c332..3fe712bf74f 100644
--- a/inputmethod/fcitx/Makefile
+++ b/inputmethod/fcitx/Makefile
@@ -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 @@ DATAFILES+= table.tar.gz
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_PRESAGE=OFF
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 --git a/inputmethod/fcitx/options.mk b/inputmethod/fcitx/options.mk
deleted file mode 100644
index 34c6326921f..00000000000
--- a/inputmethod/fcitx/options.mk
+++ /dev/null
@@ -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