Update to 0.3.5.

Changes:
* Bug fixes and improved behaviour.
* Much improved dock - apps are now freely positionable and dragable.
* New and improved themes.
* Dock and utils now use a shared library, lessening base size.
* 'Mbmenu' - an application lancher now included in distro
* Built in 'task menu' improved

5 files changed, 63 insertions, 60 deletions

diff --git a/wm/matchbox/Makefile b/wm/matchbox/Makefile
index 22e07b04f1d..5cf388eea46 100644
--- a/wm/matchbox/Makefile
+++ b/wm/matchbox/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2002/09/23 23:23:26 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/10/08 02:16:46 wiz Exp $
 #
 
-DISTNAME=	matchbox-0.3.2
+DISTNAME=	matchbox-0.3.5
 CATEGORIES=	wm
 MASTER_SITES=	http://handhelds.org/~mallum/downloadables/matchbox/
 
diff --git a/wm/matchbox/PLIST b/wm/matchbox/PLIST
index 19e0a290303..1aea3622e2b 100644
--- a/wm/matchbox/PLIST
+++ b/wm/matchbox/PLIST
@@ -1,12 +1,18 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/08/01 15:53:46 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/10/08 02:16:46 wiz Exp $
 bin/matchbox
 bin/mbcontrol
 bin/mbdock
+bin/mbmenu
 bin/minisys
 bin/minitime
 bin/minivol
 bin/miniwave
 bin/monolaunch
+lib/libmbdock.a
+lib/libmbdock.la
+lib/libmbdock.so
+lib/libmbdock.so.0
+lib/libmbdock.so.0.0
 man/man1/matchbox.1
 man/man1/mbcontrol.1
 man/man1/miniapm.1
@@ -19,61 +25,58 @@ 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/themes/akwa/button.xpm
-share/matchbox/themes/akwa/dock.cfg
-share/matchbox/themes/akwa/dockbg.xpm
-share/matchbox/themes/akwa/left.xpm
-share/matchbox/themes/akwa/mid.xpm
-share/matchbox/themes/akwa/right.xpm
-share/matchbox/themes/akwa/theme.xml
-share/matchbox/themes/classic/bg.xpm
-share/matchbox/themes/classic/close-button.xpm
-share/matchbox/themes/classic/dock.cfg
-share/matchbox/themes/classic/hide-button.xpm
-share/matchbox/themes/classic/next-button.xpm
-share/matchbox/themes/classic/prev-button.xpm
-share/matchbox/themes/classic/select.xpm
-share/matchbox/themes/classic/small-close-button.xpm
-share/matchbox/themes/classic/small-down-button.xpm
-share/matchbox/themes/classic/small-min-button.xpm
-share/matchbox/themes/classic/theme.xml
+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
-share/matchbox/themes/greeno/bggrad.xpm
-share/matchbox/themes/greeno/close.xpm
-share/matchbox/themes/greeno/closedown.xpm
-share/matchbox/themes/greeno/dock.cfg
-share/matchbox/themes/greeno/next.xpm
-share/matchbox/themes/greeno/nextdown.xpm
-share/matchbox/themes/greeno/prev.xpm
-share/matchbox/themes/greeno/prevdown.xpm
-share/matchbox/themes/greeno/small-close-button.xpm
-share/matchbox/themes/greeno/small-close-buttondown.xpm
-share/matchbox/themes/greeno/theme.xml
-share/matchbox/themes/keramik/button-close-active.xpm
-share/matchbox/themes/keramik/button-close-inactive.xpm
-share/matchbox/themes/keramik/button-menu-active.xpm
-share/matchbox/themes/keramik/button-menu-inactive.xpm
-share/matchbox/themes/keramik/caption-active-small-center.xpm
-share/matchbox/themes/keramik/caption-active-small-left.xpm
-share/matchbox/themes/keramik/caption-active-small-right.xpm
-share/matchbox/themes/keramik/dock.cfg
-share/matchbox/themes/keramik/theme.xml
-share/matchbox/themes/keramik/titlebar-active-center.xpm
-share/matchbox/themes/keramik/titlebar-active-left.xpm
-share/matchbox/themes/keramik/titlebar-active-right.xpm
-@dirrm share/matchbox/themes/keramik
-@dirrm share/matchbox/themes/greeno
 @dirrm share/matchbox/themes/depno
-@dirrm share/matchbox/themes/classic
-@dirrm share/matchbox/themes/akwa
+@dirrm share/matchbox/themes/camo
+@dirrm share/matchbox/themes/bluebox
 @dirrm share/matchbox/themes
+@dirrm share/matchbox/mbmenu
 @dirrm share/matchbox/mbdock
 @dirrm share/matchbox
diff --git a/wm/matchbox/distinfo b/wm/matchbox/distinfo
index 0520b994a26..01e8a8e7d18 100644
--- a/wm/matchbox/distinfo
+++ b/wm/matchbox/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2002/09/23 23:23:27 jlam Exp $
+$NetBSD: distinfo,v 1.3 2002/10/08 02:16:46 wiz Exp $
 
-SHA1 (matchbox-0.3.2.tar.gz) = 48916f7be3274cfd4b8c746c488cc928031edb0c
-Size (matchbox-0.3.2.tar.gz) = 195045 bytes
-SHA1 (patch-aa) = b9e186bbe6308399a124700c0f35dd5cc943daf0
-SHA1 (patch-ab) = 92a0fd3cb70f01ebfb72477a4652e6d2d61a1d71
+SHA1 (matchbox-0.3.5.tar.gz) = 1221f4367c40c44ad417f1f57f3a06234d268d29
+Size (matchbox-0.3.5.tar.gz) = 331686 bytes
+SHA1 (patch-aa) = c4f6d89d10f0f1b7f30ff30a2ad5312ade1769b0
+SHA1 (patch-ab) = c7e73b8c32dd10f7b3ef0b8af9921ba461925230
diff --git a/wm/matchbox/patches/patch-aa b/wm/matchbox/patches/patch-aa
index 85ad3b95eb0..56bd6b22481 100644
--- a/wm/matchbox/patches/patch-aa
+++ b/wm/matchbox/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.2 2002/09/23 23:23:27 jlam Exp $
+$NetBSD: patch-aa,v 1.3 2002/10/08 02:16:46 wiz Exp $
 
---- util/Makefile.in.orig	Thu Aug  1 16:22:33 2002
+--- util/Makefile.in.orig	Mon Oct  7 17:51:39 2002
 +++ util/Makefile.in
-@@ -133,7 +133,7 @@ minitime_DEPENDENCIES =
+@@ -152,7 +152,7 @@ minitime_DEPENDENCIES =
  minitime_LDFLAGS =
- am_minivol_OBJECTS = minivol.$(OBJEXT) tray.$(OBJEXT)
+ 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) tray.$(OBJEXT)
+ am_miniwave_OBJECTS = miniwave.$(OBJEXT)
diff --git a/wm/matchbox/patches/patch-ab b/wm/matchbox/patches/patch-ab
index 88847b82f3b..24b5fc085b8 100644
--- a/wm/matchbox/patches/patch-ab
+++ b/wm/matchbox/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/08/01 15:53:46 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2002/10/08 02:16:46 wiz Exp $
 
---- util/minivol.c.orig	Fri Jun 28 18:08:43 2002
+--- util/minivol.c.orig	Fri Jun 28 19:32:52 2002
 +++ util/minivol.c
 @@ -7,7 +7,11 @@
  #include <string.h>