From ea9d815aa34c3de8712fdaf258e3d38df53cb347 Mon Sep 17 00:00:00 2001
From: naddy <naddy@openbsd.org>
Date: Wed, 28 Jan 2004 20:58:53 +0000
Subject: [PATCH] regen patches

---
 x11/olvwm/patches/patch-21                    |  5 --
 x11/olvwm/patches/patch-26                    | 11 -----
 x11/olvwm/patches/patch-30                    | 11 -----
 x11/olvwm/patches/patch-32                    | 11 -----
 x11/olvwm/patches/{patch-01 => patch-CHANGES} |  5 +-
 .../patches/{patch-02 => patch-Imakefile}     | 11 +++--
 .../patches/{patch-03 => patch-LEGAL_NOTICE}  |  5 +-
 .../patches/{patch-04 => patch-Makefile}      |  7 +--
 .../{patch-05 => patch-Makefile_sunpro}       |  9 ++--
 x11/olvwm/patches/{patch-06 => patch-atom_c}  |  9 ++--
 .../patches/{patch-07 => patch-cursors_c}     |  7 +--
 .../patches/{patch-08 => patch-defaults_c}    |  7 +--
 x11/olvwm/patches/{patch-09 => patch-error_c} |  7 +--
 .../patches/{patch-10 => patch-error_c_rej}   |  5 +-
 .../patches/{patch-11 => patch-evbind_c}      |  7 +--
 x11/olvwm/patches/{patch-12 => patch-gif_c}   |  9 ++--
 .../patches/{patch-13 => patch-images_c}      | 49 ++++++++++---------
 x11/olvwm/patches/{patch-14 => patch-mem_c}   | 13 ++---
 x11/olvwm/patches/{patch-15 => patch-menu_c}  |  7 +--
 x11/olvwm/patches/{patch-16 => patch-menu_h}  |  7 +--
 .../patches/{patch-17 => patch-moveresize_c}  |  9 ++--
 .../patches/{patch-18 => patch-olvwm_info}    |  5 +-
 .../patches/{patch-19 => patch-olvwmrc_y}     | 17 ++++---
 x11/olvwm/patches/{patch-20 => patch-olwm_c}  |  9 ++--
 x11/olvwm/patches/patch-patchlevel_h          |  6 +++
 .../patches/{patch-22 => patch-pixmap_c}      |  7 +--
 .../patches/{patch-23 => patch-properties_c}  |  9 ++--
 .../patches/{patch-24 => patch-resources_c}   | 11 +++--
 .../patches/{patch-25 => patch-screen_c}      |  7 +--
 x11/olvwm/patches/patch-st_c                  | 12 +++++
 .../patches/{patch-27 => patch-states_c}      |  9 ++--
 .../patches/{patch-28 => patch-usermenu_c}    |  7 +--
 .../patches/{patch-29 => patch-virtual_c}     |  9 ++--
 x11/olvwm/patches/patch-winframe_c            | 12 +++++
 .../patches/{patch-31 => patch-winicon_c}     |  5 +-
 x11/olvwm/patches/patch-winipane_c            | 12 +++++
 36 files changed, 190 insertions(+), 158 deletions(-)
 delete mode 100644 x11/olvwm/patches/patch-21
 delete mode 100644 x11/olvwm/patches/patch-26
 delete mode 100644 x11/olvwm/patches/patch-30
 delete mode 100644 x11/olvwm/patches/patch-32
 rename x11/olvwm/patches/{patch-01 => patch-CHANGES} (86%)
 rename x11/olvwm/patches/{patch-02 => patch-Imakefile} (79%)
 rename x11/olvwm/patches/{patch-03 => patch-LEGAL_NOTICE} (94%)
 rename x11/olvwm/patches/{patch-04 => patch-Makefile} (99%)
 rename x11/olvwm/patches/{patch-05 => patch-Makefile_sunpro} (74%)
 rename x11/olvwm/patches/{patch-06 => patch-atom_c} (72%)
 rename x11/olvwm/patches/{patch-07 => patch-cursors_c} (67%)
 rename x11/olvwm/patches/{patch-08 => patch-defaults_c} (61%)
 rename x11/olvwm/patches/{patch-09 => patch-error_c} (65%)
 rename x11/olvwm/patches/{patch-10 => patch-error_c_rej} (70%)
 rename x11/olvwm/patches/{patch-11 => patch-evbind_c} (68%)
 rename x11/olvwm/patches/{patch-12 => patch-gif_c} (59%)
 rename x11/olvwm/patches/{patch-13 => patch-images_c} (68%)
 rename x11/olvwm/patches/{patch-14 => patch-mem_c} (75%)
 rename x11/olvwm/patches/{patch-15 => patch-menu_c} (68%)
 rename x11/olvwm/patches/{patch-16 => patch-menu_h} (83%)
 rename x11/olvwm/patches/{patch-17 => patch-moveresize_c} (70%)
 rename x11/olvwm/patches/{patch-18 => patch-olvwm_info} (91%)
 rename x11/olvwm/patches/{patch-19 => patch-olvwmrc_y} (79%)
 rename x11/olvwm/patches/{patch-20 => patch-olwm_c} (65%)
 create mode 100644 x11/olvwm/patches/patch-patchlevel_h
 rename x11/olvwm/patches/{patch-22 => patch-pixmap_c} (83%)
 rename x11/olvwm/patches/{patch-23 => patch-properties_c} (65%)
 rename x11/olvwm/patches/{patch-24 => patch-resources_c} (80%)
 rename x11/olvwm/patches/{patch-25 => patch-screen_c} (75%)
 create mode 100644 x11/olvwm/patches/patch-st_c
 rename x11/olvwm/patches/{patch-27 => patch-states_c} (77%)
 rename x11/olvwm/patches/{patch-28 => patch-usermenu_c} (74%)
 rename x11/olvwm/patches/{patch-29 => patch-virtual_c} (60%)
 create mode 100644 x11/olvwm/patches/patch-winframe_c
 rename x11/olvwm/patches/{patch-31 => patch-winicon_c} (66%)
 create mode 100644 x11/olvwm/patches/patch-winipane_c

