- use our naming scheme for patches

- kill a trailing whitespace in xpostit/Makefile

x11/xdu/patches/patch-xdu_c

@@ -1,10 +1,7 @@
-
-* Allow filenames with whitespace characters (not CR or LF though)
-* Correctly handle root directory entry ("/")
-
---- xdu.c.orig	Mon Apr 24 09:01:53 2000
-+++ xdu.c	Mon Apr 24 10:08:07 2000
-@@ -234,6 +234,7 @@
+$OpenBSD: patch-xdu_c,v 1.1 2007/10/26 20:59:01 jasper Exp $
+--- xdu.c.orig	Sun Jun  5 21:29:23 1994
++++ xdu.c	Fri Oct 26 22:44:33 2007
+@@ -235,6 +235,7 @@ char *filename;
  	char	name[4096];
  	int	size;
  	FILE	*fp;
@@ -12,7 +9,7 @@
  
  	if (strcmp(filename, "-") == 0) {
  		fp = stdin;
-@@ -243,11 +244,21 @@
+@@ -244,11 +245,21 @@ char *filename;
  			exit(1);
  		}
  	}
@@ -35,7 +32,7 @@
  	fclose(fp);
  }
  
-@@ -268,7 +279,7 @@
+@@ -269,7 +280,7 @@ int size;
  	length = strlen(name);
  	if ((length > 0) && (name[length-1] == '/')) {
  		/* strip off trailing / (e.g. GNU du) */
@@ -44,7 +41,7 @@
  	}
  
  	arg = 0; indx = 0;
-@@ -288,8 +299,10 @@
+@@ -289,8 +300,10 @@ int size;
  		}
  		name++;
  	}
@@ -57,7 +54,7 @@
  	path[arg] = NULL;
  
  	addtree(&top,path,size);
-@@ -398,15 +411,15 @@
+@@ -399,15 +412,15 @@ int size;
  
  	/*printf("addtree(\"%s\",\"%s\",%d)\n", top->name, path[0], size);*/
  

x11/xgrab/patches/patch-Imakefile

@@ -1,6 +1,6 @@
-$OpenBSD: patch-aa,v 1.2 2000/06/02 15:47:50 espie Exp $
+$OpenBSD: patch-Imakefile,v 1.1 2007/10/26 20:59:01 jasper Exp $
 --- Imakefile.orig	Tue Nov  7 20:31:39 1995
-+++ Imakefile	Fri Jun  2 17:31:46 2000
++++ Imakefile	Fri Oct 26 22:51:21 2007
 @@ -14,7 +14,7 @@
   *========================================================================
   */
