From c486a7d302de994dfa8276eab6a7013027f2c2d6 Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Fri, 26 Oct 2007 21:19:16 +0000
Subject: [PATCH] - use our naming scheme for patches

---
 games/starlanes/patches/patch-Makefile        | 14 +++++
 games/starlanes/patches/patch-aa              | 12 ----
 .../patches/{patch-aa => patch-Imakefile}     |  7 ++-
 .../xbill/patches/{patch-ac => patch-Cable_h} |  5 +-
 .../xbill/patches/{patch-ab => patch-Game_h}  |  5 +-
 .../patches/{patch-aa => patch-Imakefile}     |  5 +-
 .../patches/{patch-ad => patch-Library_cc}    |  5 +-
 games/xchomp/patches/patch-Imakefile          | 12 ++++
 games/xchomp/patches/patch-aa                 | 19 ------
 games/xchomp/patches/patch-ab                 |  6 --
 .../xchomp/patches/{patch-ac => patch-demo_c} |  7 ++-
 .../xchomp/patches/{patch-ad => patch-main_c} |  7 ++-
 .../patches/{patch-ae => patch-props_c}       | 11 +++-
 games/xchomp/patches/patch-xchomp_man         |  5 ++
 games/xgolgo/patches/patch-aa                 | 29 ---------
 games/xgolgo/patches/patch-ab                 | 59 -------------------
 games/xgolgo/patches/patch-xeyes_man          | 21 +++++++
 games/xgolgo/patches/patch-xgolgo_man         | 58 ++++++++++++++++++
 games/xinvaders/patches/patch-Imakefile       | 12 ++++
 games/xinvaders/patches/patch-aa              | 11 ----
 games/xinvaders/patches/patch-ae              | 11 ----
 .../patches/{patch-ab => patch-base_c}        | 15 ++---
 .../patches/{patch-ac => patch-main_c}        |  9 +--
 .../patches/{patch-ad => patch-score_c}       |  9 +--
 games/xinvaders/patches/patch-shot_c          | 12 ++++
 .../patches/{patch-af => patch-vaders_h}      | 15 ++---
 .../patches/{patch-ag => patch-widget_c}      |  8 +--
 .../{patch-aa => patch-Makefile_Linux}        |  7 ++-
 .../patches/{patch-ab => patch-Imakefile}     |  5 +-
 games/xmine/patches/patch-ac                  |  8 ---
 .../xmine/patches/{patch-aa => patch-xmine_c} | 44 +++++++-------
 games/xmine/patches/patch-xmine_man           |  9 +++
 .../patches/{patch-aa => patch-Makefile}      | 10 ++--
 .../xripple/patches/{patch-aa => patch-xrp_c} |  7 ++-
 .../patches/{patch-aa => patch-Makefile}      |  5 +-
 .../patches/{patch-ab => patch-xroach_c}      | 11 ++--
 .../patches/{patch-aa => patch-Imakefile}     |  4 +-
 .../patches/{patch-ab => patch-XScrabble_ad}  |  4 +-
 games/xscrabble/patches/patch-Xc_Control_c    | 12 ++++
 .../patches/{patch-ac => patch-Xc_Imakefile}  |  5 +-
 .../patches/{patch-ad => patch-src_Imakefile} |  5 +-
 .../patches/{patch-aa => patch-Imakefile}     |  5 +-
 42 files changed, 281 insertions(+), 249 deletions(-)
 create mode 100644 games/starlanes/patches/patch-Makefile
 delete mode 100644 games/starlanes/patches/patch-aa
 rename games/xbattle/patches/{patch-aa => patch-Imakefile} (72%)
 rename games/xbill/patches/{patch-ac => patch-Cable_h} (53%)
 rename games/xbill/patches/{patch-ab => patch-Game_h} (51%)
 rename games/xbill/patches/{patch-aa => patch-Imakefile} (81%)
 rename games/xbill/patches/{patch-ad => patch-Library_cc} (66%)
 create mode 100644 games/xchomp/patches/patch-Imakefile
 delete mode 100644 games/xchomp/patches/patch-aa
 delete mode 100644 games/xchomp/patches/patch-ab
 rename games/xchomp/patches/{patch-ac => patch-demo_c} (55%)
 rename games/xchomp/patches/{patch-ad => patch-main_c} (60%)
 rename games/xchomp/patches/{patch-ae => patch-props_c} (60%)
 create mode 100644 games/xchomp/patches/patch-xchomp_man
 delete mode 100644 games/xgolgo/patches/patch-aa
 delete mode 100644 games/xgolgo/patches/patch-ab
 create mode 100644 games/xgolgo/patches/patch-xeyes_man
 create mode 100644 games/xgolgo/patches/patch-xgolgo_man
 create mode 100644 games/xinvaders/patches/patch-Imakefile
 delete mode 100644 games/xinvaders/patches/patch-aa
 delete mode 100644 games/xinvaders/patches/patch-ae
 rename games/xinvaders/patches/{patch-ab => patch-base_c} (67%)
 rename games/xinvaders/patches/{patch-ac => patch-main_c} (60%)
 rename games/xinvaders/patches/{patch-ad => patch-score_c} (63%)
 create mode 100644 games/xinvaders/patches/patch-shot_c
 rename games/xinvaders/patches/{patch-af => patch-vaders_h} (74%)
 rename games/xinvaders/patches/{patch-ag => patch-widget_c} (51%)
 rename games/xjig/patches/{patch-aa => patch-Makefile_Linux} (73%)
 rename games/xmine/patches/{patch-ab => patch-Imakefile} (75%)
 delete mode 100644 games/xmine/patches/patch-ac
 rename games/xmine/patches/{patch-aa => patch-xmine_c} (84%)
 create mode 100644 games/xmine/patches/patch-xmine_man
 rename games/xminehunter/patches/{patch-aa => patch-Makefile} (85%)
 rename games/xripple/patches/{patch-aa => patch-xrp_c} (66%)
 rename games/xroach/patches/{patch-aa => patch-Makefile} (71%)
 rename games/xroach/patches/{patch-ab => patch-xroach_c} (80%)
 rename games/xscrabble/patches/{patch-aa => patch-Imakefile} (76%)
 rename games/xscrabble/patches/{patch-ab => patch-XScrabble_ad} (83%)
 create mode 100644 games/xscrabble/patches/patch-Xc_Control_c
 rename games/xscrabble/patches/{patch-ac => patch-Xc_Imakefile} (58%)
 rename games/xscrabble/patches/{patch-ad => patch-src_Imakefile} (71%)
 rename games/xsol/patches/{patch-aa => patch-Imakefile} (57%)

