The API for WINGs changed, but this little app hasn't caught up yet.

Patch so it can link correctly.

5 files changed, 47 insertions, 13 deletions

diff --git a/x11/wmessage/Makefile b/x11/wmessage/Makefile
index b51ab32b6e1..74531cfec22 100644
--- a/x11/wmessage/Makefile
+++ b/x11/wmessage/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.3 1999/09/21 18:18:50 tron Exp $
+# $NetBSD: Makefile,v 1.4 1999/10/06 06:07:22 jlam Exp $
 
-DISTNAME=	wmessage-0.7
+DISTNAME=	wmessage-0.8
 CATEGORIES=	x11
 MASTER_SITES=	http://www.ozemail.com.au/~crn/wmessage/
 
 MAINTAINER=	jlam@netbsd.org
 HOMEPAGE=	http://www.ozemail.com.au/~crn/wmessage/
 
-DEPENDS+=	windowmaker-*:../../x11/windowmaker
+DEPENDS+=	windowmaker-0.61.*:../../x11/windowmaker
 
 USE_X11BASE=	yes
 
diff --git a/x11/wmessage/files/md5 b/x11/wmessage/files/md5
index 1b696b075fd..a135830f673 100644
--- a/x11/wmessage/files/md5
+++ b/x11/wmessage/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1999/08/28 08:41:19 jlam Exp $
+$NetBSD: md5,v 1.3 1999/10/06 06:07:23 jlam Exp $
 
-MD5 (wmessage-0.7.tar.gz) = ccee1232a07964710fc42621ce98aa3d
+MD5 (wmessage-0.8.tar.gz) = 84a2bbc60bda2bcc7e050614b07b21a9
diff --git a/x11/wmessage/files/patch-sum b/x11/wmessage/files/patch-sum
index 759cb0bf030..77512823911 100644
--- a/x11/wmessage/files/patch-sum
+++ b/x11/wmessage/files/patch-sum
@@ -1,3 +1,4 @@
-$NetBSD: patch-sum,v 1.1.1.1 1999/08/26 11:32:28 jlam Exp $
+$NetBSD: patch-sum,v 1.2 1999/10/06 06:07:24 jlam Exp $
 
-MD5 (patch-aa) = 2ecdc7725a6684340e7092281eb1da93
+MD5 (patch-aa) = 40a19c45efbb8fca1c996887665e7069
+MD5 (patch-ab) = 462cf86b2f1604ee6a628b3ee705ce1f
diff --git a/x11/wmessage/patches/patch-aa b/x11/wmessage/patches/patch-aa
index e825e7c6db7..18d82fb249f 100644
--- a/x11/wmessage/patches/patch-aa
+++ b/x11/wmessage/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/08/26 11:32:28 jlam Exp $
+$NetBSD: patch-aa,v 1.2 1999/10/06 06:07:24 jlam Exp $
 
---- Makefile.orig	Wed Aug 25 22:08:08 1999
-+++ Makefile	Thu Aug 26 07:21:46 1999
-@@ -1,7 +1,7 @@
+--- ./Makefile.orig	Sun Aug 29 20:38:35 1999
++++ ./Makefile	Thu Sep 30 06:27:09 1999
+@@ -1,19 +1,18 @@
 -PREFIX = /usr/local
 +#PREFIX = /usr/local
  
@@ -10,9 +10,11 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/08/26 11:32:28 jlam Exp $
 -LDFLAGS = `get-wraster-flags --ldflags`
 +LDFLAGS += `get-wraster-flags --ldflags`
  LIBS = `get-wraster-flags --libs`
- CC = gcc
+-CC = gcc
++#CC = gcc
+ 
+ all: wmessage
  
-@@ -10,10 +10,9 @@
  wmessage: wmessage.o panel.o
  	$(CC) -o wmessage wmessage.o panel.o \
  		$(CFLAGS) $(LDFLAGS) $(LIBS) -lWMaker -lWINGs -lPropList
diff --git a/x11/wmessage/patches/patch-ab b/x11/wmessage/patches/patch-ab
new file mode 100644
index 00000000000..076e05414ea
--- /dev/null
+++ b/x11/wmessage/patches/patch-ab
@@ -0,0 +1,31 @@
+$NetBSD: patch-ab,v 1.1 1999/10/06 06:07:24 jlam Exp $
+
+--- ./panel.c.orig	Sun Aug 29 20:28:35 1999
++++ ./panel.c	Wed Oct  6 01:56:48 1999
+@@ -128,7 +128,7 @@
+ 		return (-2);
+ 
+ 	if (settings->centre == True) {
+-		WMSetWindowUPosition (panel->win,
++		WMSetWindowInitialPosition (panel->win,
+ 			(WidthOfScreen (DefaultScreenOfDisplay (settings->dpy)) - WMWidgetWidth(panel->win))/2,
+ 			(HeightOfScreen (DefaultScreenOfDisplay (settings->dpy)) - WMWidgetHeight(panel->win))/2);
+ 
+@@ -136,7 +136,7 @@
+ 			(WidthOfScreen (DefaultScreenOfDisplay (settings->dpy)) - WMWidgetWidth(panel->win))/2,
+ 			(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));
+ 	} else if (settings->nearmouse == True) {
+ 		int x, y, x2, y2;
+ 		unsigned int mask;
+@@ -144,7 +144,7 @@
+ 
+ 		XQueryPointer (settings->dpy, DefaultRootWindow (settings->dpy), &root, &child, &x, &y, &x2, &y2, &mask);
+ 
+-		WMSetWindowUPosition (panel->win, x - (WMWidgetWidth(panel->win)/2), y - (WMWidgetHeight(panel->win)/2));
++		WMSetWindowInitialPosition (panel->win, x - (WMWidgetWidth(panel->win)/2), y - (WMWidgetHeight(panel->win)/2));
+ 		WMMoveWidget (panel->win, x - (WMWidgetWidth(panel->win)/2), y - (WMWidgetHeight(panel->win)/2));
+ 	}
+