devel/flex updated to 2.6.1

---------------------------
* version 2.6.1 released 2016-03-01

** flex resources

*** The flex project is now hosted at github. Consider this a "period of
    transition". In particular, you should start at
    https://github.com/westes/flex for the flex codebase, issue tracking
    and pull requests.

*** New releases of flex are to be found at
    https://github.com/westes/flex/releases.

** flex internals

*** Flex now uses more modern and more standard names for variable
    types. There's more work to be done on that front yet, though.

*** A number of compiler warnings have been remedied.

*** Line directives should now work as expected and be absent when that is
    expected.

** test suite

*** When running the test suite, c++ files are compiled with the c++ header
    inside the flex distribution, rather than relying on the build system's
    flex header , which might not be installed yet or which might be out of
    date with respect to what flex tests expect.

*** Some portability fixes in the test suite such as opening files for
    reading in binary mode

** Building flex

*** The file src/scan.c asdistributed with flex source is now built with
    the current version of flex. Occasionally this had to be done manually
    to pick up new flex features. It's now just a part of flex's build
    system.

*** The pdf version of the manual is no longer distributed with flex,
    although if you have the texinfo package installed, you can still build
    it.

*** lots of general build system cleanup

*** the build system tries a bit harder to find libtoolize and texi2dvi.

*** When help2man and texi2dvi are missing, the error messages are now much
    more helpful.

** bug fixes

*** resolved github issues #53, #54, #55, #61.

*** Resolved sf bugs #128, #129, #155, #160, #184, #187, #195.

(pkgsrc changes)
- Githubify
- pre-configure: stage set for ./autogen.sh
- Add patch-src_Makefile.am to generate parse.h before main.c is
  compiled (MAKE_JOBS_SAFE = no without this patch)
- Drop (or convert) patches
  patch-src_filter.c -- upstream taken
  patch-src_Makefile.in -- file is gone
  patch-src_Makefile.am  converted to the same name, different purpose
  patch-tests_Makefile.in converted to patch-tests_Makefile.am

- Add BUILD_DEPENDS+= help2man-[0-9]*:../../converters/help2man

8 files changed, 63 insertions, 111 deletions

diff --git a/devel/flex/Makefile b/devel/flex/Makefile
index 7a0c036adfa..c92eb4ce42e 100644
--- a/devel/flex/Makefile
+++ b/devel/flex/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.49 2016/08/11 00:41:54 mef Exp $
+# $NetBSD: Makefile,v 1.50 2016/08/11 03:23:44 mef Exp $
 
-DISTNAME=	flex-2.6.0
+VERSION=	2.6.1
+DISTNAME=	flex-${VERSION}
 CATEGORIES=	devel lang
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=flex/}
-EXTRACT_SUFX=	.tar.xz
+MASTER_SITES=	${MASTER_SITE_GITHUB:=westes/}
+GITHUB_TAG=	v${VERSION}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://github.com/westes/flex
@@ -12,13 +13,15 @@ LICENSE=	2-clause-bsd
 
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		gm4:run
+USE_TOOLS+=		gm4:run	automake autoconf makeinfo gettext
 GNU_CONFIGURE=		yes
 INFO_FILES=		yes
 
 TEST_TARGET=		check
 LIBS.SunOS+=		-lm
 
+BUILD_DEPENDS+=		help2man-[0-9]*:../../converters/help2man
+
 .include "../../mk/bsd.prefs.mk"
 
 CFLAGS.AIX+=		-D_LINUX_SOURCE_COMPAT
@@ -34,5 +37,8 @@ REPLACE_BASH=		tests/testwrapper.sh tests/options.cn
 USE_TOOLS+=		gmake	# bmake has problems with the test suite
 #.endif
 
+pre-configure:
+	(cd ${WRKSRC}; ./autogen.sh)
+
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/flex/PLIST b/devel/flex/PLIST
index d6e98cf1184..11c314f3709 100644
--- a/devel/flex/PLIST
+++ b/devel/flex/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2016/01/07 12:05:30 wiz Exp $
+@comment $NetBSD: PLIST,v 1.10 2016/08/11 03:23:44 mef Exp $
 bin/flex
 bin/flex++
 include/FlexLexer.h
@@ -11,7 +11,6 @@ share/doc/flex/COPYING
 share/doc/flex/NEWS
 share/doc/flex/ONEWS
 share/doc/flex/README
