*: Replace per-package msgfmt hacks with msgfmt-desktop.mk

4 files changed, 4 insertions, 28 deletions

diff --git a/inputmethod/ibus-libpinyin/Makefile b/inputmethod/ibus-libpinyin/Makefile
index 04a8bb193cf..4a7bbdea77e 100644
--- a/inputmethod/ibus-libpinyin/Makefile
+++ b/inputmethod/ibus-libpinyin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2022/03/12 07:11:14 nia Exp $
+# $NetBSD: Makefile,v 1.27 2022/03/12 08:01:50 nia Exp $
 
 DISTNAME=	ibus-libpinyin-1.12.0
 PKGREVISION=	2
@@ -38,6 +38,7 @@ CONFIGURE_ARGS+=	--with-boost=${BUILDLINK_PREFIX.boost-headers}
 
 .include "../../devel/glib2/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../inputmethod/ibus/buildlink3.mk"
 .include "../../textproc/libpinyin/buildlink3.mk"
diff --git a/inputmethod/ibus-libpinyin/hacks.mk b/inputmethod/ibus-libpinyin/hacks.mk
deleted file mode 100644
index cfaad028fb7..00000000000
--- a/inputmethod/ibus-libpinyin/hacks.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# $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 0ba6f32309e..b719e680abf 100644
--- a/inputmethod/ibus/Makefile
+++ b/inputmethod/ibus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.83 2022/03/12 07:11:13 nia Exp $
+# $NetBSD: Makefile,v 1.84 2022/03/12 08:01:50 nia Exp $
 
 PKGREVISION= 2
 .include "Makefile.common"
@@ -57,6 +57,7 @@ BUILDLINK_TRANSFORM+=	rm:-Wno-unused-but-set-variable
 .include "../../devel/glib2/schemas.mk"
 .include "../../devel/dconf/database.mk"
 .include "../../devel/dconf/buildlink3.mk"
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
 BUILDLINK_API_DEPENDS.gobject-introspection+=	gobject-introspection>=0.9.6
 BUILDLINK_DEPMETHOD.gobject-introspection+=	build
 .include "../../devel/gobject-introspection/buildlink3.mk"
diff --git a/inputmethod/ibus/hacks.mk b/inputmethod/ibus/hacks.mk
deleted file mode 100644
index 3b383216bfc..00000000000
--- a/inputmethod/ibus/hacks.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# $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