Fix build with newer flex.

4 files changed, 49 insertions, 5 deletions

diff --git a/mail/elmo/distinfo b/mail/elmo/distinfo
index a810a7945fc..3b0231b22f6 100644
--- a/mail/elmo/distinfo
+++ b/mail/elmo/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.5 2008/08/31 20:09:12 dholland Exp $
+$NetBSD: distinfo,v 1.6 2011/12/22 04:33:27 dholland Exp $
 
 SHA1 (elmo-1.3.2.tar.gz) = d4e7999ce85c17df082a016fd70ee4978cfe1043
 RMD160 (elmo-1.3.2.tar.gz) = 3db1fafbbe38636459c4b1bbc3dae414e54c92d6
 Size (elmo-1.3.2.tar.gz) = 536768 bytes
-SHA1 (patch-aa) = 8bfed77e5b5bae8c649b7474a3e64a188fb96f75
+SHA1 (patch-aa) = d7596f202bcd3ed1596ea61602aa7b9e3ec7f542
 SHA1 (patch-ab) = 64f3b1e5e913811da210b8df99076ba2dd3fd99c
 SHA1 (patch-ac) = 47287a753a78582c6d241df0af33b4231f658c50
 SHA1 (patch-ad) = 9c22a6eba18694cbbd6c8f51c467c0986a39d4f0
@@ -13,3 +13,5 @@ SHA1 (patch-ag) = 4c6d8cc128265f7c9b5a10cca09f5ab8cd0c2e9a
 SHA1 (patch-ah) = e0607381e57acb0ea8d5939d0ed7ccae08c65ff9
 SHA1 (patch-ai) = 6e96d4bb861ffbec3e7836773133cb1c77e6510e
 SHA1 (patch-aj) = f974c1de88cc3957ce3a255a73ae690dff6cd9f1
+SHA1 (patch-src_compose_l) = f5b3e7aea749935b7992d9a16ec54dcac1ecc7a5
+SHA1 (patch-src_confread_l) = d3096ba3bed7a25cbe71710146975727cc25e13d
diff --git a/mail/elmo/patches/patch-aa b/mail/elmo/patches/patch-aa
index e72ab322f06..1ec07b6fc4e 100644
--- a/mail/elmo/patches/patch-aa
+++ b/mail/elmo/patches/patch-aa
@@ -1,7 +1,19 @@
-$NetBSD: patch-aa,v 1.1 2005/07/16 15:40:56 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2011/12/22 04:33:28 dholland Exp $
 
---- src/mlex.l.orig	Fri Aug 13 13:18:23 2004
+- newer lex does not define YY_PROTO
+- hack around issue with date parsing
+
+--- src/mlex.l.orig	2004-08-13 11:18:23.000000000 +0000
 +++ src/mlex.l
+@@ -66,7 +66,7 @@
+  ****************************************************************************/
+   
+ #define EXECUTE(fun) ((fun) ? fun (), 0 : 0)
+-#define YY_DECL  int mlex_scan YY_PROTO ((void))
++#define YY_DECL  int mlex_scan(void)
+ #define YY_BREAK offset += yyleng; break;
+ 
+ 
 @@ -352,8 +352,14 @@ TEXT_PLAIN_CHARSET [ \t]*text\/plain.*(;
                   * obsolete one first, and check if it was possible to get
                   * the date
@@ -16,5 +28,5 @@ $NetBSD: patch-aa,v 1.1 2005/07/16 15:40:56 wiz Exp $
 -                if (tmp == NULL)
 +                if (tmp == NULL) */
                          tmp = strptime (date, "%d %b %Y %H:%M:%S", &tm);
-
+ 
  #ifdef HAVE_LOCALE_H
diff --git a/mail/elmo/patches/patch-src_compose_l b/mail/elmo/patches/patch-src_compose_l
new file mode 100644
index 00000000000..1fb32722ec2
--- /dev/null
+++ b/mail/elmo/patches/patch-src_compose_l
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_compose_l,v 1.1 2011/12/22 04:33:28 dholland Exp $
+
+- newer lex does not define YY_PROTO
+
+--- src/compose.l~	2004-08-13 11:18:22.000000000 +0000
++++ src/compose.l
+@@ -83,7 +83,7 @@
+ #define PREAMBLE do {if (mail == NULL) return NULL; } while (0)
+ 
+ 
+-#define YY_DECL static void write_mail YY_PROTO ((void)) 
++#define YY_DECL static void write_mail(void)
+ 
+ typedef enum {COMPOSE_NEW, COMPOSE_REPLY, COMPOSE_FWD} compose_act_t;
+ 
diff --git a/mail/elmo/patches/patch-src_confread_l b/mail/elmo/patches/patch-src_confread_l
new file mode 100644
index 00000000000..43c1eedc24e
--- /dev/null
+++ b/mail/elmo/patches/patch-src_confread_l
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_confread_l,v 1.1 2011/12/22 04:33:28 dholland Exp $
+
+- newer lex does not define YY_PROTO
+
+--- src/confread.l~	2004-08-13 11:18:22.000000000 +0000
++++ src/confread.l
+@@ -64,7 +64,7 @@
+ #define FIRST_ALLOC 128
+ #define MAX_DEPTH   10
+ 
+-#define YY_DECL static token_t next_token YY_PROTO ((void))
++#define YY_DECL static token_t next_token(void)
+ 
+         typedef enum token {KW_SET       = 300,
+                             KW_HOOK      = 301,