Update to 2.6.2

[Juraj Lutter <juraj%lutter.sk@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Juraj Lutter <juraj%lutter.sk@localhost>
Pushed By:	otis
Date:		Sun Nov 6 20:18:41 2016 +0000
Changeset:	1253e8ee79328c1fc6006281cf8d9e5895d18cd7

Modified Files:
	flex/Makefile
	flex/PLIST
	flex/distinfo
	flex/patches/patch-tests_Makefile.am
Removed Files:
	flex/patches/patch-src_Makefile.am

Log Message:
Update to 2.6.2

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1253e8ee79328c1fc6006281cf8d9e5895d18cd7

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

diffstat:
 flex/Makefile                        |  2 +-
 flex/PLIST                           |  2 +-
 flex/distinfo                        | 11 +++---
 flex/patches/patch-src_Makefile.am   | 15 --------
 flex/patches/patch-tests_Makefile.am | 66 ++++++++++++++++++++++++++++++++----
 5 files changed, 66 insertions(+), 30 deletions(-)

diffs:
diff --git a/flex/Makefile b/flex/Makefile
index a6ee80e..b9b4ecc 100644
--- a/flex/Makefile
+++ b/flex/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.50 2016/08/11 03:23:44 mef Exp $
 
-VERSION=	2.6.1
+VERSION=	2.6.2
 DISTNAME=	flex-${VERSION}
 CATEGORIES=	devel lang
 MASTER_SITES=	${MASTER_SITE_GITHUB:=westes/}
diff --git a/flex/PLIST b/flex/PLIST
index 11c314f..55eea45 100644
--- a/flex/PLIST
+++ b/flex/PLIST
@@ -10,7 +10,7 @@ share/doc/flex/AUTHORS
 share/doc/flex/COPYING
 share/doc/flex/NEWS
 share/doc/flex/ONEWS
-share/doc/flex/README
+share/doc/flex/README.md
 share/locale/ca/LC_MESSAGES/flex.mo
 share/locale/da/LC_MESSAGES/flex.mo
 share/locale/de/LC_MESSAGES/flex.mo
diff --git a/flex/distinfo b/flex/distinfo
index 19ba6ec..d55b9d3 100644
--- a/flex/distinfo
+++ b/flex/distinfo
@@ -1,8 +1,7 @@
 $NetBSD: distinfo,v 1.23 2016/08/11 03:23:44 mef Exp $
 
-SHA1 (flex-2.6.1.tar.gz) = c99b9217dc13bc78eef3a503fc93608d113ddcad
-RMD160 (flex-2.6.1.tar.gz) = 497c257bff161300e80f0997987d250882db15a4
-SHA512 (flex-2.6.1.tar.gz) = d458822621d47472a9074e03883a9df7f6c329303debc8f03bd98617536e2c7e11afd990386cec9a4e9674cc1fc9bfa4ead45e67b72c680aab3c5626086f4c1c
-Size (flex-2.6.1.tar.gz) = 591026 bytes
-SHA1 (patch-src_Makefile.am) = 42fb784f188d44fe6c6125fd0ae117e3720e0038
-SHA1 (patch-tests_Makefile.am) = 35aeea5d02c8ce021e5d767eb311e40b6a4089a4
+SHA1 (flex-2.6.2.tar.gz) = 55aa44b8a945a51727d0e5ce6e79c58bbe0e3d43
+RMD160 (flex-2.6.2.tar.gz) = f7e1027d664728e1140b3f95a21f18f7e49e202d
+SHA512 (flex-2.6.2.tar.gz) = 4ad798f41c77b51ae0d3f306a90ed21e08ab36a21a9c673d7f7758c4c7013bc93f0cec2c85c31741d314a20971ca13f8542b6d55215be0e53e97fb4a368ac536
+Size (flex-2.6.2.tar.gz) = 440777 bytes
+SHA1 (patch-tests_Makefile.am) = 793dbe7c31554bc7d84d9c57ce99d3590bafc2d5
diff --git a/flex/patches/patch-src_Makefile.am b/flex/patches/patch-src_Makefile.am
deleted file mode 100644
index 88b11ee..0000000
--- a/flex/patches/patch-src_Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_Makefile.am,v 1.2 2016/08/11 03:23:44 mef Exp $
-
-parse.h should be created before main.c is compiled
-
---- src/Makefile.am.orig	2016-03-02 09:24:24.000000000 +0900
-+++ src/Makefile.am	2016-08-11 11:29:09.000000000 +0900
-@@ -103,7 +103,7 @@ gen.o: gen.c flexdef.h flexint.h tables.
- libmain.o: libmain.c
- libyywrap.o: libyywrap.c
- main.o: main.c flexdef.h flexint.h version.h options.h scanopt.h \
-- tables.h tables_shared.h
-+ tables.h tables_shared.h parse.h
- misc.o: misc.c flexdef.h flexint.h tables.h tables_shared.h
- nfa.o: nfa.c flexdef.h flexint.h
- options.o: options.c options.h scanopt.h flexdef.h flexint.h
diff --git a/flex/patches/patch-tests_Makefile.am b/flex/patches/patch-tests_Makefile.am
index 8172e8d..e0c30c7 100644
--- a/flex/patches/patch-tests_Makefile.am
+++ b/flex/patches/patch-tests_Makefile.am
@@ -1,12 +1,9 @@
-$NetBSD: patch-tests_Makefile.am,v 1.1 2016/08/11 03:23:44 mef Exp $
-
 Disable bison tests since we don't want to build with bison
 to avoid a dependency cycle, since bison depends on flex.
 
- bison_yylloc_main.$(OBJEXT): bison_yylloc_parser.h bison_yylloc_scanner.h
---- tests/Makefile.am.orig	2016-03-02 09:24:24.000000000 +0900
-+++ tests/Makefile.am	2016-08-11 12:17:05.000000000 +0900
-@@ -64,9 +64,6 @@ simple_tests = \
+--- tests/Makefile.am.orig	Sun Nov  6 20:09:47 2016
++++ tests/Makefile.am	Sun Nov  6 20:10:43 2016
+@@ -66,9 +66,6 @@
  	array_r \
  	basic_nr \
  	basic_r \
@@ -16,7 +13,17 @@ to avoid a dependency cycle, since bison depends on flex.
  	c_cxx_nr \
  	c_cxx_r \
  	ccl \
-@@ -170,12 +167,6 @@ top_SOURCES = top.l top_main.c
+@@ -127,9 +124,6 @@
+ array_r_SOURCES = array_r.l
+ basic_nr_SOURCES = basic_nr.l
+ basic_r_SOURCES = basic_r.l
+-bison_nr_SOURCES = bison_nr_scanner.l bison_nr_parser.y bison_nr_main.c
+-bison_yylloc_SOURCES = bison_yylloc_scanner.l bison_yylloc_parser.y bison_yylloc_main.c
+-bison_yylval_SOURCES = bison_yylval_scanner.l bison_yylval_parser.y bison_yylval_main.c
+ c_cxx_nr_SOURCES = c_cxx_nr.lll
+ c_cxx_r_SOURCES = c_cxx_r.lll
+ ccl_SOURCES = ccl.l
+@@ -170,12 +164,6 @@
  yyextra_SOURCES = yyextra.l
  
  BUILT_SOURCES = \
@@ -29,3 +36,48 @@ to avoid a dependency cycle, since bison depends on flex.
  	header_nr_scanner.h \
  	header_r_scanner.h \
  	multiple_scanners_nr_1.h \
+@@ -198,18 +186,6 @@
+ 	array_r.c \
+ 	basic_nr.c \
+ 	basic_r.c \
+-	bison_nr_parser.c \
+-	bison_nr_parser.h \
+-	bison_nr_scanner.c \
+-	bison_nr_scanner.h \
+-	bison_yylloc_parser.c \
+-	bison_yylloc_parser.h \
+-	bison_yylloc_scanner.c \
+-	bison_yylloc_scanner.h \
+-	bison_yylval_parser.c \
+-	bison_yylval_parser.h \
+-	bison_yylval_scanner.c \
+-	bison_yylval_scanner.h \
+ 	c_cxx_nr.cc \
+ 	c_cxx_r.cc \
+ 	ccl.c \
+@@ -276,9 +252,6 @@
+ 	array_r.txt \
+ 	basic_nr.txt \
+ 	basic_r.txt \
+-	bison_nr.txt \
+-	bison_yylloc.txt \
+-	bison_yylval.txt \
+ 	c_cxx_nr.txt \
+ 	c_cxx_r.txt \
+ 	ccl.txt \
+@@ -340,15 +313,6 @@
+ .ll.cc: $(FLEX)
+ 	$(FLEX) -+ -o $@ $<
+ 
+-bison_nr_main.($OBJEXT): bison_nr_parser.h bison_nr_scanner.h
+-bison_nr_scanner.h: bison_nr_scanner.c
+-
+-bison_yylloc_main.$(OBJEXT): bison_yylloc_parser.h bison_yylloc_scanner.h
+-bison_yylloc_scanner.h: bison_yylloc_scanner.c
+-
+-bison_yylval_main.$(OBJEXT): bison_yylval_parser.h bison_yylval_scanner.h
+-bison_yylval_scanner.h: bison_yylval_scanner.c
+-
+ # automake does not support compiling flex scanners output in C as C++
+ # so we explicitly sayhow, using the .lll suffix for the lex input file
+