Received: by mail.netbsd.org (Postfix, from userid 605) id 8EF4D84D54; Mon, 5 Apr 2021 08:07:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id C783784D33 for ; Mon, 5 Apr 2021 08:07:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id upWCDIMIdGPF for ; Mon, 5 Apr 2021 08:07:18 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 2758784D0C for ; Mon, 5 Apr 2021 08:07:18 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 1B64AFA95; Mon, 5 Apr 2021 08:07:18 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_161761003878960" MIME-Version: 1.0 Date: Mon, 5 Apr 2021 08:07:18 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/editors/dasher To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20210405080718.1B64AFA95@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_161761003878960 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Mon Apr 5 08:07:18 UTC 2021 Modified Files: pkgsrc/editors/dasher: Makefile Log Message: dasher: Fix glib2-2.6.0 breakage To generate a diff of this commit: cvs rdiff -u -r1.106 -r1.107 pkgsrc/editors/dasher/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_161761003878960 Content-Disposition: inline Content-Length: 958 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/editors/dasher/Makefile diff -u pkgsrc/editors/dasher/Makefile:1.106 pkgsrc/editors/dasher/Makefile:1.107 --- pkgsrc/editors/dasher/Makefile:1.106 Mon Aug 17 20:18:32 2020 +++ pkgsrc/editors/dasher/Makefile Mon Apr 5 08:07:17 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.106 2020/08/17 20:18:32 leot Exp $ +# $NetBSD: Makefile,v 1.107 2021/04/05 08:07:17 nia Exp $ DISTNAME= dasher-5.0.0.b20200225 PKGREVISION= 1 @@ -20,8 +20,15 @@ USE_LANGUAGES= c c++ USE_TOOLS+= autoreconf autoconf automake autopoint msgfmt USE_TOOLS+= pkg-config -# Requires --desktop in msgfmt. -_TOOLS_USE_PKGSRC.msgfmt= yes +# Workaround for glib2-2.68.0 c++ fallout. +CXXFLAGS+= -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_66 + +.include "../../mk/bsd.prefs.mk" + +# msgfmt: unknown option -- desktop +.if ${OPSYS} == "NetBSD" +TOOLS_PLATFORM.msgfmt= +.endif pre-configure: # tries to invoke git for something, probably fetching the ref --_----------=_161761003878960--