# HG changeset patch
# User Rich Burridge <rich.burridge@oracle.com>
# Date 1493738762 25200
# Node ID 80539200ddb3fb55516bac32b39fa9139e94f0b0
# Parent  562e5fc8e2ae535804dbc1298a9a66297027aa53
25788891 Update flex to version 2.6.3

diff -r 562e5fc8e2ae -r 80539200ddb3 components/flex/Makefile
--- a/components/flex/Makefile	Mon May 01 16:02:10 2017 -0700
+++ b/components/flex/Makefile	Tue May 02 08:26:02 2017 -0700
@@ -26,15 +26,15 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		flex
-COMPONENT_VERSION=	2.6.1
+COMPONENT_VERSION=	2.6.3
 COMPONENT_PROJECT_URL=	https://github.com/westes/flex
 COMPONENT_ARCHIVE=	v$(COMPONENT_VERSION).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:b38b05d1383100f74fcffb335cee38b5e588f8525fa08ac54c12acadd7897987
+    sha256:f3b833f377a160b1a9229a465f2ec2ba6710028832c56d2139ee3a1cb98405fb
 COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)/archive/$(COMPONENT_ARCHIVE)
 COMPONENT_ANITYA_ID=	819
 
-TPNO=			28921
+TPNO=			34479
 
 LDFLAGS += $(CC_BITS)
 
diff -r 562e5fc8e2ae -r 80539200ddb3 components/flex/flexruntime.p5m
--- a/components/flex/flexruntime.p5m	Mon May 01 16:02:10 2017 -0700
+++ b/components/flex/flexruntime.p5m	Tue May 02 08:26:02 2017 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
@@ -36,14 +36,8 @@
 link path=usr/lib/$(MACH64)/libfl.so.1 target=libfl.so.2.0.0
 link path=usr/lib/$(MACH64)/libfl.so.2 target=libfl.so.2.0.0
 file path=usr/lib/$(MACH64)/libfl.so.2.0.0
-link path=usr/lib/$(MACH64)/libfl_pic.so target=libfl_pic.so.2.0.0
-link path=usr/lib/$(MACH64)/libfl_pic.so.2 target=libfl_pic.so.2.0.0
-file path=usr/lib/$(MACH64)/libfl_pic.so.2.0.0
 link path=usr/lib/libfl.so target=libfl.so.2.0.0
 link path=usr/lib/libfl.so.1 target=libfl.so.2.0.0
 link path=usr/lib/libfl.so.2 target=libfl.so.2.0.0
 file path=usr/lib/libfl.so.2.0.0
-link path=usr/lib/libfl_pic.so target=libfl_pic.so.2.0.0
-link path=usr/lib/libfl_pic.so.2 target=libfl_pic.so.2.0.0
-file path=usr/lib/libfl_pic.so.2.0.0
 license COPYING license=BSD
diff -r 562e5fc8e2ae -r 80539200ddb3 components/flex/patches/solaris-port-fixups.patch
--- a/components/flex/patches/solaris-port-fixups.patch	Mon May 01 16:02:10 2017 -0700
+++ b/components/flex/patches/solaris-port-fixups.patch	Tue May 02 08:26:02 2017 -0700
@@ -1,35 +1,10 @@
-Copy the scan.l file to the build directory so that the .c file can be
-successfully generated.
-
-Run help2man on the flex file in the build directory to generate the man page.
-
 Make sure that we always use /usr/gnu/bin/m4 rather than what is available
 via the M4 environment variable or what's in the PATH environment variable.
 
-These changes have been sent upstream. See email thread starting at:
+This change has been sent upstream. See email thread starting at:
 
   https://sourceforge.net/p/flex/mailman/message/35103749/
 
---- flex-2.6.1/src/Makefile.am.orig	2016-05-19 06:21:16.631609293 -0700
-+++ flex-2.6.1/src/Makefile.am	2016-05-19 14:19:29.394717203 -0700
-@@ -87,7 +87,7 @@
- 	mv skel.c.tmp $(srcdir)/skel.c
- 
- stage1scan.l: scan.l
--	cp $(srcdir)/scan.l $(srcdir)/stage1scan.l
-+	cp $(srcdir)/scan.l $(top_builddir)/src/stage1scan.l
- 
- stage1scan.c: stage1scan.l stage1flex$(EXEEXT)
- 	$(top_builddir)/src/stage1flex$(EXEEXT) -o $@ $<
---- flex-2.6.1/doc/Makefile.am.orig	2016-05-19 06:45:26.670565152 -0700
-+++ flex-2.6.1/doc/Makefile.am	2016-05-19 06:45:45.734263762 -0700
-@@ -26,5 +26,5 @@
- 	for i in $(dist_man_MANS) ; do \
- 	$(help2man) --name='$(PACKAGE_NAME)' \
- 	--section=`echo $$i | sed -e 's/.*\.\([^.]*\)$$/\1/'` \
--	 $(top_srcdir)/src/flex$(EXEEXT) > $$i || rm -f $$i ; \
-+	 $(top_builddir)/src/flex$(EXEEXT) > $$i || rm -f $$i ; \
- 	done
 --- flex-2.6.1/src/main.c.orig	2016-05-19 14:36:18.569346881 -0700
 +++ flex-2.6.1/src/main.c	2016-05-20 07:59:04.169569771 -0700
 @@ -348,6 +348,7 @@
diff -r 562e5fc8e2ae -r 80539200ddb3 components/flex/test/results-all.master
--- a/components/flex/test/results-all.master	Mon May 01 16:02:10 2017 -0700
+++ b/components/flex/test/results-all.master	Tue May 02 08:26:02 2017 -0700
@@ -11,6 +11,7 @@
 PASS: ccl
 PASS: cxx_basic
 PASS: cxx_multiple_scanners
+PASS: cxx_restart
 PASS: debug_nr
 PASS: debug_r
 PASS: extended
@@ -20,12 +21,11 @@
 PASS: mem_r
 PASS: multiple_scanners_nr
 PASS: multiple_scanners_r
-PASS: noansi_nr
-PASS: noansi_r
 PASS: posix
 PASS: posixly_correct
 PASS: prefix_nr
 PASS: prefix_r
+PASS: quote_in_comment
 PASS: quotes
 PASS: string_nr
 PASS: string_r