CVS commit: pkgsrc/devel/gentle

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed Jan  4 12:53:49 UTC 2017

Modified Files:
        pkgsrc/devel/gentle: Makefile distinfo
        pkgsrc/devel/gentle/patches: patch-bi

Log Message:
Ensure the local yywrap is used.  Fixes the build of devel/rsltc with
newer flex.  Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/gentle/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/gentle/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/gentle/patches/patch-bi

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/gentle/Makefile
diff -u pkgsrc/devel/gentle/Makefile:1.13 pkgsrc/devel/gentle/Makefile:1.14
--- pkgsrc/devel/gentle/Makefile:1.13   Mon Feb 23 18:21:09 2015
+++ pkgsrc/devel/gentle/Makefile        Wed Jan  4 12:53:49 2017
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2015/02/23 18:21:09 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2017/01/04 12:53:49 jperkin Exp $
 #
 
 DISTNAME=              gentle-97
-PKGREVISION=           3
+PKGREVISION=           4
 CATEGORIES=            devel
 MASTER_SITES=          http://gentle.compilertools.net/
 

Index: pkgsrc/devel/gentle/distinfo
diff -u pkgsrc/devel/gentle/distinfo:1.6 pkgsrc/devel/gentle/distinfo:1.7
--- pkgsrc/devel/gentle/distinfo:1.6    Tue Nov  3 03:27:27 2015
+++ pkgsrc/devel/gentle/distinfo        Wed Jan  4 12:53:49 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2015/11/03 03:27:27 agc Exp $
+$NetBSD: distinfo,v 1.7 2017/01/04 12:53:49 jperkin Exp $
 
 SHA1 (gentle-97.tar.gz) = 1cbf70aa6c470346630c407f89878a5f3c0c4406
 RMD160 (gentle-97.tar.gz) = 96cbfca6909f23fa192514eaba0f0fffcfac2d40
@@ -14,6 +14,6 @@ SHA1 (patch-be) = 2c606659ca0f7e44f7939b
 SHA1 (patch-bf) = 6517ef2f65a802fff764965dc3a50bf5ce34fb2c
 SHA1 (patch-bg) = 46ad7192e8a766f8d98d1588a0e72873586bb82a
 SHA1 (patch-bh) = d6f4b4f6a5c3c8a5d90ae3515209598e851ec0ed
-SHA1 (patch-bi) = 7ae860cb89585fcb6223beee5bd6e7def405f69e
+SHA1 (patch-bi) = d5677a882bc25d2f0a3f7f398af8864a4c2062dd
 SHA1 (patch-gentle_build) = 17134abe5b892f649ebc7dd9a7b46f3eff9b6896
 SHA1 (patch-reflex_build) = d473baf5f91d762457826e7f4d297d6b95750f87

Index: pkgsrc/devel/gentle/patches/patch-bi
diff -u pkgsrc/devel/gentle/patches/patch-bi:1.1 pkgsrc/devel/gentle/patches/patch-bi:1.2
--- pkgsrc/devel/gentle/patches/patch-bi:1.1    Mon Nov 30 00:03:08 2009
+++ pkgsrc/devel/gentle/patches/patch-bi        Wed Jan  4 12:53:49 2017
@@ -1,9 +1,10 @@
-$NetBSD: patch-bi,v 1.1 2009/11/30 00:03:08 dholland Exp $
+$NetBSD: patch-bi,v 1.2 2017/01/04 12:53:49 jperkin Exp $
 
 Add standard includes needed for LP64 build.
+Ensure the local yywrap is used.
 
---- reflex/reflex.c~   1998-08-20 09:56:10.000000000 -0400
-+++ reflex/reflex.c    2009-11-29 19:02:55.000000000 -0500
+--- reflex/reflex.c.orig       1998-08-20 13:56:10.000000000 +0000
++++ reflex/reflex.c
 @@ -1,4 +1,6 @@
  #include <stdio.h>
 +#include <stdlib.h>
@@ -11,3 +12,11 @@ Add standard includes needed for LP64 bu
  
  /* ( 1) %{ */
  /* ( 2) YYSTYPE block */
+@@ -76,6 +78,7 @@ char *lexfunc[] = {
+ };
+ /* (15) YYWRAP block */
+ char *yywrap[] = {
++   "#undef yywrap",
+    "#ifndef yywrap",
+    "yywrap() { return 1; }",
+    "#endif",