Update the matchbox window manager to version 0.8.4.

The old distfile had gone, and there have been many enhancements and bug
fixes.

matchbox now takes advantage of a separate libmatchbox package.

6 files changed, 68 insertions, 135 deletions

diff --git a/wm/matchbox/Makefile b/wm/matchbox/Makefile
index 062f54448c2..4e878fb77a3 100644
--- a/wm/matchbox/Makefile
+++ b/wm/matchbox/Makefile
@@ -1,20 +1,21 @@
-# $NetBSD: Makefile,v 1.12 2004/03/10 14:12:51 xtraeme Exp $
+# $NetBSD: Makefile,v 1.13 2004/09/30 11:36:33 agc Exp $
 #
 
-DISTNAME=	matchbox-0.3.6
+DISTNAME=	matchbox-window-manager-0.8.4
+PKGNAME=	matchbox-0.8.4
 CATEGORIES=	wm x11
-MASTER_SITES=	http://handhelds.org/~mallum/downloadables/matchbox/
+MASTER_SITES=	http://matchbox.handhelds.org/sources/matchbox-window-manager/0.8/
 
 MAINTAINER=	tech-pkg@NetBSD.org
-HOMEPAGE=	http://handhelds.org/~mallum/matchbox/
+HOMEPAGE=	http://matchbox.handhelds.org/
 COMMENT=	Window manager designed for computers with small displays
 
-USE_BUILDLINK3=	YES
-USE_X11=	YES
-USE_LIBTOOL=	YES
-GNU_CONFIGURE=	YES
+USE_BUILDLINK3=	yes
+USE_X11=	yes
+USE_LIBTOOL=	yes
+GNU_CONFIGURE=	yes
 
+.include "../../devel/libmatchbox/buildlink3.mk"
 .include "../../graphics/xpm/buildlink3.mk"
 
