Update to 2.5.39:

* flex version  2.5.39

** no user visible changes in this release

* version 2.5.38 released 2014-02-14

** internationalization

*** add sr translation from the translation project

*** update da, es, ko, nl, pt_BR, ro, ru, sv, tr, vi, zh_CN translations from the translation project

*** rename zh_tw to its proper zh_TW name

* version 2.5.37 released 2012-08-03

** Import flex into git. See
   git://flex.git.sourceforge.net/gitroot/flex/flex.

** Fix make install target to not fail when the flex++ program is
   already installed

** New translations from the translation project: de, fi, pl, vi

5 files changed, 31 insertions, 25 deletions

diff --git a/devel/flex/Makefile b/devel/flex/Makefile
index 37c3fe5dd72..b8ee04f6f1d 100644
--- a/devel/flex/Makefile
+++ b/devel/flex/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.38 2012/10/31 11:16:57 asau Exp $
+# $NetBSD: Makefile,v 1.39 2014/04/17 12:41:03 wiz Exp $
 
-DISTNAME=		flex-2.5.36
-PKGREVISION=		1
+DISTNAME=		flex-2.5.39
 CATEGORIES=		lang
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=flex/}
 
@@ -15,13 +14,15 @@ COMMENT=		Fast clone of lex(1), the lexical scanner generator
 #BUILD_DEPENDS+=		tex-pdftex-[0-9]*:../../print/tex-pdftex
 #BUILD_DEPENDS+=		tex-latex-fonts-[0-9]*:../../fonts/tex-latex-fonts
 
-GNU_CONFIGURE=		YES
+GNU_CONFIGURE=		yes
+USE_LIBTOOL=		yes
 USE_TOOLS+=		gm4:run makeinfo
+INFO_FILES=		yes
+USE_PKGLOCALEDIR=	yes
+
 MAKE_JOBS_SAFE=		no
 TEST_TARGET=		check
-INFO_FILES=		yes
 LIBS.SunOS+=		-lm
-USE_PKGLOCALEDIR=	YES
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/devel/flex/PLIST b/devel/flex/PLIST
index e4ef36b3f59..b12891fe8e7 100644
--- a/devel/flex/PLIST
+++ b/devel/flex/PLIST
@@ -1,32 +1,37 @@
-@comment $NetBSD: PLIST,v 1.6 2012/08/01 13:12:36 wiz Exp $
+@comment $NetBSD: PLIST,v 1.7 2014/04/17 12:41:03 wiz Exp $
 bin/flex
 bin/flex++
 include/FlexLexer.h
 info/flex.info
-lib/libfl.a
-lib/libfl_pic.a
+lib/libfl.la
+lib/libfl_pic.la
 man/man1/flex.1
 share/doc/flex/AUTHORS
 share/doc/flex/COPYING
 share/doc/flex/NEWS
 share/doc/flex/ONEWS
 share/doc/flex/README
-share/doc/flex/README.cvs
 share/doc/flex/TODO
 share/locale/ca/LC_MESSAGES/flex.mo
 share/locale/da/LC_MESSAGES/flex.mo
 share/locale/de/LC_MESSAGES/flex.mo
+share/locale/en@boldquot/LC_MESSAGES/flex.mo
+share/locale/en@quot/LC_MESSAGES/flex.mo
+share/locale/eo/LC_MESSAGES/flex.mo
 share/locale/es/LC_MESSAGES/flex.mo
 share/locale/fi/LC_MESSAGES/flex.mo
 share/locale/fr/LC_MESSAGES/flex.mo
 share/locale/ga/LC_MESSAGES/flex.mo
+share/locale/hr/LC_MESSAGES/flex.mo
 share/locale/ko/LC_MESSAGES/flex.mo
 share/locale/nl/LC_MESSAGES/flex.mo
 share/locale/pl/LC_MESSAGES/flex.mo
 share/locale/pt_BR/LC_MESSAGES/flex.mo
 share/locale/ro/LC_MESSAGES/flex.mo
 share/locale/ru/LC_MESSAGES/flex.mo
+share/locale/sr/LC_MESSAGES/flex.mo
 share/locale/sv/LC_MESSAGES/flex.mo
 share/locale/tr/LC_MESSAGES/flex.mo
 share/locale/vi/LC_MESSAGES/flex.mo
 share/locale/zh_CN/LC_MESSAGES/flex.mo
