Update to 0.10. Also make it work with latest windowmaker.

Patches mostly by Ben Wong from pkg/13378.
Changes seem only to be other changes to keep up with windowmaker.

5 files changed, 40 insertions, 44 deletions

diff --git a/x11/wmessage/Makefile b/x11/wmessage/Makefile
index c34b3bc510b..ac4142ae46e 100644
--- a/x11/wmessage/Makefile
+++ b/x11/wmessage/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2001/03/22 14:00:39 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2001/07/23 20:38:48 wiz Exp $
 
-DISTNAME=	wmessage-0.8
+DISTNAME=	wmessage-0.10
 CATEGORIES=	x11
 MASTER_SITES=	http://www.ozemail.com.au/~crn/wmessage/
 
diff --git a/x11/wmessage/distinfo b/x11/wmessage/distinfo
index f24e833ac49..c9a7e4feaab 100644
--- a/x11/wmessage/distinfo
+++ b/x11/wmessage/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:07:46 skrll Exp $
+$NetBSD: distinfo,v 1.3 2001/07/23 20:38:48 wiz Exp $
 
-SHA1 (wmessage-0.8.tar.gz) = 07782d6ce8be9662bce99653ca3c44109e7a9f11
-Size (wmessage-0.8.tar.gz) = 15762 bytes
+SHA1 (wmessage-0.10.tar.gz) = f50b768f2e8d3c5a4503cbeb3188bde7fa79044f
+Size (wmessage-0.10.tar.gz) = 15844 bytes
 SHA1 (patch-aa) = 93c9b769b1c5e652aa114f373d6b195a234e39dc
-SHA1 (patch-ab) = b3bf6c311ad8d0f4080ceb2e6aab29177d1f569c
-SHA1 (patch-ac) = 69a032cbbf5d4ecca497c90a89316a700301a5e4
+SHA1 (patch-ab) = f0638e8f1d76a27f86502228c9b5fbc5ed4bc477
+SHA1 (patch-ac) = d4b77334fc83954091ad0acb18e216dead7b6e20
+SHA1 (patch-ad) = e21e043041005fdfa728038960f15449a2a43c7f
diff --git a/x11/wmessage/patches/patch-ab b/x11/wmessage/patches/patch-ab
index 7d0128bcea1..ec1bdedc4f1 100644
--- a/x11/wmessage/patches/patch-ab
+++ b/x11/wmessage/patches/patch-ab
@@ -1,31 +1,13 @@
-$NetBSD: patch-ab,v 1.2 2001/03/22 14:00:40 wiz Exp $
+$NetBSD: patch-ab,v 1.3 2001/07/23 20:38:48 wiz Exp $
 
---- panel.c.orig	Mon Aug 30 02:28:35 1999
+--- panel.c.orig	Tue Jan  9 01:43:47 2001
 +++ panel.c
-@@ -128,7 +128,7 @@
- 		return (-2);
+@@ -409,7 +409,7 @@
  
- 	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);
+ 	WMSetWindowTitle(panel->win, "");
  
-@@ -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));
-+		WMSetWindowBaseSize (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));
- 	}
+-	if ((appicon = WMGetApplicationIconImage (scrPtr))) {
++	if ((appicon = WMGetApplicationIconPixmap (scrPtr))) {
+ 		WMSize ais;
  
+ 		ais = WMGetPixmapSize (appicon);
diff --git a/x11/wmessage/patches/patch-ac b/x11/wmessage/patches/patch-ac
index e4d5a7b640d..be2acf1e778 100644
--- a/x11/wmessage/patches/patch-ac
+++ b/x11/wmessage/patches/patch-ac
@@ -1,16 +1,7 @@
-$NetBSD: patch-ac,v 1.1 2001/03/22 14:00:40 wiz Exp $
+$NetBSD: patch-ac,v 1.2 2001/07/23 20:38:48 wiz Exp $
 
---- wmessage.h.orig	Mon Aug 30 01:07:59 1999
+--- wmessage.h.orig	Tue Jan  9 01:45:18 2001
 +++ 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>
diff --git a/x11/wmessage/patches/patch-ad b/x11/wmessage/patches/patch-ad
new file mode 100644
index 00000000000..13992013de4
--- /dev/null
+++ b/x11/wmessage/patches/patch-ad
@@ -0,0 +1,22 @@
+$NetBSD: patch-ad,v 1.1 2001/07/23 20:38:48 wiz Exp $
+
+--- wmessage.c.orig	Mon Jan 10 06:47:21 2000
++++ wmessage.c
+@@ -247,7 +247,7 @@
+ 		icon = WMCreatePixmapFromRImage(scrPtr, tmp, 0);
+ 		RDestroyImage(tmp);
+ 		if (icon) {
+-			WMSetApplicationIconImage(scrPtr, icon);
++			WMSetApplicationIconPixmap(scrPtr, icon);
+ 			WMReleasePixmap(icon);
+ 		} else
+ 			if (settings->warnings == True)
+@@ -279,7 +279,7 @@
+ 			setAppIcon (scr, settings->icon);
+ 		} else {
+ 			pixmap = WMCreatePixmapFromXPMData(scr, GNUSTEP_XPM);
+-			WMSetApplicationIconImage(scr, pixmap);
++			WMSetApplicationIconPixmap(scr, pixmap);
+ 			WMReleasePixmap(pixmap);
+ 		}
+ 	}