Fix build with newer bison.

2 files changed, 112 insertions, 1 deletions

diff --git a/mail/freepops/distinfo b/mail/freepops/distinfo
index ee18e8ac2d2..a2d91bfa076 100644
--- a/mail/freepops/distinfo
+++ b/mail/freepops/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2012/12/12 12:52:10 wiz Exp $
+$NetBSD: distinfo,v 1.9 2014/02/21 20:26:53 joerg Exp $
 
 SHA1 (freepops-0.2.9.tar.gz) = 30e31a3618d07ec0924e9c1ae06c7acd846a13de
 RMD160 (freepops-0.2.9.tar.gz) = c473bd9a523f7bc30dbcfa30c0f1e58418301d24
@@ -10,4 +10,5 @@ SHA1 (patch-ad) = 90a2313b2e9a3a2321778df515c076e603955502
 SHA1 (patch-ae) = 389693569e978395f2d1e286003ad7d20ce59a14
 SHA1 (patch-af) = b0aabc349df11e73ccbab1943ee2075894c865d4
 SHA1 (patch-ag) = 9c7f944d0f2f5a5303e692844b729e933655f9f4
+SHA1 (patch-modules_src_getdate_getdate-curl-7.11.0.diff) = 02a71389e023f24f55715cf59714e1da9c7dfe57
 SHA1 (patch-modules_src_luacurl_lua-curl-0_3_0_diff) = bbd7c92b25d262f414662b509acbbe8f3f468ffc