+share/locale/zh_TW/LC_MESSAGES/flex.mo
diff --git a/devel/flex/distinfo b/devel/flex/distinfo
index c52da09ef7a..3a1dd73e058 100644
--- a/devel/flex/distinfo
+++ b/devel/flex/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.14 2012/08/01 13:12:36 wiz Exp $
+$NetBSD: distinfo,v 1.15 2014/04/17 12:41:03 wiz Exp $
 
-SHA1 (flex-2.5.36.tar.gz) = ba0e59cb23bbaf1ef30b3648981981ae3db1a4d2
-RMD160 (flex-2.5.36.tar.gz) = c94b16dd78ba24626f06224b415ca40b52dc8543
-Size (flex-2.5.36.tar.gz) = 1584362 bytes
+SHA1 (flex-2.5.39.tar.gz) = 40866373afd3ab88a7f7fe26c9b27b035aa1f2a9
+RMD160 (flex-2.5.39.tar.gz) = 5c2e3859466cac39da72d2f6e4b23998ba0ecaf6
+Size (flex-2.5.39.tar.gz) = 1916273 bytes
 SHA1 (patch-aa) = 938335a9071be62f534bad8e785003318816fd38
-SHA1 (patch-ab) = a459d86dce4f93103efde2dbd353db455b0c5e21
+SHA1 (patch-ab) = d2fde3befc93337f21965241080b783c9aa75e67
 SHA1 (patch-ac) = 27ac026f8a180b49523933c5d70db0237e8dc095
 SHA1 (patch-ad) = b7fe34269e4425a7b3871278bb6a2b1e754c9045
-SHA1 (patch-doc_Makefile.in) = 553176c39c357173286d0d5d5438c9a3ef240cf3
+SHA1 (patch-doc_Makefile.in) = 358daafc6ab8a9c68f8541c67ae147cfa3b7d5cc
diff --git a/devel/flex/patches/patch-ab b/devel/flex/patches/patch-ab
index 1393705e032..6b58523b7b9 100644
--- a/devel/flex/patches/patch-ab
+++ b/devel/flex/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.4 2012/07/29 19:42:21 wiz Exp $
+$NetBSD: patch-ab,v 1.5 2014/04/17 12:41:04 wiz Exp $
 
---- Makefile.in.orig	2012-06-22 21:02:56.000000000 +0000
+--- Makefile.in.orig	2014-03-26 18:58:57.000000000 +0000
 +++ Makefile.in
-@@ -138,7 +138,7 @@ am_flex_OBJECTS = ccl.$(OBJEXT) dfa.$(OB
+@@ -165,7 +165,7 @@ am_flex_OBJECTS = ccl.$(OBJEXT) dfa.$(OB
  	options.$(OBJEXT) scanopt.$(OBJEXT) buf.$(OBJEXT) \
  	tables.$(OBJEXT) tables_shared.$(OBJEXT) filter.$(OBJEXT) \
  	regex.$(OBJEXT)
 -flex_OBJECTS = $(am_flex_OBJECTS)
 +flex_OBJECTS = $(am_flex_OBJECTS) $(LIBOBJS)
  flex_LDADD = $(LDADD)
- flex_DEPENDENCIES = lib/libcompat.a
+ flex_DEPENDENCIES = lib/libcompat.la
  DEFAULT_INCLUDES = -I.@am__isrc@
diff --git a/devel/flex/patches/patch-doc_Makefile.in b/devel/flex/patches/patch-doc_Makefile.in
index 64203052d0f..624edbaffe2 100644
--- a/devel/flex/patches/patch-doc_Makefile.in
+++ b/devel/flex/patches/patch-doc_Makefile.in
@@ -1,17 +1,17 @@
-$NetBSD: patch-doc_Makefile.in,v 1.1 2012/08/01 13:12:36 wiz Exp $
+$NetBSD: patch-doc_Makefile.in,v 1.2 2014/04/17 12:41:04 wiz Exp $
 
 Do not build and install pdf documentation.
 Too many dependencies for such a low-level package.
 (No configure option available to disable this there.)
 
---- doc/Makefile.in.orig	2012-08-01 13:08:04.000000000 +0000
+--- doc/Makefile.in.orig	2014-03-26 18:58:56.000000000 +0000
 +++ doc/Makefile.in
-@@ -217,7 +217,7 @@ top_srcdir = @top_srcdir@
+@@ -272,7 +272,7 @@ top_srcdir = @top_srcdir@
  help2man = @HELP2MAN@
  info_TEXINFOS = flex.texi
  dist_man_MANS = flex.1
 -dist_doc_DATA = flex.pdf
 +dist_doc_DATA = 
  CLEANFILES = \
- 	flex.hks \
- 	flex.ops
+ 	flex.aux \
+ 	flex.cp \