Update to 0.3.1.

Improve COMMENT.
Change configure argument from --with-xawm to --with-xaw3d.
Add to BUILD_DEFS.

(NOTE: I am updating misc/siag also.)

Changelog has:

070830  Two patches from Pascal Terjan fixes buffer overflows
        in MwXFilesel.c and MwXFormat.c.
        Released 0.3.1.

040108  Added John Cwikla's XCC code. Prepended Mw to all files
        and external symbols. This adds "Color Contexts" which
        allow easy colour management with any visual. Anything
        within Mowitz that calls MwAllocColor or MwQueryColor
        will be rewritten to use color contexts instead.

030919  Cleaned up the code for release.
        Released 0.3.0.

030304  New widget in MwApplicationShell.c is subclassed from
        applicationShellWidgetClass, but has callbacks for
        OffiX and Xdnd drops.

030209  MwMenu.c: catch X errors in XGrabButton. Needed for OpenWindows,
        discovered by James B. Hiller <jhiller@visi.net>.
        Released 0.2.3.

030128  Changed malloc to MwMalloc, realloc to MwRealloc and
        free to MwFree in MwRudegrid.c.

5 files changed, 30 insertions, 26 deletions

diff --git a/x11/mowitz/Makefile b/x11/mowitz/Makefile
index 1fa2db05de4..41d0b7dd5c6 100644
--- a/x11/mowitz/Makefile
+++ b/x11/mowitz/Makefile
@@ -1,27 +1,28 @@
-# $NetBSD: Makefile,v 1.13 2006/12/27 13:37:42 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2008/01/09 19:00:25 reed Exp $
 
-DISTNAME=	Mowitz-0.2.2
-PKGREVISION=	2
+DISTNAME=	Mowitz-0.3.1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://siag.nu/pub/mowitz/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://siag.nu/mowitz/
-COMMENT=	"More widgets" library
+COMMENT=	"More widgets" library providing X11 widgets
 
 USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
 
 .include "../../mk/bsd.prefs.mk"
 
+BUILD_DEFS+=	XAW_TYPE
+
 .if ${XAW_TYPE} == "xpm"
-CONFIGURE_ARGS+=--with-xawm=XawXpm
+CONFIGURE_ARGS+=--with-xaw3d=XawXpm
 .elif ${XAW_TYPE} == "3d"
-CONFIGURE_ARGS+=--with-xawm=Xaw3d
+CONFIGURE_ARGS+=--with-xaw3d=Xaw3d
 .elif ${XAW_TYPE} == "neXtaw"
-CONFIGURE_ARGS+=--with-xawm=neXtaw
+CONFIGURE_ARGS+=--with-xaw3d=neXtaw
 .else
-CONFIGURE_ARGS+=--with-xawm=Xaw
+CONFIGURE_ARGS+=--with-xaw3d=Xaw
 .endif
 
 .include "../../x11/libXp/buildlink3.mk"
diff --git a/x11/mowitz/PLIST b/x11/mowitz/PLIST
index eb4e18e8ced..a665e0e7ba5 100644
--- a/x11/mowitz/PLIST
+++ b/x11/mowitz/PLIST
@@ -1,9 +1,11 @@
-@comment $NetBSD: PLIST,v 1.4 2006/06/05 23:25:43 reed Exp $
+@comment $NetBSD: PLIST,v 1.5 2008/01/09 19:00:25 reed Exp $
 bin/mowitz-config
 include/Mowitz/Mowitz.h
 include/Mowitz/MwAnimator.h
 include/Mowitz/MwAnimatorP.h
 include/Mowitz/MwAnimatorTypes.h
+include/Mowitz/MwApplicationShell.h
+include/Mowitz/MwApplicationShellP.h
 include/Mowitz/MwBase.h
 include/Mowitz/MwBaseComp.h
 include/Mowitz/MwBaseCompP.h