@@ -10,7 +10,7 @@ $OpenBSD: patch-aa,v 1.2 2000/06/02 15:47:50 espie Exp $
  
  /* you can specify many config.h options here if you don't want to
   * modify config.h.  E.g.,
-@@ -59,11 +59,11 @@ ComplexProgramTarget_1(xgrabsc,Nil,$(XLI
+@@ -59,11 +59,11 @@ ComplexProgramTarget_1(xgrabsc,Nil,$(XLIB))
  ComplexProgramTarget_2(xgrab,Nil,$(LIBS2))
  SpecialObjectRule(Objs2,$(SRCS2) ADInc config.h, Nil)
  

x11/xgrab/patches/patch-xgrabsc_c

@@ -1,7 +1,7 @@
-$OpenBSD: patch-ab,v 1.2 2000/06/02 15:47:50 espie Exp $
+$OpenBSD: patch-xgrabsc_c,v 1.1 2007/10/26 20:59:01 jasper Exp $
 --- xgrabsc.c.orig	Tue Nov  7 20:31:41 1995
-+++ xgrabsc.c	Fri Jun  2 17:09:12 2000
-@@ -106,6 +106,7 @@ static Window xgTryChildren (win, WM_STA
++++ xgrabsc.c	Fri Oct 26 22:51:21 2007
+@@ -106,6 +106,7 @@ static Window xgTryChildren (win, WM_STATE)
  int ScreenNumberOfScreen (scr)
      register Screen *scr;
  {

x11/xlogout/patches/patch-Imakefile

@@ -1,5 +1,6 @@
+$OpenBSD: patch-Imakefile,v 1.1 2007/10/26 20:59:01 jasper Exp $
 --- Imakefile.orig	Thu Nov 30 00:29:33 1989
-+++ Imakefile	Fri Nov  6 19:00:24 1998
++++ Imakefile	Fri Oct 26 22:54:37 2007
 @@ -1,5 +1,5 @@
          DEPLIBS = XawClientDepLibs
 -LOCAL_LIBRARIES = XawClientsLibs

x11/xlogout/patches/patch-ab

@@ -1,11 +0,0 @@
---- xlogout.c.orig	Thu Nov 30 00:29:37 1989
-+++ xlogout.c	Fri Nov  6 19:06:53 1998
-@@ -48,7 +48,7 @@
- };
- 
- 
--void main (argc, argv)
-+int main (argc, argv)
-     int argc;
-     char **argv;
- {

x11/xlogout/patches/patch-xlogout_c

@@ -0,0 +1,12 @@
+$OpenBSD: patch-xlogout_c,v 1.1 2007/10/26 20:59:01 jasper Exp $
+--- xlogout.c.orig	Thu Nov 30 00:29:37 1989
++++ xlogout.c	Fri Oct 26 22:54:37 2007
+@@ -48,7 +48,7 @@ static XrmOptionDescRec options[] = {
+ };
+ 
+ 
+-void main (argc, argv)
++int main (argc, argv)
+     int argc;
+     char **argv;
+ {

x11/xpostit/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2007/09/15 20:04:28 merdely Exp $
+# $OpenBSD: Makefile,v 1.19 2007/10/26 20:59:01 jasper Exp $
 
 COMMENT=	PostIt (R) messages onto your X11 screen
 
@@ -18,7 +18,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		ICE SM X11 Xaw Xext Xmu Xp Xpm Xt c 
+WANTLIB=		ICE SM X11 Xaw Xext Xmu Xp Xpm Xt c
 
 USE_X11=	Yes
 CONFIGURE_STYLE=	imake

x11/xpostit/patches/patch-plaid_c

@@ -1,6 +1,7 @@
+$OpenBSD: patch-plaid_c,v 1.1 2007/10/26 20:59:01 jasper Exp $
 --- plaid.c.orig	Thu Dec 10 17:40:26 1992
-+++ plaid.c	Mon May  6 13:23:17 1996
-@@ -60,6 +60,7 @@
++++ plaid.c	Fri Oct 26 22:55:30 2007
+@@ -60,6 +60,7 @@ CreatePlaidWidget()
  {
  	Arg args[4];
  	register int nargs;
@@ -8,7 +9,7 @@
  
  	/*
  	 * Create the plaid widget.
-@@ -78,20 +79,22 @@
+@@ -78,20 +79,22 @@ CreatePlaidWidget()
  	 * Get the width and height of the widget.
  	 */
  	nargs = 0;
@@ -38,13 +39,3 @@
  
  		XtSetValues(plaidwidget, args, nargs);
  	}
---- ./xpostit.c.org	Thu Dec 10 08:40:27 1992
-+++ ./xpostit.c	Thu Oct 31 21:31:14 1996
-@@ -121,7 +121,6 @@
- {
- 	Arg args[4];
- 	char *appname;
--	char *rindex();
- 	Atom protos[2];
- 	register int nargs;
- 	Boolean setsigs = False;

x11/xpostit/patches/patch-xpostit_c

@@ -0,0 +1,11 @@
+$OpenBSD: patch-xpostit_c,v 1.1 2007/10/26 20:59:01 jasper Exp $
+--- xpostit.c.orig	Thu Dec 10 17:40:27 1992
++++ xpostit.c	Fri Oct 26 22:55:30 2007
+@@ -121,7 +121,6 @@ int argc;
+ {
+ 	Arg args[4];
+ 	char *appname;
+-	char *rindex();
+ 	Atom protos[2];
+ 	register int nargs;
+ 	Boolean setsigs = False;

x11/xzoom/patches/patch-Imakefile

@@ -0,0 +1,11 @@
+$OpenBSD: patch-Imakefile,v 1.1 2007/10/26 20:59:01 jasper Exp $
+--- Imakefile.orig	Wed Apr 17 11:04:51 1996
++++ Imakefile	Fri Oct 26 22:57:08 2007
+@@ -19,7 +19,4 @@ LOCAL_LIBRARIES = -lXext -lX11
+ 
+ NAME = xzoom
+ 
+-BINDIR = /usr/local/bin
+-MANPATH = /usr/local/man
+-
+ SimpleProgramTarget($(NAME))

x11/xzoom/patches/patch-aa

@@ -1,10 +0,0 @@
---- Imakefile.orig	Wed Apr 17 11:04:51 1996
-+++ Imakefile	Mon Apr  3 23:05:45 2000
-@@ -19,7 +19,4 @@
- 
- NAME = xzoom
- 
--BINDIR = /usr/local/bin
--MANPATH = /usr/local/man
--
- SimpleProgramTarget($(NAME))