Updated flex to 2.5.33.

Changes since 2.5.4a (10 years ago) are too many to be listed here.

5 files changed, 21 insertions, 39 deletions

diff --git a/devel/flex/Makefile b/devel/flex/Makefile
index 30e2274dc3a..342326e23ff 100644
--- a/devel/flex/Makefile
+++ b/devel/flex/Makefile
@@ -1,18 +1,27 @@
-# $NetBSD: Makefile,v 1.17 2006/03/04 21:29:15 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2007/01/15 06:14:48 rillig Exp $
 
-DISTNAME=		flex-2.5.4a
+DISTNAME=		flex-2.5.33
 CATEGORIES=		lang
-MASTER_SITES=   	${MASTER_SITE_GNU:=non-gnu/flex/}
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=flex/}
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.gnu.org/software/flex/
 COMMENT=		Fast clone of lex(1), the lexical scanner generator
 
-WRKSRC=			${WRKDIR}/flex-2.5.4
 GNU_CONFIGURE=		YES
-CONFIGURE_HAS_MANDIR=	NO
 USE_TOOLS+=		bison
-
+MAKE_JOBS_SAFE=		no
 TEST_TARGET=		check
+INFO_FILES=		yes
+
+.include "../../mk/bsd.prefs.mk"
+
+.if !empty(PKGSRC_RUN_TEST:M[Yy][Ee][Ss])
+USE_LANGUAGES=		c c++
+USE_TOOLS+=		gmake	# bmake has problems with the test suite
+.endif
+
+post-install:
+	cd ${PREFIX}/bin && ln -s flex flex++
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/flex/PLIST b/devel/flex/PLIST
index 10809a8644c..e09b86a7b53 100644
--- a/devel/flex/PLIST
+++ b/devel/flex/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:23:27 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/01/15 06:14:48 rillig Exp $
 bin/flex
 bin/flex++
 include/FlexLexer.h
+info/flex.info
 lib/libfl.a
 man/man1/flex.1
diff --git a/devel/flex/distinfo b/devel/flex/distinfo
index 897b1ac549b..1427ac2df48 100644
--- a/devel/flex/distinfo
+++ b/devel/flex/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.5 2005/10/04 17:45:22 reed Exp $
+$NetBSD: distinfo,v 1.6 2007/01/15 06:14:48 rillig Exp $
 
-SHA1 (flex-2.5.4a.tar.gz) = 38a5e15c348d2ca7dce94d71de2b51484d23e2ef
-RMD160 (flex-2.5.4a.tar.gz) = 6b8ff62207fd3961ad2544db083cec1e42b8519b
-Size (flex-2.5.4a.tar.gz) = 380995 bytes
-SHA1 (patch-aa) = 2090bae09103fc04672081c855ca8be637f5fe9e
-SHA1 (patch-ab) = 8cb35c1bd8d0510f900c0f3abc31a87dbb50c841
+SHA1 (flex-2.5.33.tar.gz) = 9bf2d66bb2e15c26c466eb88218cca6ad9476805
+RMD160 (flex-2.5.33.tar.gz) = f7a9ce99fc699de6fe3324916ac8154a3654a303
+Size (flex-2.5.33.tar.gz) = 880445 bytes
diff --git a/devel/flex/patches/patch-aa b/devel/flex/patches/patch-aa
deleted file mode 100644
index 37725cc6216..00000000000
--- a/devel/flex/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2003/10/11 12:11:41 grant Exp $
-
---- configure.orig	1995-04-21 06:10:14.000000000 +1000
-+++ configure
-@@ -624,7 +624,7 @@ test -z "$INSTALL_PROGRAM" && INSTALL_PR
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
- 
- echo $ac_n "checking whether ${MAKE-make} sets \$MAKE""... $ac_c" 1>&4
--set dummy ${MAKE-make}; ac_make=$2
-+set dummy `basename ${MAKE-make}`; ac_make=$2
- if eval "test \"`echo '${'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&4
- else
diff --git a/devel/flex/patches/patch-ab b/devel/flex/patches/patch-ab
deleted file mode 100644
index a15f84bcb50..00000000000
--- a/devel/flex/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2005/10/04 17:45:22 reed Exp $
-
---- Makefile.in.orig	1996-09-10 16:59:11.000000000 -0700
-+++ Makefile.in
-@@ -34,7 +34,7 @@ bindir = $(exec_prefix)/bin
- libdir = $(exec_prefix)/lib
- includedir = $(prefix)/include
- manext = 1
--mandir = $(prefix)/man/man$(manext)
-+mandir = $(prefix)/${PKGMANDIR}/man$(manext)
- 
- # You can define these to be "lex" and "libl.a" if you want to replace
- # lex at your site.