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

3 files changed, 28 insertions, 4 deletions

diff --git a/devel/flex/Makefile b/devel/flex/Makefile
index f7dae793981..ec18896a6eb 100644
--- a/devel/flex/Makefile
+++ b/devel/flex/Makefile
@@ -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 @@ INFO_FILES=		yes
 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 --git a/devel/flex/distinfo b/devel/flex/distinfo
index 0ae78d33240..c4f1ee02b1f 100644
--- a/devel/flex/distinfo
+++ b/devel/flex/distinfo
@@ -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 --git a/devel/flex/patches/patch-ac b/devel/flex/patches/patch-ac
new file mode 100644
index 00000000000..acb1fa23bee
--- /dev/null
+++ b/devel/flex/patches/patch-ac
@@ -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;