Skip to content

Commit

Permalink
Updated flex to 2.6.2.
Browse files Browse the repository at this point in the history
Slightly based on wip/flex by Makoto Fujiwara and Juraj Lutter.

* version 2.6.2 released 2016-10-24

** flex internals

*** a segfalt involving yyrestart(NULL) has been fixed

*** flex should now handle quoting when mixed with m4 processing correctly

*** flex handles `[[' and `]]' correctly

*** flex no longer generates non-ANSI code

*** more compilation warnings were squashed in generated scanners

*** prevented a buffer overflow that could occur when input buffers were the exact wrong size

** test suite

*** input filenames on MSWindows are now calculated correctly

*** general code cleanups in a number of tests now make the test suite compile much more cleanly

** build system

*** the xz archive has been replaced with an lzip archive

*** a new option to configure --enable-warnings to encapsulate passing
    of warning-related flags which is useful in testing flex

*** make indent now works for out of source builds

*** Portability warnings when generating Makefile.in files are now suppressed; they were just noise and the use of GNU extensions in Makefile.{am,in,} was intentional and well known.

** bugs

*** resolved gh#67

** new sv translation from the translation project

* 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 TritonDataCenter#53, TritonDataCenter#54, TritonDataCenter#55, TritonDataCenter#61.

*** Resolved sf bugs TritonDataCenter#128, TritonDataCenter#129, TritonDataCenter#155, TritonDataCenter#160, TritonDataCenter#184, TritonDataCenter#187, TritonDataCenter#195.
  • Loading branch information
wiz committed Nov 6, 2016
1 parent f0f9862 commit d030484
Show file tree
Hide file tree
Showing 9 changed files with 382 additions and 92 deletions.
14 changes: 8 additions & 6 deletions devel/flex/Makefile
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
# $NetBSD: Makefile,v 1.51 2016/08/12 10:12:23 mef Exp $
# $NetBSD: Makefile,v 1.52 2016/11/06 21:31:38 wiz Exp $

DISTNAME= flex-2.6.0
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=flex/}
EXTRACT_SUFX= .tar.xz
DISTNAME= flex-2.6.2
CATEGORIES= devel lang
MASTER_SITES= ${MASTER_SITE_GITHUB:=westes/}
GITHUB_RELEASE= v${PKGVERSION_NOREV}

MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= https://github.com/westes/flex
COMMENT= Fast clone of lex(1), the lexical scanner generator
LICENSE= 2-clause-bsd

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

USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
USE_TOOLS+= gm4:run
USE_TOOLS+= gm4:run makeinfo gettext
GNU_CONFIGURE= yes
INFO_FILES= yes

Expand Down
5 changes: 2 additions & 3 deletions devel/flex/PLIST
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.11 2016/08/12 10:12:23 mef Exp $
@comment $NetBSD: PLIST,v 1.12 2016/11/06 21:31:38 wiz Exp $
bin/flex
bin/flex++
include/FlexLexer.h
Expand All @@ -10,8 +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/flex.pdf
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
Expand Down
17 changes: 8 additions & 9 deletions devel/flex/distinfo
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
$NetBSD: distinfo,v 1.24 2016/08/12 10:12:23 mef Exp $
$NetBSD: distinfo,v 1.25 2016/11/06 21:31:38 wiz 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.2.tar.gz) = 9eab5eddb6efb34d420b3162fd619a01940b9438
RMD160 (flex-2.6.2.tar.gz) = f58dca039f2b77b9477e45ac92a57804a6458f13
SHA512 (flex-2.6.2.tar.gz) = 481fe3f1c370fe04d5a605a826c53dd0afa5b6ea655f0d14fa9bb9cb498c016f68cef8fea806458f07baa7ae5bc1ac729be427cb4e0cc39ce744a809ef6442b3
Size (flex-2.6.2.tar.gz) = 1402237 bytes
SHA1 (patch-configure) = 8eeb54c913794d9489b6e2a6d9ae9ce2d32fb7f1
SHA1 (patch-tests_Makefile.am) = f30524f9b8c22a37cb04b4406ec142ea1ecb8e59
SHA1 (patch-tests_Makefile.in) = 709d5f117418bbcbcc54926f582bc808daf12f3b
15 changes: 15 additions & 0 deletions devel/flex/patches/patch-configure
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
$NetBSD: patch-configure,v 1.1 2016/11/06 21:31:38 wiz Exp $

Fix unportable test(1) operator.

--- configure.orig 2016-11-06 21:14:32.894863747 +0000
+++ configure
@@ -18200,7 +18200,7 @@ done

# Check whether --enable-warnings was given.
if test "${enable_warnings+set}" = set; then :
- enableval=$enable_warnings; if test "x$GCC" == xyes; then :
+ enableval=$enable_warnings; if test "x$GCC" = xyes; then :
: ${WARNINGFLAGS="-Wall -Wextra -Wmissing-prototypes -Wstrict-prototypes -Wnested-externs -Wold-style-definition -Wredundant-decls -Wconversion -Wno-unused-but-set-variable"}
fi
fi
25 changes: 0 additions & 25 deletions devel/flex/patches/patch-src_Makefile.am

This file was deleted.

25 changes: 0 additions & 25 deletions devel/flex/patches/patch-src_Makefile.in

This file was deleted.

16 changes: 0 additions & 16 deletions devel/flex/patches/patch-src_filter.c

This file was deleted.

86 changes: 86 additions & 0 deletions devel/flex/patches/patch-tests_Makefile.am
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
$NetBSD: patch-tests_Makefile.am,v 1.3 2016/11/06 21:31:38 wiz Exp $

Disable bison tests since we don't want to build with bison
to avoid a dependency cycle, since bison depends on flex.
https://github.com/westes/flex/issues/49

--- 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

Loading

0 comments on commit d030484

Please sign in to comment.