Wed Jan 4 12:53:49 2017 UTC ()
Ensure the local yywrap is used.  Fixes the build of devel/rsltc with
newer flex.  Bump PKGREVISION.


(jperkin)
diff -r1.13 -r1.14 pkgsrc/devel/gentle/Makefile
diff -r1.6 -r1.7 pkgsrc/devel/gentle/distinfo
diff -r1.1 -r1.2 pkgsrc/devel/gentle/patches/patch-bi
cvs diff -r1.13 -r1.14 pkgsrc/devel/gentle/Makefile (switch to unified diff)

--- pkgsrc/devel/gentle/Makefile 2015/02/23 18:21:09 1.13
+++ pkgsrc/devel/gentle/Makefile 2017/01/04 12:53:49 1.14
@@ -1,52 +1,52 @@ @@ -1,52 +1,52 @@
1# $NetBSD: Makefile,v 1.13 2015/02/23 18:21:09 joerg Exp $ 1# $NetBSD: Makefile,v 1.14 2017/01/04 12:53:49 jperkin Exp $
2# 2#
3 3
4DISTNAME= gentle-97 4DISTNAME= gentle-97
5PKGREVISION= 3 5PKGREVISION= 4
6CATEGORIES= devel 6CATEGORIES= devel
7MASTER_SITES= http://gentle.compilertools.net/ 7MASTER_SITES= http://gentle.compilertools.net/
8 8
9MAINTAINER= MarkoSchuetz@web.de 9MAINTAINER= MarkoSchuetz@web.de
10HOMEPAGE= http://gentle.compilertools.net/ 10HOMEPAGE= http://gentle.compilertools.net/
11COMMENT= Gentle Compiler Construction System 11COMMENT= Gentle Compiler Construction System
12 12
13BROKEN_ON_PLATFORM= ${LP64PLATFORMS} 13BROKEN_ON_PLATFORM= ${LP64PLATFORMS}
14 14
15USE_LIBTOOL= yes 15USE_LIBTOOL= yes
16INSTALLATION_DIRS= bin lib share/doc/gentle/html share/examples/gentle 16INSTALLATION_DIRS= bin lib share/doc/gentle/html share/examples/gentle
17 17
18.include "../../mk/compiler.mk" 18.include "../../mk/compiler.mk"
19.if !empty(PKGSRC_COMPILER:Mclang) 19.if !empty(PKGSRC_COMPILER:Mclang)
20CFLAGS+= -Wno-error=return-type 20CFLAGS+= -Wno-error=return-type
21.endif 21.endif
22 22
23do-build: 23do-build:
24 (cd ${WRKSRC}/gentle && LIBTOOL=${LIBTOOL:Q} CC=${CC:Q} CFLAGS=${CFLAGS:Q} ./build) 24 (cd ${WRKSRC}/gentle && LIBTOOL=${LIBTOOL:Q} CC=${CC:Q} CFLAGS=${CFLAGS:Q} ./build)
25 (cd ${WRKSRC}/lib && LIBTOOL=${LIBTOOL:Q} CC=${CC:Q} CFLAGS=${CFLAGS:Q} ./build) 25 (cd ${WRKSRC}/lib && LIBTOOL=${LIBTOOL:Q} CC=${CC:Q} CFLAGS=${CFLAGS:Q} ./build)
26 (cd ${WRKSRC}/reflex && LIBTOOL=${LIBTOOL:Q} CC=${CC:Q} CFLAGS=${CFLAGS:Q} ./build) 26 (cd ${WRKSRC}/reflex && LIBTOOL=${LIBTOOL:Q} CC=${CC:Q} CFLAGS=${CFLAGS:Q} ./build)
27 27
28do-install: 28do-install:
29 ${INSTALL_PROGRAM} ${WRKSRC}/gentle/gentle ${DESTDIR}${PREFIX}/bin 29 ${INSTALL_PROGRAM} ${WRKSRC}/gentle/gentle ${DESTDIR}${PREFIX}/bin
30 ${INSTALL_LIB} ${WRKSRC}/gentle/grts.o ${DESTDIR}${PREFIX}/lib 30 ${INSTALL_LIB} ${WRKSRC}/gentle/grts.o ${DESTDIR}${PREFIX}/lib
31 ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/lib/libgentle.la \ 31 ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/lib/libgentle.la \
32 ${DESTDIR}${PREFIX}/lib 32 ${DESTDIR}${PREFIX}/lib
33 ${LIBTOOL} --mode=finish ${DESTDIR}${PREFIX}/lib 33 ${LIBTOOL} --mode=finish ${DESTDIR}${PREFIX}/lib
34 ${INSTALL_PROGRAM} ${WRKSRC}/reflex/reflex ${DESTDIR}${PREFIX}/bin 34 ${INSTALL_PROGRAM} ${WRKSRC}/reflex/reflex ${DESTDIR}${PREFIX}/bin
35 set -e; for i in ${WRKSRC}/html/* ; do \ 35 set -e; for i in ${WRKSRC}/html/* ; do \
36 ${INSTALL_DATA} "$$i" \ 36 ${INSTALL_DATA} "$$i" \
37 ${DESTDIR}${PREFIX}/share/doc/gentle/html ; \ 37 ${DESTDIR}${PREFIX}/share/doc/gentle/html ; \
38 done 38 done
39 ${INSTALL_DATA} ${WRKSRC}/BOOK.html \ 39 ${INSTALL_DATA} ${WRKSRC}/BOOK.html \
40 ${DESTDIR}${PREFIX}/share/doc/gentle 40 ${DESTDIR}${PREFIX}/share/doc/gentle
41 ${INSTALL_DATA} ${WRKSRC}/BOOK.ps ${DESTDIR}${PREFIX}/share/doc/gentle 41 ${INSTALL_DATA} ${WRKSRC}/BOOK.ps ${DESTDIR}${PREFIX}/share/doc/gentle
42.for i in calc flat micro nested polish virtual 42.for i in calc flat micro nested polish virtual
43 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/gentle/${i} 43 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/gentle/${i}
44 set -e; for j in ${WRKSRC}/examples/${i}/* ; do \ 44 set -e; for j in ${WRKSRC}/examples/${i}/* ; do \
45 ${INSTALL_DATA} "$$j" \ 45 ${INSTALL_DATA} "$$j" \
46 ${DESTDIR}${PREFIX}/share/examples/gentle/${i} ; \ 46 ${DESTDIR}${PREFIX}/share/examples/gentle/${i} ; \
47 done 47 done
48.endfor 48.endfor
49 ${INSTALL_DATA} ${WRKSRC}/examples/README \ 49 ${INSTALL_DATA} ${WRKSRC}/examples/README \
50 ${DESTDIR}${PREFIX}/share/examples/gentle 50 ${DESTDIR}${PREFIX}/share/examples/gentle
51 51
52.include "../../mk/bsd.pkg.mk" 52.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/devel/gentle/distinfo (switch to unified diff)

--- pkgsrc/devel/gentle/distinfo 2015/11/03 03:27:27 1.6
+++ pkgsrc/devel/gentle/distinfo 2017/01/04 12:53:49 1.7
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1$NetBSD: distinfo,v 1.6 2015/11/03 03:27:27 agc Exp $ 1$NetBSD: distinfo,v 1.7 2017/01/04 12:53:49 jperkin Exp $
2 2
3SHA1 (gentle-97.tar.gz) = 1cbf70aa6c470346630c407f89878a5f3c0c4406 3SHA1 (gentle-97.tar.gz) = 1cbf70aa6c470346630c407f89878a5f3c0c4406
4RMD160 (gentle-97.tar.gz) = 96cbfca6909f23fa192514eaba0f0fffcfac2d40 4RMD160 (gentle-97.tar.gz) = 96cbfca6909f23fa192514eaba0f0fffcfac2d40
5SHA512 (gentle-97.tar.gz) = 41fa95e53261430b456298002000b05a9b26593fa32792e1d382eeac8431babb583dcd9442ed09181ccfcb0ee8c62c9ed3b0e61ca035651c5ba0f34787e65d23 5SHA512 (gentle-97.tar.gz) = 41fa95e53261430b456298002000b05a9b26593fa32792e1d382eeac8431babb583dcd9442ed09181ccfcb0ee8c62c9ed3b0e61ca035651c5ba0f34787e65d23
6Size (gentle-97.tar.gz) = 453860 bytes 6Size (gentle-97.tar.gz) = 453860 bytes
7SHA1 (patch-aa) = 4b76e24c516ea96214e749758ff4093c0f464ecc 7SHA1 (patch-aa) = 4b76e24c516ea96214e749758ff4093c0f464ecc
8SHA1 (patch-ab) = a97340016a76e2e5a90aca7f2c1b644125ac9af5 8SHA1 (patch-ab) = a97340016a76e2e5a90aca7f2c1b644125ac9af5
9SHA1 (patch-ba) = 2189027d7dd50604623d8b741de96a6920542efc 9SHA1 (patch-ba) = 2189027d7dd50604623d8b741de96a6920542efc
10SHA1 (patch-bb) = c0fe7c3f4171904848043ea7ec62c8e2c87b4197 10SHA1 (patch-bb) = c0fe7c3f4171904848043ea7ec62c8e2c87b4197
11SHA1 (patch-bc) = 0281d99d868c6e55eca3357819bd4f8d41297fd3 11SHA1 (patch-bc) = 0281d99d868c6e55eca3357819bd4f8d41297fd3
12SHA1 (patch-bd) = 1cc0893b963a8d8e70464d3186e670bd20918bf9 12SHA1 (patch-bd) = 1cc0893b963a8d8e70464d3186e670bd20918bf9
13SHA1 (patch-be) = 2c606659ca0f7e44f7939ba15be4c56c995299f2 13SHA1 (patch-be) = 2c606659ca0f7e44f7939ba15be4c56c995299f2
14SHA1 (patch-bf) = 6517ef2f65a802fff764965dc3a50bf5ce34fb2c 14SHA1 (patch-bf) = 6517ef2f65a802fff764965dc3a50bf5ce34fb2c
15SHA1 (patch-bg) = 46ad7192e8a766f8d98d1588a0e72873586bb82a 15SHA1 (patch-bg) = 46ad7192e8a766f8d98d1588a0e72873586bb82a
16SHA1 (patch-bh) = d6f4b4f6a5c3c8a5d90ae3515209598e851ec0ed 16SHA1 (patch-bh) = d6f4b4f6a5c3c8a5d90ae3515209598e851ec0ed
17SHA1 (patch-bi) = 7ae860cb89585fcb6223beee5bd6e7def405f69e 17SHA1 (patch-bi) = d5677a882bc25d2f0a3f7f398af8864a4c2062dd
18SHA1 (patch-gentle_build) = 17134abe5b892f649ebc7dd9a7b46f3eff9b6896 18SHA1 (patch-gentle_build) = 17134abe5b892f649ebc7dd9a7b46f3eff9b6896
19SHA1 (patch-reflex_build) = d473baf5f91d762457826e7f4d297d6b95750f87 19SHA1 (patch-reflex_build) = d473baf5f91d762457826e7f4d297d6b95750f87
cvs diff -r1.1 -r1.2 pkgsrc/devel/gentle/patches/patch-bi (switch to unified diff)

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