Make this crap build again. PKGREVISION++ because of the xview-lib issues.

6 files changed, 60 insertions, 16 deletions

diff --git a/x11/xview-clients/Makefile b/x11/xview-clients/Makefile
index af68e9b4ace..f85d2985dcf 100644
--- a/x11/xview-clients/Makefile
+++ b/x11/xview-clients/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2007/02/15 14:55:26 rillig Exp $
+# $NetBSD: Makefile,v 1.32 2008/08/30 20:03:03 dholland Exp $
 
 DISTNAME=		xview3.2p1-X11R6
 PKGNAME=		xview-clients-3.2.1
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 
diff --git a/x11/xview-clients/distinfo b/x11/xview-clients/distinfo
index 5fa6b9969ef..bdde4ac30d7 100644
--- a/x11/xview-clients/distinfo
+++ b/x11/xview-clients/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2007/05/12 00:22:19 tnn Exp $
+$NetBSD: distinfo,v 1.8 2008/08/30 20:03:03 dholland Exp $
 
 SHA1 (xview3.2p1-X11R6.tar.gz) = 1cd04231b893c3e6c70b56791d527b498e21a27a
 RMD160 (xview3.2p1-X11R6.tar.gz) = 2f21b14cb088aec887683bbc6d4ed9a3bc3fe2bb
@@ -11,7 +11,7 @@ SHA1 (patch-ae) = 7f753cecac9cea559c4f068c5e1269e4c37c43fa
 SHA1 (patch-af) = dd07abd0b550b0dc70d37979dc4565b8d7512e0a
 SHA1 (patch-ag) = 831991b5a4821d8eeafbc99aec955d98c7f6effd
 SHA1 (patch-ah) = cc65141a303cf712225ff1094450a59659270a5c
-SHA1 (patch-ai) = 88b0e4e2846c109325dd7311d0c081f677b9a95e
+SHA1 (patch-ai) = 7f92299a1160f09a67461caae1285261609b237f
 SHA1 (patch-aj) = b25eecf40f5adb0fc1168de7f79133e46e861ca4
 SHA1 (patch-ak) = 1b6184a772270afe6b45c8550f19154ad62c585e
 SHA1 (patch-al) = c53df5677afab49f983cac760e4d9307a6f9e65e
@@ -56,7 +56,7 @@ SHA1 (patch-bx) = e7c5667480ff5825a75ac8fefd3440f7fdfb4ecb
 SHA1 (patch-by) = 067415c656c9b7d2c04fdcdf9a340a5e35a56ce0
 SHA1 (patch-bz) = 865f045373146de5dc629dc1973068c6ac4769c9
 SHA1 (patch-ca) = cdab4a603499cac14c78f53e5441f89ecd2517be
-SHA1 (patch-cb) = 4711998f0e4ce9edc683929bc152bff71e232111
+SHA1 (patch-cb) = 20d0af985a1ff98594fd91871fda4da2cf7a0e6b
 SHA1 (patch-cc) = 30ee919efa604c6c2c898005c457dec542972bf5
 SHA1 (patch-cd) = c0e79604ec2a079956c5ab084227520a27653569
 SHA1 (patch-ce) = 550cc9b33bad852b243edabf9cefb27e1dbe0d15
@@ -75,7 +75,7 @@ SHA1 (patch-cq) = ef43a3956c4c3be5abddb941dc462464a8d95399
 SHA1 (patch-cr) = a80e2eb1e5ca6590c9916423d60953b8eff1b8c7
 SHA1 (patch-cs) = e842d44ea449fa071c2fbd6851693b544e570a97
 SHA1 (patch-ct) = f1860aab72a787c721c1e798701ffeb14ead6ecf
-SHA1 (patch-cu) = c1d1e9d68cc4b4c4db924ee3f382a5b71f2b886f
+SHA1 (patch-cu) = e8318e31ace61651d931eae759ce0f273f92a632
 SHA1 (patch-cv) = 8fa492a471e5b52f79146a1b3c189a0634c684ac
 SHA1 (patch-cw) = c38e136c838c89b31b70910a4f4c8641b9707b7e
 SHA1 (patch-cx) = c8bb747e58214097df290f303a86683921a77a5f
@@ -98,3 +98,4 @@ SHA1 (patch-dn) = e147b6c9b3cd5b119006e8d8217ad3fd25adcd15
 SHA1 (patch-do) = 9b3461fff958764669e11115f881f9b1b71466f0
 SHA1 (patch-dp) = 42d0d86c0fb8e98d7245a98ed9b25bd9172c04df
 SHA1 (patch-dq) = 9744e800be15542261099a1d0f6e31483de68254
+SHA1 (patch-dr) = 2ae1f1d201fc85999ef5585aeb5583fbbfeb5854
diff --git a/x11/xview-clients/patches/patch-ai b/x11/xview-clients/patches/patch-ai
index e82323bee7b..f5062cfa382 100644
--- a/x11/xview-clients/patches/patch-ai
+++ b/x11/xview-clients/patches/patch-ai
@@ -1,18 +1,29 @@
-$NetBSD: patch-ai,v 1.1 2001/12/28 14:58:03 tron Exp $
+$NetBSD: patch-ai,v 1.2 2008/08/30 20:03:03 dholland Exp $
 
