From 6bba6c07f73a6e3ca50f248edb769e1f7671dff4 Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Sun, 23 May 2010 11:29:45 +0000
Subject: [PATCH] fix build

---
 x11/tvtwm/patches/patch-Imakefile |  8 ++++----
 x11/tvtwm/patches/patch-gram_y    |  6 +++---
 x11/tvtwm/patches/patch-parse_c   | 19 +++++++++++++++++++
 3 files changed, 26 insertions(+), 7 deletions(-)
 create mode 100644 x11/tvtwm/patches/patch-parse_c

diff --git a/x11/tvtwm/patches/patch-Imakefile b/x11/tvtwm/patches/patch-Imakefile
index 8eae7198efe..8a1f3f28511 100644
--- a/x11/tvtwm/patches/patch-Imakefile
+++ b/x11/tvtwm/patches/patch-Imakefile
@@ -1,7 +1,7 @@
-$OpenBSD: patch-Imakefile,v 1.1 2002/07/18 21:02:02 naddy Exp $
+$OpenBSD: patch-Imakefile,v 1.2 2010/05/23 11:29:45 espie Exp $
 --- Imakefile.orig	Fri Feb  3 01:25:44 1995
-+++ Imakefile	Thu Jul 18 22:15:15 2002
-@@ -25,7 +25,7 @@ XCOMM the maximum level of compatibility
++++ Imakefile	Sat May 22 16:16:03 2010
+@@ -25,7 +25,7 @@ XCOMM the maximum level of compatibility with AT&T lex
  XCOMM will define yylineno.  If you get an "Undefined symbol: _yylineno"
  XCOMM when linking, adjust this to work on your system.
  
@@ -10,7 +10,7 @@ $OpenBSD: patch-Imakefile,v 1.1 2002/07/18 21:02:02 naddy Exp $
  # ifdef LexCmd
  LEX = LexCmd -l
  # else
-@@ -100,7 +100,7 @@ SpecialObjectRule(vdt.o,NullParameter,$(
+@@ -100,7 +100,7 @@ SpecialObjectRule(vdt.o,NullParameter,$(XLOADIM_DEF))
  SpecialObjectRule(LocPixmap.o,NullParameter,'-DBITMAPDIR="$(INCDIR)/bitmaps"')
  SpecialObjectRule(twm.o,NullParameter,$(TWM_DEFS))
  
diff --git a/x11/tvtwm/patches/patch-gram_y b/x11/tvtwm/patches/patch-gram_y
index 2e08ec666fd..d7402059ebf 100644
--- a/x11/tvtwm/patches/patch-gram_y
+++ b/x11/tvtwm/patches/patch-gram_y
@@ -1,7 +1,7 @@
-$OpenBSD: patch-gram_y,v 1.1 2002/07/18 21:02:02 naddy Exp $
+$OpenBSD: patch-gram_y,v 1.2 2010/05/23 11:29:45 espie Exp $
 --- gram.y.orig	Mon Nov 22 21:10:49 1993
-+++ gram.y	Thu Jul 18 22:15:15 2002
-@@ -79,7 +79,7 @@ unsigned int mods_used = (ShiftMask | Co
++++ gram.y	Sat May 22 16:16:03 2010
+@@ -79,7 +79,7 @@ unsigned int mods_used = (ShiftMask | ControlMask | Mo
  extern int do_single_keyword(), do_string_keyword(), do_number_keyword();
  extern name_list **do_colorlist_keyword();
  extern int do_color_keyword(), do_string_savecolor();
diff --git a/x11/tvtwm/patches/patch-parse_c b/x11/tvtwm/patches/patch-parse_c
new file mode 100644
index 00000000000..f6401eba823
--- /dev/null
+++ b/x11/tvtwm/patches/patch-parse_c
@@ -0,0 +1,19 @@
+$OpenBSD: patch-parse_c,v 1.1 2010/05/23 11:29:45 espie Exp $
+--- parse.c.orig	Sun May 23 13:26:33 2010
++++ parse.c	Sun May 23 13:27:06 2010
+@@ -81,6 +81,7 @@ static char **stringListSource, *currentString;
+ static int ParseUsePPosition();
+ static int ParseState();
+ static FILE *start_m4();
++static char *m4_defs(Display *, char *);
+ int m4_pid;
+ 
+ /* If you're using flex (and lex on 386 bsd boxes, which *is* flex, really)
+@@ -1627,7 +1628,6 @@ FILE *fraw;
+ 	if (fres == 0) {
+ 		extern Display *dpy;
+ 		extern char *display_name;
+-		static char *m4_defs();
+ 		char *tmp_file;
+ 
+ 		/* Child */