-share/doc/flex/flex.pdf
 share/locale/ca/LC_MESSAGES/flex.mo
 share/locale/da/LC_MESSAGES/flex.mo
 share/locale/de/LC_MESSAGES/flex.mo
diff --git a/devel/flex/distinfo b/devel/flex/distinfo
index b66af86c2e5..19ba6ec01da 100644
--- a/devel/flex/distinfo
+++ b/devel/flex/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.22 2016/01/08 11:59:36 wiz Exp $
+$NetBSD: distinfo,v 1.23 2016/08/11 03:23:44 mef Exp $
 
-SHA1 (flex-2.6.0.tar.xz) = 684c927c9f1b170e9627338de12e99cf2c224b91
-RMD160 (flex-2.6.0.tar.xz) = 07c8ffa268fc4a9a117e9c12736f8b58a583dde8
-SHA512 (flex-2.6.0.tar.xz) = 9cd48aa79ce70814902745d6e67f677bcc67f23dcc46ebb5f2963efac0d8f6f6c10ee87369d2d7557d29e390a3502dd99246db0fd2e096b9e7bb6e16d51d3abe
-Size (flex-2.6.0.tar.xz) = 1369552 bytes
-SHA1 (patch-src_Makefile.am) = b50c07da46385500c1a220967c84bea1027b4081
-SHA1 (patch-src_Makefile.in) = 8d36fbd12918986715c53c772df549a5057325b7
-SHA1 (patch-src_filter.c) = 377be93afefeca93efa1f8eae0407374bd006ab3
-SHA1 (patch-tests_Makefile.in) = cff98017e0cc0046b57d3b50c9d07ca43d7ce4f7
+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
diff --git a/devel/flex/patches/patch-src_Makefile.am b/devel/flex/patches/patch-src_Makefile.am
index f5c60d07cc6..88b11eed14b 100644
--- a/devel/flex/patches/patch-src_Makefile.am
+++ b/devel/flex/patches/patch-src_Makefile.am
@@ -1,25 +1,15 @@
-$NetBSD: patch-src_Makefile.am,v 1.1 2016/01/07 12:05:31 wiz Exp $
+$NetBSD: patch-src_Makefile.am,v 1.2 2016/08/11 03:23:44 mef Exp $
 
-libfl* do not need to be linked against libintl, only the binaries do.
-https://sourceforge.net/p/flex/bugs/198/
+parse.h should be created before main.c is compiled
 
