Fri Mar 11 09:01:02 2022 UTC ()
fonts: Use hacks.mk to avoid NetBSD msgfmt on NetBSD only.


(nia)
diff -r1.123 -r1.124 pkgsrc/fonts/fontforge/Makefile
diff -r0 -r1.4 pkgsrc/fonts/fontforge/hacks.mk
cvs diff -r1.123 -r1.124 pkgsrc/fonts/fontforge/Makefile (expand / switch to unified diff)

--- pkgsrc/fonts/fontforge/Makefile 2021/12/08 16:04:23 1.123
+++ pkgsrc/fonts/fontforge/Makefile 2022/03/11 09:01:02 1.124
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.123 2021/12/08 16:04:23 adam Exp $ 1# $NetBSD: Makefile,v 1.124 2022/03/11 09:01:02 nia Exp $
2 2
3DISTNAME= fontforge-20201107 3DISTNAME= fontforge-20201107
4PKGREVISION= 3 4PKGREVISION= 3
5CATEGORIES= fonts editors 5CATEGORIES= fonts editors
6MASTER_SITES= ${MASTER_SITE_GITHUB:=fontforge/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=fontforge/}
7GITHUB_PROJECT= fontforge 7GITHUB_PROJECT= fontforge
8GITHUB_RELEASE= ${PKGVERSION_NOREV} 8GITHUB_RELEASE= ${PKGVERSION_NOREV}
9EXTRACT_SUFX= .tar.xz 9EXTRACT_SUFX= .tar.xz
10 10
11MAINTAINER= adam@NetBSD.org 11MAINTAINER= adam@NetBSD.org
12HOMEPAGE= https://fontforge.github.io/ 12HOMEPAGE= https://fontforge.github.io/
13COMMENT= Postscript font editor 13COMMENT= Postscript font editor
14LICENSE= modified-bsd 14LICENSE= modified-bsd
@@ -23,29 +23,26 @@ GCC_REQD+= 4.8 @@ -23,29 +23,26 @@ GCC_REQD+= 4.8
23CONFIGURE_DIRS+= build 23CONFIGURE_DIRS+= build
24CMAKE_ARGS+= .. 24CMAKE_ARGS+= ..
25CMAKE_ARGS+= -DENABLE_DOCS=NO 25CMAKE_ARGS+= -DENABLE_DOCS=NO
26 26
27PY_PATCHPLIST= yes 27PY_PATCHPLIST= yes
28 28
29CHECK_PORTABILITY_SKIP+= osx/FontForge.app/Contents/MacOS/* 29CHECK_PORTABILITY_SKIP+= osx/FontForge.app/Contents/MacOS/*
30 30
31PYTHON_VERSIONS_INCOMPATIBLE= 27 31PYTHON_VERSIONS_INCOMPATIBLE= 27
32 32
33pre-configure: 33pre-configure:
34 ${MKDIR} ${WRKSRC}/build 34 ${MKDIR} ${WRKSRC}/build
35 35
36# XXX msgfmt: unknown option -- xml 
37_TOOLS_USE_PKGSRC.msgfmt= yes 
38 
39.include "../../lang/python/application.mk" 36.include "../../lang/python/application.mk"
40.include "../../converters/libiconv/buildlink3.mk" 37.include "../../converters/libiconv/buildlink3.mk"
41.include "../../databases/shared-mime-info/mimedb.mk" 38.include "../../databases/shared-mime-info/mimedb.mk"
42.include "../../devel/gettext-lib/buildlink3.mk" 39.include "../../devel/gettext-lib/buildlink3.mk"
43.include "../../devel/glib2/buildlink3.mk" 40.include "../../devel/glib2/buildlink3.mk"
44.include "../../devel/libltdl/buildlink3.mk" 41.include "../../devel/libltdl/buildlink3.mk"
45.include "../../devel/pango/buildlink3.mk" 42.include "../../devel/pango/buildlink3.mk"
46.include "../../devel/zlib/buildlink3.mk" 43.include "../../devel/zlib/buildlink3.mk"
47.include "../../fonts/woff2/buildlink3.mk" 44.include "../../fonts/woff2/buildlink3.mk"
48.include "../../graphics/cairo/buildlink3.mk" 45.include "../../graphics/cairo/buildlink3.mk"
49.include "../../graphics/giflib/buildlink3.mk" 46.include "../../graphics/giflib/buildlink3.mk"
50.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 47.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
51.include "../../graphics/freetype2/buildlink3.mk" 48.include "../../graphics/freetype2/buildlink3.mk"
File Added: pkgsrc/fonts/fontforge/Attic/hacks.mk
# $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