CVS commit: pkgsrc/inputmethod

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Mar 12 07:11:14 UTC 2022

Modified Files:
        pkgsrc/inputmethod/ibus: Makefile
        pkgsrc/inputmethod/ibus-libpinyin: Makefile
Added Files:
        pkgsrc/inputmethod/ibus: hacks.mk
        pkgsrc/inputmethod/ibus-libpinyin: hacks.mk

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


To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 pkgsrc/inputmethod/ibus/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/inputmethod/ibus/hacks.mk
cvs rdiff -u -r1.25 -r1.26 pkgsrc/inputmethod/ibus-libpinyin/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/inputmethod/ibus-libpinyin/hacks.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/inputmethod/ibus/Makefile
diff -u pkgsrc/inputmethod/ibus/Makefile:1.82 pkgsrc/inputmethod/ibus/Makefile:1.83
--- pkgsrc/inputmethod/ibus/Makefile:1.82       Fri Jan 28 14:02:33 2022
+++ pkgsrc/inputmethod/ibus/Makefile    Sat Mar 12 07:11:13 2022
@@ -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
 

Index: pkgsrc/inputmethod/ibus-libpinyin/Makefile
diff -u pkgsrc/inputmethod/ibus-libpinyin/Makefile:1.25 pkgsrc/inputmethod/ibus-libpinyin/Makefile:1.26
--- pkgsrc/inputmethod/ibus-libpinyin/Makefile:1.25     Wed Dec  8 16:05:14 2021
+++ pkgsrc/inputmethod/ibus-libpinyin/Makefile  Sat Mar 12 07:11:14 2022
@@ -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=${PYVERS
 .  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

Added files:

Index: pkgsrc/inputmethod/ibus/hacks.mk
diff -u /dev/null pkgsrc/inputmethod/ibus/hacks.mk:1.1
--- /dev/null   Sat Mar 12 07:11:14 2022
+++ pkgsrc/inputmethod/ibus/hacks.mk    Sat Mar 12 07:11:13 2022
@@ -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

Index: pkgsrc/inputmethod/ibus-libpinyin/hacks.mk
diff -u /dev/null pkgsrc/inputmethod/ibus-libpinyin/hacks.mk:1.1
--- /dev/null   Sat Mar 12 07:11:14 2022
+++ pkgsrc/inputmethod/ibus-libpinyin/hacks.mk  Sat Mar 12 07:11:14 2022
@@ -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