[pkgsrc/trunk]: pkgsrc/devel/flex - add a patch from debian that fixes a pars...

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5aca5df058ed
branches:  trunk
changeset: 538995:5aca5df058ed
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Fri Feb 22 22:13:33 2008 +0000

description:
- add a patch from debian that fixes a parser bug
- do a "two stage" bootstrap: build flex, then regenerate the scanner and
  rebuild flex.
- This should fix PR pkg/38084
- bump PKGREVISION.

diffstat:

 devel/flex/Makefile         |  14 +++++++++++---
 devel/flex/distinfo         |   3 ++-
 devel/flex/patches/patch-ac |  15 +++++++++++++++
 3 files changed, 28 insertions(+), 4 deletions(-)

diffs (66 lines):

diff -r 09b13f5189f3 -r 5aca5df058ed devel/flex/Makefile
--- a/devel/flex/Makefile       Fri Feb 22 21:58:16 2008 +0000
+++ b/devel/flex/Makefile       Fri Feb 22 22:13:33 2008 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2008/02/21 18:26:05 tnn Exp $
+# $NetBSD: Makefile,v 1.28 2008/02/22 22:13:33 tnn Exp $
 
 DISTNAME=              flex-2.5.34
+PKGREVISION=           1
 CATEGORIES=            lang
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=flex/}
 
@@ -18,12 +19,19 @@
 LIBS.SunOS+=           -lm
 USE_PKGLOCALEDIR=      YES
 
+do-build:
+       ${RUN} cd ${WRKSRC} && ${BUILD_MAKE_CMD} ${BUILD_TARGET}
+       @${STEP_MSG} "Regenerating the scanner"
+       ${RUN} cd ${WRKSRC} && ./flex -o scan.c scan.l
+       @${STEP_MSG} "Rebuilding flex"
+       ${RUN} cd ${WRKSRC} && ${BUILD_MAKE_CMD} ${BUILD_TARGET}
+
 .include "../../mk/bsd.prefs.mk"
 
-.if !empty(PKGSRC_RUN_TEST:M[Yy][Ee][Ss])
+#.if !empty(PKGSRC_RUN_TEST:M[Yy][Ee][Ss])
 USE_LANGUAGES=         c c++
 USE_TOOLS+=            gmake   # bmake has problems with the test suite
-.endif
+#.endif
 
 post-install:
        cd ${DESTDIR:Q}${PREFIX:Q}/bin && ln -s flex flex++
diff -r 09b13f5189f3 -r 5aca5df058ed devel/flex/distinfo
--- a/devel/flex/distinfo       Fri Feb 22 21:58:16 2008 +0000
+++ b/devel/flex/distinfo       Fri Feb 22 22:13:33 2008 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.8 2008/02/21 18:57:46 tnn Exp $
+$NetBSD: distinfo,v 1.9 2008/02/22 22:13:33 tnn Exp $
 
 SHA1 (flex-2.5.34.tar.gz) = b82c6baaeebf0ec84504e5b16751930ae06583e6
 RMD160 (flex-2.5.34.tar.gz) = eecc06d453fc450c400beb4e72b50b3251e80b68
 Size (flex-2.5.34.tar.gz) = 1453805 bytes
 SHA1 (patch-aa) = 938335a9071be62f534bad8e785003318816fd38
 SHA1 (patch-ab) = 84e8f679973ffa298391bfe20215f5c6878ed65e
+SHA1 (patch-ac) = c38998d345d98c1c367eddaa5c9f9dbae95975ae
diff -r 09b13f5189f3 -r 5aca5df058ed devel/flex/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/flex/patches/patch-ac       Fri Feb 22 22:13:33 2008 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.1 2008/02/22 22:13:33 tnn Exp $
+
+--- parse.y.orig       2007-09-10 08:16:34.000000000 +0200
++++ parse.y
+@@ -856,8 +856,8 @@ ccl                :  ccl CHAR '-' CHAR
+ 
+             /* Do it again for upper/lowercase */
+             if (sf_case_ins() && has_case($2)){
+-                $1 = reverse_case ($2);
+-                ccladd ($1, reverse_case ($2));
++                $2 = reverse_case ($2);
++                ccladd ($1, $2);
+ 
+                 cclsorted = cclsorted && ($2 > lastchar);
+                 lastchar = $2;