Changes 0.93.94:

Fix the crashes that were introduced by fixes for gadget colour problems.

Changes 0.93.91:
Implement Add Mode in XmText.

12 files changed, 64 insertions, 71 deletions

diff --git a/x11/lesstif/Makefile b/x11/lesstif/Makefile
index 983415da568..1e81f41c4a7 100644
--- a/x11/lesstif/Makefile
+++ b/x11/lesstif/Makefile
@@ -1,26 +1,20 @@
-# $NetBSD: Makefile,v 1.66 2003/08/20 10:37:37 markd Exp $
+# $NetBSD: Makefile,v 1.67 2003/12/12 10:11:39 adam Exp $
 
-DISTNAME=		lesstif-0.93.46
-PKGREVISION=		1
-CATEGORIES=		x11
-MASTER_SITES=		ftp://ftp.hungry.com/pub/hungry/lesstif/srcdist/ \
-			ftp://ftp.unicamp.br/pub/X11/lesstif/srcdist/ \
-			ftp://ftp.kddlabs.co.jp/X11/lesstif/srcdist/ \
-			ftp://linux.mathematik.tu-darmstadt.de/pub/linux/mirrors/misc/lesstif/srcdist/ \
-			http://gd.tuwien.ac.at/hci/lesstif/srcdist/ \
-			http://www.damtp.cam.ac.uk/mirror/ftp.hungry.com/pub/hungry/lesstif/srcdist/
-EXTRACT_SUFX=		.tar.bz2
+DISTNAME=	lesstif-0.93.94
+CATEGORIES=	x11
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=lesstif/}
+EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=		jlam@NetBSD.org
-HOMEPAGE=		http://www.lesstif.org/
+MAINTAINER=	jlam@NetBSD.org
+HOMEPAGE=	http://www.lesstif.org/
 COMMENT=	API compatible clone of the OSF/Motif toolkit
 
 CONFLICTS+=	openmotif-[0-9]*
 
-USE_BUILDLINK2=	# defined
-USE_X11BASE=		# defined
-USE_GMAKE=		# defined
-USE_LIBTOOL=		# defined
+USE_BUILDLINK2=		YES
+USE_X11BASE=		YES
+USE_GMAKE=		YES
+USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 LIBTOOL_OVERRIDE+=	${WRKSRC}/test/libtool
 GNU_CONFIGURE=		# defined
diff --git a/x11/lesstif/PLIST b/x11/lesstif/PLIST
index c283c1a4658..de33ad6ebf9 100644
--- a/x11/lesstif/PLIST
+++ b/x11/lesstif/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2003/08/20 10:37:37 markd Exp $
+@comment $NetBSD: PLIST,v 1.7 2003/12/12 10:11:39 adam Exp $
 bin/mwm
 bin/mxmkmf
 bin/uil
@@ -432,8 +432,6 @@ share/doc/lesstif/ReleaseNotes.txt
 @dirrm share/doc/html/lesstif/images
 @dirrm share/doc/html/lesstif
 @dirrm lib/X11/mwm
-@dirrm lib/LessTif/config
-@dirrm lib/LessTif
 @dirrm include/uil
 @dirrm include/Xm
 @dirrm include/Mrm
diff --git a/x11/lesstif/distinfo b/x11/lesstif/distinfo
index cbba94319a8..4d6bc75f56e 100644
--- a/x11/lesstif/distinfo
+++ b/x11/lesstif/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.7 2003/08/20 10:37:37 markd Exp $
+$NetBSD: distinfo,v 1.8 2003/12/12 10:11:39 adam Exp $
 
-SHA1 (lesstif-0.93.46.tar.bz2) = 478bf421fd3782b61f737c46cef9eac8bbd61ee7
-Size (lesstif-0.93.46.tar.bz2) = 2557851 bytes
-SHA1 (patch-aa) = b96680513291214446618f26d44c1766825796e4
+SHA1 (lesstif-0.93.94.tar.bz2) = 7f366e0a97d3f21480d55f8dca9b7b97e28a5e1c
+Size (lesstif-0.93.94.tar.bz2) = 3461827 bytes
+SHA1 (patch-aa) = 8aecea9444476b44bf2abdcc185ee2ee4b62227e
 SHA1 (patch-ac) = c0fa9429cfc40d7c4071b71e7d71e6175c0c6048
