pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/misc misc: Use hacks.mk to avoid NetBSD msgfmt on NetB...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/65a9b02df948
branches:  trunk
changeset: 375314:65a9b02df948
user:      nia <nia%pkgsrc.org@localhost>
date:      Sat Mar 12 07:14:17 2022 +0000

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

diffstat:

 misc/orca/Makefile  |   5 +----
 misc/orca/hacks.mk  |  13 +++++++++++++
 misc/yelp3/Makefile |   5 +----
 misc/yelp3/hacks.mk |  13 +++++++++++++
 4 files changed, 28 insertions(+), 8 deletions(-)

diffs (72 lines):

diff -r 533c5a3b4e7c -r 65a9b02df948 misc/orca/Makefile
--- a/misc/orca/Makefile        Sat Mar 12 07:11:13 2022 +0000
+++ b/misc/orca/Makefile        Sat Mar 12 07:14:17 2022 +0000
@@ -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 @@
 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
 
diff -r 533c5a3b4e7c -r 65a9b02df948 misc/orca/hacks.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/orca/hacks.mk        Sat Mar 12 07:14:17 2022 +0000
@@ -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
diff -r 533c5a3b4e7c -r 65a9b02df948 misc/yelp3/Makefile
--- a/misc/yelp3/Makefile       Sat Mar 12 07:11:13 2022 +0000
+++ b/misc/yelp3/Makefile       Sat Mar 12 07:14:17 2022 +0000
@@ -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_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
diff -r 533c5a3b4e7c -r 65a9b02df948 misc/yelp3/hacks.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/yelp3/hacks.mk       Sat Mar 12 07:14:17 2022 +0000
@@ -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



Home | Main Index | Thread Index | Old Index