Fri Jul 27 15:50:45 2018 UTC ()
Cast another unsigned char to fix self-tests on NetBSD 8. Bump PKGREVISION.


(schmonz)
diff -r1.6 -r1.7 pkgsrc/textproc/discount/Makefile
diff -r1.7 -r1.8 pkgsrc/textproc/discount/distinfo
diff -r1.1 -r1.2 pkgsrc/textproc/discount/patches/patch-generate.c
cvs diff -r1.6 -r1.7 pkgsrc/textproc/discount/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/discount/Makefile 2018/03/17 20:54:06 1.6
+++ pkgsrc/textproc/discount/Makefile 2018/07/27 15:50:45 1.7
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.6 2018/03/17 20:54:06 schmonz Exp $ 1# $NetBSD: Makefile,v 1.7 2018/07/27 15:50:45 schmonz Exp $
2# 2#
3 3
4DISTNAME= discount-2.2.3a 4DISTNAME= discount-2.2.3a
5PKGREVISION= 3 5PKGREVISION= 4
6CATEGORIES= textproc 6CATEGORIES= textproc
7MASTER_SITES= ${HOMEPAGE} 7MASTER_SITES= ${HOMEPAGE}
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= zecrazytux@zecrazytux.net 10MAINTAINER= zecrazytux@zecrazytux.net
11HOMEPAGE= http://www.pell.portland.or.us/~orc/Code/discount/ 11HOMEPAGE= http://www.pell.portland.or.us/~orc/Code/discount/
12COMMENT= Markdown C implementation 12COMMENT= Markdown C implementation
13LICENSE= modified-bsd 13LICENSE= modified-bsd
14 14
15HAS_CONFIGURE= YES 15HAS_CONFIGURE= YES
16CONFIGURE_SCRIPT= ./configure.sh 16CONFIGURE_SCRIPT= ./configure.sh
17CONFIGURE_ARGS= --prefix=${PREFIX} 17CONFIGURE_ARGS= --prefix=${PREFIX}
18CONFIGURE_ARGS+= --execdir=${PREFIX}/bin 18CONFIGURE_ARGS+= --execdir=${PREFIX}/bin
cvs diff -r1.7 -r1.8 pkgsrc/textproc/discount/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/discount/distinfo 2018/04/23 14:42:03 1.7
+++ pkgsrc/textproc/discount/distinfo 2018/07/27 15:50:45 1.8
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.7 2018/04/23 14:42:03 schmonz Exp $ 1$NetBSD: distinfo,v 1.8 2018/07/27 15:50:45 schmonz Exp $
2 2
3SHA1 (discount-2.2.3a.tar.bz2) = 9ff2985b89e7bc7ca6a18f82aade2b25db2c97f8 3SHA1 (discount-2.2.3a.tar.bz2) = 9ff2985b89e7bc7ca6a18f82aade2b25db2c97f8
4RMD160 (discount-2.2.3a.tar.bz2) = 66a13d6848251ab8a73a59ba4ec95befe9bbdc2d 4RMD160 (discount-2.2.3a.tar.bz2) = 66a13d6848251ab8a73a59ba4ec95befe9bbdc2d
5SHA512 (discount-2.2.3a.tar.bz2) = cf995a46879f269f3e02f7d480303d229676bb36f71fe045d3a8eab7306fca9cce98496611b9fb9e0a14a9cf46ee66bd239dd9c946dff54ae09277fd66459c1f 5SHA512 (discount-2.2.3a.tar.bz2) = cf995a46879f269f3e02f7d480303d229676bb36f71fe045d3a8eab7306fca9cce98496611b9fb9e0a14a9cf46ee66bd239dd9c946dff54ae09277fd66459c1f
6Size (discount-2.2.3a.tar.bz2) = 98325 bytes 6Size (discount-2.2.3a.tar.bz2) = 98325 bytes
7SHA1 (patch-Makefile.in) = 66270dca27485373279bd9ce8c445cc5a931e29a 7SHA1 (patch-Makefile.in) = 66270dca27485373279bd9ce8c445cc5a931e29a
8SHA1 (patch-generate.c) = b584de3a654c3bc3f2a2b1204926164c6ed67035 8SHA1 (patch-generate.c) = 40ba6619c592531724ed78df5ffc99998e55498e
cvs diff -r1.1 -r1.2 pkgsrc/textproc/discount/patches/patch-generate.c (expand / switch to unified diff)

--- pkgsrc/textproc/discount/patches/patch-generate.c 2018/03/17 20:54:06 1.1
+++ pkgsrc/textproc/discount/patches/patch-generate.c 2018/07/27 15:50:45 1.2
@@ -1,19 +1,28 @@ @@ -1,19 +1,28 @@
1$NetBSD: patch-generate.c,v 1.1 2018/03/17 20:54:06 schmonz Exp $ 1$NetBSD: patch-generate.c,v 1.2 2018/07/27 15:50:45 schmonz Exp $
2 2
3Fix self-tests on NetBSD. 3Fix self-tests on NetBSD.
4 4
5--- generate.c.orig 2018-03-02 22:52:05.000000000 +0000 5--- generate.c.orig 2018-03-02 22:52:05.000000000 +0000
6+++ generate.c 6+++ generate.c
 7@@ -747,7 +747,7 @@ linkylinky(int image, MMIOT *f)
 8 else {
 9 int goodlink, implicit_mark = mmiottell(f);
 10
 11- if ( isspace(peek(f,1)) )
 12+ if ( isspace((unsigned char)peek(f,1)) )
 13 pull(f);
 14
 15 if ( peek(f,1) == '[' ) {
7@@ -1151,7 +1151,7 @@ islike(MMIOT *f, char *s) 16@@ -1151,7 +1151,7 @@ islike(MMIOT *f, char *s)
8 } 17 }
9  18
10 for (i=1; i < len; i++) 19 for (i=1; i < len; i++)
11- if (tolower(peek(f,i)) != s[i]) 20- if (tolower(peek(f,i)) != s[i])
12+ if (tolower((unsigned char)peek(f,i)) != s[i]) 21+ if (tolower((unsigned char)peek(f,i)) != s[i])
13 return 0; 22 return 0;
14 return 1; 23 return 1;
15 } 24 }
16@@ -1269,7 +1269,7 @@ tickhandler(MMIOT *f, int tickchar, int  25@@ -1269,7 +1269,7 @@ tickhandler(MMIOT *f, int tickchar, int
17 int endticks, size; 26 int endticks, size;
18 int tick = nrticks(0, tickchar, f); 27 int tick = nrticks(0, tickchar, f);
19  28