CVS commit: pkgsrc/print/evince3

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

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

Modified Files:
        pkgsrc/print/evince3: Makefile.common
Added Files:
        pkgsrc/print/evince3: hacks.mk

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


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 pkgsrc/print/evince3/Makefile.common
cvs rdiff -u -r0 -r1.1 pkgsrc/print/evince3/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/print/evince3/Makefile.common
diff -u pkgsrc/print/evince3/Makefile.common:1.23 pkgsrc/print/evince3/Makefile.common:1.24
--- pkgsrc/print/evince3/Makefile.common:1.23   Sun May  2 11:06:14 2021
+++ pkgsrc/print/evince3/Makefile.common        Sat Mar 12 07:19:24 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.23 2021/05/02 11:06:14 nia Exp $
+# $NetBSD: Makefile.common,v 1.24 2022/03/12 07:19:24 nia Exp $
 #
 # used by print/evince3/Makefile
 # would probably be used by print/evince3-nautilus/Makefile if that existed
@@ -23,9 +23,6 @@ USE_TOOLS+=           gmake intltool msgfmt pkg-c
 USE_TOOLS+=            gdbus-codegen
 USE_LANGUAGES=         c c++
 
-# Requires --desktop in msgfmt.
-_TOOLS_USE_PKGSRC.msgfmt=      yes
-
 CONFIGURE_ARGS+=       --disable-browser-plugin
 CONFIGURE_ARGS+=       --without-gspell
 # Disable thumbnail cache

Added files:

Index: pkgsrc/print/evince3/hacks.mk
diff -u /dev/null pkgsrc/print/evince3/hacks.mk:1.1
--- /dev/null   Sat Mar 12 07:19:24 2022
+++ pkgsrc/print/evince3/hacks.mk       Sat Mar 12 07:19:24 2022
@@ -0,0 +1,13 @@
+# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:19:24 nia Exp $
+
+.if !defined(EVINCE_HACKS_MK)
+EVINCE_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 # EVINCE_HACKS_MK