CVS commit: pkgsrc/fonts/fontforge

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Mar 11 09:01:02 UTC 2022

Modified Files:
        pkgsrc/fonts/fontforge: Makefile
Added Files:
        pkgsrc/fonts/fontforge: hacks.mk

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


To generate a diff of this commit:
cvs rdiff -u -r1.123 -r1.124 pkgsrc/fonts/fontforge/Makefile
cvs rdiff -u -r0 -r1.4 pkgsrc/fonts/fontforge/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/fonts/fontforge/Makefile
diff -u pkgsrc/fonts/fontforge/Makefile:1.123 pkgsrc/fonts/fontforge/Makefile:1.124
--- pkgsrc/fonts/fontforge/Makefile:1.123       Wed Dec  8 16:04:23 2021
+++ pkgsrc/fonts/fontforge/Makefile     Fri Mar 11 09:01:02 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.123 2021/12/08 16:04:23 adam Exp $
+# $NetBSD: Makefile,v 1.124 2022/03/11 09:01:02 nia Exp $
 
 DISTNAME=      fontforge-20201107
 PKGREVISION=   3
@@ -33,9 +33,6 @@ PYTHON_VERSIONS_INCOMPATIBLE= 27
 pre-configure:
        ${MKDIR} ${WRKSRC}/build
 
-# XXX msgfmt: unknown option -- xml
-_TOOLS_USE_PKGSRC.msgfmt=      yes
-
 .include "../../lang/python/application.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../databases/shared-mime-info/mimedb.mk"

Added files:

Index: pkgsrc/fonts/fontforge/hacks.mk
diff -u /dev/null pkgsrc/fonts/fontforge/hacks.mk:1.4
--- /dev/null   Fri Mar 11 09:01:02 2022
+++ pkgsrc/fonts/fontforge/hacks.mk     Fri Mar 11 09:01:02 2022
@@ -0,0 +1,13 @@
+# $NetBSD: hacks.mk,v 1.4 2022/03/11 09:01:02 nia Exp $
+
+.if !defined(FONTFORGE_HACKS_MK)
+FONTFORGE_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 # FONTFORGE_HACKS_MK