-.include "../../mk/ossaudio.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/matchbox/PLIST b/wm/matchbox/PLIST
index 74b1956a99d..2b7f53337f7 100644
--- a/wm/matchbox/PLIST
+++ b/wm/matchbox/PLIST
@@ -1,78 +1,56 @@
-@comment $NetBSD: PLIST,v 1.3 2004/09/22 08:09:56 jlam Exp $
-bin/matchbox
-bin/mbcontrol
-bin/mbdock
-bin/mbmenu
-bin/minisys
-bin/minitime
-bin/minivol
-bin/miniwave
-bin/monolaunch
-lib/libmbdock.la
-man/man1/matchbox.1
-man/man1/mbcontrol.1
-man/man1/miniapm.1
-man/man1/minisys.1
-man/man1/minitime.1
-man/man1/minivol.1
-man/man1/miniwave.1
-man/man1/monolaunch.1
-share/matchbox/defaults
-share/matchbox/icon.xpm
-share/matchbox/mbdock/add.xpm
-share/matchbox/mbdock/down.xpm
-share/matchbox/mbdock/mbmenu
-share/matchbox/mbdock/mbmenu.xpm
-share/matchbox/mbdock/miniapm
-share/matchbox/mbdock/minisys
-share/matchbox/mbdock/minitime
-share/matchbox/mbdock/minivol
-share/matchbox/mbdock/miniwave
-share/matchbox/mbdock/move.xpm
-share/matchbox/mbdock/remove.xpm
-share/matchbox/mbdock/stop.xpm
-share/matchbox/mbmenu/app.xpm
-share/matchbox/mbmenu/folder.xpm
-share/matchbox/themes/bluebox/buttclosedown.xpm
-share/matchbox/themes/bluebox/buttcloseup.xpm
-share/matchbox/themes/bluebox/buttmenudown.xpm
-share/matchbox/themes/bluebox/buttmenuup.xpm
-share/matchbox/themes/bluebox/buttsmallclosedown.xpm
-share/matchbox/themes/bluebox/buttsmallcloseup.xpm
-share/matchbox/themes/bluebox/buttsmallmaxdown.xpm
-share/matchbox/themes/bluebox/buttsmallmaxup.xpm
-share/matchbox/themes/bluebox/buttsmallmindown.xpm
-share/matchbox/themes/bluebox/buttsmallminup.xpm
-share/matchbox/themes/bluebox/dialogbg.xpm
-share/matchbox/themes/bluebox/dock.cfg
-share/matchbox/themes/bluebox/theme.xml
-share/matchbox/themes/bluebox/titlebg.xpm
-share/matchbox/themes/bluebox/titleleft.xpm
-share/matchbox/themes/bluebox/titleright.xpm
-share/matchbox/themes/bluebox/titleseperator.xpm
-share/matchbox/themes/camo/close.xpm
-share/matchbox/themes/camo/closedown.xpm
-share/matchbox/themes/camo/dock.cfg
-share/matchbox/themes/camo/next.xpm
-share/matchbox/themes/camo/nextdown.xpm
-share/matchbox/themes/camo/prev.xpm
-share/matchbox/themes/camo/prevdown.xpm
-share/matchbox/themes/camo/select.xpm
-share/matchbox/themes/camo/small-close-button-down.xpm
-share/matchbox/themes/camo/small-close-button.xpm
-share/matchbox/themes/camo/small-down-button.xpm
-share/matchbox/themes/camo/small-min-button.xpm
-share/matchbox/themes/camo/smallmax.xpm
-share/matchbox/themes/camo/smallmaxdown.xpm
-share/matchbox/themes/camo/smallmin.xpm
-share/matchbox/themes/camo/smallmindown.xpm
-share/matchbox/themes/camo/theme.xml
-share/matchbox/themes/depno/dock.cfg
-share/matchbox/themes/depno/theme.xml
-@dirrm share/matchbox/themes/depno
-@dirrm share/matchbox/themes/camo
-@dirrm share/matchbox/themes/bluebox
-@dirrm share/matchbox/themes
-@dirrm share/matchbox/mbmenu
-@dirrm share/matchbox/mbdock
+@comment $NetBSD: PLIST,v 1.4 2004/09/30 11:36:33 agc Exp $
+bin/matchbox-remote
+bin/matchbox-window-manager
+share/matchbox/kbdconfig
+share/matchbox/mbnoapp.xpm
+share/themes/blondie/matchbox/accept.png
+share/themes/blondie/matchbox/close-small.png
+share/themes/blondie/matchbox/close.png
+share/themes/blondie/matchbox/dialogbottomleft.png
+share/themes/blondie/matchbox/dialogbottomright.png
+share/themes/blondie/matchbox/dialogbottomtile.png
+share/themes/blondie/matchbox/dialogtopleft.png
+share/themes/blondie/matchbox/dialogtopleft2.png
+share/themes/blondie/matchbox/dialogtopright.png
+share/themes/blondie/matchbox/dialogtopright2.png
+share/themes/blondie/matchbox/dialogtoptile.png
+share/themes/blondie/matchbox/dialogtoptile2.png
+share/themes/blondie/matchbox/hide.png
+share/themes/blondie/matchbox/menu.png
+share/themes/blondie/matchbox/next.png
+share/themes/blondie/matchbox/prev.png
+share/themes/blondie/matchbox/que.png
+share/themes/blondie/matchbox/theme.desktop
+share/themes/blondie/matchbox/theme.xml
+share/themes/blondie/matchbox/titleleft.png
+share/themes/blondie/matchbox/titleright.png
+share/themes/blondie/matchbox/titlestrip.png
+share/themes/bluebox/matchbox/buttclosedown.xpm
+share/themes/bluebox/matchbox/buttcloseup.xpm
+share/themes/bluebox/matchbox/buttmenudown.xpm
+share/themes/bluebox/matchbox/buttmenuup.xpm
+share/themes/bluebox/matchbox/buttsmallclosedown.xpm
+share/themes/bluebox/matchbox/buttsmallcloseup.xpm
+share/themes/bluebox/matchbox/buttsmallmaxdown.xpm
+share/themes/bluebox/matchbox/buttsmallmaxup.xpm
+share/themes/bluebox/matchbox/buttsmallmindown.xpm
+share/themes/bluebox/matchbox/buttsmallminup.xpm
+share/themes/bluebox/matchbox/theme.desktop
+share/themes/bluebox/matchbox/theme.xml
+share/themes/bluebox/matchbox/titlebg.xpm
+share/themes/bluebox/matchbox/titleleft.xpm
+share/themes/bluebox/matchbox/titleright.xpm
+share/themes/borillo/matchbox/blank.png
+share/themes/borillo/matchbox/close.png
+share/themes/borillo/matchbox/minimise.png
+share/themes/borillo/matchbox/next.png
+share/themes/borillo/matchbox/prev.png
+share/themes/borillo/matchbox/theme.desktop
+share/themes/borillo/matchbox/theme.xml
+@dirrm share/themes/borillo/matchbox
+@dirrm share/themes/borillo
+@dirrm share/themes/bluebox/matchbox
+@dirrm share/themes/bluebox
+@dirrm share/themes/blondie/matchbox
+@dirrm share/themes/blondie
 @dirrm share/matchbox