-SHA1 (patch-am) = c203512f91bbef0f9799c2d4ce92b0e2a8cf10e1
-SHA1 (patch-an) = 953fe36d90f103734011f5b236419a760f5a6d47
-SHA1 (patch-ao) = b73057afec02365cb2af383ad44492bfbb29914c
-SHA1 (patch-ap) = ce916400dab822f3bcaaa3fed92724b054e5188b
-SHA1 (patch-aq) = dab3eec221770cc1b9b8be0bdf6c9b410091b717
-SHA1 (patch-ar) = bcd73f008fd43adc183ffb4dfa6e5b6789ffeb3e
-SHA1 (patch-bm) = 78541ed54a3c25cd4700b53836c74fbaf3a7653a
-SHA1 (patch-bn) = f6ccd7a79296f60d4db368f4c6a8cb6b1b825e73
+SHA1 (patch-am) = 7c28e5a71ed01f22609b6433295b4e3535d9b2c5
+SHA1 (patch-an) = 15cc17b95726ac42e69460a1f156c589842db4aa
+SHA1 (patch-ao) = b243b99c4e24dee3bf37609c5f808e1a87bf79f8
+SHA1 (patch-ap) = f6448aad2bda33ff61c77e9e29da0b8b511bd114
+SHA1 (patch-aq) = d05b80ea376e7dde29233066778f8baa376693c0
+SHA1 (patch-ar) = 3d59488aeb1764cf1594f7cab82e8ad5c510d52c
+SHA1 (patch-bm) = e97f6acd4c80d28d0939c21826d30b1477a7d789
+SHA1 (patch-bn) = 582c1f9946b62e7b8621ae7c754986b525e0142a
diff --git a/x11/lesstif/patches/patch-aa b/x11/lesstif/patches/patch-aa
index 1052cd8096c..5084ce7db0b 100644
--- a/x11/lesstif/patches/patch-aa
+++ b/x11/lesstif/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.21 2003/07/18 10:50:07 adam Exp $
+$NetBSD: patch-aa,v 1.22 2003/12/12 10:11:39 adam Exp $
 
---- Makefile.in.orig	2003-07-18 01:04:22.000000000 +0200
-+++ Makefile.in	2003-07-18 12:06:25.000000000 +0200
-@@ -164,12 +164,12 @@
+--- Makefile.in.orig	2003-11-27 19:29:46.000000000 +0000
++++ Makefile.in
+@@ -237,12 +237,12 @@ DIST_SUBDIRS = scripts include lib clien
  # Lets put the informational stuff in a sub directory to avoid 
  # poluting /usr/local for default installs.
  #
diff --git a/x11/lesstif/patches/patch-am b/x11/lesstif/patches/patch-am
index 131f7610872..5d253f06987 100644
--- a/x11/lesstif/patches/patch-am
+++ b/x11/lesstif/patches/patch-am
@@ -1,8 +1,8 @@
-$NetBSD: patch-am,v 1.12 2003/07/18 10:50:07 adam Exp $
+$NetBSD: patch-am,v 1.13 2003/12/12 10:11:39 adam Exp $
 
---- doc/Makefile.in.orig	2003-07-18 01:04:24.000000000 +0200
-+++ doc/Makefile.in	2003-07-18 12:06:55.000000000 +0200
-@@ -154,7 +154,7 @@
+--- doc/Makefile.in.orig	2003-11-27 19:29:48.000000000 +0000
++++ doc/Makefile.in
+@@ -227,7 +227,7 @@ EXTRA_DIST = $(DATA)
  # it has a stand-alone Makefile w/o auto* stuff
  SUBDIRS = www.lesstif.org lessdox
  
diff --git a/x11/lesstif/patches/patch-an b/x11/lesstif/patches/patch-an
index ccae0221330..b24ba7a5468 100644
--- a/x11/lesstif/patches/patch-an
+++ b/x11/lesstif/patches/patch-an
@@ -1,8 +1,8 @@
-$NetBSD: patch-an,v 1.15 2003/07/18 10:50:07 adam Exp $
+$NetBSD: patch-an,v 1.16 2003/12/12 10:11:39 adam Exp $
 
