flex: remove, pkgsrc was updated based on this.

[Thomas Klausner <wiz%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Sun Nov 6 22:35:41 2016 +0100
Changeset:	e096ed8c4d3907943b98aff17bb5d787d6c9b873

Modified Files:
	Makefile
Removed Files:
	flex/DESCR
	flex/Makefile
	flex/PLIST
	flex/TODO
	flex/buildlink3.mk
	flex/distinfo
	flex/patches/patch-tests_Makefile.am

Log Message:
flex: remove, pkgsrc was updated based on this.

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

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

diffstat:
 Makefile                             |  6 ++-
 flex/DESCR                           | 10 -----
 flex/Makefile                        | 46 --------------------
 flex/PLIST                           | 36 ----------------
 flex/TODO                            |  2 -
 flex/buildlink3.mk                   | 14 ------
 flex/distinfo                        |  7 ---
 flex/patches/patch-tests_Makefile.am | 83 ------------------------------------
 8 files changed, 4 insertions(+), 200 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index 402e852..3cbdb94 100644
--- a/Makefile
+++ b/Makefile
@@ -27,8 +27,8 @@ SUBDIR+=	Pythonol
 SUBDIR+=	R-BiocGenerics
 SUBDIR+=	R-C50
 SUBDIR+=	R-MySQL
-SUBDIR+=	R-Rgraphviz
 SUBDIR+=	R-RNetCDF
+SUBDIR+=	R-Rgraphviz
 SUBDIR+=	R-Rserve
 SUBDIR+=	R-VGAM
 SUBDIR+=	R-biganalytics
@@ -192,6 +192,7 @@ SUBDIR+=	bamtools
 SUBDIR+=	banshee
 SUBDIR+=	bareos
 SUBDIR+=	baresip
+SUBDIR+=	barony
 SUBDIR+=	bashdb
 SUBDIR+=	bastard
 SUBDIR+=	beads
@@ -294,6 +295,7 @@ SUBDIR+=	cb2bib
 SUBDIR+=	ccrypt
 SUBDIR+=	cddlib
 SUBDIR+=	cde
+SUBDIR+=	cdirip
 SUBDIR+=	cdogs
 SUBDIR+=	cdpr
 SUBDIR+=	cedet
@@ -732,7 +734,6 @@ SUBDIR+=	firehose
 SUBDIR+=	flam3-svn
 SUBDIR+=	flasm
 SUBDIR+=	flc
-SUBDIR+=	flex
 SUBDIR+=	flexdock
 SUBDIR+=	flexdump
 SUBDIR+=	flightgear
@@ -1055,6 +1056,7 @@ SUBDIR+=	habak
 SUBDIR+=	haddock
 SUBDIR+=	hammer
 SUBDIR+=	hanazono-ttf
+SUBDIR+=	haproxy
 SUBDIR+=	haproxy-devel
 SUBDIR+=	haproxy15
 SUBDIR+=	hasciicam
diff --git a/flex/DESCR b/flex/DESCR
deleted file mode 100644
index 554b10b..0000000
--- a/flex/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
-flex is a tool for generating scanners:  programs which recognized
-lexical patterns in text.  flex reads the given input files, or its
-standard input if no file names are given, for a description of a
-scanner to generate.  The description is in the form of pairs of
-regular expressions and C code, called rules.  flex generates as
-output a C source file, lex.yy.c, which defines a routine yylex().
-This file is compiled and linked with the -lfl library to produce an
-executable.  When the executable is run, it analyzes its input for
-occurrences of the regular expressions.  Whenever it finds one, it
-executes the corresponding C code.
diff --git a/flex/Makefile b/flex/Makefile
deleted file mode 100644
index b9b4ecc..0000000
--- a/flex/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-# $NetBSD: Makefile,v 1.50 2016/08/11 03:23:44 mef Exp $
-
-VERSION=	2.6.2
-DISTNAME=	flex-${VERSION}
-CATEGORIES=	devel lang
-MASTER_SITES=	${MASTER_SITE_GITHUB:=westes/}
-GITHUB_TAG=	v${VERSION}
-
-MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=	https://github.com/westes/flex
-COMMENT=	Fast clone of lex(1), the lexical scanner generator
-LICENSE=	2-clause-bsd
-
-USE_LIBTOOL=		yes
-USE_PKGLOCALEDIR=	yes
-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
-BUILD_DEPENDS+=		bison-[0-9]*:../../devel/bison
-
-.include "../../mk/bsd.prefs.mk"
-
-CFLAGS.AIX+=		-D_LINUX_SOURCE_COMPAT
-
-.if ${OS_VARIANT} == "SCOOSR5"
-LDFLAGS.SCO_SV+=	-lsocket
-.endif
-
-#.if !empty(PKGSRC_RUN_TEST:M[Yy][Ee][Ss])
-USE_LANGUAGES=		c c++
-USE_TOOLS+=		bash:build
-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 "../../devel/gettext-tools/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/flex/PLIST b/flex/PLIST
deleted file mode 100644
index 55eea45..0000000
--- a/flex/PLIST
+++ /dev/null
@@ -1,36 +0,0 @@
-@comment $NetBSD: PLIST,v 1.10 2016/08/11 03:23:44 mef Exp $
-bin/flex
-bin/flex++
-include/FlexLexer.h
-info/flex.info
-lib/libfl.la
-lib/libfl_pic.la
-man/man1/flex.1
-share/doc/flex/AUTHORS
-share/doc/flex/COPYING
-share/doc/flex/NEWS
-share/doc/flex/ONEWS
-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
-share/locale/en@boldquot/LC_MESSAGES/flex.mo
-share/locale/en@quot/LC_MESSAGES/flex.mo
-share/locale/eo/LC_MESSAGES/flex.mo
-share/locale/es/LC_MESSAGES/flex.mo
-share/locale/fi/LC_MESSAGES/flex.mo
-share/locale/fr/LC_MESSAGES/flex.mo
-share/locale/ga/LC_MESSAGES/flex.mo
-share/locale/hr/LC_MESSAGES/flex.mo
-share/locale/ko/LC_MESSAGES/flex.mo
-share/locale/nl/LC_MESSAGES/flex.mo
-share/locale/pl/LC_MESSAGES/flex.mo
-share/locale/pt_BR/LC_MESSAGES/flex.mo
-share/locale/ro/LC_MESSAGES/flex.mo
-share/locale/ru/LC_MESSAGES/flex.mo
-share/locale/sr/LC_MESSAGES/flex.mo
-share/locale/sv/LC_MESSAGES/flex.mo
-share/locale/tr/LC_MESSAGES/flex.mo
-share/locale/vi/LC_MESSAGES/flex.mo
-share/locale/zh_CN/LC_MESSAGES/flex.mo
-share/locale/zh_TW/LC_MESSAGES/flex.mo
diff --git a/flex/TODO b/flex/TODO
deleted file mode 100644
index 8bc2d1d..0000000
--- a/flex/TODO
+++ /dev/null
@@ -1,2 +0,0 @@
-- Bison is required without pre generated files
-  but Bison needs (this) flex, so introducing cyclic dependency
diff --git a/flex/buildlink3.mk b/flex/buildlink3.mk
deleted file mode 100644
index 517bf9c..0000000
--- a/flex/buildlink3.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:13 joerg Exp $
-#
-
-BUILDLINK_TREE+=	flex
-
-.if !defined(FLEX_BUILDLINK3_MK)
-FLEX_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.flex+=	flex>=2.5.4a
-BUILDLINK_PKGSRCDIR.flex?=	../../devel/flex
-BUILDLINK_DEPMETHOD.flex?=	build
-.endif # FLEX_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-flex
diff --git a/flex/distinfo b/flex/distinfo
deleted file mode 100644
index d55b9d3..0000000
--- a/flex/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.23 2016/08/11 03:23:44 mef Exp $
-
-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-tests_Makefile.am b/flex/patches/patch-tests_Makefile.am
deleted file mode 100644
index e0c30c7..0000000
--- a/flex/patches/patch-tests_Makefile.am
+++ /dev/null
@@ -1,83 +0,0 @@
-Disable bison tests since we don't want to build with bison
-to avoid a dependency cycle, since bison depends on flex.
-
---- 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 \
--	bison_nr \
--	bison_yylloc \
--	bison_yylval \
- 	c_cxx_nr \
- 	c_cxx_r \
- 	ccl \
-@@ -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 = \
--	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 \
-@@ -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
-