diff --git a/wm/matchbox/distinfo b/wm/matchbox/distinfo
index b2a74aedecd..39c89f951d8 100644
--- a/wm/matchbox/distinfo
+++ b/wm/matchbox/distinfo
@@ -1,7 +1,4 @@
-$NetBSD: distinfo,v 1.5 2002/12/20 15:59:44 tsarna Exp $
+$NetBSD: distinfo,v 1.6 2004/09/30 11:36:33 agc Exp $
 
-SHA1 (matchbox-0.3.6.tar.gz) = 2bedd60387fcf1a614bd55150e56ee5e294aa307
-Size (matchbox-0.3.6.tar.gz) = 332086 bytes
-SHA1 (patch-aa) = c4f6d89d10f0f1b7f30ff30a2ad5312ade1769b0
-SHA1 (patch-ab) = c7e73b8c32dd10f7b3ef0b8af9921ba461925230
-SHA1 (patch-ac) = 1b0b60ea25a4d8f0799917e9c28dc9481258bb16
+SHA1 (matchbox-window-manager-0.8.4.tar.gz) = c9fd75cd01bd9800fcd1c962fa0294e5b4482a2f
+Size (matchbox-window-manager-0.8.4.tar.gz) = 217677 bytes
diff --git a/wm/matchbox/patches/patch-aa b/wm/matchbox/patches/patch-aa
deleted file mode 100644
index 56bd6b22481..00000000000
--- a/wm/matchbox/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2002/10/08 02:16:46 wiz Exp $
-
---- util/Makefile.in.orig	Mon Oct  7 17:51:39 2002
-+++ util/Makefile.in
-@@ -152,7 +152,7 @@ minitime_DEPENDENCIES =
- minitime_LDFLAGS =
- am_minivol_OBJECTS = minivol.$(OBJEXT)
- minivol_OBJECTS = $(am_minivol_OBJECTS)
--minivol_LDADD = $(LDADD)
-+minivol_LDADD = $(LDADD) $(LIBOSSAUDIO)
- minivol_DEPENDENCIES =
- minivol_LDFLAGS =
- am_miniwave_OBJECTS = miniwave.$(OBJEXT)
diff --git a/wm/matchbox/patches/patch-ab b/wm/matchbox/patches/patch-ab
deleted file mode 100644
index 24b5fc085b8..00000000000
--- a/wm/matchbox/patches/patch-ab
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2002/10/08 02:16:46 wiz Exp $
-
---- util/minivol.c.orig	Fri Jun 28 19:32:52 2002
-+++ util/minivol.c
-@@ -7,7 +7,11 @@
- #include <string.h>
- #include <errno.h>
- #include <sys/ioctl.h>
-+#ifdef __NetBSD__
-+#include <soundcard.h>
-+#else
- #include <sys/soundcard.h>
-+#endif
- 
- #include <X11/Xlib.h>
- #include <X11/Xutil.h>
diff --git a/wm/matchbox/patches/patch-ac b/wm/matchbox/patches/patch-ac
deleted file mode 100644
index 4e147fd5199..00000000000
--- a/wm/matchbox/patches/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2002/10/25 07:25:09 agc Exp $
-
---- util/mbmenu.c	2002/10/25 07:09:25	1.1
-+++ util/mbmenu.c	2002/10/25 07:09:47
-@@ -31,7 +31,9 @@
- #include <X11/Xlib.h>
- #include <X11/Xutil.h>
- #include <X11/Xatom.h>
-+#ifdef USE_XFT
- #include <X11/Xft/Xft.h>
-+#endif
- #include <X11/xpm.h>
- #include <X11/Xresource.h>
- #include <X11/extensions/shape.h>