CVS commit: pkgsrc/misc

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

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

Modified Files:
        pkgsrc/misc/orca: Makefile
        pkgsrc/misc/yelp3: Makefile
Added Files:
        pkgsrc/misc/orca: hacks.mk
        pkgsrc/misc/yelp3: hacks.mk

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


To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 pkgsrc/misc/orca/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/misc/orca/hacks.mk
cvs rdiff -u -r1.78 -r1.79 pkgsrc/misc/yelp3/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/misc/yelp3/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/misc/orca/Makefile
diff -u pkgsrc/misc/orca/Makefile:1.58 pkgsrc/misc/orca/Makefile:1.59
--- pkgsrc/misc/orca/Makefile:1.58      Wed Dec  8 16:05:42 2021
+++ pkgsrc/misc/orca/Makefile   Sat Mar 12 07:14:17 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2021/12/08 16:05:42 adam Exp $
+# $NetBSD: Makefile,v 1.59 2022/03/12 07:14:17 nia Exp $
 
 DISTNAME=      orca-3.34.1
 PKGREVISION=   6
@@ -22,9 +22,6 @@ PY_PATCHPLIST=        yes
 USE_TOOLS+=    pkg-config gmake itstool
 USE_TOOLS+=    msgfmt msgmerge xgettext
 
-# XXX msgfmt: unknown option -- desktop
-_TOOLS_USE_PKGSRC.msgfmt=      yes
-
 # Python 3 only
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 

Index: pkgsrc/misc/yelp3/Makefile
diff -u pkgsrc/misc/yelp3/Makefile:1.78 pkgsrc/misc/yelp3/Makefile:1.79
--- pkgsrc/misc/yelp3/Makefile:1.78     Wed Dec  8 16:05:44 2021
+++ pkgsrc/misc/yelp3/Makefile  Sat Mar 12 07:14:17 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.78 2021/12/08 16:05:44 adam Exp $
+# $NetBSD: Makefile,v 1.79 2022/03/12 07:14:17 nia Exp $
 
 DISTNAME=              yelp-3.32.0
 PKGREVISION=           11
@@ -16,9 +16,6 @@ USE_LIBTOOL=          yes
 USE_PKGLOCALEDIR=      yes
 GNU_CONFIGURE=         yes
 
-# Requires --desktop in msgfmt.
-_TOOLS_USE_PKGSRC.msgfmt=      yes
-
 BUILDLINK_API_DEPENDS.glib2+=  glib2>=2.38.0
 BUILDLINK_API_DEPENDS.gtk3+=   gtk3+>=3.13.3
 BUILDLINK_API_DEPENDS.libxslt+=        libxslt>=1.1.4

Added files:

Index: pkgsrc/misc/orca/hacks.mk
diff -u /dev/null pkgsrc/misc/orca/hacks.mk:1.1
--- /dev/null   Sat Mar 12 07:14:17 2022
+++ pkgsrc/misc/orca/hacks.mk   Sat Mar 12 07:14:17 2022
@@ -0,0 +1,13 @@
+# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:14:17 nia Exp $
+
+.if !defined(ORCA_HACKS_MK)
+ORCA_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 # ORCA_HACKS_MK

Index: pkgsrc/misc/yelp3/hacks.mk
diff -u /dev/null pkgsrc/misc/yelp3/hacks.mk:1.1
--- /dev/null   Sat Mar 12 07:14:17 2022
+++ pkgsrc/misc/yelp3/hacks.mk  Sat Mar 12 07:14:17 2022
@@ -0,0 +1,13 @@
+# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:14:17 nia Exp $
+
+.if !defined(YELP_HACKS_MK)
+YELP_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 # YELP_HACKS_MK