Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id 7E33E1A9239 for ; Fri, 11 Mar 2022 09:01:04 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id BF46484E73; Fri, 11 Mar 2022 09:01:03 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id E0F8084D44 for ; Fri, 11 Mar 2022 09:01:02 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id PF9po5eJxaEU for ; Fri, 11 Mar 2022 09:01:02 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 36F7284D36 for ; Fri, 11 Mar 2022 09:01:02 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 2E7E9FB24; Fri, 11 Mar 2022 09:01:02 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1646989262171800" MIME-Version: 1.0 Date: Fri, 11 Mar 2022 09:01:02 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/fonts/fontforge To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20220311090102.2E7E9FB24@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1646989262171800 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Fri Mar 11 09:01:02 UTC 2022 Modified Files: pkgsrc/fonts/fontforge: Makefile Added Files: pkgsrc/fonts/fontforge: hacks.mk Log Message: fonts: Use hacks.mk to avoid NetBSD msgfmt on NetBSD only. To generate a diff of this commit: cvs rdiff -u -r1.123 -r1.124 pkgsrc/fonts/fontforge/Makefile cvs rdiff -u -r0 -r1.4 pkgsrc/fonts/fontforge/hacks.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1646989262171800 Content-Disposition: inline Content-Length: 1355 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/fonts/fontforge/Makefile diff -u pkgsrc/fonts/fontforge/Makefile:1.123 pkgsrc/fonts/fontforge/Makefile:1.124 --- pkgsrc/fonts/fontforge/Makefile:1.123 Wed Dec 8 16:04:23 2021 +++ pkgsrc/fonts/fontforge/Makefile Fri Mar 11 09:01:02 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.123 2021/12/08 16:04:23 adam Exp $ +# $NetBSD: Makefile,v 1.124 2022/03/11 09:01:02 nia Exp $ DISTNAME= fontforge-20201107 PKGREVISION= 3 @@ -33,9 +33,6 @@ PYTHON_VERSIONS_INCOMPATIBLE= 27 pre-configure: ${MKDIR} ${WRKSRC}/build -# XXX msgfmt: unknown option -- xml -_TOOLS_USE_PKGSRC.msgfmt= yes - .include "../../lang/python/application.mk" .include "../../converters/libiconv/buildlink3.mk" .include "../../databases/shared-mime-info/mimedb.mk" Added files: Index: pkgsrc/fonts/fontforge/hacks.mk diff -u /dev/null pkgsrc/fonts/fontforge/hacks.mk:1.4 --- /dev/null Fri Mar 11 09:01:02 2022 +++ pkgsrc/fonts/fontforge/hacks.mk Fri Mar 11 09:01:02 2022 @@ -0,0 +1,13 @@ +# $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 --_----------=_1646989262171800--