---- doc/lessdox/clients/Makefile.in.orig	2003-07-18 01:04:24.000000000 +0200
-+++ doc/lessdox/clients/Makefile.in	2003-07-18 12:16:54.000000000 +0200
-@@ -160,7 +160,7 @@
+--- doc/lessdox/clients/Makefile.in.orig	2003-11-27 19:29:48.000000000 +0000
++++ doc/lessdox/clients/Makefile.in
+@@ -233,7 +233,7 @@ manone_DATA = mwm.1 xmbind.1 lesstif.1 u
  manthree_DATA = 
  manfive_DATA = mwmrc.5 VirtualBindings.5
  
diff --git a/x11/lesstif/patches/patch-ao b/x11/lesstif/patches/patch-ao
index 56d532cf3db..543f1005d53 100644
--- a/x11/lesstif/patches/patch-ao
+++ b/x11/lesstif/patches/patch-ao
@@ -1,8 +1,8 @@
-$NetBSD: patch-ao,v 1.12 2003/07/18 10:50:07 adam Exp $
+$NetBSD: patch-ao,v 1.13 2003/12/12 10:11:39 adam Exp $
 
---- doc/lessdox/functions/Makefile.in.orig	2003-07-18 01:04:24.000000000 +0200
-+++ doc/lessdox/functions/Makefile.in	2003-07-18 12:17:38.000000000 +0200
-@@ -160,7 +160,7 @@
+--- doc/lessdox/functions/Makefile.in.orig	2003-11-27 19:29:48.000000000 +0000
++++ doc/lessdox/functions/Makefile.in
+@@ -233,7 +233,7 @@ manone_DATA = 
  manthree_DATA = 
  manfive_DATA = 
  
diff --git a/x11/lesstif/patches/patch-ap b/x11/lesstif/patches/patch-ap
index dd946224a16..a0c34d03ae0 100644
--- a/x11/lesstif/patches/patch-ap
+++ b/x11/lesstif/patches/patch-ap
@@ -1,8 +1,8 @@
-$NetBSD: patch-ap,v 1.11 2003/07/18 10:50:08 adam Exp $
+$NetBSD: patch-ap,v 1.12 2003/12/12 10:11:39 adam Exp $
 
---- doc/lessdox/widgets/Makefile.in.orig	2003-07-18 01:04:25.000000000 +0200
-+++ doc/lessdox/widgets/Makefile.in	2003-07-18 12:18:27.000000000 +0200
-@@ -186,7 +186,7 @@
+--- doc/lessdox/widgets/Makefile.in.orig	2003-11-27 19:29:49.000000000 +0000
++++ doc/lessdox/widgets/Makefile.in
+@@ -259,7 +259,7 @@ manthree_DATA = \
  
  manfive_DATA = 
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ap,v 1.11 2003/07/18 10:50:08 adam Exp $
  
  html_DATA = ${manone_DATA:.1=.html} ${manthree_DATA:.3=.html} \
                  ${manfive_DATA:.5=.html}
-@@ -436,7 +436,7 @@
+@@ -519,7 +519,7 @@ $(html_DATA): $(MAN2HTML)
  # in both the http://www.lesstif.org and the locally installed case.
  #
  install-data-hook:
diff --git a/x11/lesstif/patches/patch-aq b/x11/lesstif/patches/patch-aq
index 053bd56640e..d0ee6ee03f7 100644
--- a/x11/lesstif/patches/patch-aq
+++ b/x11/lesstif/patches/patch-aq
@@ -1,8 +1,8 @@
-$NetBSD: patch-aq,v 1.14 2003/07/18 10:50:08 adam Exp $
+$NetBSD: patch-aq,v 1.15 2003/12/12 10:11:39 adam Exp $
 
---- doc/www.lesstif.org/Makefile.in.orig	2003-07-18 01:04:25.000000000 +0200
-+++ doc/www.lesstif.org/Makefile.in	2003-07-18 12:07:33.000000000 +0200
-@@ -159,7 +159,7 @@
+--- doc/www.lesstif.org/Makefile.in.orig	2003-11-27 19:29:49.000000000 +0000
++++ doc/www.lesstif.org/Makefile.in
+@@ -232,7 +232,7 @@ SUBDIRS = images
  # Lets put the informational stuff in a sub directory to avoid 
  # polluting /usr/local for default installs.
  #