diff --git a/games/starlanes/patches/patch-Makefile b/games/starlanes/patches/patch-Makefile
new file mode 100644
index 00000000000..013ecf29846
--- /dev/null
+++ b/games/starlanes/patches/patch-Makefile
@@ -0,0 +1,14 @@
+$OpenBSD: patch-Makefile,v 1.1 2007/10/26 21:19:16 ajacoutot Exp $
+--- Makefile.orig	Sun Mar 30 01:36:44 1997
++++ Makefile	Fri Oct 26 22:55:11 2007
+@@ -3,8 +3,8 @@
+ #
+ 
+ CC=gcc
+-CCOPTS=-Wall
+-CURSESLIB=ncurses
++CCOPTS=-Wall ${CFLAGS}
++CURSESLIB=curses
+ INSTALLDIR=/usr/local
+ 
+ starlanes: starlanes.c
diff --git a/games/starlanes/patches/patch-aa b/games/starlanes/patches/patch-aa
deleted file mode 100644
index 776fdca5eba..00000000000
--- a/games/starlanes/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./Makefile.org	Sat Mar 29 16:36:44 1997
-+++ ./Makefile	Tue Jun 10 02:44:54 1997
-@@ -3,7 +3,7 @@
- #
- 
- CC=gcc
--CCOPTS=-Wall
-+CCOPTS=-Wall ${CFLAGS}
--CURSESLIB=ncurses
-+CURSESLIB=curses
- INSTALLDIR=/usr/local
- 
diff --git a/games/xbattle/patches/patch-aa b/games/xbattle/patches/patch-Imakefile
similarity index 72%
rename from games/xbattle/patches/patch-aa
rename to games/xbattle/patches/patch-Imakefile
index 2d4975ae576..3a259620797 100644
--- a/games/xbattle/patches/patch-aa
+++ b/games/xbattle/patches/patch-Imakefile
@@ -1,6 +1,7 @@
---- Imakefile.orig	Tue Oct 17 10:14:37 1995
-+++ Imakefile	Fri Oct  1 11:31:21 1999
-@@ -7,9 +7,9 @@
+$OpenBSD: patch-Imakefile,v 1.1 2007/10/26 21:19:16 ajacoutot Exp $
+--- Imakefile.orig	Tue Oct 17 15:14:37 1995
++++ Imakefile	Fri Oct 26 22:59:54 2007
+@@ -7,9 +7,9 @@ CCOPTIONS = -Wf,-XNl4096
  #endif
  #endif
  
diff --git a/games/xbill/patches/patch-ac b/games/xbill/patches/patch-Cable_h
similarity index 53%
rename from games/xbill/patches/patch-ac
rename to games/xbill/patches/patch-Cable_h
index 6682e7d9d77..7463d0df8e9 100644
--- a/games/xbill/patches/patch-ac
+++ b/games/xbill/patches/patch-Cable_h
@@ -1,6 +1,7 @@
+$OpenBSD: patch-Cable_h,v 1.1 2007/10/26 21:19:16 ajacoutot Exp $
 --- Cable.h.orig	Thu Jan 23 17:22:49 1997
