[pkgsrc/trunk]: pkgsrc/inputmethod inputmethod: Use hacks.mk to avoid NetBSD ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/533c5a3b4e7c
branches:  trunk
changeset: 375313:533c5a3b4e7c
user:      nia <nia%pkgsrc.org@localhost>
date:      Sat Mar 12 07:11:13 2022 +0000

description:
inputmethod: Use hacks.mk to avoid NetBSD msgfmt on NetBSD only.

diffstat:

 inputmethod/ibus-libpinyin/Makefile |   7 +------
 inputmethod/ibus-libpinyin/hacks.mk |  13 +++++++++++++
 inputmethod/ibus/Makefile           |   6 ++----
 inputmethod/ibus/hacks.mk           |  13 +++++++++++++
 4 files changed, 29 insertions(+), 10 deletions(-)

diffs (75 lines):

diff -r e8d9694952d7 -r 533c5a3b4e7c inputmethod/ibus-libpinyin/Makefile
--- a/inputmethod/ibus-libpinyin/Makefile       Sat Mar 12 07:06:26 2022 +0000
+++ b/inputmethod/ibus-libpinyin/Makefile       Sat Mar 12 07:11:13 2022 +0000
@@ -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 @@
 .  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 -r e8d9694952d7 -r 533c5a3b4e7c inputmethod/ibus-libpinyin/hacks.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/inputmethod/ibus-libpinyin/hacks.mk       Sat Mar 12 07:11:13 2022 +0000
@@ -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 -r e8d9694952d7 -r 533c5a3b4e7c inputmethod/ibus/Makefile
--- a/inputmethod/ibus/Makefile Sat Mar 12 07:06:26 2022 +0000
+++ b/inputmethod/ibus/Makefile Sat Mar 12 07:11:13 2022 +0000
@@ -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 @@
 
 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 -r e8d9694952d7 -r 533c5a3b4e7c inputmethod/ibus/hacks.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/inputmethod/ibus/hacks.mk Sat Mar 12 07:11:13 2022 +0000
@@ -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