diff options
| author | jperkin <jperkin> | 2017-01-04 12:53:49 +0000 |
|---|---|---|
| committer | jperkin <jperkin> | 2017-01-04 12:53:49 +0000 |
| commit | b7307201248aee8ddd65dd175eba8e4580768c13 (patch) | |
| tree | 2cb100f58e581eee3fdd372b002dd1c54bea9fde | |
| parent | 1f8958683921d4a63109b51250b81085084fede7 (diff) | |
| download | pkgsrc-b7307201248aee8ddd65dd175eba8e4580768c13.tar.gz | |
Ensure the local yywrap is used. Fixes the build of devel/rsltc with
newer flex. Bump PKGREVISION.
| -rw-r--r-- | devel/gentle/Makefile | 4 | ||||
| -rw-r--r-- | devel/gentle/distinfo | 4 | ||||
| -rw-r--r-- | devel/gentle/patches/patch-bi | 15 |
3 files changed, 16 insertions, 7 deletions
diff --git a/devel/gentle/Makefile b/devel/gentle/Makefile index 51949ba4511..dc38853acb0 100644 --- a/devel/gentle/Makefile +++ b/devel/gentle/Makefile @@ -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/ diff --git a/devel/gentle/distinfo b/devel/gentle/distinfo index e933877b028..4696dd0bf7d 100644 --- a/devel/gentle/distinfo +++ b/devel/gentle/distinfo @@ -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) = 2c606659ca0f7e44f7939ba15be4c56c995299f2 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 diff --git a/devel/gentle/patches/patch-bi b/devel/gentle/patches/patch-bi index 87975e1761d..27db265dd3d 100644 --- a/devel/gentle/patches/patch-bi +++ b/devel/gentle/patches/patch-bi @@ -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 build. /* ( 1) %{ */ /* ( 2) YYSTYPE block */ +@@ -76,6 +78,7 @@ char *lexfunc[] = { + }; + /* (15) YYWRAP block */ + char *yywrap[] = { ++ "#undef yywrap", + "#ifndef yywrap", + "yywrap() { return 1; }", + "#endif", |