Update to Windowmaker 0.64.0 (WINGs include path change, and rename of

a function).

5 files changed, 35 insertions, 12 deletions

diff --git a/x11/wmessage/Makefile b/x11/wmessage/Makefile
index 7ce9c498559..c34b3bc510b 100644
--- a/x11/wmessage/Makefile
+++ b/x11/wmessage/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/02/17 17:06:53 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2001/03/22 14:00:39 wiz Exp $
 
 DISTNAME=	wmessage-0.8
 CATEGORIES=	x11
@@ -8,7 +8,7 @@ MAINTAINER=	jlam@netbsd.org
 HOMEPAGE=	http://www.ozemail.com.au/~crn/wmessage/
 COMMENT=	WINGs based message viewer similar to xmessage
 
-DEPENDS+=	windowmaker>=0.61.0:../../wm/windowmaker
+DEPENDS+=	windowmaker>=0.64.0:../../wm/windowmaker
 
 USE_X11=	yes
 
diff --git a/x11/wmessage/files/patch-sum b/x11/wmessage/files/patch-sum
index 77512823911..a8768272552 100644
--- a/x11/wmessage/files/patch-sum
+++ b/x11/wmessage/files/patch-sum
@@ -1,4 +1,5 @@
-$NetBSD: patch-sum,v 1.2 1999/10/06 06:07:24 jlam Exp $
+$NetBSD: patch-sum,v 1.3 2001/03/22 14:00:40 wiz Exp $
 
-MD5 (patch-aa) = 40a19c45efbb8fca1c996887665e7069
-MD5 (patch-ab) = 462cf86b2f1604ee6a628b3ee705ce1f
+SHA1 (patch-aa) = 93c9b769b1c5e652aa114f373d6b195a234e39dc
+SHA1 (patch-ab) = b3bf6c311ad8d0f4080ceb2e6aab29177d1f569c
+SHA1 (patch-ac) = 69a032cbbf5d4ecca497c90a89316a700301a5e4
diff --git a/x11/wmessage/patches/patch-aa b/x11/wmessage/patches/patch-aa
index 18d82fb249f..6b4bc2f7c5c 100644
--- a/x11/wmessage/patches/patch-aa
+++ b/x11/wmessage/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.2 1999/10/06 06:07:24 jlam Exp $
+$NetBSD: patch-aa,v 1.3 2001/03/22 14:00:40 wiz Exp $
 
---- ./Makefile.orig	Sun Aug 29 20:38:35 1999
-+++ ./Makefile	Thu Sep 30 06:27:09 1999
+--- Makefile.orig	Mon Aug 30 02:38:35 1999
++++ Makefile
 @@ -1,19 +1,18 @@
 -PREFIX = /usr/local
 +#PREFIX = /usr/local
diff --git a/x11/wmessage/patches/patch-ab b/x11/wmessage/patches/patch-ab
index 076e05414ea..7d0128bcea1 100644
--- a/x11/wmessage/patches/patch-ab
+++ b/x11/wmessage/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.1 1999/10/06 06:07:24 jlam Exp $
+$NetBSD: patch-ab,v 1.2 2001/03/22 14:00:40 wiz Exp $
 
---- ./panel.c.orig	Sun Aug 29 20:28:35 1999
-+++ ./panel.c	Wed Oct  6 01:56:48 1999
+--- panel.c.orig	Mon Aug 30 02:28:35 1999
++++ panel.c
 @@ -128,7 +128,7 @@
  		return (-2);
  
@@ -16,7 +16,7 @@ $NetBSD: patch-ab,v 1.1 1999/10/06 06:07:24 jlam Exp $
  			(HeightOfScreen (DefaultScreenOfDisplay (settings->dpy)) - WMWidgetHeight(panel->win))/2);
  		
 -		WMSetWindowUSize (panel->win, WMWidgetWidth (panel->win), WMWidgetHeight (panel->win));
-+		WMSetWindowInitialSize (panel->win, WMWidgetWidth (panel->win), WMWidgetHeight (panel->win));
++		WMSetWindowBaseSize (panel->win, WMWidgetWidth (panel->win), WMWidgetHeight (panel->win));
  	} else if (settings->nearmouse == True) {
  		int x, y, x2, y2;
  		unsigned int mask;
diff --git a/x11/wmessage/patches/patch-ac b/x11/wmessage/patches/patch-ac
new file mode 100644
index 00000000000..e4d5a7b640d
--- /dev/null
+++ b/x11/wmessage/patches/patch-ac
@@ -0,0 +1,22 @@
+$NetBSD: patch-ac,v 1.1 2001/03/22 14:00:40 wiz Exp $
+
+--- wmessage.h.orig	Mon Aug 30 01:07:59 1999
++++ wmessage.h
+@@ -25,7 +25,7 @@
+ 
+ #include <wraster.h>
+ 
+-#include <WINGs.h>
++#include <WINGs/WINGs.h>
+ 
+ #include <unistd.h>
+ #include <stdio.h>
+@@ -38,7 +38,7 @@
+ 
+ #include <X11/keysym.h>
+ 
+-#include <WUtil.h>
++#include <WINGs/WUtil.h>
+ 
+ #include "wconfig.h"
+