diff --git a/x11/lesstif/patches/patch-ar b/x11/lesstif/patches/patch-ar
index d73bacefad3..ead944cdc7d 100644
--- a/x11/lesstif/patches/patch-ar
+++ b/x11/lesstif/patches/patch-ar
@@ -1,8 +1,8 @@
-$NetBSD: patch-ar,v 1.10 2003/07/18 10:50:08 adam Exp $
+$NetBSD: patch-ar,v 1.11 2003/12/12 10:11:39 adam Exp $
 
---- doc/www.lesstif.org/images/Makefile.in.orig	2003-07-18 01:04:25.000000000 +0200
-+++ doc/www.lesstif.org/images/Makefile.in	2003-07-18 12:08:32.000000000 +0200
-@@ -156,7 +156,7 @@
+--- doc/www.lesstif.org/images/Makefile.in.orig	2003-11-27 19:29:49.000000000 +0000
++++ doc/www.lesstif.org/images/Makefile.in
+@@ -229,7 +229,7 @@ EXTRA_DIST = $(DATA)
  # Lets put the informational stuff in a sub directory to avoid 
  # poluting /usr/local for default installs.
  #
diff --git a/x11/lesstif/patches/patch-bm b/x11/lesstif/patches/patch-bm
index c68dea7a392..733179db066 100644
--- a/x11/lesstif/patches/patch-bm
+++ b/x11/lesstif/patches/patch-bm
@@ -1,8 +1,8 @@
-$NetBSD: patch-bm,v 1.5 2003/08/20 10:37:38 markd Exp $
+$NetBSD: patch-bm,v 1.6 2003/12/12 10:11:39 adam Exp $
 
---- lib/config/Makefile.in.orig	Fri Jul 18 11:04:27 2003
+--- lib/config/Makefile.in.orig	2003-11-27 19:29:53.000000000 +0000
 +++ lib/config/Makefile.in
-@@ -150,12 +150,12 @@ xmVer = @xmVer@
+@@ -223,13 +223,13 @@ xmVer = @xmVer@
  MAINTAINERCLEANFILES = Makefile.in
  bin_SCRIPTS = mxmkmf
  
@@ -10,10 +10,11 @@ $NetBSD: patch-bm,v 1.5 2003/08/20 10:37:38 markd Exp $
 +configdir = $(libdir)/X11/config
  
  EXTRA_DIST = LessTif.rules LessTif.tmpl host.def Imake.tmpl
- 
  # so being R5 
+ @XIsR6_FALSE@config_DATA = Imake.tmpl LessTif.rules LessTif.tmpl
+ 
 -@XIsR6_TRUE@config_DATA = LessTif.rules LessTif.tmpl host.def
 +@XIsR6_TRUE@config_DATA = LessTif.rules LessTif.tmpl LessTif.def
- @XIsR6_FALSE@config_DATA = Imake.tmpl LessTif.rules LessTif.tmpl
  subdir = lib/config
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/x11/lesstif/patches/patch-bn b/x11/lesstif/patches/patch-bn
index 3cf2274dc36..b8d0c604bfb 100644
--- a/x11/lesstif/patches/patch-bn
+++ b/x11/lesstif/patches/patch-bn
@@ -1,8 +1,8 @@
-$NetBSD: patch-bn,v 1.4 2003/07/18 10:50:08 adam Exp $
+$NetBSD: patch-bn,v 1.5 2003/12/12 10:11:39 adam Exp $
 
---- scripts/autoconf/Makefile.in.orig	2003-07-18 01:04:28.000000000 +0200
-+++ scripts/autoconf/Makefile.in	2003-07-18 12:09:47.000000000 +0200
-@@ -151,9 +151,9 @@
+--- scripts/autoconf/Makefile.in.orig	2003-11-27 19:29:53.000000000 +0000
++++ scripts/autoconf/Makefile.in
+@@ -224,9 +224,9 @@ MAINTAINERCLEANFILES = Makefile.in
  
  EXTRA_DIST = ac_find_motif.m4
  
@@ -12,5 +12,5 @@ $NetBSD: patch-bn,v 1.4 2003/07/18 10:50:08 adam Exp $
 -@Aclocal_TRUE@aclocal_DATA = ac_find_motif.m4
 +aclocal_DATA = ac_find_motif.m4
  subdir = scripts/autoconf
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/include/LTconfig.h