Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-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 598811A9217 for ; Tue, 1 Dec 2020 11:21:18 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 9FD2284E19; Tue, 1 Dec 2020 11:21:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id DA7AF84D8E for ; Tue, 1 Dec 2020 11:21:16 +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 16T3ge-AyTIM for ; Tue, 1 Dec 2020 11:21:16 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 4E62584CDF for ; Tue, 1 Dec 2020 11:21:16 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 4706EFA9D; Tue, 1 Dec 2020 11:21:16 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_160682167659670" MIME-Version: 1.0 Date: Tue, 1 Dec 2020 11:21:16 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/textproc/dwdiff To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20201201112116.4706EFA9D@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_160682167659670 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Tue Dec 1 11:21:16 UTC 2020 Modified Files: pkgsrc/textproc/dwdiff: Makefile distinfo Added Files: pkgsrc/textproc/dwdiff/patches: patch-src_definitions.h Log Message: dwdiff: Update to 2.1.3 Version 2.1.3: Bug fixes: - Fixed compilation problems on GCC 10, due to multiple definition of the same variable. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/dwdiff/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/dwdiff/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/textproc/dwdiff/patches/patch-src_definitions.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_160682167659670 Content-Disposition: inline Content-Length: 2790 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/textproc/dwdiff/Makefile diff -u pkgsrc/textproc/dwdiff/Makefile:1.3 pkgsrc/textproc/dwdiff/Makefile:1.4 --- pkgsrc/textproc/dwdiff/Makefile:1.3 Thu Nov 5 09:09:13 2020 +++ pkgsrc/textproc/dwdiff/Makefile Tue Dec 1 11:21:15 2020 @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.3 2020/11/05 09:09:13 ryoon Exp $ +# $NetBSD: Makefile,v 1.4 2020/12/01 11:21:15 nia Exp $ -DISTNAME= dwdiff-2.1.2 -PKGREVISION= 1 +DISTNAME= dwdiff-2.1.3 CATEGORIES= textproc MASTER_SITES= https://os.ghalkes.nl/dist/ EXTRACT_SUFX= .tar.bz2 Index: pkgsrc/textproc/dwdiff/distinfo diff -u pkgsrc/textproc/dwdiff/distinfo:1.1 pkgsrc/textproc/dwdiff/distinfo:1.2 --- pkgsrc/textproc/dwdiff/distinfo:1.1 Fri Jun 5 12:43:53 2020 +++ pkgsrc/textproc/dwdiff/distinfo Tue Dec 1 11:21:15 2020 @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.1 2020/06/05 12:43:53 ryoon Exp $ +$NetBSD: distinfo,v 1.2 2020/12/01 11:21:15 nia Exp $ -SHA1 (dwdiff-2.1.2.tar.bz2) = f44d63d95e4df7e8acfeb57473552c0c15ca5a3b -RMD160 (dwdiff-2.1.2.tar.bz2) = 4fdb32536a86a4c08c5a01c1f83b62ad62bce091 -SHA512 (dwdiff-2.1.2.tar.bz2) = e4897ec3990261ddadf1fd4287902dd74c8350d11448714be8ea4b7808fc7d419ca2fd7fe65f347f46fdb1090d2d116c180a53fde3ff095027765f40acaa1c91 -Size (dwdiff-2.1.2.tar.bz2) = 79282 bytes +SHA1 (dwdiff-2.1.3.tar.bz2) = 301a6e5e7f101e418b0f524904e23409d04b13d1 +RMD160 (dwdiff-2.1.3.tar.bz2) = 853cc09ba21297b3b3e5232705c565b9bcdfe41d +SHA512 (dwdiff-2.1.3.tar.bz2) = e4375658ddb919d763bedacd122e5597a4c3cd40ddff2c954c6cc88e5047d20d4d3b18eaf75c6835be21e1f72e2622e25b212ae9882d8eaa36874af3f6de4b3f +Size (dwdiff-2.1.3.tar.bz2) = 79862 bytes SHA1 (patch-config.pkg) = d65cabaf94ebd0283ccce54b7e982e2b3395b59d +SHA1 (patch-src_definitions.h) = ba3feaf2ecbdbe7c330dd877d1b23e9bfbddd30d Added files: Index: pkgsrc/textproc/dwdiff/patches/patch-src_definitions.h diff -u /dev/null pkgsrc/textproc/dwdiff/patches/patch-src_definitions.h:1.1 --- /dev/null Tue Dec 1 11:21:16 2020 +++ pkgsrc/textproc/dwdiff/patches/patch-src_definitions.h Tue Dec 1 11:21:16 2020 @@ -0,0 +1,22 @@ +$NetBSD: patch-src_definitions.h,v 1.1 2020/12/01 11:21:16 nia Exp $ + +Avoid redefining bool. + +--- src/definitions.h.orig 2020-07-18 06:57:36.000000000 +0000 ++++ src/definitions.h +@@ -43,12 +43,10 @@ + + /*==== Misc definitions ====*/ + /* Define a bool type if not already defined (C++ and C99 do)*/ +-#if !(defined(__cplusplus) || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 19990601L)) +-/*@-incondefs@*/ +-typedef enum {false, true} bool; +-/*@+incondefs@*/ +-#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 19990601L ++#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L + #include ++#else ++typedef enum {false, true} bool; + #endif + + /*==== Configuration definitions ====*/ --_----------=_160682167659670--