diff --git a/mail/freepops/patches/patch-modules_src_getdate_getdate-curl-7.11.0.diff b/mail/freepops/patches/patch-modules_src_getdate_getdate-curl-7.11.0.diff
new file mode 100644
index 00000000000..191725a3afe
--- /dev/null
+++ b/mail/freepops/patches/patch-modules_src_getdate_getdate-curl-7.11.0.diff
@@ -0,0 +1,110 @@
+$NetBSD: patch-modules_src_getdate_getdate-curl-7.11.0.diff,v 1.1 2014/02/21 20:26:53 joerg Exp $
+
+--- modules/src/getdate/getdate-curl-7.11.0.diff.orig	2014-02-21 00:02:59.000000000 +0000
++++ modules/src/getdate/getdate-curl-7.11.0.diff
+@@ -1,6 +1,6 @@
+-diff -ruN getdate-curl-7.11.0/Makefile getdate-curl-7.11.0-new/Makefile
+---- getdate-curl-7.11.0/Makefile	1970-01-01 01:00:00.000000000 +0100
+-+++ getdate-curl-7.11.0-new/Makefile	2004-02-03 18:26:37.000000000 +0100
++diff -ur getdate-curl-7.11.0/Makefile getdate-curl-7.11.0-new/Makefile
++--- getdate-curl-7.11.0/Makefile	2014-02-21 00:01:21.000000000 +0000
+++++ getdate-curl-7.11.0-new/Makefile	2014-02-21 00:01:21.000000000 +0000
+ @@ -0,0 +1,20 @@
+ +include $(CONFIG)
+ +H=@
+@@ -22,10 +22,9 @@ diff -ruN getdate-curl-7.11.0/Makefile g
+ +clean:
+ +	$(H)rm -f *.o
+ +.PHONY:  all
+-+
+-diff -ruN getdate-curl-7.11.0/getdate.h getdate-curl-7.11.0-new/getdate.h
+---- getdate-curl-7.11.0/getdate.h	2004-02-03 18:23:54.000000000 +0100
+-+++ getdate-curl-7.11.0-new/getdate.h	2004-02-03 18:19:13.000000000 +0100
++diff -ur getdate-curl-7.11.0/getdate.h getdate-curl-7.11.0-new/getdate.h
++--- getdate-curl-7.11.0/getdate.h	2004-02-03 17:23:54.000000000 +0000
+++++ getdate-curl-7.11.0-new/getdate.h	2014-02-21 00:01:21.000000000 +0000
+ @@ -7,7 +7,9 @@
+  **  This code is in the public domain and has no copyright.
+  */
+@@ -43,9 +42,9 @@ diff -ruN getdate-curl-7.11.0/getdate.h 
+  
+ -time_t curl_getdate PARAMS ((const char *p, const time_t *now));
+ +time_t gd_getdate PARAMS ((const char *p, const time_t *now));
+-diff -ruN getdate-curl-7.11.0/getdate.y getdate-curl-7.11.0-new/getdate.y
+---- getdate-curl-7.11.0/getdate.y	2004-02-03 18:23:54.000000000 +0100
+-+++ getdate-curl-7.11.0-new/getdate.y	2004-02-03 18:21:42.000000000 +0100
++diff -ur getdate-curl-7.11.0/getdate.y getdate-curl-7.11.0-new/getdate.y
++--- getdate-curl-7.11.0/getdate.y	2004-02-03 17:23:54.000000000 +0000
+++++ getdate-curl-7.11.0-new/getdate.y	2014-02-21 00:02:09.000000000 +0000
+ @@ -11,7 +11,10 @@
+  **  This code is in the public domain and has no copyright.
+  */
+@@ -55,10 +54,10 @@ diff -ruN getdate-curl-7.11.0/getdate.y 
+ +#include "config.h"
+ +#endif
+ +extern void abort(void);
+-
++ 
+  # ifdef HAVE_ALLOCA_H
+  #  include <alloca.h>
+-@@ -113,44 +115,44 @@
++@@ -113,44 +116,44 @@
+     then those parser generators need to be fixed instead of adding those
+     names to this list. */
+  
+@@ -141,7 +140,7 @@ diff -ruN getdate-curl-7.11.0/getdate.y 
+  
+  static int yylex ();
+  static int yyerror ();
+-@@ -178,7 +180,7 @@
++@@ -178,7 +181,7 @@
+  } MERIDIAN;
+  
+  /* parse results and input string */
+@@ -150,7 +149,7 @@ diff -ruN getdate-curl-7.11.0/getdate.y 
+      const char	*yyInput;
+      int		yyDayOrdinal;
+      int		yyDayNumber;
+-@@ -201,14 +203,14 @@
++@@ -201,14 +204,12 @@
+      int		yyRelMonth;
+      int		yyRelSeconds;
+      int		yyRelYear;
+@@ -161,14 +160,25 @@ diff -ruN getdate-curl-7.11.0/getdate.y 
+ -**  in a user defined value (CURL_CONTEXT struct in our case)
+ +**  in a user defined value (GD_CONTEXT struct in our case)
+  */
+- #define YYPARSE_PARAM cookie
+- #define YYLEX_PARAM cookie
++-#define YYPARSE_PARAM cookie
++-#define YYLEX_PARAM cookie
+ -#define context ((CURL_CONTEXT *) cookie)
+ +#define context ((GD_CONTEXT *) cookie)
+  %}
+  
+  /* This grammar has 13 shift/reduce conflicts. */
+-@@ -947,11 +949,11 @@
++@@ -217,7 +218,9 @@
++ /* turn global variables into locals, additionally enable extra arguments
++ ** for yylex (pointer to yylval and user defined value)
++ */
++-%pure_parser
+++%pure-parser
+++%parse-param {GD_CONTEXT *cookie}
+++%lex-param {GD_CONTEXT *cookie}
++ 
++ %union {
++     int			Number;
++@@ -947,11 +950,11 @@
+  }
+  
+  time_t
+@@ -182,7 +192,7 @@ diff -ruN getdate-curl-7.11.0/getdate.y 
+  #ifdef HAVE_LOCALTIME_R
+    struct tm keeptime;
+  #endif
+-@@ -1098,7 +1100,7 @@
++@@ -1098,7 +1101,7 @@
+    buff[MAX_BUFF_LEN] = 0;
+    while (fgets (buff, MAX_BUFF_LEN, stdin) && buff[0])
+      {