CVS commit: pkgsrc/www/epiphany

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

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

Modified Files:
        pkgsrc/www/epiphany: Makefile
Added Files:
        pkgsrc/www/epiphany: hacks.mk

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


To generate a diff of this commit:
cvs rdiff -u -r1.207 -r1.208 pkgsrc/www/epiphany/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/www/epiphany/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/www/epiphany/Makefile
diff -u pkgsrc/www/epiphany/Makefile:1.207 pkgsrc/www/epiphany/Makefile:1.208
--- pkgsrc/www/epiphany/Makefile:1.207  Thu Mar 10 21:28:03 2022
+++ pkgsrc/www/epiphany/Makefile        Sat Mar 12 07:44:12 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.207 2022/03/10 21:28:03 prlw1 Exp $
+# $NetBSD: Makefile,v 1.208 2022/03/12 07:44:12 nia Exp $
 
 DISTNAME=      epiphany-40.6
 CATEGORIES=    www gnome
@@ -20,9 +20,6 @@ LDFLAGS+=     ${COMPILER_RPATH_FLAG}${PREFIX
 
 PYTHON_FOR_BUILD_ONLY= tool
 
-# XXX msgfmt: unknown option -- desktop
-_TOOLS_USE_PKGSRC.msgfmt=      yes
-
 .include "../../devel/meson/build.mk"
 .include "../../archivers/libarchive/buildlink3.mk"
 BUILDLINK_API_DEPENDS.glib2+=  glib2>=2.64.0

Added files:

Index: pkgsrc/www/epiphany/hacks.mk
diff -u /dev/null pkgsrc/www/epiphany/hacks.mk:1.1
--- /dev/null   Sat Mar 12 07:44:12 2022
+++ pkgsrc/www/epiphany/hacks.mk        Sat Mar 12 07:44:12 2022
@@ -0,0 +1,13 @@
+# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:44:12 nia Exp $
+
+.if !defined(EPIPHANY_HACKS_MK)
+EPIPHANY_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 # EPIPHANY_HACKS_MK