Tue Dec 1 11:21:16 2020 UTC ()
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.


(nia)
diff -r1.3 -r1.4 pkgsrc/textproc/dwdiff/Makefile
diff -r1.1 -r1.2 pkgsrc/textproc/dwdiff/distinfo
diff -r0 -r1.1 pkgsrc/textproc/dwdiff/patches/patch-src_definitions.h
cvs diff -r1.3 -r1.4 pkgsrc/textproc/dwdiff/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/dwdiff/Makefile 2020/11/05 09:09:13 1.3
+++ pkgsrc/textproc/dwdiff/Makefile 2020/12/01 11:21:15 1.4
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.3 2020/11/05 09:09:13 ryoon Exp $ 1# $NetBSD: Makefile,v 1.4 2020/12/01 11:21:15 nia Exp $
2 2
3DISTNAME= dwdiff-2.1.2 3DISTNAME= dwdiff-2.1.3
4PKGREVISION= 1 
5CATEGORIES= textproc 4CATEGORIES= textproc
6MASTER_SITES= https://os.ghalkes.nl/dist/ 5MASTER_SITES= https://os.ghalkes.nl/dist/
7EXTRACT_SUFX= .tar.bz2 6EXTRACT_SUFX= .tar.bz2
8 7
9MAINTAINER= ryoon@NetBSD.org 8MAINTAINER= ryoon@NetBSD.org
10HOMEPAGE= https://os.ghalkes.nl/dwdiff.html 9HOMEPAGE= https://os.ghalkes.nl/dwdiff.html
11COMMENT= Word level diff program 10COMMENT= Word level diff program
12LICENSE= gnu-gpl-v3 11LICENSE= gnu-gpl-v3
13 12
14GNU_CONFIGURE= yes 13GNU_CONFIGURE= yes
15USE_PKGLOCALEDIR= yes 14USE_PKGLOCALEDIR= yes
16USE_TOOLS+= pkg-config 15USE_TOOLS+= pkg-config
17MAKE_FLAGS+= mandir=${PREFIX}/${PKGMANDIR} 16MAKE_FLAGS+= mandir=${PREFIX}/${PKGMANDIR}
cvs diff -r1.1 -r1.2 pkgsrc/textproc/dwdiff/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/dwdiff/distinfo 2020/06/05 12:43:53 1.1
+++ pkgsrc/textproc/dwdiff/distinfo 2020/12/01 11:21:15 1.2
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.1 2020/06/05 12:43:53 ryoon Exp $ 1$NetBSD: distinfo,v 1.2 2020/12/01 11:21:15 nia Exp $
2 2
3SHA1 (dwdiff-2.1.2.tar.bz2) = f44d63d95e4df7e8acfeb57473552c0c15ca5a3b 3SHA1 (dwdiff-2.1.3.tar.bz2) = 301a6e5e7f101e418b0f524904e23409d04b13d1
4RMD160 (dwdiff-2.1.2.tar.bz2) = 4fdb32536a86a4c08c5a01c1f83b62ad62bce091 4RMD160 (dwdiff-2.1.3.tar.bz2) = 853cc09ba21297b3b3e5232705c565b9bcdfe41d
5SHA512 (dwdiff-2.1.2.tar.bz2) = e4897ec3990261ddadf1fd4287902dd74c8350d11448714be8ea4b7808fc7d419ca2fd7fe65f347f46fdb1090d2d116c180a53fde3ff095027765f40acaa1c91 5SHA512 (dwdiff-2.1.3.tar.bz2) = e4375658ddb919d763bedacd122e5597a4c3cd40ddff2c954c6cc88e5047d20d4d3b18eaf75c6835be21e1f72e2622e25b212ae9882d8eaa36874af3f6de4b3f
6Size (dwdiff-2.1.2.tar.bz2) = 79282 bytes 6Size (dwdiff-2.1.3.tar.bz2) = 79862 bytes
7SHA1 (patch-config.pkg) = d65cabaf94ebd0283ccce54b7e982e2b3395b59d 7SHA1 (patch-config.pkg) = d65cabaf94ebd0283ccce54b7e982e2b3395b59d
 8SHA1 (patch-src_definitions.h) = ba3feaf2ecbdbe7c330dd877d1b23e9bfbddd30d
File Added: pkgsrc/textproc/dwdiff/patches/patch-src_definitions.h
$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 <stdbool.h>
+#else
+typedef enum {false, true} bool;
 #endif
 
 /*==== Configuration definitions ====*/