diff options
| author | nia <nia@pkgsrc.org> | 2022-03-12 07:11:13 +0000 |
|---|---|---|
| committer | nia <nia@pkgsrc.org> | 2022-03-12 07:11:13 +0000 |
| commit | 7fc7d9f481b5dc872c7adf5a3f2e2a219ccd94ac (patch) | |
| tree | c033193ccb690f38cde6eafb05c08afba52322a5 /inputmethod | |
| parent | 132bfba431740bb6d5e857d52656cf43031edd1b (diff) | |
| download | pkgsrc-7fc7d9f481b5dc872c7adf5a3f2e2a219ccd94ac.tar.gz | |
inputmethod: Use hacks.mk to avoid NetBSD msgfmt on NetBSD only.
Diffstat (limited to 'inputmethod')
| -rw-r--r-- | inputmethod/ibus-libpinyin/Makefile | 7 | ||||
| -rw-r--r-- | inputmethod/ibus-libpinyin/hacks.mk | 13 | ||||
| -rw-r--r-- | inputmethod/ibus/Makefile | 6 | ||||
| -rw-r--r-- | inputmethod/ibus/hacks.mk | 13 |
4 files changed, 29 insertions, 10 deletions
diff --git a/inputmethod/ibus-libpinyin/Makefile b/inputmethod/ibus-libpinyin/Makefile index b858b82b68c..04a8bb193cf 100644 --- a/inputmethod/ibus-libpinyin/Makefile +++ b/inputmethod/ibus-libpinyin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2021/12/08 16:05:14 adam Exp $ +# $NetBSD: Makefile,v 1.26 2022/03/12 07:11:14 nia Exp $ DISTNAME= ibus-libpinyin-1.12.0 PKGREVISION= 2 @@ -28,11 +28,6 @@ PLIST_SUBST+= PYVERSION_DIGIT=${PYVERSION_DIGIT} . include "../../devel/libuuid/buildlink3.mk" .endif -# msgfmt: unknown option -- desktop -.if ${OPSYS} == "NetBSD" -TOOLS_PLATFORM.msgfmt= -.endif - .if (!empty(PKGSRC_COMPILER:Mgcc) && !empty(CC_VERSION:Mgcc-4.[4-9]*)) || !empty(PKGSRC_COMPILER:Mclang) CONFIGURE_ARGS+= --disable-boost .else diff --git a/inputmethod/ibus-libpinyin/hacks.mk b/inputmethod/ibus-libpinyin/hacks.mk new file mode 100644 index 00000000000..cfaad028fb7 --- /dev/null +++ b/inputmethod/ibus-libpinyin/hacks.mk @@ -0,0 +1,13 @@ +# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:11:14 nia Exp $ + +.if !defined(IBUS_LIBPINYIN_HACKS_MK) +IBUS_LIBPINYIN_HACKS_MK:= + +.include "../../mk/bsd.fast.prefs.mk" + +.if ${OPSYS} == "NetBSD" +# Old GPLv2 version of msgfmt in NetBSD does not support --desktop/--xml. +TOOLS_PLATFORM.msgfmt= # none +PKG_HACKS+= avoid-gplv2-msgfmt +.endif +.endif # IBUS_LIBPINYIN_HACKS_MK diff --git a/inputmethod/ibus/Makefile b/inputmethod/ibus/Makefile index b113d219f5a..0ba6f32309e 100644 --- a/inputmethod/ibus/Makefile +++ b/inputmethod/ibus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.82 2022/01/28 14:02:33 wiz Exp $ +# $NetBSD: Makefile,v 1.83 2022/03/12 07:11:13 nia Exp $ PKGREVISION= 2 .include "Makefile.common" @@ -14,9 +14,7 @@ PYTHON_VERSIONS_ACCEPTED= 27 GNU_CONFIGURE= yes USE_LIBTOOL= yes -# XXX fails without GNU msgfmt -_TOOLS_USE_PKGSRC.msgfmt= yes -USE_TOOLS+= pkg-config intltool gmsgfmt gmake msgmerge +USE_TOOLS+= pkg-config intltool msgfmt gmake msgmerge USE_LANGUAGES= c c++ USE_PKGLOCALEDIR= yes diff --git a/inputmethod/ibus/hacks.mk b/inputmethod/ibus/hacks.mk new file mode 100644 index 00000000000..3b383216bfc --- /dev/null +++ b/inputmethod/ibus/hacks.mk @@ -0,0 +1,13 @@ +# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:11:13 nia Exp $ + +.if !defined(IBUS_HACKS_MK) +IBUS_HACKS_MK:= + +.include "../../mk/bsd.fast.prefs.mk" + +.if ${OPSYS} == "NetBSD" +# Old GPLv2 version of msgfmt in NetBSD does not support --desktop/--xml. +TOOLS_PLATFORM.msgfmt= # none +PKG_HACKS+= avoid-gplv2-msgfmt +.endif +.endif # IBUS_HACKS_MK |