---- src/Makefile.am.orig	2015-11-13 19:32:53.000000000 +0000
-+++ src/Makefile.am
-@@ -1,7 +1,7 @@
- AM_YFLAGS = -d
- localedir = $(datadir)/locale
- AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl
--LIBS = @LIBINTL@ @LIBS@
-+LIBS = @LIBS@
- 
- m4 = @M4@
- 
-@@ -33,7 +33,7 @@ flex_SOURCES = \
- 	filter.c \
- 	regex.c
- 
--LDADD = ../lib/libcompat.la
-+LDADD = ../lib/libcompat.la @LIBINTL@
- 
- libfl_la_SOURCES = \
- 	libmain.c \
+--- 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/devel/flex/patches/patch-src_Makefile.in b/devel/flex/patches/patch-src_Makefile.in
deleted file mode 100644
index e4bcca7e178..00000000000
--- a/devel/flex/patches/patch-src_Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-src_Makefile.in,v 1.1 2016/01/07 12:05:31 wiz Exp $
-
-libfl* do not need to be linked against libintl, only the binaries do.
-https://sourceforge.net/p/flex/bugs/198/
-
---- src/Makefile.in.orig	2015-11-17 16:19:45.000000000 +0000
-+++ src/Makefile.in
-@@ -302,7 +302,7 @@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
- LIBICONV = @LIBICONV@
- LIBINTL = @LIBINTL@
- LIBOBJS = @LIBOBJS@
--LIBS = @LIBINTL@ @LIBS@
-+LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LIPO = @LIPO@
- LN_S = @LN_S@
-@@ -428,7 +428,7 @@ flex_SOURCES = \
- 	filter.c \
- 	regex.c
- 
--LDADD = ../lib/libcompat.la
-+LDADD = ../lib/libcompat.la @LIBINTL@
- libfl_la_SOURCES = \
- 	libmain.c \
- 	libyywrap.c
diff --git a/devel/flex/patches/patch-src_filter.c b/devel/flex/patches/patch-src_filter.c
deleted file mode 100644
index 5656c805686..00000000000
--- a/devel/flex/patches/patch-src_filter.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_filter.c,v 1.1 2016/01/07 12:05:31 wiz Exp $
-
-Improve stdin-to-pipe hack on NetBSD
-https://sourceforge.net/p/flex/bugs/198/
-
---- src/filter.c.orig	2015-11-10 23:10:20.000000000 +0000
-+++ src/filter.c
-@@ -174,6 +174,8 @@ clearerr(stdin);
- 			flexfatal (_("dup2(pipes[0],0)"));
- 		close (pipes[0]);
-         fseek (stdin, 0, SEEK_CUR);
-+        ungetc(' ', stdin); /* still an evil hack, but one that works better */
-+        (void)fgetc(stdin); /* on NetBSD than the fseek attempt does */
- 
- 		/* run as a filter, either internally or by exec */
- 		if (chain->filter_func) {
diff --git a/devel/flex/patches/patch-tests_Makefile.am b/devel/flex/patches/patch-tests_Makefile.am
new file mode 100644
index 00000000000..8172e8d40d9
--- /dev/null
+++ b/devel/flex/patches/patch-tests_Makefile.am
@@ -0,0 +1,31 @@
+$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 = \
+ 	array_r \
+ 	basic_nr \
+ 	basic_r \
+-	bison_nr \
+-	bison_yylloc \
+-	bison_yylval \
+ 	c_cxx_nr \
+ 	c_cxx_r \
+ 	ccl \
+@@ -170,12 +167,6 @@ top_SOURCES = top.l top_main.c
+ yyextra_SOURCES = yyextra.l
+ 
+ BUILT_SOURCES = \
+-	bison_nr_parser.h \
+-	bison_nr_scanner.h \
+-	bison_yylloc_parser.h \
+-	bison_yylloc_scanner.h \
+-	bison_yylval_parser.h \
+-	bison_yylval_scanner.h \
+ 	header_nr_scanner.h \
+ 	header_r_scanner.h \
+ 	multiple_scanners_nr_1.h \
diff --git a/devel/flex/patches/patch-tests_Makefile.in b/devel/flex/patches/patch-tests_Makefile.in
deleted file mode 100644
index d3d43b6dbb3..00000000000
--- a/devel/flex/patches/patch-tests_Makefile.in
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-tests_Makefile.in,v 1.1 2016/01/08 11:59:36 wiz Exp $
-
-Disable bison tests since we don't want to build with bison
-to avoid a dependency cycle, since bison depends on flex.
-
---- tests/Makefile.in.orig	2015-11-17 16:19:46.000000000 +0000
-+++ tests/Makefile.in
-@@ -131,8 +131,8 @@ CONFIG_HEADER = $(top_builddir)/src/conf
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
- am__EXEEXT_1 = alloc_extra$(EXEEXT) array_nr$(EXEEXT) array_r$(EXEEXT) \
--	basic_nr$(EXEEXT) basic_r$(EXEEXT) bison_nr$(EXEEXT) \
--	bison_yylloc$(EXEEXT) bison_yylval$(EXEEXT) c_cxx_nr$(EXEEXT) \
-+	basic_nr$(EXEEXT) basic_r$(EXEEXT) \
-+	c_cxx_nr$(EXEEXT) \
- 	c_cxx_r$(EXEEXT) ccl$(EXEEXT) cxx_basic$(EXEEXT) \
- 	cxx_multiple_scanners$(EXEEXT) debug_nr$(EXEEXT) \
- 	debug_r$(EXEEXT) extended$(EXEEXT) header_nr$(EXEEXT) \
-@@ -1440,12 +1440,6 @@ string_r_SOURCES = string_r.l
- top_SOURCES = top.l top_main.c
- yyextra_SOURCES = yyextra.l
- BUILT_SOURCES = \
--	bison_nr_parser.h \
--	bison_nr_scanner.h \
--	bison_yylloc_parser.h \
--	bison_yylloc_scanner.h \
--	bison_yylval_parser.h \
--	bison_yylval_scanner.h \
- 	header_nr_scanner.h \
- 	header_r_scanner.h \
- 	multiple_scanners_nr_1.h \