@@ -87,6 +89,8 @@ include/Mowitz/MwTraverse.h
 include/Mowitz/MwUtils.h
 include/Mowitz/MwVSlider.h
 include/Mowitz/MwVSliderP.h
+include/Mowitz/MwXCC.h
+include/Mowitz/MwXCCP.h
 include/Mowitz/MwXFormat.h
 include/Mowitz/MwXutils.h
 lib/libMowitz.la
diff --git a/x11/mowitz/buildlink3.mk b/x11/mowitz/buildlink3.mk
index 09b790c794f..d82f06f4573 100644
--- a/x11/mowitz/buildlink3.mk
+++ b/x11/mowitz/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/12/15 20:33:04 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2008/01/09 19:00:25 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 MOWITZ_BUILDLINK3_MK:=	${MOWITZ_BUILDLINK3_MK}+
@@ -12,8 +12,7 @@ BUILDLINK_PACKAGES+=	Mowitz
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}Mowitz
 
 .if !empty(MOWITZ_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.Mowitz+=	Mowitz>=0.2.1
-BUILDLINK_ABI_DEPENDS.Mowitz+=	Mowitz>=0.2.2nb2
+BUILDLINK_API_DEPENDS.Mowitz+=	Mowitz>=0.3.0
 BUILDLINK_PKGSRCDIR.Mowitz?=	../../x11/mowitz
 .endif	# MOWITZ_BUILDLINK3_MK
 
diff --git a/x11/mowitz/distinfo b/x11/mowitz/distinfo
index de56360cfb0..5dd063f143e 100644
--- a/x11/mowitz/distinfo
+++ b/x11/mowitz/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 17:36:17 wiz Exp $
+$NetBSD: distinfo,v 1.4 2008/01/09 19:00:25 reed Exp $
 
-SHA1 (Mowitz-0.2.2.tar.gz) = 534a8b9e56b5816f134a9d20410cf77a257586fd
-RMD160 (Mowitz-0.2.2.tar.gz) = 1c2979a83ac60cf275c2d2a01d536f081e9b6876
-Size (Mowitz-0.2.2.tar.gz) = 1036719 bytes
-SHA1 (patch-aa) = a154f49e00a8b1fd5819c5c14b72ee986a772629
+SHA1 (Mowitz-0.3.1.tar.gz) = 0a850d5d47c3ec79eb294c4ef946252388ccaaf6
+RMD160 (Mowitz-0.3.1.tar.gz) = 0fe2976726aff3a5f246ce50aeb537bc1418497b
+Size (Mowitz-0.3.1.tar.gz) = 1150170 bytes
+SHA1 (patch-aa) = 5acdce4a2b3ef6681a8ab62219077115b102ead6
diff --git a/x11/mowitz/patches/patch-aa b/x11/mowitz/patches/patch-aa
index c97172ba48e..92f487eeda8 100644
--- a/x11/mowitz/patches/patch-aa
+++ b/x11/mowitz/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.2 2003/03/05 13:14:56 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2008/01/09 19:00:25 reed Exp $
 
---- doc/Makefile.in.orig	Fri Jan 17 22:02:14 2003
-+++ doc/Makefile.in
-@@ -121,7 +121,7 @@ sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
+--- doc/Makefile.in.orig	2007-08-30 03:38:35.000000000 -0500
++++ doc/Makefile.in	2008-01-09 10:23:15.000000000 -0600
+@@ -88,7 +88,7 @@
+ STRIP = @STRIP@
+ VERSION = @VERSION@
+ 
 -docdir = $(prefix)/doc/Mowitz
 +docdir = $(datadir)/doc/Mowitz
  
- doc_DATA = Filesel.html \
- 	ListTree.HISTORY ListTree.README ListTree.gif \
+ doc_DATA = Filesel.html 	ListTree.HISTORY ListTree.README ListTree.gif 	ListTree.html ListTreeProg.html ListTreeTitle.gif 	TreeFSel.gif new.gif 	Slider.README Slider.man
+