---- olwm/slave.c.orig	Tue Jun 29 07:11:57 1993
-+++ olwm/slave.c	Fri Dec 28 15:55:43 2001
+--- olwm/slave.c.orig	1993-06-29 01:11:57.000000000 -0400
++++ olwm/slave.c	2008-08-30 15:38:43.000000000 -0400
 @@ -1,4 +1,3 @@
 -#ident	"@(#)slave.c	26.13	93/06/28 SMI"
  
  /*
   *      (c) Copyright 1989 Sun Microsystems, Inc.
-@@ -21,6 +20,8 @@
+@@ -21,6 +20,9 @@
  #include <X11/Xlib.h>
  #include <signal.h>
  #include <stdio.h>
++#include <stdlib.h>
 +
 +#include <sys/param.h>
  
  #include "cmdstream.h"
  #include "error.h"
+@@ -44,8 +46,7 @@ static SlaveInfo slaveInfo = {
+  *	Local Forward Declarations
+  * ---------------------------------------------------------------------*/
+ 
+-void	SlaveFailure();
+-
++static void	SlaveFailure(void);
+ 
+ /* ----------------------------------------------------------------------
+  *	SlaveStart
diff --git a/x11/xview-clients/patches/patch-cb b/x11/xview-clients/patches/patch-cb
index 44ae4fc0db2..21e2282fc99 100644
--- a/x11/xview-clients/patches/patch-cb
+++ b/x11/xview-clients/patches/patch-cb
@@ -1,9 +1,17 @@
-$NetBSD: patch-cb,v 1.1 2001/12/28 14:58:05 tron Exp $
+$NetBSD: patch-cb,v 1.2 2008/08/30 20:03:03 dholland Exp $
 
---- olwm/st.c.orig	Tue Jun 29 07:11:58 1993
-+++ olwm/st.c	Fri Dec 28 15:55:43 2001
+--- olwm/st.c.orig	1993-06-29 01:11:58.000000000 -0400
++++ olwm/st.c	2008-08-30 15:41:45.000000000 -0400
 @@ -1,4 +1,3 @@
 -#ident	"@(#)st.c	26.8	93/06/28 SMI"
  
  /* This is a general purpose hash table package written by Peter Moore @ UCB. */
  
+@@ -6,6 +5,7 @@
+ #include "st.h"
+ #include "mem.h"
+ 
++static int rehash(register st_table *table);
+ 
+ #define max(a,b) ((a) > (b) ? (a) : (b))
+ #define nil(type) ((type *) 0)
diff --git a/x11/xview-clients/patches/patch-cu b/x11/xview-clients/patches/patch-cu
index 2ef2185e34f..f594a38b5b8 100644
--- a/x11/xview-clients/patches/patch-cu
+++ b/x11/xview-clients/patches/patch-cu
@@ -1,9 +1,17 @@
-$NetBSD: patch-cu,v 1.1 2001/12/28 14:58:06 tron Exp $
+$NetBSD: patch-cu,v 1.2 2008/08/30 20:03:03 dholland Exp $
 
---- olwm/winframe.c.orig	Tue Jun 29 07:12:03 1993
-+++ olwm/winframe.c	Fri Dec 28 15:55:43 2001
+--- olwm/winframe.c.orig	1993-06-29 01:12:03.000000000 -0400
++++ olwm/winframe.c	2008-08-30 15:44:21.000000000 -0400
 @@ -1,4 +1,3 @@
 -#ident	"@(#)winframe.c	26.77	93/06/28 SMI"
  
  /*
   *      (c) Copyright 1989 Sun Microsystems, Inc.
+@@ -72,6 +71,7 @@ void FrameUpdateShape();
+ static void setIMStatusText();
+ #endif
+ static void updateResizePositions();
++static int headerHeight(Client *cli, Graphics_info *gis);
+ 
+ /***************************************************************************
+ * sizing and decoration positioning functions
diff --git a/x11/xview-clients/patches/patch-dr b/x11/xview-clients/patches/patch-dr
new file mode 100644
index 00000000000..28476c4a79a
--- /dev/null
+++ b/x11/xview-clients/patches/patch-dr
@@ -0,0 +1,16 @@
+$NetBSD: patch-dr,v 1.1 2008/08/30 20:03:03 dholland Exp $
+
+--- clock/clock.c.orig	1993-06-29 01:11:39.000000000 -0400
++++ clock/clock.c	2008-08-30 15:36:59.000000000 -0400
+@@ -206,6 +206,11 @@ typedef struct clckObject {
+ 	Menu			menu;
+ 	} ClockObject, *Clock;
+ 
++static int min(int a, int b);
++static int armwidth(int r);
++static int seconds_on(Options o);
++static int date_on(Options o);
++
+ Server_image	handspr;
+ Server_image	spotpr;
+ Server_image	dotspr;