-+++ Cable.h	Fri Jun  2 18:32:04 2000
-@@ -13,7 +13,7 @@ public:
++++ Cable.h	Fri Oct 26 23:01:32 2007
+@@ -13,7 +13,7 @@ class Cable { (public)
  	void setup();
  	void draw();
  	void update();
diff --git a/games/xbill/patches/patch-ab b/games/xbill/patches/patch-Game_h
similarity index 51%
rename from games/xbill/patches/patch-ab
rename to games/xbill/patches/patch-Game_h
index cf48d11f909..c466f073061 100644
--- a/games/xbill/patches/patch-ab
+++ b/games/xbill/patches/patch-Game_h
@@ -1,5 +1,6 @@
---- Game.h.orig	Tue Nov 30 19:56:38 1999
-+++ Game.h	Tue Nov 30 19:57:12 1999
+$OpenBSD: patch-Game_h,v 1.1 2007/10/26 21:19:16 ajacoutot Exp $
+--- Game.h.orig	Thu Jan 23 17:22:50 1997
++++ Game.h	Fri Oct 26 23:01:31 2007
 @@ -4,7 +4,7 @@
  #include "objects.h"
  
diff --git a/games/xbill/patches/patch-aa b/games/xbill/patches/patch-Imakefile
similarity index 81%
rename from games/xbill/patches/patch-aa
rename to games/xbill/patches/patch-Imakefile
index 207a52ab9a2..07000af2035 100644
--- a/games/xbill/patches/patch-aa
+++ b/games/xbill/patches/patch-Imakefile
@@ -1,12 +1,13 @@
+$OpenBSD: patch-Imakefile,v 1.1 2007/10/26 21:19:16 ajacoutot Exp $
 --- Imakefile.orig	Thu Jan 23 17:38:35 1997
-+++ Imakefile	Mon Apr 14 18:44:18 2003
++++ Imakefile	Fri Oct 26 23:01:31 2007
 @@ -1,4 +1,4 @@
 -XBILL_DIR = /var/lib/games/xbill/
 +XBILL_DIR = /usr/local/share/xbill/
  XCOMM XBILL_DIR = $(HOME)/.xbill/
  
  XCOMM Which widget set?  Motif looks slightly better; Athena is free.
-@@ -19,7 +19,7 @@ XBILL_DEF = -DXBILL_HOME=\"$(XBILL_DIR)\
+@@ -19,7 +19,7 @@ XBILL_DEF = -DXBILL_HOME=\"$(XBILL_DIR)\"
  
  INCLUDES = -I. $(XPMINC)
  CXXDEFINES = $(XBILL_DEF) $(DEFS) $(INCS)
diff --git a/games/xbill/patches/patch-ad b/games/xbill/patches/patch-Library_cc
similarity index 66%
rename from games/xbill/patches/patch-ad
rename to games/xbill/patches/patch-Library_cc
index a4aa4d4e228..8fcab6d5253 100644
--- a/games/xbill/patches/patch-ad
+++ b/games/xbill/patches/patch-Library_cc
@@ -1,5 +1,6 @@
---- Library.cc.orig	Thu Jan 23 08:22:50 1997
-+++ Library.cc	Wed Feb 12 00:51:28 1997
+$OpenBSD: patch-Library_cc,v 1.1 2007/10/26 21:19:16 ajacoutot Exp $
+--- Library.cc.orig	Thu Jan 23 17:22:50 1997
++++ Library.cc	Fri Oct 26 23:01:33 2007
 @@ -3,7 +3,7 @@
  void Library::load_pix() {
  	int i;
diff --git a/games/xchomp/patches/patch-Imakefile b/games/xchomp/patches/patch-Imakefile
new file mode 100644
index 00000000000..18c9d83a3ee
--- /dev/null
+++ b/games/xchomp/patches/patch-Imakefile
@@ -0,0 +1,12 @@
+$OpenBSD: patch-Imakefile,v 1.1 2007/10/26 21:19:16 ajacoutot Exp $
+--- Imakefile.orig	Fri Mar 18 06:16:10 1994
++++ Imakefile	Fri Oct 26 23:02:48 2007
+@@ -2,7 +2,7 @@
+ #include BandAidCompiler
+ #endif
+ 
+-DEFINES = -DX11
++DEFINES = -DX11 -DFRAME_DELAY=40000
+ INCLUDES = -I$(TOP) -I$(TOP)/X11
+ DEPLIBS = $(DEPXLIB)
+ LOCAL_LIBRARIES = $(XLIB)
diff --git a/games/xchomp/patches/patch-aa b/games/xchomp/patches/patch-aa
deleted file mode 100644
index 939478cf6d5..00000000000
--- a/games/xchomp/patches/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-*** Imakefile.orig	Mon Apr 23 05:50:51 1990
---- Imakefile	Wed Jan  4 00:23:19 1995
-***************
-*** 2,8 ****
-  #include BandAidCompiler
-  #endif
-  
-! DEFINES = -DX11
-  INCLUDES = -I$(TOP) -I$(TOP)/X11
-  DEPLIBS = $(DEPXLIB)
-  LOCAL_LIBRARIES = $(XLIB)
---- 2,8 ----
-  #include BandAidCompiler
-  #endif
-  
-! DEFINES = -DX11 -DFRAME_DELAY=40000
-  INCLUDES = -I$(TOP) -I$(TOP)/X11
-  DEPLIBS = $(DEPXLIB)
-  LOCAL_LIBRARIES = $(XLIB)
diff --git a/games/xchomp/patches/patch-ab b/games/xchomp/patches/patch-ab
deleted file mode 100644
index 3a42a9de703..00000000000
--- a/games/xchomp/patches/patch-ab
+++ /dev/null
@@ -1,6 +0,0 @@
-*** /dev/null	Tue May 19 23:02:34 1998
---- xchomp.man	Tue May 19 23:27:42 1998
-***************
-*** 0 ****
---- 1 ----
-+ 
diff --git a/games/xchomp/patches/patch-ac b/games/xchomp/patches/patch-demo_c
similarity index 55%
rename from games/xchomp/patches/patch-ac
rename to games/xchomp/patches/patch-demo_c
index 59bf4f7717b..afd1edc17d5 100644
--- a/games/xchomp/patches/patch-ac
+++ b/games/xchomp/patches/patch-demo_c
@@ -1,9 +1,12 @@
+$OpenBSD: patch-demo_c,v 1.1 2007/10/26 21:19:16 ajacoutot Exp $
 --- demo.c.orig	Fri Mar 18 06:12:23 1994
-+++ demo.c	Thu Mar 16 15:45:38 2000
-@@ -128,5 +128,5 @@
++++ demo.c	Fri Oct 26 23:02:48 2007
+@@ -127,7 +127,7 @@ demo_seq()
+       if (event.xany.window != window) continue;
        switch (event.type) {
           case KeyPress:
 -	    XLookupString(&event, &c_buf, 1, &last_key, &status);
 +	    XLookupString((XKeyEvent *) &event, &c_buf, 1, &last_key, &status);
  	    if ((last_key == XK_q) || (last_key == XK_Q))
  	       do_exit();
+ 	    XFillRectangle(display, window, clearGC, 0, 0, WIN_WIDTH,
diff --git a/games/xchomp/patches/patch-ad b/games/xchomp/patches/patch-main_c
similarity index 60%
rename from games/xchomp/patches/patch-ad
rename to games/xchomp/patches/patch-main_c
index bf641a2df99..a3207ae4305 100644
--- a/games/xchomp/patches/patch-ad
+++ b/games/xchomp/patches/patch-main_c
@@ -1,9 +1,12 @@
+$OpenBSD: patch-main_c,v 1.1 2007/10/26 21:19:16 ajacoutot Exp $
 --- main.c.orig	Fri Mar 18 06:12:24 1994
-+++ main.c	Thu Mar 16 15:45:54 2000
-@@ -167,5 +167,5 @@
++++ main.c	Fri Oct 26 23:02:48 2007
+@@ -166,7 +166,7 @@ play_game() {
+          if (event.xany.window != window) continue;
           switch (event.type) {
              case KeyPress:
 -               XLookupString(&event, &c_buf, 1, &last_key, &status);
 +               XLookupString((XKeyEvent *) &event, &c_buf, 1, &last_key, &status);
                 if (last_key == XK_space)
                    if (!pause_seq())
+                      goto demo;
diff --git a/games/xchomp/patches/patch-ae b/games/xchomp/patches/patch-props_c
similarity index 60%
rename from games/xchomp/patches/patch-ae
rename to games/xchomp/patches/patch-props_c
index 9c4c06957fb..74ed71dc6c0 100644
--- a/games/xchomp/patches/patch-ae
+++ b/games/xchomp/patches/patch-props_c
@@ -1,16 +1,21 @@
+$OpenBSD: patch-props_c,v 1.1 2007/10/26 21:19:16 ajacoutot Exp $
 --- props.c.orig	Fri Mar 18 06:13:17 1994
-+++ props.c	Thu Mar 16 15:46:08 2000
-@@ -116,5 +116,5 @@
++++ props.c	Fri Oct 26 23:02:48 2007
+@@ -115,7 +115,7 @@ Bool pause_seq()
+       if (event.xany.window != window) continue;
        switch (event.type) {
  	 case KeyPress:
 -	    XLookupString(&event, &c_buf, 1, &last_key, &status);
 +	    XLookupString((XKeyEvent *) &event, &c_buf, 1, &last_key, &status);
  	    if ((last_key == XK_q) || (last_key == XK_Q))
  	       do_exit();
-@@ -176,5 +176,5 @@
+ 	    if ((last_key == XK_r) || (last_key == XK_R))
+@@ -175,7 +175,7 @@ check_normal_events()
+       if (event.xany.window != window) continue;
        switch (event.type) {
           case KeyPress:
 -            XLookupString(&event, &c_buf, 1, &last_key, &status);
 +            XLookupString((XKeyEvent *) &event, &c_buf, 1, &last_key, &status);
              if (last_key == XK_space)
                 if (!pause_seq())
+                   longjmp(jb_start, 1);
diff --git a/games/xchomp/patches/patch-xchomp_man b/games/xchomp/patches/patch-xchomp_man
new file mode 100644
index 00000000000..748646f1839
--- /dev/null
+++ b/games/xchomp/patches/patch-xchomp_man
@@ -0,0 +1,5 @@
+$OpenBSD: patch-xchomp_man,v 1.1 2007/10/26 21:19:16 ajacoutot Exp $
+--- xchomp.man.orig	Fri Oct 26 23:02:48 2007
++++ xchomp.man	Fri Oct 26 23:02:48 2007
+@@ -0,0 +1 @@
++
diff --git a/games/xgolgo/patches/patch-aa b/games/xgolgo/patches/patch-aa
deleted file mode 100644
index 9c962ab085f..00000000000
--- a/games/xgolgo/patches/patch-aa
+++ /dev/null
@@ -1,29 +0,0 @@
-*** xeyes.man.orig	Tue Oct 14 11:44:06 1997
---- xeyes.man	Tue Oct 14 11:45:09 1997
-***************
-*** 1,12 ****
-! .TH XEYES 1 "Release 5" "X Version 11"
-  .SH NAME
-! xeyes \- a follow the mouse X demo
-  .SH SYNOPSIS
-! .B xeyes
-  [-option ...]
-  .SH DESCRIPTION
-! .I Xeyes
-! watches what you do and reports to the Boss.
-  .SH OPTIONS
-  .TP 8
-  .B \-fg \fIforeground color\fB
---- 1,12 ----
-! .TH XGOLGO 1 "Release 5" "X Version 11"
-  .SH NAME
-! xgolgo \- a follow the mouse X demo
-  .SH SYNOPSIS
-! .B xgolgo
-  [-option ...]
-  .SH DESCRIPTION
-! .I Xgolgo
-! watches what you do and whether you are hostile or not.
-  .SH OPTIONS
-  .TP 8
-  .B \-fg \fIforeground color\fB
diff --git a/games/xgolgo/patches/patch-ab b/games/xgolgo/patches/patch-ab
deleted file mode 100644
index dab573030ec..00000000000
--- a/games/xgolgo/patches/patch-ab
+++ /dev/null
@@ -1,59 +0,0 @@
-*** /dev/null	Tue May 19 23:02:34 1998
---- xgolgo.man	Tue May 19 23:18:59 1998
-***************
-*** 0 ****
---- 1,54 ----
-+ .TH XGOLGO 1 "Release 5" "X Version 11"
-+ .SH NAME
-+ xgolgo \- a follow the mouse X demo
-+ .SH SYNOPSIS
-+ .B xgolgo
-+ [-option ...]
-+ .SH DESCRIPTION
-+ .I Xgolgo
-+ watches what you do and whether you are hostile or not.
-+ .SH OPTIONS
-+ .TP 8
-+ .B \-fg \fIforeground color\fB
-+ choose a different color for the pupil of the eyes.
-+ .TP 8
-+ .B \-bg \fIbackground color\fB
-+ choose a different color for the background.
-+ .TP 8
-+ .B \-outline \fIoutline color\fB
-+ choose a different color for the outline of the eyes.
-+ .TP 8
-+ .B \-center \fIcenter color\fB
-+ choose a different color for the center of the eyes.
-+ .TP 8
-+ .B \-backing \fI{ WhenMapped Always NotUseful }\fB
-+ selects an appropriate level of backing store.
-+ .TP 8
-+ .B \-geometry \fIgeometry\fB
-+ define the initial window geometry; see \fIX(1)\fP.
-+ .TP 8
-+ .B \-display \fIdisplay\fB
-+ specify the display to use; see \fIX(1)\fP.
-+ .TP 8
-+ .B \-bd \fIborder color\fB
-+ choose a different color for the window border.
-+ .TP 8
-+ .B \-bw \fIborder width\fB
-+ choose a different width for the window border.
-+ .TP 8
-+ .B \-shape
-+ uses the SHAPE extension to shape the window.  This is the default.
-+ .TP 8
-+ .B \+shape
-+ Disables uses the SHAPE extension to shape the window.
-+ .SH "SEE ALSO"
-+ X(1), X Toolkit documentation
-+ .SH COPYRIGHT
-+ Copyright 1988, Massachusetts Institute of Technology.
-+ .br
-+ See \fIX(1)\fP for a full statement of rights and permissions.
-+ .SH AUTHOR
-+ Keith Packard, MIT X Consortium
-+ .br
-+ Copied from the NeWS version written (apparantly) by Jeremy Huxtable as seen
-+ at SIGGRAPH '88
diff --git a/games/xgolgo/patches/patch-xeyes_man b/games/xgolgo/patches/patch-xeyes_man
new file mode 100644
index 00000000000..df0ae620411
--- /dev/null
+++ b/games/xgolgo/patches/patch-xeyes_man
@@ -0,0 +1,21 @@
+$OpenBSD: patch-xeyes_man,v 1.1 2007/10/26 21:19:16 ajacoutot Exp $
+--- xeyes.man.orig	Fri Jun  4 01:53:05 1993
++++ xeyes.man	Fri Oct 26 23:03:56 2007
+@@ -1,12 +1,12 @@
+-.TH XEYES 1 "Release 5" "X Version 11"
++.TH XGOLGO 1 "Release 5" "X Version 11"
+ .SH NAME
+-xeyes \- a follow the mouse X demo
++xgolgo \- a follow the mouse X demo
+ .SH SYNOPSIS
+-.B xeyes
++.B xgolgo
+ [-option ...]
+ .SH DESCRIPTION
+-.I Xeyes
+-watches what you do and reports to the Boss.
++.I Xgolgo
++watches what you do and whether you are hostile or not.
+ .SH OPTIONS
+ .TP 8
+ .B \-fg \fIforeground color\fB
diff --git a/games/xgolgo/patches/patch-xgolgo_man b/games/xgolgo/patches/patch-xgolgo_man
new file mode 100644
index 00000000000..dd07127257e
--- /dev/null
+++ b/games/xgolgo/patches/patch-xgolgo_man
@@ -0,0 +1,58 @@
+$OpenBSD: patch-xgolgo_man,v 1.1 2007/10/26 21:19:16 ajacoutot Exp $
+--- xgolgo.man.orig	Fri Oct 26 23:03:56 2007
++++ xgolgo.man	Fri Oct 26 23:03:56 2007
+@@ -0,0 +1,54 @@
++.TH XGOLGO 1 "Release 5" "X Version 11"
++.SH NAME
++xgolgo \- a follow the mouse X demo
++.SH SYNOPSIS
++.B xgolgo
++[-option ...]
++.SH DESCRIPTION
++.I Xgolgo
++watches what you do and whether you are hostile or not.
++.SH OPTIONS
++.TP 8
++.B \-fg \fIforeground color\fB
++choose a different color for the pupil of the eyes.
++.TP 8
++.B \-bg \fIbackground color\fB
++choose a different color for the background.
++.TP 8
++.B \-outline \fIoutline color\fB
++choose a different color for the outline of the eyes.
++.TP 8
++.B \-center \fIcenter color\fB
++choose a different color for the center of the eyes.
++.TP 8
++.B \-backing \fI{ WhenMapped Always NotUseful }\fB
++selects an appropriate level of backing store.
++.TP 8
++.B \-geometry \fIgeometry\fB
++define the initial window geometry; see \fIX(1)\fP.
++.TP 8
++.B \-display \fIdisplay\fB
++specify the display to use; see \fIX(1)\fP.
++.TP 8
++.B \-bd \fIborder color\fB
++choose a different color for the window border.
++.TP 8
++.B \-bw \fIborder width\fB
++choose a different width for the window border.
++.TP 8
++.B \-shape
++uses the SHAPE extension to shape the window.  This is the default.
++.TP 8
++.B \+shape
++Disables uses the SHAPE extension to shape the window.
++.SH "SEE ALSO"
++X(1), X Toolkit documentation
++.SH COPYRIGHT
++Copyright 1988, Massachusetts Institute of Technology.
++.br
++See \fIX(1)\fP for a full statement of rights and permissions.
++.SH AUTHOR
++Keith Packard, MIT X Consortium
++.br
++Copied from the NeWS version written (apparantly) by Jeremy Huxtable as seen
++at SIGGRAPH '88
diff --git a/games/xinvaders/patches/patch-Imakefile b/games/xinvaders/patches/patch-Imakefile
new file mode 100644
index 00000000000..6bc78f8035d
--- /dev/null
+++ b/games/xinvaders/patches/patch-Imakefile
@@ -0,0 +1,12 @@
+$OpenBSD: patch-Imakefile,v 1.1 2007/10/26 21:19:16 ajacoutot Exp $
+--- Imakefile.orig	Fri Oct 26 23:05:34 2007
++++ Imakefile	Fri Oct 26 23:05:39 2007
+@@ -4,6 +4,7 @@ OBJS = spacers.o base.o widget.o main.o vaders.o shot.
+ 
+ SRCS = spacers.c base.c widget.c main.c vaders.c shot.c score.c
+ 
+-INCLUDES = -I$(TOP) -I$(TOP)/X11
++INCLUDES = -I$(TOP)
+ 
+ ComplexProgramTarget(xinvaders)
++MANSUFFIX=6
diff --git a/games/xinvaders/patches/patch-aa b/games/xinvaders/patches/patch-aa
deleted file mode 100644
index e0f555e4a9d..00000000000
--- a/games/xinvaders/patches/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- Imakefile.orig	Fri Sep 25 18:10:18 1998
-+++ Imakefile	Fri Sep 25 18:13:21 1998
-@@ -4,6 +4,7 @@
- 
- SRCS = spacers.c base.c widget.c main.c vaders.c shot.c score.c
- 
--INCLUDES = -I$(TOP) -I$(TOP)/X11
-+INCLUDES = -I$(TOP)
- 
- ComplexProgramTarget(xinvaders)
-+MANSUFFIX=6
diff --git a/games/xinvaders/patches/patch-ae b/games/xinvaders/patches/patch-ae
deleted file mode 100644
index 86efc302594..00000000000
--- a/games/xinvaders/patches/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
---- shot.c.orig	Sun Jul  5 20:01:40 1998
-+++ shot.c	Sun Jul  5 18:56:09 1998
-@@ -230,7 +230,7 @@
-   return BitmapSuccess;
- }
- 
--InitShot()
-+void InitShot()
- {
-     shottimerid = NULL;
-     numshots = 0;
diff --git a/games/xinvaders/patches/patch-ab b/games/xinvaders/patches/patch-base_c
similarity index 67%
rename from games/xinvaders/patches/patch-ab
rename to games/xinvaders/patches/patch-base_c
index 2025d2303fa..d20adc6d9e0 100644
--- a/games/xinvaders/patches/patch-ab
+++ b/games/xinvaders/patches/patch-base_c
@@ -1,6 +1,7 @@
---- base.c.orig	Sun Jul  5 20:01:35 1998
-+++ base.c	Sun Jul  5 18:54:53 1998
-@@ -48,11 +48,6 @@
+$OpenBSD: patch-base_c,v 1.1 2007/10/26 21:19:16 ajacoutot Exp $
+--- base.c.orig	Fri Oct 26 23:05:33 2007
++++ base.c	Fri Oct 26 23:05:40 2007
+@@ -48,11 +48,6 @@ XImage *explosion;
  
  int ReadBaseImage()
  {
@@ -12,7 +13,7 @@
    base->width = (scale == 1) ? base1_width : base2_width;
    base->height = (scale == 1) ? base1_height : base2_height;
  
-@@ -105,7 +100,7 @@
+@@ -105,7 +100,7 @@ GC gc;
  }
  
  
@@ -21,7 +22,7 @@
  int i;
  GC gc;
  {
-@@ -114,7 +109,7 @@
+@@ -114,7 +109,7 @@ GC gc;
  	    base->width, base->height);
  }
  
@@ -30,7 +31,7 @@
  {
    int i;
    XDrawString(dpy, labelwindow, scoregc,
-@@ -156,7 +151,7 @@
+@@ -156,7 +151,7 @@ int x,y;
    return FALSE;
  }
  
@@ -39,7 +40,7 @@
  {
    static Arg args[1];
  
-@@ -314,7 +309,7 @@
+@@ -314,7 +309,7 @@ int x,y;
    return FALSE;
  }
  
diff --git a/games/xinvaders/patches/patch-ac b/games/xinvaders/patches/patch-main_c
similarity index 60%
rename from games/xinvaders/patches/patch-ac
rename to games/xinvaders/patches/patch-main_c
index 9ada6c7ac4e..6e619cf2f7f 100644
--- a/games/xinvaders/patches/patch-ac
+++ b/games/xinvaders/patches/patch-main_c
@@ -1,6 +1,7 @@
---- main.c.orig	Sun Jul  5 20:01:36 1998
-+++ main.c	Sun Jul  5 19:20:11 1998
-@@ -135,14 +135,13 @@
+$OpenBSD: patch-main_c,v 1.1 2007/10/26 21:19:16 ajacoutot Exp $
+--- main.c.orig	Fri Oct 26 23:05:33 2007
++++ main.c	Fri Oct 26 23:05:40 2007
+@@ -135,14 +135,13 @@ caddr_t data;
    return w;
  }
  
@@ -16,7 +17,7 @@
  
    me_image = NULL;
  
-@@ -268,12 +267,4 @@
+@@ -268,12 +267,4 @@ char *path;
  #endif
       }
  }
diff --git a/games/xinvaders/patches/patch-ad b/games/xinvaders/patches/patch-score_c
similarity index 63%
rename from games/xinvaders/patches/patch-ad
rename to games/xinvaders/patches/patch-score_c
index c891c5ee80f..d32a645ea68 100644
--- a/games/xinvaders/patches/patch-ad
+++ b/games/xinvaders/patches/patch-score_c
@@ -1,6 +1,7 @@
---- score.c.orig	Sun Jul  5 20:01:39 1998
-+++ score.c	Sun Jul  5 18:56:23 1998
-@@ -20,7 +20,7 @@
+$OpenBSD: patch-score_c,v 1.1 2007/10/26 21:19:16 ajacoutot Exp $
+--- score.c.orig	Fri Oct 26 23:05:34 2007
++++ score.c	Fri Oct 26 23:05:40 2007
+@@ -20,7 +20,7 @@ Wed May  8 1991
  #define HILABEL		(SCOREPOS+20)
  #define HIPOS		(HILABEL+15)
  
@@ -9,7 +10,7 @@
  {
    char scorestring[8];
    XDrawImageString(dpy, labelwindow, scoregc, 0, SCORELABEL, "Score", 5);
-@@ -39,7 +39,7 @@
+@@ -39,7 +39,7 @@ PaintScore()
      XDrawImageString(dpy, labelwindow, scoregc, 0, HIPOS, scorestring, 7);
  }
  
diff --git a/games/xinvaders/patches/patch-shot_c b/games/xinvaders/patches/patch-shot_c
new file mode 100644
index 00000000000..359a4233b0d
--- /dev/null
+++ b/games/xinvaders/patches/patch-shot_c
@@ -0,0 +1,12 @@
+$OpenBSD: patch-shot_c,v 1.1 2007/10/26 21:19:16 ajacoutot Exp $
+--- shot.c.orig	Fri Oct 26 23:05:34 2007
++++ shot.c	Fri Oct 26 23:05:41 2007
+@@ -230,7 +230,7 @@ int ReadVshotImages()
+   return BitmapSuccess;
+ }
+ 
+-InitShot()
++void InitShot()
+ {
+     shottimerid = NULL;
+     numshots = 0;
diff --git a/games/xinvaders/patches/patch-af b/games/xinvaders/patches/patch-vaders_h
similarity index 74%
rename from games/xinvaders/patches/patch-af
rename to games/xinvaders/patches/patch-vaders_h
index 904ed60f6bf..be7818bbdd9 100644
--- a/games/xinvaders/patches/patch-af
+++ b/games/xinvaders/patches/patch-vaders_h
@@ -1,6 +1,7 @@
---- vaders.h.orig	Sun Jul  5 20:01:45 1998
-+++ vaders.h	Sun Jul  5 19:54:16 1998
-@@ -130,11 +130,11 @@
+$OpenBSD: patch-vaders_h,v 1.1 2007/10/26 21:19:16 ajacoutot Exp $
+--- vaders.h.orig	Fri Oct 26 23:05:36 2007
++++ vaders.h	Fri Oct 26 23:05:41 2007
+@@ -130,11 +130,11 @@ ext int vaderwait;		/* Number of milleseconds to wait 
  
  ext Pixel spacerpixel;
  ext XtIntervalId spacertimerid;
@@ -15,7 +16,7 @@
  ext int spacer_counter;		/* number of cycles to create a spacer */
  
  /* Shot info. */
-@@ -168,7 +168,6 @@
+@@ -168,7 +168,6 @@ ext XImage *me_image;
  
  /* From widget.c */
  
@@ -23,7 +24,7 @@
  extern void Quit();
  extern void Pause();
  extern int paused;
-@@ -188,6 +187,10 @@
+@@ -188,6 +187,10 @@ extern Boolean ShotHitsBuilding();
  extern void InitBase();
  extern void PaintBase();
  extern void DrawBuildings();
@@ -34,7 +35,7 @@
  
  /* From vaders.c */
  
-@@ -207,6 +210,10 @@
+@@ -207,6 +210,10 @@ extern void MakeSpacer();
  extern void InitSpacers();
  extern void PaintSpacer();
  
@@ -45,7 +46,7 @@
  /* From shot.c */
  
  extern void AddLine();
-@@ -216,6 +223,7 @@
+@@ -216,6 +223,7 @@ extern void MoveShots();
  extern void MoveVshots();
  extern void PaintAllShots();
  ext Pixel defaultfore, defaultback;
diff --git a/games/xinvaders/patches/patch-ag b/games/xinvaders/patches/patch-widget_c
similarity index 51%
rename from games/xinvaders/patches/patch-ag
rename to games/xinvaders/patches/patch-widget_c
index 38c2e7f905a..1e297e133c1 100644
--- a/games/xinvaders/patches/patch-ag
+++ b/games/xinvaders/patches/patch-widget_c
@@ -1,7 +1,7 @@
-diff -u ./widget.c ../widget.c
---- ./widget.c	Sun Jul  5 20:01:37 1998
-+++ ../widget.c	Sun Jul  5 19:55:08 1998
-@@ -25,8 +25,9 @@
+$OpenBSD: patch-widget_c,v 1.1 2007/10/26 21:19:16 ajacoutot Exp $
+--- widget.c.orig	Fri Oct 26 23:05:34 2007
++++ widget.c	Fri Oct 26 23:05:41 2007
+@@ -25,8 +25,9 @@ typedef struct _BaseRec {
  
  extern Base base;
  
diff --git a/games/xjig/patches/patch-aa b/games/xjig/patches/patch-Makefile_Linux
similarity index 73%
rename from games/xjig/patches/patch-aa
rename to games/xjig/patches/patch-Makefile_Linux
index abf48b92af8..e6f1607c463 100644
--- a/games/xjig/patches/patch-aa
+++ b/games/xjig/patches/patch-Makefile_Linux
@@ -1,5 +1,6 @@
---- Makefile.Linux.orig	Wed Jul 17 16:10:55 1996
-+++ Makefile.Linux	Sat Oct  2 17:35:30 1999
+$OpenBSD: patch-Makefile_Linux,v 1.1 2007/10/26 21:19:16 ajacoutot Exp $
+--- Makefile.Linux.orig	Wed Jul 17 22:10:55 1996
++++ Makefile.Linux	Fri Oct 26 23:07:06 2007
 @@ -1,11 +1,11 @@
  
  ### compiler section
@@ -15,7 +16,7 @@
  
  ### Directories for include files of X11 and libraries
  
-@@ -20,7 +20,7 @@
+@@ -20,7 +20,7 @@ LDFLAGS		= -L$(XLIB_DIR)
  .SUFFIXES: .C .o
  
  .C.o:
diff --git a/games/xmine/patches/patch-ab b/games/xmine/patches/patch-Imakefile
similarity index 75%
rename from games/xmine/patches/patch-ab
rename to games/xmine/patches/patch-Imakefile
index 191500182b7..4828c544694 100644
--- a/games/xmine/patches/patch-ab
+++ b/games/xmine/patches/patch-Imakefile
@@ -1,5 +1,6 @@
---- Imakefile.orig	Fri May 11 02:41:54 2001
-+++ Imakefile	Fri May  4 11:00:38 2001
+$OpenBSD: patch-Imakefile,v 1.1 2007/10/26 21:19:16 ajacoutot Exp $
+--- Imakefile.orig	Mon Dec 26 12:42:58 1994
++++ Imakefile	Fri Oct 26 23:07:54 2007
 @@ -1,5 +1,7 @@
 +MANSUFFIX=6
 +
diff --git a/games/xmine/patches/patch-ac b/games/xmine/patches/patch-ac
deleted file mode 100644
index 44f1f7ad6b2..00000000000
--- a/games/xmine/patches/patch-ac
+++ /dev/null
@@ -1,8 +0,0 @@
---- xmine.man.orig	Mon Mar 28 10:15:52 1994
-+++ xmine.man	Fri Jan  3 03:27:40 1997
-@@ -1,4 +1,4 @@
--.TH XMINE 1
-+.TH XMINE 6
- .SH NAME
- xmine \- identify mines in a mine field without getting blown up
- .SH SYNOPSIS
diff --git a/games/xmine/patches/patch-aa b/games/xmine/patches/patch-xmine_c
similarity index 84%
rename from games/xmine/patches/patch-aa
rename to games/xmine/patches/patch-xmine_c
index 1856d7124cd..daea964f261 100644
--- a/games/xmine/patches/patch-aa
+++ b/games/xmine/patches/patch-xmine_c
@@ -1,5 +1,6 @@
---- xmine.c.orig	Fri May 11 02:41:41 2001
-+++ xmine.c	Fri May 11 00:49:10 2001
+$OpenBSD: patch-xmine_c,v 1.1 2007/10/26 21:19:16 ajacoutot Exp $
+--- xmine.c.orig	Mon Dec 26 12:31:20 1994
++++ xmine.c	Fri Oct 26 23:07:54 2007
 @@ -78,6 +78,13 @@
  #define GSPACEX 16
  #define GSPACEY 16
@@ -14,7 +15,7 @@
  #define SCORE_FILE "~/.xmine_scores"
  #define TOPMARGIN 60
  #define BOTMARGIN 12
-@@ -119,6 +126,7 @@
+@@ -119,6 +126,7 @@ Widget drawarea;
  Display *disp;
  Window win;
  int colordisp;
@@ -22,7 +23,7 @@
  
  #define COL_BLUE 0
  #define COL_LIMEGREEN 1
-@@ -239,6 +247,7 @@
+@@ -239,6 +247,7 @@ void	get_score_file_name P ((char *));
  int	cant_write_score_file P ((void));
  void	fix_size P ((void));
  void	relax_size P ((void));
@@ -30,7 +31,7 @@
  
  Pixmap fillface;
  XtAppContext app;
-@@ -271,7 +280,7 @@
+@@ -271,7 +280,7 @@ main(argc, argv)
  	XColor unused;
  	int i;
  
@@ -39,7 +40,7 @@
  	String translations =
  		"<Btn1Down>:   search(down)\n\
  		 <Btn1Up>:     search(up)\n\
-@@ -284,6 +293,8 @@
+@@ -284,6 +293,8 @@ main(argc, argv)
  	toplevel = XtVaAppInitialize(&app, "Xmine", NULL, 0,
  				     &argc, argv, fallbacks, NULL);
  
@@ -48,22 +49,23 @@
  	main_w = XtVaCreateManagedWidget("main_w", boxWidgetClass, toplevel,
  					 XtNorientation, XtorientVertical,
  					 NULL);
-@@ -383,7 +394,13 @@
+@@ -383,8 +394,14 @@ main(argc, argv)
  	actions[1].proc = search_action;
  	actions[2].string = "mark";
  	actions[2].proc = mark_action;
 -	XtAppAddActions(app, actions, 3);
 +	actions[3].string = "GlobalProtoHandler";
 +	actions[3].proc = GlobalProtoHandler;
-+
+ 
 +	XtAppAddActions(app, actions, 4);
 +	XtOverrideTranslations(toplevel, XtParseTranslationTable(
 +		"<Message>WM_PROTOCOLS : GlobalProtoHandler()")
 +	);
- 
++
  	drawing_a = XtVaCreateManagedWidget
  		("drawing_a",
-@@ -404,6 +421,7 @@
+ 		 canvasWidgetClass, main_w,
+@@ -404,6 +421,7 @@ main(argc, argv)
  	XtAddEventHandler(toplevel,
  			  StructureNotifyMask, False, resize_handler, 0);
  	XtRealizeWidget(toplevel);
@@ -71,7 +73,7 @@
  	fillface = XCreateBitmapFromData(XtDisplay(main_w),
  					 XtWindow(main_w), fillface_bits,
  					 fillface_width, fillface_height);
-@@ -461,13 +479,15 @@
+@@ -461,13 +479,15 @@ search_action(widget, ev, args, num_args)
  		if (xg == armed_x && yg == armed_y) {
  			if (!armed) {
  				set_face(FACE_OHNO);
@@ -89,7 +91,7 @@
  				armed = False;
  			}
  		}
-@@ -628,11 +648,12 @@
+@@ -628,11 +648,12 @@ arm_clear(x, y, armit)
  	set_face(armit ? FACE_OHNO : FACE_HAPPY);
  	for (dx = -1; dx <= 1; dx++)
  		for (dy = -1; dy <= 1; dy++)
@@ -103,7 +105,7 @@
  }
  
  #if NeedFunctionPrototypes
-@@ -911,12 +932,21 @@
+@@ -911,12 +932,21 @@ layout_board(fx, fy)
  {
  	int i, x, y, xd, yd, tries;
  
@@ -125,7 +127,7 @@
  			tries--;
  		} while (tries && (grid[x][y] ||
  				   !(x < fx-1 || x > fx+1 || y < fy-1
-@@ -1069,6 +1099,7 @@
+@@ -1069,6 +1099,7 @@ winner()
  		for (y = 0; y != gsizey; y++)
  			if (gridview[x][y] == COVERED) {
  				gridview[x][y] = MARKED;
@@ -133,7 +135,7 @@
  				redrawsquare(x, y);
  			}
  	draw_digits(0, 0);
-@@ -1346,6 +1377,10 @@
+@@ -1346,6 +1377,10 @@ set_custom(dummy, closure, call_data)
  	XtAddCallback(w, XtNcallback, dialog_ok, NULL);
  	XtManageChild(pane);
  	XtPopup(custom, XtGrabExclusive);
@@ -144,7 +146,7 @@
  	dialog_up = True;
  	while (dialog_up) {
  		XtAppProcessEvent(app, XtIMAll);
-@@ -1391,7 +1426,6 @@
+@@ -1391,7 +1426,6 @@ get_text_int(w, val)
  	str = XawDialogGetValueString(w);
  	if (!str) return;
  	if (atoi(str)) *val = atoi(str);
@@ -152,7 +154,7 @@
  }
  
  /* ARGSUSED */
-@@ -1510,6 +1544,10 @@
+@@ -1510,6 +1544,10 @@ best_times(dummy, closure, call_data)
  	if (cant_write_score_file()) XtSetSensitive(w, False);
  	XtManageChild(pane);
  	XtPopup(best, XtGrabExclusive);
@@ -163,7 +165,7 @@
  	dialog_up = True;
  	while (dialog_up) {
  		XtAppProcessEvent(app, XtIMAll);
-@@ -1554,6 +1592,10 @@
+@@ -1554,6 +1592,10 @@ Xaw version by J%crg Wunsch", PATCHLEVEL, 0xf6 /* o-um
  	XtAddCallback(w, XtNcallback, dialog_ok, NULL);
  	XtManageChild(pane);
  	XtPopup(about, XtGrabExclusive);
@@ -174,7 +176,7 @@
  	dialog_up = True;
  	while (dialog_up) {
  		XtAppProcessEvent(app, XtIMAll);
-@@ -1659,6 +1701,10 @@
+@@ -1659,6 +1701,10 @@ new_best(closure, id)
  	
  	XtManageChild(pane);
  	XtPopup(custom, XtGrabExclusive);
@@ -185,7 +187,7 @@
  
  	dialog_up = True;
  	while (dialog_up) {
-@@ -1672,7 +1718,6 @@
+@@ -1672,7 +1718,6 @@ new_best(closure, id)
  		sc->times[level] = timer;
  		write_scores(sc);
  	}
@@ -193,7 +195,7 @@
  	best_times(NULL, NULL, NULL);
  }
  
-@@ -1814,3 +1859,24 @@
+@@ -1814,3 +1859,24 @@ exit_game(dummy, closure, call_data)
  {
  	exit(0);
  }
diff --git a/games/xmine/patches/patch-xmine_man b/games/xmine/patches/patch-xmine_man
new file mode 100644
index 00000000000..4aaa4c2d83c
--- /dev/null
+++ b/games/xmine/patches/patch-xmine_man
@@ -0,0 +1,9 @@
+$OpenBSD: patch-xmine_man,v 1.1 2007/10/26 21:19:16 ajacoutot Exp $
+--- xmine.man.orig	Mon Mar 28 20:15:52 1994
++++ xmine.man	Fri Oct 26 23:07:55 2007
+@@ -1,4 +1,4 @@
+-.TH XMINE 1
++.TH XMINE 6
+ .SH NAME
+ xmine \- identify mines in a mine field without getting blown up
+ .SH SYNOPSIS
diff --git a/games/xminehunter/patches/patch-aa b/games/xminehunter/patches/patch-Makefile
similarity index 85%
rename from games/xminehunter/patches/patch-aa
rename to games/xminehunter/patches/patch-Makefile
index 640a5dbad56..1fce0d2d040 100644
--- a/games/xminehunter/patches/patch-aa
+++ b/games/xminehunter/patches/patch-Makefile
@@ -1,6 +1,7 @@
+$OpenBSD: patch-Makefile,v 1.1 2007/10/26 21:19:16 ajacoutot Exp $
 --- Makefile.orig	Mon Jul 22 08:11:34 1996
-+++ Makefile	Sat Mar 17 16:34:09 2001
-@@ -1,13 +1,12 @@
++++ Makefile	Fri Oct 26 23:08:54 2007
+@@ -1,14 +1,13 @@
 -INSTALL_BIN_PATH = /usr/local/bin
 -INSTALL_SCORE_PATH = /usr/local/lib/xminehunter
 +INSTALL_BIN_PATH = ${LOCALBASE}/bin
@@ -14,12 +15,13 @@
 +CC = ${CXX}
  
 -CC = g++
--
--CFLAGS = -DMINE_SCORE_PATH=\"${INSTALL_SCORE_PATH}\"
 +CFLAGS += -DMINE_SCORE_PATH=\"${INSTALL_SCORE_PATH}\"
  
+-CFLAGS = -DMINE_SCORE_PATH=\"${INSTALL_SCORE_PATH}\"
+-
  # no need to change anything below this line
  
+ PGM = xminehunter
 @@ -50,7 +49,7 @@ bitmap.o: ${HEADERS} bitmap.cc
  
  install:
diff --git a/games/xripple/patches/patch-aa b/games/xripple/patches/patch-xrp_c
similarity index 66%
rename from games/xripple/patches/patch-aa
rename to games/xripple/patches/patch-xrp_c
index 2cf126cdf5d..990df68f571 100644
--- a/games/xripple/patches/patch-aa
+++ b/games/xripple/patches/patch-xrp_c
@@ -1,6 +1,7 @@
---- xrp.c.orig	Wed Jul 10 08:47:30 1996
-+++ xrp.c	Wed Mar 18 14:49:59 1998
-@@ -124,7 +124,19 @@
+$OpenBSD: patch-xrp_c,v 1.1 2007/10/26 21:19:17 ajacoutot Exp $
+--- xrp.c.orig	Wed Jul 10 14:47:30 1996
++++ xrp.c	Fri Oct 26 23:10:56 2007
+@@ -124,7 +124,19 @@ doit()
  
  main(int argc, char **argv)
  {  
diff --git a/games/xroach/patches/patch-aa b/games/xroach/patches/patch-Makefile
similarity index 71%
rename from games/xroach/patches/patch-aa
rename to games/xroach/patches/patch-Makefile
index c57c2ee416c..7cc34c823ba 100644
--- a/games/xroach/patches/patch-aa
+++ b/games/xroach/patches/patch-Makefile
@@ -1,5 +1,6 @@
---- Makefile.orig	Tue Jun  8 20:00:00 1993
-+++ Makefile	Fri Mar 31 16:15:28 2000
+$OpenBSD: patch-Makefile,v 1.1 2007/10/26 21:19:17 ajacoutot Exp $
+--- Makefile.orig	Wed Jun  9 02:00:00 1993
++++ Makefile	Fri Oct 26 23:11:45 2007
 @@ -1,9 +1,11 @@
  #	@(#)Makefile	8.1 (Berkeley) 6/8/93
  
diff --git a/games/xroach/patches/patch-ab b/games/xroach/patches/patch-xroach_c
similarity index 80%
rename from games/xroach/patches/patch-ab
rename to games/xroach/patches/patch-xroach_c
index 9a32077e02c..1ecbc9c94c8 100644
--- a/games/xroach/patches/patch-ab
+++ b/games/xroach/patches/patch-xroach_c
@@ -1,6 +1,7 @@
---- xroach.c.orig	Wed Sep 22 18:18:08 1999
-+++ xroach.c	Wed Sep 22 18:18:17 1999
-@@ -77,7 +77,7 @@
+$OpenBSD: patch-xroach_c,v 1.1 2007/10/26 21:19:17 ajacoutot Exp $
+--- xroach.c.orig	Fri Jun  4 02:00:00 1993
++++ xroach.c	Fri Oct 26 23:11:46 2007
+@@ -77,7 +77,7 @@ int CalcRootVisible();
  int MarkHiddenRoaches();
  Pixel AllocNamedColor();
  
@@ -9,7 +10,7 @@
  main(ac, av)
  int ac;
  char *av[];
-@@ -96,26 +96,30 @@
+@@ -96,26 +96,30 @@ char *av[];
      /*
         Process command line options.
      */
@@ -47,7 +48,7 @@
      
      /*
         Catch some signals so we can erase any visible roaches.
-@@ -212,6 +216,7 @@
+@@ -212,6 +216,7 @@ char *av[];
      CoverRoot();
      
      XCloseDisplay(display);
diff --git a/games/xscrabble/patches/patch-aa b/games/xscrabble/patches/patch-Imakefile
similarity index 76%
rename from games/xscrabble/patches/patch-aa
rename to games/xscrabble/patches/patch-Imakefile
index 42fa1e6208d..84a7ac187b7 100644
--- a/games/xscrabble/patches/patch-aa
+++ b/games/xscrabble/patches/patch-Imakefile
@@ -1,6 +1,6 @@
-$OpenBSD: patch-aa,v 1.3 2003/04/15 12:42:31 wilfried Exp $
+$OpenBSD: patch-Imakefile,v 1.1 2007/10/26 21:19:17 ajacoutot Exp $
 --- Imakefile.orig	Tue Mar 11 06:56:29 1997
-+++ Imakefile	Mon Apr 14 14:49:03 2003
++++ Imakefile	Fri Oct 26 23:12:39 2007
 @@ -9,3 +9,6 @@ DependSubdirs($(SUBDIRS))
  MakeLintLibSubdirs($(SUBDIRS))
  MakeLintSubdirs($(SUBDIRS),install.ln,install.ln)
diff --git a/games/xscrabble/patches/patch-ab b/games/xscrabble/patches/patch-XScrabble_ad
similarity index 83%
rename from games/xscrabble/patches/patch-ab
rename to games/xscrabble/patches/patch-XScrabble_ad
index 889b85f9852..24bcc52c697 100644
--- a/games/xscrabble/patches/patch-ab
+++ b/games/xscrabble/patches/patch-XScrabble_ad
@@ -1,6 +1,6 @@
-$OpenBSD: patch-ab,v 1.2 2003/04/15 12:42:31 wilfried Exp $
+$OpenBSD: patch-XScrabble_ad,v 1.1 2007/10/26 21:19:17 ajacoutot Exp $
 --- XScrabble.ad.orig	Tue Mar 11 06:57:16 1997
-+++ XScrabble.ad	Mon Apr 14 14:50:27 2003
++++ XScrabble.ad	Fri Oct 26 23:12:39 2007
 @@ -1,9 +1,9 @@
  ! *** XScrabble resource file ***
  
diff --git a/games/xscrabble/patches/patch-Xc_Control_c b/games/xscrabble/patches/patch-Xc_Control_c
new file mode 100644
index 00000000000..cef52d4105d
--- /dev/null
+++ b/games/xscrabble/patches/patch-Xc_Control_c
@@ -0,0 +1,12 @@
+$OpenBSD: patch-Xc_Control_c,v 1.1 2007/10/26 21:19:17 ajacoutot Exp $
+--- Xc/Control.c.orig	Sun Nov  5 13:17:43 1995
++++ Xc/Control.c	Sun Nov  5 13:17:43 1995
+@@ -547,7 +547,7 @@ char ch;
+ 	 *dest = ch;
+    }
+ 
+-   dest = NULL;
++   *dest = 0;
+ 
+ }  /* end of ToLower */
+ 
diff --git a/games/xscrabble/patches/patch-ac b/games/xscrabble/patches/patch-Xc_Imakefile
similarity index 58%
rename from games/xscrabble/patches/patch-ac
rename to games/xscrabble/patches/patch-Xc_Imakefile
index 896e533cb75..c1c7653621c 100644
--- a/games/xscrabble/patches/patch-ac
+++ b/games/xscrabble/patches/patch-Xc_Imakefile
@@ -1,6 +1,7 @@
+$OpenBSD: patch-Xc_Imakefile,v 1.1 2007/10/26 21:19:17 ajacoutot Exp $
 --- Xc/Imakefile.orig	Fri Nov 10 18:53:09 1995
-+++ Xc/Imakefile	Sun Jul 27 10:23:24 1997
-@@ -22,10 +22,8 @@
++++ Xc/Imakefile	Fri Oct 26 23:12:39 2007
+@@ -22,10 +22,8 @@ LOCAL_LIBS = $(XCLIB) XawClientLibs
  #endif
  
  NormalLibraryTarget(Xc,$(OBJS))
diff --git a/games/xscrabble/patches/patch-ad b/games/xscrabble/patches/patch-src_Imakefile
similarity index 71%
rename from games/xscrabble/patches/patch-ad
rename to games/xscrabble/patches/patch-src_Imakefile
index bfaa8eb1945..60720521fcc 100644
--- a/games/xscrabble/patches/patch-ad
+++ b/games/xscrabble/patches/patch-src_Imakefile
@@ -1,5 +1,6 @@
+$OpenBSD: patch-src_Imakefile,v 1.1 2007/10/26 21:19:17 ajacoutot Exp $
 --- src/Imakefile.orig	Tue Mar 11 06:56:24 1997
-+++ src/Imakefile	Sun Jul 27 10:04:12 1997
++++ src/Imakefile	Fri Oct 26 23:12:39 2007
 @@ -28,8 +28,8 @@
       PROGRAMS = xscrab xscrabble
          SLIBS = 
@@ -11,7 +12,7 @@
  
      CCOPTIONS = 
  
-@@ -39,4 +39,7 @@
+@@ -39,4 +39,7 @@ NormalProgramTarget(xscrab,$(OBJS),$(DEPLIBS),$(LOCAL_
  NormalProgramTarget(xscrabble,$(SETUP_OBJS),$(DEPLIBS),$(LOCAL_LIBS),$(SLIBS))
  
  DependTarget()
diff --git a/games/xsol/patches/patch-aa b/games/xsol/patches/patch-Imakefile
similarity index 57%
rename from games/xsol/patches/patch-aa
rename to games/xsol/patches/patch-Imakefile
index 4e6e08e047f..dcec4bd2744 100644
--- a/games/xsol/patches/patch-aa
+++ b/games/xsol/patches/patch-Imakefile
@@ -1,5 +1,6 @@
---- Imakefile.orig	Sun Jan 23 14:14:53 2000
-+++ Imakefile	Sun Jan 23 14:15:00 2000
+$OpenBSD: patch-Imakefile,v 1.1 2007/10/26 21:19:17 ajacoutot Exp $
+--- Imakefile.orig	Thu Jul 30 11:58:36 1992
++++ Imakefile	Fri Oct 26 23:13:42 2007
 @@ -1,6 +1,7 @@
          DEPLIBS = $(DEPOLDXLIB) $(DEPXLIB) 
  LOCAL_LIBRARIES = $(OLDXLIB) $(XLIB)