diff --git a/x11/olvwm/patches/patch-21 b/x11/olvwm/patches/patch-21
deleted file mode 100644
index dd5b92204d7..00000000000
--- a/x11/olvwm/patches/patch-21
+++ /dev/null
@@ -1,5 +0,0 @@
---- patchlevel.h.orig	Thu Jan 13 22:40:04 1994
-+++ ./patchlevel.h	Sat Jul 17 10:04:12 1999
-@@ -1 +1 @@
--#define PATCHLEVELv4 0
-+#define PATCHLEVELv4 2
diff --git a/x11/olvwm/patches/patch-26 b/x11/olvwm/patches/patch-26
deleted file mode 100644
index 5947ad24488..00000000000
--- a/x11/olvwm/patches/patch-26
+++ /dev/null
@@ -1,11 +0,0 @@
---- st.c.orig	Thu Jan 13 22:36:18 1994
-+++ ./st.c	Fri Jul 16 21:49:04 1999
-@@ -208,7 +208,7 @@
-     }
- }
- 
--static rehash(table)
-+extern rehash(table)
- register st_table *table;
- {
-     register st_table_entry *ptr, *next, **old_bins = table->bins;
diff --git a/x11/olvwm/patches/patch-30 b/x11/olvwm/patches/patch-30
deleted file mode 100644
index 067309df6b3..00000000000
--- a/x11/olvwm/patches/patch-30
+++ /dev/null
@@ -1,11 +0,0 @@
---- winframe.c.orig	Thu Jan 13 22:36:25 1994
-+++ ./winframe.c	Fri Jul 16 21:49:05 1999
-@@ -52,6 +52,8 @@
- 
- extern Time TimeFresh();
- 
-+static	headerHeight();
-+
- /***************************************************************************
- * private data
- ***************************************************************************/
diff --git a/x11/olvwm/patches/patch-32 b/x11/olvwm/patches/patch-32
deleted file mode 100644
index a47010ff941..00000000000
--- a/x11/olvwm/patches/patch-32
+++ /dev/null
@@ -1,11 +0,0 @@
---- winipane.c.orig	Thu Jan 13 22:36:26 1994
-+++ ./winipane.c	Fri Jul 16 23:42:24 1999
-@@ -120,6 +120,8 @@
- #else
-     switch(winInfo->iconDepth) {
- 	case 8:
-+        case 16:
-+        case 24:
- 	    XCopyArea(dpy, winInfo->iconPixmap, pane, gc,
- 		0, 0, winInfo->core.width, winInfo->core.height,
- 		0, 0);
diff --git a/x11/olvwm/patches/patch-01 b/x11/olvwm/patches/patch-CHANGES
similarity index 86%
rename from x11/olvwm/patches/patch-01
rename to x11/olvwm/patches/patch-CHANGES
index 1a77256de0f..5ad0a263e70 100644
--- a/x11/olvwm/patches/patch-01
+++ b/x11/olvwm/patches/patch-CHANGES
@@ -1,5 +1,6 @@
---- CHANGES.orig	Mon Jan 24 22:43:14 1994
-+++ ./CHANGES	Sat Jul 17 10:04:13 1999
+$OpenBSD: patch-CHANGES,v 1.1 2004/01/28 20:58:53 naddy Exp $
+--- CHANGES.orig	1994-01-24 22:43:14.000000000 +0100
++++ CHANGES	2004-01-28 21:49:09.000000000 +0100
 @@ -1,4 +1,31 @@
 -Version 3.4 fixes and enhancements:
 +Version 4.2 fixes:
diff --git a/x11/olvwm/patches/patch-02 b/x11/olvwm/patches/patch-Imakefile
similarity index 79%
rename from x11/olvwm/patches/patch-02
rename to x11/olvwm/patches/patch-Imakefile
index d8bee65681a..ddb33097077 100644
--- a/x11/olvwm/patches/patch-02
+++ b/x11/olvwm/patches/patch-Imakefile
@@ -1,5 +1,6 @@
---- Imakefile.orig	Mon Jan 24 22:45:05 1994
-+++ ./Imakefile	Fri Jul 16 22:18:41 1999
+$OpenBSD: patch-Imakefile,v 1.1 2004/01/28 20:58:53 naddy Exp $
+--- Imakefile.orig	1994-01-24 22:45:05.000000000 +0100
++++ Imakefile	2004-01-28 21:49:09.000000000 +0100
 @@ -45,8 +45,8 @@
  /**/#MORECCFLAGS=-DOW_I18N_L3 -DSHAPE -DIDENT
  
@@ -11,7 +12,7 @@
  /**/#
  /**/# Set MORELDFLAGS to any link options you want.  Be sure to add -lxpm if you
  /**/# want to include XPM support.  For a generic Solaris 1.x
-@@ -54,8 +54,8 @@
+@@ -54,8 +54,8 @@ MORECCFLAGS=-DOW_I18N_L3 -DSHAPE -DSVR4 
  /**/#MORELDFLAGS=-L${OPENWINHOME}/lib
  /**/#
  /**/# For Solaris 2.x, I'd suggest
@@ -22,7 +23,7 @@
  
  /**/# No more changes needed
  
-@@ -67,7 +67,7 @@
+@@ -67,7 +67,7 @@ MORELDFLAGS=-L${OPENWINHOME}/lib -R ${OP
  
  DEFINES =  $(MORECCFLAGS)
  SYS_LIBRARIES = -ll -lm
@@ -31,7 +32,7 @@
  DEPLIBS = 
  LOCAL_LIBRARIES = $(MORELDFLAGS) $(OLGXLIB) $(XLIB)
  
-@@ -139,7 +139,9 @@
+@@ -139,7 +139,9 @@ install.man:: $(MANPAGES)
  	@for i in $(MANPAGES) ;\
  	do \
  	echo "installing $$i"; \
diff --git a/x11/olvwm/patches/patch-03 b/x11/olvwm/patches/patch-LEGAL_NOTICE
similarity index 94%
rename from x11/olvwm/patches/patch-03
rename to x11/olvwm/patches/patch-LEGAL_NOTICE
index f5926163a86..8e5ddf5f266 100644
--- a/x11/olvwm/patches/patch-03
+++ b/x11/olvwm/patches/patch-LEGAL_NOTICE
@@ -1,5 +1,6 @@
---- LEGAL_NOTICE.orig	Thu Jan  1 01:00:00 1970
-+++ ./LEGAL_NOTICE	Fri Jul 16 21:49:02 1999
+$OpenBSD: patch-LEGAL_NOTICE,v 1.1 2004/01/28 20:58:53 naddy Exp $
+--- LEGAL_NOTICE.orig	2004-01-28 21:49:09.000000000 +0100
++++ LEGAL_NOTICE	2004-01-28 21:49:09.000000000 +0100
 @@ -0,0 +1,56 @@
 +	NOTICE TO USER: The source code, including the glyphs or icons 
 +	forming a par of the OPEN LOOK TM Graphic User Interface, on this 
diff --git a/x11/olvwm/patches/patch-04 b/x11/olvwm/patches/patch-Makefile
similarity index 99%
rename from x11/olvwm/patches/patch-04
rename to x11/olvwm/patches/patch-Makefile
index cb3d66434d5..0ad37282bd4 100644
--- a/x11/olvwm/patches/patch-04
+++ b/x11/olvwm/patches/patch-Makefile
@@ -1,5 +1,6 @@
---- Makefile.orig	Thu Jan  1 01:00:00 1970
-+++ ./Makefile	Fri Jul 16 22:18:44 1999
+$OpenBSD: patch-Makefile,v 1.1 2004/01/28 20:58:53 naddy Exp $
+--- Makefile.orig	2004-01-28 21:49:09.000000000 +0100
++++ Makefile	2004-01-28 21:49:09.000000000 +0100
 @@ -0,0 +1,986 @@
 +# Makefile generated by imake - do not edit!
 +# $TOG: imake.c /main/97 1997/06/20 20:23:51 kaleb $
@@ -35,7 +36,7 @@
 +
 +# platform:  $XFree86: xc/config/cf/OpenBSD.cf,v 3.1.2.13 1998/12/22 11:23:02 hohndel Exp $
 +#
-+# $OpenBSD: patch-04,v 1.2 1999/07/17 10:53:21 matthieu Exp $
++# $OpenBSD: patch-Makefile,v 1.1 2004/01/28 20:58:53 naddy Exp $
 +#
 +
 +# operating system:  OpenBSD 2.5 i386 OSBinaryType (2.5.0)
diff --git a/x11/olvwm/patches/patch-05 b/x11/olvwm/patches/patch-Makefile_sunpro
similarity index 74%
rename from x11/olvwm/patches/patch-05
rename to x11/olvwm/patches/patch-Makefile_sunpro
index 5a264656053..60da58afe40 100644
--- a/x11/olvwm/patches/patch-05
+++ b/x11/olvwm/patches/patch-Makefile_sunpro
@@ -1,6 +1,7 @@
---- Makefile.sunpro.orig	Mon Jan 24 23:31:50 1994
-+++ ./Makefile.sunpro	Fri Jul 16 21:49:02 1999
-@@ -60,7 +60,11 @@
+$OpenBSD: patch-Makefile_sunpro,v 1.1 2004/01/28 20:58:53 naddy Exp $
+--- Makefile.sunpro.orig	1994-01-24 23:31:50.000000000 +0100
++++ Makefile.sunpro	2004-01-28 21:49:09.000000000 +0100
+@@ -60,7 +60,11 @@ MAN5DIR = ${OPENWINHOME}/man/man5
  #  -DSVR4		Support for System V Release 4 (you must also include
  #			    	-DSYSV)
  #  -DXPM		Support the XPM color pixmaps -- requires that you
@@ -13,7 +14,7 @@
  #
  # I haven't tested this on Solaris 1.x, but I'd suggest
  #MORECCFLAGS=-DOW_I18N_L3 -DSHAPE -DIDENT
-@@ -71,10 +75,10 @@
+@@ -71,10 +75,10 @@ MORECCFLAGS=-DOW_I18N_L3 -DSHAPE -DSVR4 
  #
  # Set LDFLAGS to any link options you want.  For a generic Solaris 1.x
  # system, I'd suggest
diff --git a/x11/olvwm/patches/patch-06 b/x11/olvwm/patches/patch-atom_c
similarity index 72%
rename from x11/olvwm/patches/patch-06
rename to x11/olvwm/patches/patch-atom_c
index bbeb73c4737..c91a6a04157 100644
--- a/x11/olvwm/patches/patch-06
+++ b/x11/olvwm/patches/patch-atom_c
@@ -1,6 +1,7 @@
---- atom.c.orig	Thu Jan 13 22:36:02 1994
-+++ ./atom.c	Sat Jul 17 10:04:13 1999
-@@ -73,11 +73,11 @@
+$OpenBSD: patch-atom_c,v 1.1 2004/01/28 20:58:53 naddy Exp $
+--- atom.c.orig	1994-01-13 22:36:02.000000000 +0100
++++ atom.c	2004-01-28 21:49:09.000000000 +0100
+@@ -73,11 +73,11 @@ Atom	AtomSunOLWinAttr5;
  Atom	AtomDecorIconName;
  Atom	AtomSunReReadMenuFile;
  #ifdef OW_I18N_L4
@@ -13,7 +14,7 @@
  
  /***************************************************************************
  * Global functions
-@@ -153,9 +153,7 @@
+@@ -153,9 +153,7 @@ Display	*dpy;
  	AtomTargets = XInternAtom(dpy,"TARGETS",False);
  	AtomTimestamp = XInternAtom(dpy,"TIMESTAMP",False);
  	AtomUser = XInternAtom(dpy,"USER",False);
diff --git a/x11/olvwm/patches/patch-07 b/x11/olvwm/patches/patch-cursors_c
similarity index 67%
rename from x11/olvwm/patches/patch-07
rename to x11/olvwm/patches/patch-cursors_c
index c5cdfabb1fa..73e68b57e0d 100644
--- a/x11/olvwm/patches/patch-07
+++ b/x11/olvwm/patches/patch-cursors_c
@@ -1,5 +1,6 @@
---- cursors.c.orig	Thu Jan 13 22:36:03 1994
-+++ ./cursors.c	Sat Jul 17 10:04:13 1999
+$OpenBSD: patch-cursors_c,v 1.1 2004/01/28 20:58:53 naddy Exp $
+--- cursors.c.orig	1994-01-13 22:36:03.000000000 +0100
++++ cursors.c	2004-01-28 21:49:09.000000000 +0100
 @@ -21,7 +21,7 @@
  #include "st.h"
  
@@ -9,7 +10,7 @@
  #endif
  
  static st_table	*cursorTable;
-@@ -278,7 +278,7 @@
+@@ -278,7 +278,7 @@ initPointer(dpy, cmap, data, pointer)
  	    if (our_copy[0] == 'X')
  		font_file = "cursor";
  	    else if (our_copy[0] == 'O')
diff --git a/x11/olvwm/patches/patch-08 b/x11/olvwm/patches/patch-defaults_c
similarity index 61%
rename from x11/olvwm/patches/patch-08
rename to x11/olvwm/patches/patch-defaults_c
index 5df35526ad4..154fd7263d1 100644
--- a/x11/olvwm/patches/patch-08
+++ b/x11/olvwm/patches/patch-defaults_c
@@ -1,6 +1,7 @@
---- defaults.c.orig	Thu Jan 13 22:36:03 1994
-+++ ./defaults.c	Fri Jul 16 21:49:02 1999
-@@ -90,7 +90,11 @@
+$OpenBSD: patch-defaults_c,v 1.1 2004/01/28 20:58:53 naddy Exp $
+--- defaults.c.orig	1994-01-13 22:36:03.000000000 +0100
++++ defaults.c	2004-01-28 21:49:09.000000000 +0100
+@@ -90,7 +90,11 @@ GetUserDefaults(dpy)
  #ifdef SVR4
  	    if (sysinfo(SI_HOSTNAME, hostname, sizeof(hostname)) != -1) {
  #else
diff --git a/x11/olvwm/patches/patch-09 b/x11/olvwm/patches/patch-error_c
similarity index 65%
rename from x11/olvwm/patches/patch-09
rename to x11/olvwm/patches/patch-error_c
index 10833c0eb8a..0054747e2ff 100644
--- a/x11/olvwm/patches/patch-09
+++ b/x11/olvwm/patches/patch-error_c
@@ -1,5 +1,6 @@
---- error.c.orig	Thu Jan 13 22:36:04 1994
-+++ ./error.c	Sat Jul 17 10:05:18 1999
+$OpenBSD: patch-error_c,v 1.1 2004/01/28 20:58:53 naddy Exp $
+--- error.c.orig	1994-01-13 22:36:04.000000000 +0100
++++ error.c	2004-01-28 21:49:09.000000000 +0100
 @@ -13,7 +13,11 @@
  
  #include <stdio.h>
@@ -12,7 +13,7 @@
  #include <X11/Xproto.h>
  
  #include "i18n.h"
-@@ -232,8 +236,6 @@
+@@ -232,8 +236,6 @@ printError(dpy, err, tag)
  	err->resourceid);
      FPRINTF(stderr, GetString("  serial number of failed request:  %d\n"),
  	err->serial);
diff --git a/x11/olvwm/patches/patch-10 b/x11/olvwm/patches/patch-error_c_rej
similarity index 70%
rename from x11/olvwm/patches/patch-10
rename to x11/olvwm/patches/patch-error_c_rej
index 7dcb3a861e3..f5b2f44fe79 100644
--- a/x11/olvwm/patches/patch-10
+++ b/x11/olvwm/patches/patch-error_c_rej
@@ -1,5 +1,6 @@
---- error.c.rej.orig	Thu Jan  1 01:00:00 1970
-+++ ./error.c.rej	Sat Jul 17 10:04:14 1999
+$OpenBSD: patch-error_c_rej,v 1.1 2004/01/28 20:58:53 naddy Exp $
+--- error.c.rej.orig	2004-01-28 21:49:09.000000000 +0100
++++ error.c.rej	2004-01-28 21:49:09.000000000 +0100
 @@ -0,0 +1,17 @@
 +***************
 +*** 232,239 ****
diff --git a/x11/olvwm/patches/patch-11 b/x11/olvwm/patches/patch-evbind_c
similarity index 68%
rename from x11/olvwm/patches/patch-11
rename to x11/olvwm/patches/patch-evbind_c
index a6b079c427b..583df8f0eda 100644
--- a/x11/olvwm/patches/patch-11
+++ b/x11/olvwm/patches/patch-evbind_c
@@ -1,5 +1,6 @@
---- evbind.c.orig	Thu Jan 13 22:36:05 1994
-+++ ./evbind.c	Sat Jul 17 10:04:14 1999
+$OpenBSD: patch-evbind_c,v 1.1 2004/01/28 20:58:53 naddy Exp $
+--- evbind.c.orig	1994-01-13 22:36:05.000000000 +0100
++++ evbind.c	2004-01-28 21:49:10.000000000 +0100
 @@ -5,7 +5,7 @@
   */
  
@@ -19,7 +20,7 @@
  #include <X11/Xlib.h>
  #include <X11/Xutil.h>
  #include <X11/keysym.h>
-@@ -137,7 +139,7 @@
+@@ -137,7 +139,7 @@ establishModBindings(dpy, newDB)
   */
  
  typedef struct {
diff --git a/x11/olvwm/patches/patch-12 b/x11/olvwm/patches/patch-gif_c
similarity index 59%
rename from x11/olvwm/patches/patch-12
rename to x11/olvwm/patches/patch-gif_c
index d564b73b270..6048942dac9 100644
--- a/x11/olvwm/patches/patch-12
+++ b/x11/olvwm/patches/patch-gif_c
@@ -1,6 +1,7 @@
---- gif.c.orig	Thu Jan 13 22:36:06 1994
-+++ ./gif.c	Fri Jul 16 21:49:03 1999
-@@ -56,6 +56,10 @@
+$OpenBSD: patch-gif_c,v 1.1 2004/01/28 20:58:53 naddy Exp $
+--- gif.c.orig	1994-01-13 22:36:06.000000000 +0100
++++ gif.c	2004-01-28 21:49:10.000000000 +0100
+@@ -56,6 +56,10 @@ struct {
  	int     disposal;
  } Gif89 = { -1, -1, -1, 0 };
  
@@ -11,7 +12,7 @@
  extern XImage* ReadImage();
  
  XImage *ReadGIF(dpy, fd, pNcolors, pColors)
-@@ -456,7 +460,7 @@
+@@ -456,7 +460,7 @@ int     input_code_size;
  	return code;
  }
  
diff --git a/x11/olvwm/patches/patch-13 b/x11/olvwm/patches/patch-images_c
similarity index 68%
rename from x11/olvwm/patches/patch-13
rename to x11/olvwm/patches/patch-images_c
index 46e75ebc91d..50679a0948f 100644
--- a/x11/olvwm/patches/patch-13
+++ b/x11/olvwm/patches/patch-images_c
@@ -1,5 +1,6 @@
---- images.c.orig	Thu Jan 13 22:36:07 1994
-+++ ./images.c	Fri Jul 16 21:49:03 1999
+$OpenBSD: patch-images_c,v 1.1 2004/01/28 20:58:54 naddy Exp $
+--- images.c.orig	1994-01-13 22:36:07.000000000 +0100
++++ images.c	2004-01-28 21:49:10.000000000 +0100
 @@ -4,7 +4,7 @@
   */
  
@@ -9,7 +10,7 @@
  #endif
  
  /* Use small images */
-@@ -51,7 +51,6 @@
+@@ -51,7 +51,6 @@ openButton = {
      True,
      True,
      WindowOpenCloseAction,
@@ -17,7 +18,7 @@
      ACTION_OPEN_CLOSE,
      NULL,
      NULL
-@@ -67,7 +66,6 @@
+@@ -67,7 +66,6 @@ fullSizeButton = {
      True,
      True,
      WindowFullRestoreSizeAction,
@@ -25,7 +26,7 @@
      ACTION_FULL_RESTORE,
      NULL,
      NULL
-@@ -83,7 +81,6 @@
+@@ -83,7 +81,6 @@ moveButton = {
      True,
      True,
      WindowMoveAction,
@@ -33,7 +34,7 @@
      ACTION_MOVE,
      NULL,
      NULL
-@@ -99,7 +96,6 @@
+@@ -99,7 +96,6 @@ resizeButton = {
      True,
      True,
      WindowResizeAction,
@@ -41,7 +42,7 @@
      ACTION_RESIZE,
      NULL,
      NULL
-@@ -115,7 +111,6 @@
+@@ -115,7 +111,6 @@ stickyButton = {
      True,
      True,
      WindowStickAction,
@@ -49,7 +50,7 @@
      ACTION_STICK,
      NULL,
      NULL
-@@ -131,7 +126,6 @@
+@@ -131,7 +126,6 @@ propertiesButton = {
      False,
      True,
      WindowPropsAction,
@@ -57,7 +58,7 @@
      ACTION_PROPS,
      NULL,
      NULL
-@@ -147,7 +141,6 @@
+@@ -147,7 +141,6 @@ backButton = {
      True,
      True,
      WindowBackAction,
@@ -65,7 +66,7 @@
      ACTION_BACK,
      NULL,
      NULL
-@@ -163,7 +156,6 @@
+@@ -163,7 +156,6 @@ refreshButton = {
      True,
      True,
      WindowRefreshAction,
@@ -73,7 +74,7 @@
      ACTION_REFRESH,
      NULL,
      NULL
-@@ -179,7 +171,6 @@
+@@ -179,7 +171,6 @@ quitButton = {
      True,
      True,
      WindowQuitAction,
@@ -81,7 +82,7 @@
      ACTION_QUIT,
      NULL,
      NULL
-@@ -195,7 +186,6 @@
+@@ -195,7 +186,6 @@ dismissButton = {
      True,
      True,
      NULL,
@@ -89,7 +90,7 @@
      ACTION_NONE,
      NULL,
      NULL
-@@ -211,7 +201,6 @@
+@@ -211,7 +201,6 @@ dismissThisButton = {
      True,
      True,
      WindowDismissThisAction,
@@ -97,7 +98,7 @@
      ACTION_OPEN_CLOSE,
      NULL,
      NULL
-@@ -227,7 +216,6 @@
+@@ -227,7 +216,6 @@ dismissAllButton = {
      True,
      True,
      WindowDismissAllAction,
@@ -105,7 +106,7 @@
      ACTION_NONE,
      NULL,
      NULL
-@@ -243,7 +231,6 @@
+@@ -243,7 +231,6 @@ ownerButton = {
      True,
      True,
      WindowFlashOwnerAction,
@@ -113,7 +114,7 @@
      ACTION_OWNER,
      NULL,
      NULL
-@@ -262,7 +249,6 @@
+@@ -262,7 +249,6 @@ Button moveRightButton = {
      True,
      True,
      VDMMenuAction,
@@ -121,7 +122,7 @@
      ACTION_RIGHT_V,
      NULL,
      NULL
-@@ -277,7 +263,6 @@
+@@ -277,7 +263,6 @@ Button moveLeftButton = {
      True,
      True,
      VDMMenuAction,
@@ -129,7 +130,7 @@
      ACTION_LEFT_V,
      NULL,
  };
-@@ -291,7 +276,6 @@
+@@ -291,7 +276,6 @@ Button moveUpButton = {
      True,
      True,
      VDMMenuAction,
@@ -137,7 +138,7 @@
      ACTION_UP_V,
      NULL,
      NULL
-@@ -306,7 +290,6 @@
+@@ -306,7 +290,6 @@ Button moveDownButton = {
      True,
      True,
      VDMMenuAction,
@@ -145,7 +146,7 @@
      ACTION_DOWN_V,
      NULL,
      NULL
-@@ -321,7 +304,6 @@
+@@ -321,7 +304,6 @@ Button moveUpRightButton = {
      True,
      True,
      VDMMenuAction, 
@@ -153,7 +154,7 @@
      ACTION_UPRIGHT_V,
      NULL,
      NULL
-@@ -336,7 +318,6 @@
+@@ -336,7 +318,6 @@ Button moveDownRightButton = {
      True,
      True,
      VDMMenuAction,
@@ -161,7 +162,7 @@
      ACTION_DOWNRIGHT_V,
      NULL,
      NULL
-@@ -351,7 +332,6 @@
+@@ -351,7 +332,6 @@ Button moveUpLeftButton = {
      True,
      True,
      VDMMenuAction,
@@ -169,7 +170,7 @@
      ACTION_UPLEFT_V,
      NULL,
      NULL
-@@ -366,7 +346,6 @@
+@@ -366,7 +346,6 @@ Button moveDownLeftButton = {
      True,
      True,
      VDMMenuAction,
@@ -177,7 +178,7 @@
      ACTION_DOWNLEFT_V,
      NULL,
      NULL
-@@ -381,7 +360,6 @@
+@@ -381,7 +360,6 @@ Button moveHomeButton = {
      True,
      True,
      VDMMenuAction,
diff --git a/x11/olvwm/patches/patch-14 b/x11/olvwm/patches/patch-mem_c
similarity index 75%
rename from x11/olvwm/patches/patch-14
rename to x11/olvwm/patches/patch-mem_c
index ea1ddf3f9eb..c510bfb1008 100644
--- a/x11/olvwm/patches/patch-14
+++ b/x11/olvwm/patches/patch-mem_c
@@ -1,5 +1,6 @@
---- mem.c.orig	Thu Jan 13 22:36:08 1994
-+++ ./mem.c	Fri Jul 16 21:49:03 1999
+$OpenBSD: patch-mem_c,v 1.1 2004/01/28 20:58:54 naddy Exp $
+--- mem.c.orig	1994-01-13 22:36:08.000000000 +0100
++++ mem.c	2004-01-28 21:49:10.000000000 +0100
 @@ -18,7 +18,7 @@
  
  
@@ -9,7 +10,7 @@
  #include <memory.h>
  #include <stdio.h>
  
-@@ -139,7 +139,7 @@
+@@ -139,7 +139,7 @@ MemAllocN(sz
  {
      void       *p;
  
@@ -18,7 +19,7 @@
        ErrorGeneral(gettext("Memory allocation failure."));
  
  #ifdef MEMDEBUG
-@@ -164,7 +164,7 @@
+@@ -164,7 +164,7 @@ MemAlloc(sz
  {
      void       *p;
  
@@ -27,7 +28,7 @@
  	ErrorGeneral(GetString("Memory allocation failure."));
  
      memset((char *) p, 0, (int) sz);
-@@ -191,7 +191,7 @@
+@@ -191,7 +191,7 @@ MemCalloc(num, sz
  {
      void       *p;
  
@@ -36,7 +37,7 @@
  	ErrorGeneral(GetString("Memory array allocation failure."));
  
      memset((char *) p, 0, (int) sz * (int) num);
-@@ -210,7 +210,7 @@
+@@ -210,7 +210,7 @@ MemRealloc(p, sz)
  {
      void       *t;
  
diff --git a/x11/olvwm/patches/patch-15 b/x11/olvwm/patches/patch-menu_c
similarity index 68%
rename from x11/olvwm/patches/patch-15
rename to x11/olvwm/patches/patch-menu_c
index fbe0043ac90..a851e9e1c48 100644
--- a/x11/olvwm/patches/patch-15
+++ b/x11/olvwm/patches/patch-menu_c
@@ -1,5 +1,6 @@
---- menu.c.orig	Thu Jan 13 22:36:09 1994
-+++ ./menu.c	Sat Jul 17 10:04:15 1999
+$OpenBSD: patch-menu_c,v 1.1 2004/01/28 20:58:54 naddy Exp $
+--- menu.c.orig	1994-01-13 22:36:09.000000000 +0100
++++ menu.c	2004-01-28 21:49:10.000000000 +0100
 @@ -5,7 +5,7 @@
   */
  
@@ -9,7 +10,7 @@
  #endif
  
  /*
-@@ -3154,7 +3154,11 @@
+@@ -3154,7 +3154,11 @@ drawCommonButton(dpy, menuInfo, idx, fDe
      else if (pb->label[pb->which].kind == ComboLabel) {
  	label = &combLabel;
  	combLabel.pixlabel = *(pb->label[pb->which].pixlabel);
diff --git a/x11/olvwm/patches/patch-16 b/x11/olvwm/patches/patch-menu_h
similarity index 83%
rename from x11/olvwm/patches/patch-16
rename to x11/olvwm/patches/patch-menu_h
index 1b4627392ce..4a419d58701 100644
--- a/x11/olvwm/patches/patch-16
+++ b/x11/olvwm/patches/patch-menu_h
@@ -1,5 +1,6 @@
---- menu.h.orig	Thu Jan 13 22:40:03 1994
-+++ ./menu.h	Fri Jul 16 21:49:03 1999
+$OpenBSD: patch-menu_h,v 1.1 2004/01/28 20:58:54 naddy Exp $
+--- menu.h.orig	1994-01-13 22:40:03.000000000 +0100
++++ menu.h	2004-01-28 21:49:10.000000000 +0100
 @@ -8,7 +8,7 @@
  #define _OLWM_MENU_H
  
@@ -9,7 +10,7 @@
  #endif
  
  /*
-@@ -56,17 +56,18 @@
+@@ -56,17 +56,18 @@ typedef struct _button {
      FuncPtr	callback;	/* function to call when item hit */
  				/* NULL if button has pullright */
  
diff --git a/x11/olvwm/patches/patch-17 b/x11/olvwm/patches/patch-moveresize_c
similarity index 70%
rename from x11/olvwm/patches/patch-17
rename to x11/olvwm/patches/patch-moveresize_c
index 30c59bf7e06..92f773f4fd3 100644
--- a/x11/olvwm/patches/patch-17
+++ b/x11/olvwm/patches/patch-moveresize_c
@@ -1,5 +1,6 @@
---- moveresize.c.orig	Thu Jan 13 22:36:09 1994
-+++ ./moveresize.c	Sat Jul 17 10:04:15 1999
+$OpenBSD: patch-moveresize_c,v 1.1 2004/01/28 20:58:54 naddy Exp $
+--- moveresize.c.orig	1994-01-13 22:36:09.000000000 +0100
++++ moveresize.c	2004-01-28 21:49:10.000000000 +0100
 @@ -5,7 +5,7 @@
   */
  
@@ -9,7 +10,7 @@
  #endif
  
  /*
-@@ -1067,6 +1067,7 @@
+@@ -1067,6 +1067,7 @@ moveDone(mstuff)
      XUngrabPointer(mstuff->dpy, CurrentTime);
      XUngrabKeyboard(mstuff->dpy, CurrentTime);
  
@@ -17,7 +18,7 @@
      /*
       * If we moved the outline (not the whole window) cause the window to be
       * raised at the same time it is moved.  Raise just the frame the user
-@@ -1087,6 +1088,7 @@
+@@ -1087,6 +1088,7 @@ moveDone(mstuff)
  
      destroyStatusWindow(mstuff->statuswindow);
      mstuff->statuswindow = NULL;
diff --git a/x11/olvwm/patches/patch-18 b/x11/olvwm/patches/patch-olvwm_info
similarity index 91%
rename from x11/olvwm/patches/patch-18
rename to x11/olvwm/patches/patch-olvwm_info
index 5d2bc7427f1..ba975e8a569 100644
--- a/x11/olvwm/patches/patch-18
+++ b/x11/olvwm/patches/patch-olvwm_info
@@ -1,5 +1,6 @@
---- olvwm.info.orig	Thu Jan  1 01:00:00 1970
-+++ ./olvwm.info	Fri Jul 16 21:49:03 1999
+$OpenBSD: patch-olvwm_info,v 1.1 2004/01/28 20:58:54 naddy Exp $
+--- olvwm.info.orig	2004-01-28 21:49:10.000000000 +0100
++++ olvwm.info	2004-01-28 21:49:10.000000000 +0100
 @@ -0,0 +1,48 @@
 +# -----------------------------------------------
 +#	olvwm.info	31 October 1991
diff --git a/x11/olvwm/patches/patch-19 b/x11/olvwm/patches/patch-olvwmrc_y
similarity index 79%
rename from x11/olvwm/patches/patch-19
rename to x11/olvwm/patches/patch-olvwmrc_y
index afc70a86c12..d4430acc010 100644
--- a/x11/olvwm/patches/patch-19
+++ b/x11/olvwm/patches/patch-olvwmrc_y
@@ -1,5 +1,6 @@
---- olvwmrc.y.orig	Thu Jan 13 22:46:53 1994
-+++ ./olvwmrc.y	Sat Jul 17 10:04:15 1999
+$OpenBSD: patch-olvwmrc_y,v 1.1 2004/01/28 20:58:54 naddy Exp $
+--- olvwmrc.y.orig	1994-01-13 22:46:53.000000000 +0100
++++ olvwmrc.y	2004-01-28 21:49:10.000000000 +0100
 @@ -5,7 +5,7 @@
  
  %{
@@ -9,7 +10,7 @@
  #endif
  
  #include <sys/types.h>
-@@ -81,6 +81,7 @@
+@@ -81,6 +81,7 @@ List    *ProgKeyList = NULL;
  List	*WinMenuActionsList = NULL;
  
  static Display	*dpy;
@@ -17,7 +18,7 @@
  %}
  
  
-@@ -526,7 +527,9 @@
+@@ -526,7 +527,9 @@ String :    WORD
  	    }
  %%
  /* Programs */
@@ -27,7 +28,7 @@
  #include "parse.c"
  
  extern List	*ActiveClientList;
-@@ -577,7 +580,7 @@
+@@ -577,7 +580,7 @@ char   name[];
     return(True);
  }
  
@@ -36,7 +37,7 @@
  strexpand(s)
  char *s;
  {
-@@ -712,7 +715,8 @@
+@@ -712,7 +715,8 @@ matchProgKey(p, ev)
  
  {
      if (p->keycode == ev->xkey.keycode &&
@@ -46,7 +47,7 @@
  	return p;
      return NULL;
  }
-@@ -799,14 +803,26 @@
+@@ -799,14 +803,26 @@ struct stat statbuf;
  		    extern List *ScreenInfoList;
  		    List *l = ScreenInfoList;
  		    ScreenInfo *scr;
@@ -75,7 +76,7 @@
  		    findClient_rootid = 0;
  		}
  	    free(s);
-@@ -1249,6 +1265,7 @@
+@@ -1249,6 +1265,7 @@ InitOlvwmRC(ldpy, path)
  	return;
      olvwmOldBuf = olvwmBuf;
      dpy = ldpy;
diff --git a/x11/olvwm/patches/patch-20 b/x11/olvwm/patches/patch-olwm_c
similarity index 65%
rename from x11/olvwm/patches/patch-20
rename to x11/olvwm/patches/patch-olwm_c
index bc7bae9b02b..7b8e3e915e2 100644
--- a/x11/olvwm/patches/patch-20
+++ b/x11/olvwm/patches/patch-olwm_c
@@ -1,5 +1,6 @@
---- olwm.c.orig	Thu Jan 13 22:36:12 1994
-+++ ./olwm.c	Fri Jul 16 21:49:04 1999
+$OpenBSD: patch-olwm_c,v 1.1 2004/01/28 20:58:54 naddy Exp $
+--- olwm.c.orig	1994-01-13 22:36:12.000000000 +0100
++++ olwm.c	2004-01-28 21:49:10.000000000 +0100
 @@ -56,6 +56,9 @@
  
  typedef	void	(*VoidFunc)();
@@ -10,7 +11,7 @@
  
  /*
   * Globals
-@@ -182,7 +185,7 @@
+@@ -182,7 +185,7 @@ static char	**argVec;
  /*
   * main	-- parse arguments, perform initialization, call event-loop
   */
@@ -19,7 +20,7 @@
  main(argc, argv)
  	int argc;
  	char **argv;
-@@ -679,7 +682,11 @@
+@@ -679,7 +682,11 @@ ReapChildren()
  #else
  	int oldmask;
  	int pid;
diff --git a/x11/olvwm/patches/patch-patchlevel_h b/x11/olvwm/patches/patch-patchlevel_h
new file mode 100644
index 00000000000..9a00778c07e
--- /dev/null
+++ b/x11/olvwm/patches/patch-patchlevel_h
@@ -0,0 +1,6 @@
+$OpenBSD: patch-patchlevel_h,v 1.1 2004/01/28 20:58:54 naddy Exp $
+--- patchlevel.h.orig	1994-01-13 22:40:04.000000000 +0100
++++ patchlevel.h	2004-01-28 21:49:10.000000000 +0100
+@@ -1 +1 @@
+-#define PATCHLEVELv4 0
++#define PATCHLEVELv4 2
diff --git a/x11/olvwm/patches/patch-22 b/x11/olvwm/patches/patch-pixmap_c
similarity index 83%
rename from x11/olvwm/patches/patch-22
rename to x11/olvwm/patches/patch-pixmap_c
index 0386c5f42ac..b677f44ba07 100644
--- a/x11/olvwm/patches/patch-22
+++ b/x11/olvwm/patches/patch-pixmap_c
@@ -1,5 +1,6 @@
---- pixmap.c.orig	Thu Jan 13 22:36:12 1994
-+++ ./pixmap.c	Sat Jul 17 00:35:59 1999
+$OpenBSD: patch-pixmap_c,v 1.1 2004/01/28 20:58:54 naddy Exp $
+--- pixmap.c.orig	1994-01-13 22:36:12.000000000 +0100
++++ pixmap.c	2004-01-28 21:49:10.000000000 +0100
 @@ -4,7 +4,7 @@
   */
  
@@ -32,7 +33,7 @@
  
  #include "i18n.h"
  #include <olgx/olgx.h>
-@@ -159,6 +171,7 @@
+@@ -159,6 +171,7 @@ XColor **colors;
  }
  
  FreePixmapColors(dpy, ncolors, colors, colormap)
diff --git a/x11/olvwm/patches/patch-23 b/x11/olvwm/patches/patch-properties_c
similarity index 65%
rename from x11/olvwm/patches/patch-23
rename to x11/olvwm/patches/patch-properties_c
index 285977699b3..2493573f2af 100644
--- a/x11/olvwm/patches/patch-23
+++ b/x11/olvwm/patches/patch-properties_c
@@ -1,6 +1,7 @@
---- properties.c.orig	Thu Jan 13 22:36:13 1994
-+++ ./properties.c	Sat Jul 17 10:04:15 1999
-@@ -63,8 +63,8 @@
+$OpenBSD: patch-properties_c,v 1.1 2004/01/28 20:58:54 naddy Exp $
+--- properties.c.orig	1994-01-13 22:36:13.000000000 +0100
++++ properties.c	2004-01-28 21:49:10.000000000 +0100
+@@ -63,8 +63,8 @@ extern Atom AtomRightFooter;
  extern Atom AtomDecorIMStatus;
  extern Atom AtomLeftIMStatus;
  extern Atom AtomRightIMStatus;
@@ -10,7 +11,7 @@
  
  /***************************************************************************
   * 	GetWindowProperty
-@@ -147,8 +147,9 @@
+@@ -147,8 +147,9 @@ propGetTextProp(dpy,win,property,text)
  	}
  		
  #else
diff --git a/x11/olvwm/patches/patch-24 b/x11/olvwm/patches/patch-resources_c
similarity index 80%
rename from x11/olvwm/patches/patch-24
rename to x11/olvwm/patches/patch-resources_c
index e654f5d8f26..e97fd4edb1a 100644
--- a/x11/olvwm/patches/patch-24
+++ b/x11/olvwm/patches/patch-resources_c
@@ -1,5 +1,6 @@
---- resources.c.orig	Thu Jan 13 22:36:14 1994
-+++ ./resources.c	Sat Jul 17 10:04:16 1999
+$OpenBSD: patch-resources_c,v 1.1 2004/01/28 20:58:54 naddy Exp $
+--- resources.c.orig	1994-01-13 22:36:14.000000000 +0100
++++ resources.c	2004-01-28 21:49:10.000000000 +0100
 @@ -5,7 +5,7 @@
   */
  
@@ -9,7 +10,7 @@
  #endif
  
  /*
-@@ -562,8 +562,8 @@
+@@ -562,8 +562,8 @@ ResourceItem MainItemTable[] = {
      &(GRV.VirtualFontColor),	cvtString,		updVirtualFontColor,
      0L },
  {   "virtualIconic",		"VirtualIconic", 	"False",
@@ -20,7 +21,7 @@
  {   "virtualSticky",		"VirtualSticky", 	"",
      &(GRV.StickyList),		cvtStringList,		NULL,
      0L },
-@@ -620,13 +620,13 @@
+@@ -620,13 +620,13 @@ ResourceItem MainItemTable[] = {
      0L },
  {   "autoShowRootMenu",		"AutoShowRootMenu", 	"False",
      &(GRV.AutoShowRootMenu),	cvtBoolean,		NULL,
@@ -37,7 +38,7 @@
  {   "inputFocusColor",		"InputFocusColor", 	NULL,
      &(GRV.InputFocusColor),	cvtString,		updInputFocusColor,
      0L },
-@@ -1577,7 +1577,7 @@
+@@ -1577,7 +1577,7 @@ dump_locale()
  	    GRV.lc_ilang.locale ? GRV.lc_ilang.locale : "(null)",
  	    GRV.lc_numeric.locale ? GRV.lc_numeric.locale : "(null)",
  	    GRV.lc_datefmt.locale ? GRV.lc_datefmt.locale : "(null)");
diff --git a/x11/olvwm/patches/patch-25 b/x11/olvwm/patches/patch-screen_c
similarity index 75%
rename from x11/olvwm/patches/patch-25
rename to x11/olvwm/patches/patch-screen_c
index 21194c16ac9..13ba4582f16 100644
--- a/x11/olvwm/patches/patch-25
+++ b/x11/olvwm/patches/patch-screen_c
@@ -1,5 +1,6 @@
---- screen.c.orig	Thu Jan 13 22:36:16 1994
-+++ ./screen.c	Fri Jul 16 21:49:04 1999
+$OpenBSD: patch-screen_c,v 1.1 2004/01/28 20:58:54 naddy Exp $
+--- screen.c.orig	1994-01-13 22:36:16.000000000 +0100
++++ screen.c	2004-01-28 21:49:10.000000000 +0100
 @@ -66,6 +66,13 @@
   *-------------------------------------------------------------------------*/
  List	*ScreenInfoList;			/* List of managed screens */
@@ -14,7 +15,7 @@
  
  /*-------------------------------------------------------------------------
   *	Local Data
-@@ -281,6 +288,7 @@
+@@ -281,6 +288,7 @@ isColorScreen(scrInfo,visInfo,nvisuals)
  		     	case StaticColor:
  		     	case PseudoColor:
  			case GrayScale:
diff --git a/x11/olvwm/patches/patch-st_c b/x11/olvwm/patches/patch-st_c
new file mode 100644
index 00000000000..02d8ff45b45
--- /dev/null
+++ b/x11/olvwm/patches/patch-st_c
@@ -0,0 +1,12 @@
+$OpenBSD: patch-st_c,v 1.1 2004/01/28 20:58:54 naddy Exp $
+--- st.c.orig	1994-01-13 22:36:18.000000000 +0100
++++ st.c	2004-01-28 21:49:10.000000000 +0100
+@@ -208,7 +208,7 @@ char ***slot;
+     }
+ }
+ 
+-static rehash(table)
++extern rehash(table)
+ register st_table *table;
+ {
+     register st_table_entry *ptr, *next, **old_bins = table->bins;
diff --git a/x11/olvwm/patches/patch-27 b/x11/olvwm/patches/patch-states_c
similarity index 77%
rename from x11/olvwm/patches/patch-27
rename to x11/olvwm/patches/patch-states_c
index 1a9bae392b7..9d8b76f167b 100644
--- a/x11/olvwm/patches/patch-27
+++ b/x11/olvwm/patches/patch-states_c
@@ -1,5 +1,6 @@
---- states.c.orig	Thu Jan 13 22:36:20 1994
-+++ ./states.c	Fri Jul 16 21:49:04 1999
+$OpenBSD: patch-states_c,v 1.1 2004/01/28 20:58:54 naddy Exp $
+--- states.c.orig	1994-01-13 22:36:20.000000000 +0100
++++ states.c	2004-01-28 21:49:10.000000000 +0100
 @@ -8,7 +8,7 @@
   */
  
@@ -19,7 +20,7 @@
  #include <X11/Xos.h>
  #include <X11/Xlib.h>
  #include <X11/Xutil.h>
-@@ -1356,7 +1358,9 @@
+@@ -1356,7 +1358,9 @@ Time	timestamp;
  		        (WinFunc(iconInfo,core.setconfigfunc))
  				(iconInfo->core.client->dpy, iconInfo);
  		    }
@@ -29,7 +30,7 @@
                          IconShow(cli, iconInfo);
                  	ClientSetWMState(cli, IconicState);
  		        if (cli->groupmask == GROUP_LEADER)
-@@ -1367,7 +1371,9 @@
+@@ -1367,7 +1371,9 @@ Time	timestamp;
  			    GroupApply(PANEWINOFCLIENT(cli), iconifyOne,
  				       iconInfo, GROUP_DEPENDENT);
  			}
diff --git a/x11/olvwm/patches/patch-28 b/x11/olvwm/patches/patch-usermenu_c
similarity index 74%
rename from x11/olvwm/patches/patch-28
rename to x11/olvwm/patches/patch-usermenu_c
index 30731370597..f020f5c88c8 100644
--- a/x11/olvwm/patches/patch-28
+++ b/x11/olvwm/patches/patch-usermenu_c
@@ -1,5 +1,6 @@
---- usermenu.c.orig	Thu Jan 13 22:36:21 1994
-+++ ./usermenu.c	Sat Jul 17 10:04:16 1999
+$OpenBSD: patch-usermenu_c,v 1.1 2004/01/28 20:58:54 naddy Exp $
+--- usermenu.c.orig	1994-01-13 22:36:21.000000000 +0100
++++ usermenu.c	2004-01-28 21:49:10.000000000 +0100
 @@ -5,7 +5,7 @@
   */
  
@@ -18,7 +19,7 @@
  #endif XPM
  
  #include <assert.h>
-@@ -1003,7 +1003,7 @@
+@@ -1003,7 +1003,7 @@ menuFromFile(file, menu, messages)
      int	 lineno = 1;	/* Needed for recursion */
      int		rval;
  
diff --git a/x11/olvwm/patches/patch-29 b/x11/olvwm/patches/patch-virtual_c
similarity index 60%
rename from x11/olvwm/patches/patch-29
rename to x11/olvwm/patches/patch-virtual_c
index 856871556ff..cfee25fc893 100644
--- a/x11/olvwm/patches/patch-29
+++ b/x11/olvwm/patches/patch-virtual_c
@@ -1,6 +1,7 @@
---- virtual.c.orig	Thu Jan 13 22:36:22 1994
-+++ ./virtual.c	Fri Jul 16 21:49:05 1999
-@@ -48,6 +48,9 @@
+$OpenBSD: patch-virtual_c,v 1.1 2004/01/28 20:58:54 naddy Exp $
+--- virtual.c.orig	1994-01-13 22:36:22.000000000 +0100
++++ virtual.c	2004-01-28 21:49:10.000000000 +0100
+@@ -48,6 +48,9 @@ regexp *expbuf;
  #ident "@(#)virtual.c	1.6 olvwm version 07 Jan 1994"
  #endif
  
@@ -10,7 +11,7 @@
  /* Class Function Vector; a virtual pane is the VDM window in which all
   * the little virtual windows appear (and to which said windows are
   * parented)
-@@ -2108,7 +2111,9 @@
+@@ -2108,7 +2111,9 @@ int val;
      }
  }
  
diff --git a/x11/olvwm/patches/patch-winframe_c b/x11/olvwm/patches/patch-winframe_c
new file mode 100644
index 00000000000..6c2bc86b2ea
--- /dev/null
+++ b/x11/olvwm/patches/patch-winframe_c
@@ -0,0 +1,12 @@
+$OpenBSD: patch-winframe_c,v 1.1 2004/01/28 20:58:54 naddy Exp $
+--- winframe.c.orig	1994-01-13 22:36:25.000000000 +0100
++++ winframe.c	2004-01-28 21:49:11.000000000 +0100
+@@ -52,6 +52,8 @@ extern int Resize_height, Resize_width;
+ 
+ extern Time TimeFresh();
+ 
++static	headerHeight();
++
+ /***************************************************************************
+ * private data
+ ***************************************************************************/
diff --git a/x11/olvwm/patches/patch-31 b/x11/olvwm/patches/patch-winicon_c
similarity index 66%
rename from x11/olvwm/patches/patch-31
rename to x11/olvwm/patches/patch-winicon_c
index f5f9ed9ea88..d5a011c799a 100644
--- a/x11/olvwm/patches/patch-31
+++ b/x11/olvwm/patches/patch-winicon_c
@@ -1,5 +1,6 @@
---- winicon.c.orig	Thu Jan 13 22:36:26 1994
-+++ ./winicon.c	Fri Jul 16 21:49:05 1999
+$OpenBSD: patch-winicon_c,v 1.1 2004/01/28 20:58:54 naddy Exp $
+--- winicon.c.orig	1994-01-13 22:36:26.000000000 +0100
++++ winicon.c	2004-01-28 21:49:11.000000000 +0100
 @@ -37,6 +37,10 @@
  extern 	Bool	PropGetWMName();
  extern 	Bool	PropGetWMIconName();
diff --git a/x11/olvwm/patches/patch-winipane_c b/x11/olvwm/patches/patch-winipane_c
new file mode 100644
index 00000000000..ba391a907ae
--- /dev/null
+++ b/x11/olvwm/patches/patch-winipane_c
@@ -0,0 +1,12 @@
+$OpenBSD: patch-winipane_c,v 1.1 2004/01/28 20:58:54 naddy Exp $
+--- winipane.c.orig	1994-01-13 22:36:26.000000000 +0100
++++ winipane.c	2004-01-28 21:49:11.000000000 +0100
+@@ -120,6 +120,8 @@ WinIconPane *winInfo;
+ #else
+     switch(winInfo->iconDepth) {
+ 	case 8:
++        case 16:
++        case 24:
+ 	    XCopyArea(dpy, winInfo->iconPixmap, pane, gc,
+ 		0, 0, winInfo->core.width, winInfo->core.height,
+ 		0, 0);