Mon Oct 28 09:46:19 2019 UTC ()
fcitx: Remove the qt (qt4) build option (it was disabled by default)


(kamil)
diff -r1.20 -r1.21 pkgsrc/inputmethod/fcitx/Makefile
diff -r1.1 -r0 pkgsrc/inputmethod/fcitx/options.mk
cvs diff -r1.20 -r1.21 pkgsrc/inputmethod/fcitx/Makefile (expand / switch to unified diff)

--- pkgsrc/inputmethod/fcitx/Makefile 2019/07/21 22:25:08 1.20
+++ pkgsrc/inputmethod/fcitx/Makefile 2019/10/28 09:46:18 1.21
@@ -1,57 +1,58 @@ @@ -1,57 +1,58 @@
1# $NetBSD: Makefile,v 1.20 2019/07/21 22:25:08 wiz Exp $ 1# $NetBSD: Makefile,v 1.21 2019/10/28 09:46:18 kamil Exp $
2# 2#
3 3
4DISTNAME= fcitx-4.2.9.6 4DISTNAME= fcitx-4.2.9.6
5PKGREVISION= 5 5PKGREVISION= 6
6CATEGORIES= inputmethod 6CATEGORIES= inputmethod
7MASTER_SITES= https://download.fcitx-im.org/fcitx/ 7MASTER_SITES= https://download.fcitx-im.org/fcitx/
8EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
9 9
10DISTFILES= ${DEFAULT_DISTFILES} 10DISTFILES= ${DEFAULT_DISTFILES}
11 11
12DATAFILES= en_dict-20121020.tar.gz 12DATAFILES= en_dict-20121020.tar.gz
13DATAFILES+= pinyin.tar.gz 13DATAFILES+= pinyin.tar.gz
14DATAFILES+= py_stroke-20121124.tar.gz 14DATAFILES+= py_stroke-20121124.tar.gz
15DATAFILES+= py_table-20121124.tar.gz 15DATAFILES+= py_table-20121124.tar.gz
16DATAFILES+= table.tar.gz 16DATAFILES+= table.tar.gz
17 17
18EXTRACT_ONLY= ${DEFAULT_DISTFILES} 18EXTRACT_ONLY= ${DEFAULT_DISTFILES}
19 19
20.include "options.mk" 
21 
22.for f in ${DATAFILES} 20.for f in ${DATAFILES}
23SITES.${f}= https://download.fcitx-im.org/data/ 21SITES.${f}= https://download.fcitx-im.org/data/
24DISTFILES+= ${f} 22DISTFILES+= ${f}
25.endfor 23.endfor
26 24
27MAINTAINER= rxg@NetBSD.org 25MAINTAINER= rxg@NetBSD.org
28HOMEPAGE= https://www.fcitx-im.org/ 26HOMEPAGE= https://www.fcitx-im.org/
29COMMENT= Free Chinese Input Toy of X 27COMMENT= Free Chinese Input Toy of X
30 28
31BUILD_DEPENDS+= extra-cmake-modules-[0-9]*:../../devel/extra-cmake-modules 29BUILD_DEPENDS+= extra-cmake-modules-[0-9]*:../../devel/extra-cmake-modules
32 30
33USE_LANGUAGES+= c c++ 31USE_LANGUAGES+= c c++
34 32
35USE_TOOLS+= bash:run gmake pkg-config 33USE_TOOLS+= bash:run gmake pkg-config
36USE_CMAKE= yes 34USE_CMAKE= yes
37 35
38REPLACE_BASH+= data/script/*sh 36REPLACE_BASH+= data/script/*sh
39REPLACE_BASH+= cmake/*sh 37REPLACE_BASH+= cmake/*sh
40 38
41CMAKE_ARGS+= -DENABLE_PRESAGE=OFF 39CMAKE_ARGS+= -DENABLE_PRESAGE=OFF
42CMAKE_ARGS+= -DENABLE_GIR=OFF 40CMAKE_ARGS+= -DENABLE_GIR=OFF
43CMAKE_ARGS+= -DENABLE_GTK2_IM_MODULE=ON 41CMAKE_ARGS+= -DENABLE_GTK2_IM_MODULE=ON
44CMAKE_ARGS+= -DENABLE_GTK3_IM_MODULE=ON 42CMAKE_ARGS+= -DENABLE_GTK3_IM_MODULE=ON
 43CMAKE_ARGS+= -DENABLE_QT=OFF
 44CMAKE_ARGS+= -DENABLE_QT_IM_MODULE=OFF
 45CMAKE_ARGS+= -DENABLE_QT_GUI=OFF
45 46
46BUILDLINK_DEPMETHOD.libXt?= build 47BUILDLINK_DEPMETHOD.libXt?= build
47 48
48PTHREAD_AUTO_VARS= yes 49PTHREAD_AUTO_VARS= yes
49LDFLAGS.NetBSD+= -lexecinfo -lintl 50LDFLAGS.NetBSD+= -lexecinfo -lintl
50BUILDLINK_TRANSFORM+= rm:-Wl,--as-needed 51BUILDLINK_TRANSFORM+= rm:-Wl,--as-needed
51 52
52post-extract: 53post-extract:
53 ${CP} ${DISTDIR}/en_dict-20121020.tar.gz \ 54 ${CP} ${DISTDIR}/en_dict-20121020.tar.gz \
54 ${WRKSRC}/src/module/spell/dict/ 55 ${WRKSRC}/src/module/spell/dict/
55 ${CP} ${DISTDIR}/pinyin.tar.gz \ 56 ${CP} ${DISTDIR}/pinyin.tar.gz \
56 ${WRKSRC}/src/im/pinyin/data/ 57 ${WRKSRC}/src/im/pinyin/data/
57 ${CP} ${DISTDIR}/py_stroke-20121124.tar.gz \ 58 ${CP} ${DISTDIR}/py_stroke-20121124.tar.gz \
File Deleted: pkgsrc/inputmethod/fcitx/Attic/options.mk