Update to 2.5.36. Add build dependencies on gtexinfo and two tex

packages needed to build pdf documentation, since there is no
configure option to disable it that I can see. If this leads to
problems, we'll have to disable it with a patch.

* version 2.5.36

** various portability fixes that quiet compiler warnings on 64-bit
   hosts

** various manual fixes, including correcting the name of a %option and
   updating some simple examples to use ANSI C syntax

** various bug fixes that prevent certain error conditions from
   persisting when they should not persist

** improvements to the test suite so it behaves better when linking
   compiled files

** new translations from the translation project: ca, da, es, fi, fr,
   ga, ko, pt_br, ro, ru, sv, tr, zh_cn

** the flex distribution is now built with automake 1.10.1 and automake
   2.61

4 files changed, 26 insertions, 17 deletions

diff --git a/devel/flex/Makefile b/devel/flex/Makefile
index 7937e868aca..f271e1ac332 100644
--- a/devel/flex/Makefile
+++ b/devel/flex/Makefile
@@ -1,14 +1,17 @@
-# $NetBSD: Makefile,v 1.34 2012/06/06 13:27:05 obache Exp $
+# $NetBSD: Makefile,v 1.35 2012/07/29 19:42:21 wiz Exp $
 
-DISTNAME=		flex-2.5.35
+DISTNAME=		flex-2.5.36
 CATEGORIES=		lang
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=flex/}
-PKGREVISION=		2
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://flex.sourceforge.net/
 COMMENT=		Fast clone of lex(1), the lexical scanner generator
 
+BUILD_DEPENDS+=		gtexinfo-[0-9]*:../../devel/gtexinfo
+BUILD_DEPENDS+=		tex-tex-[0-9]*:../../print/tex-tex
+BUILD_DEPENDS+=		tex-latex-fonts-[0-9]*:../../fonts/tex-latex-fonts
+
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		YES
@@ -30,8 +33,5 @@ USE_LANGUAGES=		c c++
 USE_TOOLS+=		gmake	# bmake has problems with the test suite
 #.endif
 
-post-install:
-	cd ${DESTDIR:Q}${PREFIX:Q}/bin && ln -s flex flex++
-
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/flex/PLIST b/devel/flex/PLIST
index 5ba7b2f9db4..3831ed30234 100644
--- a/devel/flex/PLIST
+++ b/devel/flex/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2008/02/21 18:26:05 tnn Exp $
+@comment $NetBSD: PLIST,v 1.5 2012/07/29 19:42:21 wiz Exp $
 bin/flex
 bin/flex++
 include/FlexLexer.h
@@ -6,10 +6,19 @@ info/flex.info
 lib/libfl.a
 lib/libfl_pic.a
 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/doc/flex/flex.pdf
 share/locale/ca/LC_MESSAGES/flex.mo
 share/locale/da/LC_MESSAGES/flex.mo
 share/locale/de/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/ko/LC_MESSAGES/flex.mo
diff --git a/devel/flex/distinfo b/devel/flex/distinfo
index d59a8dd27bf..8f94d73bf85 100644
--- a/devel/flex/distinfo
+++ b/devel/flex/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.12 2010/01/31 17:10:08 spz Exp $
+$NetBSD: distinfo,v 1.13 2012/07/29 19:42:21 wiz Exp $
 
-SHA1 (flex-2.5.35.tar.gz) = 333c876a8e24ae5a17d9573459fc501b7721930b
-RMD160 (flex-2.5.35.tar.gz) = 648645f4751ec5029f510730577f5c3e291b7a5e
-Size (flex-2.5.35.tar.gz) = 1456620 bytes
+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 (patch-aa) = 938335a9071be62f534bad8e785003318816fd38
-SHA1 (patch-ab) = 84e8f679973ffa298391bfe20215f5c6878ed65e
+SHA1 (patch-ab) = a459d86dce4f93103efde2dbd353db455b0c5e21
 SHA1 (patch-ac) = 27ac026f8a180b49523933c5d70db0237e8dc095
 SHA1 (patch-ad) = b7fe34269e4425a7b3871278bb6a2b1e754c9045
diff --git a/devel/flex/patches/patch-ab b/devel/flex/patches/patch-ab
index cd81057db18..1393705e032 100644
--- a/devel/flex/patches/patch-ab
+++ b/devel/flex/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.3 2008/02/21 18:57:46 tnn Exp $
+$NetBSD: patch-ab,v 1.4 2012/07/29 19:42:21 wiz Exp $
 
---- Makefile.in.orig	2008-02-21 19:44:15.000000000 +0100
+--- Makefile.in.orig	2012-06-22 21:02:56.000000000 +0000
 +++ Makefile.in
-@@ -124,7 +124,7 @@ am_flex_OBJECTS = ccl.$(OBJEXT) dfa.$(OB
+@@ -138,7 +138,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)
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
- depcomp = $(SHELL) $(top_srcdir)/depcomp
+ flex_DEPENDENCIES = lib/libcompat.a
+ DEFAULT_INCLUDES = -I.@am__isrc@