Cleanup patch files:

- unified format
- only one patch per file
- no files gets patched twice

1 files changed, 15 insertions, 35 deletions

diff --git a/x11/xview-lib/patches/patch-ac b/x11/xview-lib/patches/patch-ac
index 3fbf5edd268..b720e1334d9 100644
--- a/x11/xview-lib/patches/patch-ac
+++ b/x11/xview-lib/patches/patch-ac
@@ -1,36 +1,16 @@
-$NetBSD: patch-ac,v 1.2 1998/08/07 11:18:35 agc Exp $
+$NetBSD: patch-ac,v 1.3 2001/12/20 09:19:54 tron Exp $
 
-diff -rc ../old/xview3.2p1-X11R6/lib/libolgx/ol_init.c ./lib/libolgx/ol_init.c
-*** ../old/xview3.2p1-X11R6/lib/libolgx/ol_init.c	Tue Jun 29 01:18:28 1993
---- ./lib/libolgx/ol_init.c	Sun Nov 20 13:38:59 1994
-***************
-*** 9,15 ****
---- 9,18 ----
-  
-  #include <stdio.h>
-  #include <stdlib.h>
-+ #include <sys/param.h>
-+ #if !(defined(BSD) && (BSD >= 199103))
-  #include <malloc.h>
-+ #endif
-  #include <X11/Xlib.h>
-  #include "olgx_impl.h"
-  #include "busy.h"
-diff -rc ../old/xview3.2p1-X11R6/lib/libolgx/ol_sb.c ./lib/libolgx/ol_sb.c
-*** ../old/xview3.2p1-X11R6/lib/libolgx/ol_sb.c	Tue Jun 29 01:18:29 1993
---- ./lib/libolgx/ol_sb.c	Sun Nov 20 13:38:59 1994
-***************
-*** 11,17 ****
---- 11,22 ----
-   */
-  
-  #include <stdio.h>
-+ #include <sys/param.h>
-+ #if (defined(BSD) && (BSD >= 199103))
-+ #include <stdlib.h>
-+ #else
-  #include <malloc.h>
-+ #endif
-  #include <X11/Xlib.h>
-  #include <X11/Xutil.h>
-  #include "olgx_impl.h"
+--- images/Imakefile.orig	Tue Jun 29 07:18:41 1993
++++ images/Imakefile	Thu Dec 20 10:09:16 2001
+@@ -99,9 +99,9 @@
+ 
+ ALLFILES = $(BITMAPS) $(ICONS) $(PIXRECTS) $(CURSORS) $(IMAGES)
+ 
+-all: $(SRCS)
++all:: $(SRCS)
+ 
+-BuildIncludes($(INCLUDES_SRCS),$(IMAGE_INCDIR),/**/)
++BuildIncludes($(INCLUDES_SRCS),$(IMAGE_INCDIR),.)
+ 
+ install:: $(SRCS)
+ 	$(MKDIRHIER) $(HEADER_DEST)/$(IMAGEINC)