Update lesstif to 0.91.8. Changes from version 0.91.4 include several

fixes to plug memory leaks and changing the way LessTif imake config files
are handled.  Also, install the HTML documentation in share/doc/html.

29 files changed, 285 insertions, 182 deletions

diff --git a/x11/lesstif/Makefile b/x11/lesstif/Makefile
index d76193ce01a..66dd1e8eb08 100644
--- a/x11/lesstif/Makefile
+++ b/x11/lesstif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2000/07/25 14:42:00 jlam Exp $
+# $NetBSD: Makefile,v 1.52 2000/10/23 19:45:05 jlam Exp $
 # FreeBSD Id: Makefile,v 1.13 1997/09/08 08:34:13 tg Exp
 #
 
@@ -7,11 +7,19 @@ BUILD_DEPENDS+=		lynx:../../www/lynx
 CONFIGURE_ARGS+=	--disable-build-12
 CONFIGURE_ARGS+=	--enable-build-20
 CONFIGURE_ARGS+=	--enable-default-20
-PLIST_SUBST+=		LOCALBASE=${LOCALBASE}
+
+DEINSTALL_FILE=		${WRKDIR}/DEINSTALL
+INSTALL_FILE=		${WRKDIR}/INSTALL
+
+post-build:
+	${SED}	-e "s,@LOCALBASE@,${LOCALBASE},g" \
+		-e "s,@X11BASE@,${X11BASE},g" \
+		< ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE}
+	${SED}	-e "s,@LOCALBASE@,${LOCALBASE},g" \
+		-e "s,@X11BASE@,${X11BASE},g" \
+		< ${PKGDIR}/INSTALL > ${INSTALL_FILE}
 
 post-install:
-	${TEST} ${PREFIX} = ${LOCALBASE} || \
-	${LN} -fs ${PREFIX}/share/aclocal/ac_find_motif.m4 \
-		${LOCALBASE}/share/aclocal/ac_find_motif.m4
+	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 
 .include "../../x11/lesstif/Makefile.common"
diff --git a/x11/lesstif/Makefile.common b/x11/lesstif/Makefile.common
index e1e1b1108b9..ae89b42026d 100644
--- a/x11/lesstif/Makefile.common
+++ b/x11/lesstif/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.2 2000/07/30 01:33:11 dmcmahill Exp $
+# $NetBSD: Makefile.common,v 1.3 2000/10/23 19:45:05 jlam Exp $
 
 DISTNAME=		lesstif-${LESSTIF_VERSION}
-LESSTIF_VERSION=	0.91.4
+LESSTIF_VERSION=	0.91.8
 CATEGORIES=		x11
 MASTER_SITES=		ftp://ftp.hungry.com/pub/hungry/lesstif/srcdist/ \
 			ftp://ftp.unicamp.br/pub/X11/lesstif/srcdist/ \
@@ -13,7 +13,7 @@ MASTER_SITES=		ftp://ftp.hungry.com/pub/hungry/lesstif/srcdist/ \
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.lesstif.org/
 
-BUILD_DEPENDS+=		autoreconf:../../devel/autoconf
+BUILD_DEPENDS+=		autoconf:../../devel/autoconf
 BUILD_DEPENDS+=		automake:../../devel/automake
 
 USE_X11BASE=		# defined
@@ -24,11 +24,15 @@ LTCONFIG_OVERRIDE+=	${WRKSRC}/Xlt/ltconfig
 LTCONFIG_OVERRIDE+=	${WRKSRC}/Xbae/ltconfig
 
 GNU_CONFIGURE=		# defined
-CONFIGURE_ARGS+=	--enable-production --disable-debug
+CONFIGURE_ARGS+=	--enable-production --disable-debug --disable-verbose
+CONFIGURE_ARGS+=	--enable-xdnd
 
 FILESDIR=		${.CURDIR}/../../x11/lesstif/files
 PATCHDIR=		${.CURDIR}/../../x11/lesstif/patches
 
+post-extract:
+	cd ${WRKSRC}/lib/config; ${MV} host.def LessTif.def
+
 pre-configure:
 	for d in . lib/Xlt lib/Xbae test ; do \
 		cd ${WRKSRC}/$$d && libtoolize --force && aclocal && autoheader && automake -a -i && autoconf; \
diff --git a/x11/lesstif/files/md5 b/x11/lesstif/files/md5
index b5eeb187403..9780cbaeec6 100644
--- a/x11/lesstif/files/md5
+++ b/x11/lesstif/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.20 2000/07/25 14:42:02 jlam Exp $
+$NetBSD: md5,v 1.21 2000/10/23 19:45:08 jlam Exp $
 
-MD5 (lesstif-0.91.4.tar.gz) = 264ddee653cb7ea7d0bc9ae6e99a9ef7
+MD5 (lesstif-0.91.8.tar.gz) = 4b91059f06b4764d247af4fda968e1cc
diff --git a/x11/lesstif/files/patch-sum b/x11/lesstif/files/patch-sum
index b88fc90a95a..3e5d6789b85 100644
--- a/x11/lesstif/files/patch-sum
+++ b/x11/lesstif/files/patch-sum
@@ -1,23 +1,23 @@
-$NetBSD: patch-sum,v 1.16 2000/07/26 07:23:21 jlam Exp $
+$NetBSD: patch-sum,v 1.17 2000/10/23 19:45:08 jlam Exp $
 
-MD5 (patch-aa) = 635bc9f78b3226575791fa1e6565bafd
-MD5 (patch-ab) = f428946d710cd77bd6e50980d818dc0f
-MD5 (patch-ac) = 19740d07b484de823da25440bafe04eb
-MD5 (patch-ad) = 74b7dd9d247a27d7e00a65b63ec6bfb1
-MD5 (patch-ae) = 0844cb7134b667e8b5098bd0e697f7f5
-MD5 (patch-af) = 13df521d3f8a094e877f50c676a5fe87
-MD5 (patch-ag) = 8029cc62e235e40ac7fbe1e73213e5bd
-MD5 (patch-ah) = a04b484d20f4de1a3ebdf04807bb2396
-MD5 (patch-ai) = fbb91571fb3b0ea96fd02d5f9b342d23
-MD5 (patch-aj) = 44c972e32c501df4f8fddbcea0607584
-MD5 (patch-ak) = 5989cf903e136e91ec485d2376614c1e
-MD5 (patch-al) = 9142f1e8ce39105bb7d16fc71840c4b3
-MD5 (patch-am) = dca2abc6f49364b098224b8d270abf06
-MD5 (patch-an) = 6f95c065993f22f88c0ac16a01844130
-MD5 (patch-ao) = b2c40f5bebd5410f1e1a094a2bf2f757
-MD5 (patch-ap) = 33a9af475c1888745925d4fb5d83ca20
-MD5 (patch-aq) = f9ce52e6b9047451d0fea7bd02fbd1bd
-MD5 (patch-ar) = f96acf8a051b276ec16555b9537c0467
-MD5 (patch-as) = c0ac9cb2545939ae34585868b5c22f61
-MD5 (patch-at) = b5603ba8e130fc5dae1fb76f7ef8769d
-MD5 (patch-au) = a71b1c301077d37fbf348d63f2c900b4
+MD5 (patch-aa) = f4006d871d14ebef13e1e625437d071a
+MD5 (patch-ab) = 2af3d1361a6df268fc5d68b222b8b037
+MD5 (patch-ac) = a5ba6f0b459e60f32c0ba26c18d5464e
+MD5 (patch-ad) = 0de2ac2fa21267f5489a55d363a6a2f4
+MD5 (patch-ae) = 105fc92adbb8716287d1d62ce8371681
+MD5 (patch-af) = faacbb261c275fb065cbbe1d59cc92e0
+MD5 (patch-ag) = 4e8afb72a8ec981ec99a8de36a14f6bc
+MD5 (patch-ah) = fa6d0469298ce223a2bf1d090953c4e6
+MD5 (patch-ai) = 584bdfcfb4cc79ae8a7334b18bfc4b8f
+MD5 (patch-aj) = fc85758a1771e83ba99c6c146015acda
+MD5 (patch-ak) = e7ebd4ee7ce2eb4f6f805318fcf4991d
+MD5 (patch-al) = c0f366a04cd3e2140f278c3d4d715233
+MD5 (patch-am) = 08d057ac808ab8c914edeaa321f55638
+MD5 (patch-an) = 1f1ecdc3e7879b2ab587c8486fbde407
+MD5 (patch-ao) = 070e7fac68615a1729864b663efa2bd9
+MD5 (patch-ap) = 3ec5a0689b9ea93f679b72ea7c9c5e09
+MD5 (patch-aq) = a8b4441ffe4be86ce27f1c72f79d72d6
+MD5 (patch-ar) = 4c99d6f84fde742a610f257a9e6067c3
+MD5 (patch-as) = 142cce459071b0044183b917e7b2c430
+MD5 (patch-at) = aa39fb291a286ce2d33df08f5429dbeb
+MD5 (patch-au) = 1327dc62791d641799b2a38c9808abd2
diff --git a/x11/lesstif/patches/patch-aa b/x11/lesstif/patches/patch-aa
index 7c057c4fdd8..4a830bf55d9 100644
--- a/x11/lesstif/patches/patch-aa
+++ b/x11/lesstif/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.14 2000/07/25 14:42:02 jlam Exp $
+$NetBSD: patch-aa,v 1.15 2000/10/23 19:45:10 jlam Exp $
 
 --- Makefile.am.orig	Tue May  2 17:05:14 2000
-+++ Makefile.am	Tue Jul 25 08:18:13 2000
-@@ -3,31 +3,38 @@
++++ Makefile.am
+@@ -3,29 +3,37 @@
  #
  
  MAINTAINERCLEANFILES=Makefile.in configure libtool config.guess config.sub ltconfig ltmain.sh aclocal.m4 config.h.in install-sh missing mkinstalldirs
@@ -19,8 +19,8 @@ $NetBSD: patch-aa,v 1.14 2000/07/25 14:42:02 jlam Exp $
  
  AUTOMAKE_OPTIONS = 1.4
  
-+EXTRA_DIST=	acconfig.h configure \
-+		BUG-REPORTING CREDITS KNOWN_BUGS RELEASE-POLICY NOTES
++EXTRA_DIST=    acconfig.h configure \
++               BUG-REPORTING CREDITS KNOWN_BUGS RELEASE-POLICY NOTES
 +
 +# Only install the documentation if installing 2.0-compatible libraries.
 +#
@@ -33,25 +33,24 @@ $NetBSD: patch-aa,v 1.14 2000/07/25 14:42:02 jlam Exp $
  #
 -rootdir=	$(exec_prefix)/LessTif
 -root_DATA=	AUTHORS BUG-REPORTING COPYING COPYING.LIB CREDITS \
--	KNOWN_BUGS NEWS README RELEASE-POLICY TODO release-notes.txt
--
--EXTRA_DIST=	acconfig.h configure \
--		BUG-REPORTING CREDITS KNOWN_BUGS RELEASE-POLICY NOTES
 +doc_DATA=	AUTHORS BUG-REPORTING COPYING COPYING.LIB CREDITS \
-+	KNOWN_BUGS NEWS README RELEASE-POLICY TODO release-notes.txt \
-+	release-notes.html
+ 	KNOWN_BUGS NEWS README RELEASE-POLICY TODO release-notes.txt
  
+-EXTRA_DIST=	acconfig.h configure \
+-		BUG-REPORTING CREDITS KNOWN_BUGS RELEASE-POLICY NOTES
+-
  @MAINT@changelog:
  @MAINT@	@( cd $(srcdir)/lib/Xm ; cvs -Q log -rrelease_@MAJOR_VERSION@_@MINOR_VERSION@_@PICO_VERSION@: ) | $(srcdir)/scripts/parselog >ChangeLog
  
 -htmldir=	$(exec_prefix)/LessTif/doc
--html_DATA=	release-notes.html
--
- all-local: BUG-REPORTING
- 
- BUG-REPORTING: $(top_srcdir)/doc/www.lesstif.org/bugs.html
-@@ -50,3 +57,4 @@
+ html_DATA=	release-notes.html
  
- #install-data-hook:
- #	${INSTALL_DATA} $(srcdir)/NOTES $(DESTDIR)$(htmldir)/release-notes.html
+ all-local: BUG-REPORTING
+@@ -47,6 +55,4 @@
+ release-notes.html:	$(srcdir)/NOTES
+ 	rm -f $@
+ 	cp $(srcdir)/NOTES $@
+-
+-#install-data-hook:
+-#	${INSTALL_DATA} $(srcdir)/NOTES $(DESTDIR)$(htmldir)/release-notes.html
 +endif
diff --git a/x11/lesstif/patches/patch-ab b/x11/lesstif/patches/patch-ab
index 7d9501214da..e621d88d9b3 100644
--- a/x11/lesstif/patches/patch-ab
+++ b/x11/lesstif/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.10 2000/07/25 14:42:03 jlam Exp $
+$NetBSD: patch-ab,v 1.11 2000/10/23 19:45:10 jlam Exp $
 
 --- clients/Motif-1.2/mwm/system.mwmrc.orig	Sun Jan 16 06:06:11 2000
-+++ clients/Motif-1.2/mwm/system.mwmrc	Tue Jul 25 08:18:13 2000
++++ clients/Motif-1.2/mwm/system.mwmrc
 @@ -4,7 +4,7 @@
  Menu DefaultRootMenu
  {
diff --git a/x11/lesstif/patches/patch-ac b/x11/lesstif/patches/patch-ac
index c5f944e0058..2b865fcfa71 100644
--- a/x11/lesstif/patches/patch-ac
+++ b/x11/lesstif/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.10 2000/07/25 14:42:03 jlam Exp $
+$NetBSD: patch-ac,v 1.11 2000/10/23 19:45:16 jlam Exp $
 
---- configure.in.orig	Mon Jul  3 18:38:20 2000
-+++ configure.in	Tue Jul 25 08:18:13 2000
-@@ -503,7 +503,7 @@
+--- configure.in.orig	Thu Aug 31 04:46:02 2000
++++ configure.in
+@@ -506,7 +506,7 @@
  dnl We provide for such a translation via Debian's man2html.
  dnl
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.10 2000/07/25 14:42:03 jlam Exp $
  AM_CONDITIONAL(HaveMan2html, test x$VarHaveMan2html = xyes)
  
  dnl
-@@ -606,6 +606,11 @@
+@@ -609,6 +609,11 @@
  
  dnl AC_SUBST(libdir)
  AC_SUBST(bindir)
diff --git a/x11/lesstif/patches/patch-ad b/x11/lesstif/patches/patch-ad
index 9abf5450fe0..77463e5f559 100644
--- a/x11/lesstif/patches/patch-ad
+++ b/x11/lesstif/patches/patch-ad
@@ -1,14 +1,14 @@
-$NetBSD: patch-ad,v 1.13 2000/07/25 14:42:04 jlam Exp $
+$NetBSD: patch-ad,v 1.14 2000/10/23 19:45:16 jlam Exp $
 
 --- doc/Makefile.am.orig	Fri Jan  7 11:57:44 2000
-+++ doc/Makefile.am	Tue Jul 25 08:18:13 2000
++++ doc/Makefile.am
 @@ -6,8 +6,7 @@
  
  SUBDIRS	= www.lesstif.org lessdox
  
 -rootdir=	$(exec_prefix)/LessTif/doc
 -root_DATA=	All.html Clipboard.txt DragAndDrop.txt Form.txt \
-+doc_DATA=	All.html Clipboard.txt DragAndDrop.txt Form.txt \
++html_DATA=	All.html Clipboard.txt DragAndDrop.txt Form.txt \
  		GeoUtils.txt Geometry.html SyntheticResources.txt \
  		UIL.txt XmStrings.txt thread.html INSTALL.html
  
diff --git a/x11/lesstif/patches/patch-ae b/x11/lesstif/patches/patch-ae
index d57e82151e0..54939884bd6 100644
--- a/x11/lesstif/patches/patch-ae
+++ b/x11/lesstif/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.13 2000/07/25 14:42:04 jlam Exp $
+$NetBSD: patch-ae,v 1.14 2000/10/23 19:45:16 jlam Exp $
 
 --- doc/lessdox/clients/Makefile.am.orig	Tue Dec 21 19:26:24 1999
-+++ doc/lessdox/clients/Makefile.am	Tue Jul 25 08:18:13 2000
++++ doc/lessdox/clients/Makefile.am
 @@ -6,10 +6,9 @@
  EXTRA_DIST = $(man1_DATA) $(man3_DATA) $(man5_DATA)
  SUFFIXES=	.1 .3 .5 .html
diff --git a/x11/lesstif/patches/patch-af b/x11/lesstif/patches/patch-af
index 00c01e4884c..6ffe6b67b4f 100644
--- a/x11/lesstif/patches/patch-af
+++ b/x11/lesstif/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.11 2000/07/25 14:42:04 jlam Exp $
+$NetBSD: patch-af,v 1.12 2000/10/23 19:45:16 jlam Exp $
 
 --- doc/lessdox/functions/Makefile.am.orig	Sun Sep 19 12:51:05 1999
-+++ doc/lessdox/functions/Makefile.am	Tue Jul 25 08:18:13 2000
++++ doc/lessdox/functions/Makefile.am
 @@ -6,10 +6,9 @@
  EXTRA_DIST += $(man1_DATA) $(man3_DATA) $(man5_DATA)
  SUFFIXES=	.1 .3 .5 .html
diff --git a/x11/lesstif/patches/patch-ag b/x11/lesstif/patches/patch-ag
index 73669ac02a2..75ad0d4f7bd 100644
--- a/x11/lesstif/patches/patch-ag
+++ b/x11/lesstif/patches/patch-ag
@@ -1,7 +1,7 @@
-$NetBSD: patch-ag,v 1.10 2000/07/25 14:42:05 jlam Exp $
+$NetBSD: patch-ag,v 1.11 2000/10/23 19:45:17 jlam Exp $
 
 --- doc/lessdox/widgets/Makefile.am.orig	Thu Nov 11 10:22:20 1999
-+++ doc/lessdox/widgets/Makefile.am	Tue Jul 25 08:18:13 2000
++++ doc/lessdox/widgets/Makefile.am
 @@ -6,10 +6,9 @@
  EXTRA_DIST += $(man1_DATA) $(man3_DATA) $(man5_DATA)
  SUFFIXES=	.1 .3 .5 .html
diff --git a/x11/lesstif/patches/patch-ah b/x11/lesstif/patches/patch-ah
index b3bb7f866a1..2cd231a3edb 100644
--- a/x11/lesstif/patches/patch-ah
+++ b/x11/lesstif/patches/patch-ah
@@ -1,18 +1,20 @@
-$NetBSD: patch-ah,v 1.11 2000/07/25 14:42:05 jlam Exp $
+$NetBSD: patch-ah,v 1.12 2000/10/23 19:45:17 jlam Exp $
 
---- doc/www.lesstif.org/Makefile.am.orig	Wed May  3 14:35:13 2000
-+++ doc/www.lesstif.org/Makefile.am	Tue Jul 25 08:18:13 2000
-@@ -11,7 +11,6 @@
+--- doc/www.lesstif.org/Makefile.am.orig	Tue Jul 11 12:26:20 2000
++++ doc/www.lesstif.org/Makefile.am
+@@ -11,8 +11,7 @@
  # Lets put the informational stuff in a sub directory to avoid 
  # polluting /usr/local for default installs.
  #
 -docdir=	$(exec_prefix)/LessTif/doc
- doc_DATA=	COPYING.LIB.html FAQ.html INSTALL.html apps.html \
+-doc_DATA=	COPYING.LIB.html FAQ.html INSTALL.html apps.html \
++html_DATA=	COPYING.LIB.html FAQ.html INSTALL.html apps.html \
  		bugs.html cdrom.html core.html current.html \
  		cvs.html download.html index.html links.html lists.html \
+ 		mirrors.html platforms.html release-policy.html \
 @@ -20,7 +19,7 @@
  		versions.html web_button.html known.html help.html \
- 		Advocacy.html Xbae.html Xlt.html
+ 		Advocacy.html Xbae.html Xlt.html feedback.html
  
 -rootdir=	$(exec_prefix)/LessTif
 +rootdir=	$(docdir)
diff --git a/x11/lesstif/patches/patch-ai b/x11/lesstif/patches/patch-ai
index 9177cd8580f..638b1f3076a 100644
--- a/x11/lesstif/patches/patch-ai
+++ b/x11/lesstif/patches/patch-ai
@@ -1,13 +1,13 @@
-$NetBSD: patch-ai,v 1.13 2000/07/25 14:42:06 jlam Exp $
+$NetBSD: patch-ai,v 1.14 2000/10/23 19:45:17 jlam Exp $
 
---- doc/www.lesstif.org/images/Makefile.am.orig	Wed Dec  8 11:22:49 1999
-+++ doc/www.lesstif.org/images/Makefile.am	Tue Jul 25 08:18:13 2000
+--- doc/www.lesstif.org/images/Makefile.am.orig	Tue Jul 11 12:26:18 2000
++++ doc/www.lesstif.org/images/Makefile.am
 @@ -10,7 +10,7 @@
  # Lets put the informational stuff in a sub directory to avoid 
  # poluting /usr/local for default installs.
  #
 -rootdir=	$(exec_prefix)/LessTif/doc/images
-+rootdir=	$(docdir)/images
++rootdir=	$(htmldir)/images
  root_DATA=	hungry.png \
  		lesstif-realsmall.png lesstif-small.png lesstif.png \
- 		ltsunlogo.png lesstif.jpg ltsunlogo.jpg
+ 		ltsunlogo.png lesstif.jpg ltsunlogo.jpg \
diff --git a/x11/lesstif/patches/patch-aj b/x11/lesstif/patches/patch-aj
index 222972ff440..42749dd73f9 100644
--- a/x11/lesstif/patches/patch-aj
+++ b/x11/lesstif/patches/patch-aj
@@ -1,7 +1,7 @@
-$NetBSD: patch-aj,v 1.9 2000/07/25 14:42:06 jlam Exp $
+$NetBSD: patch-aj,v 1.10 2000/10/23 19:45:17 jlam Exp $
 
 --- include/Motif-1.2/Mrm/Makefile.am.orig	Sun Apr 11 08:28:41 1999
-+++ include/Motif-1.2/Mrm/Makefile.am	Tue Jul 25 08:20:31 2000
++++ include/Motif-1.2/Mrm/Makefile.am
 @@ -16,11 +16,3 @@
  mrm_HEADERS=	MrmAppl.h MrmDecls.h MrmPrivate.h MrmPublic.h
  
diff --git a/x11/lesstif/patches/patch-ak b/x11/lesstif/patches/patch-ak
index 7187f996fff..5fbfc88b9ca 100644
--- a/x11/lesstif/patches/patch-ak
+++ b/x11/lesstif/patches/patch-ak
@@ -1,7 +1,7 @@
-$NetBSD: patch-ak,v 1.9 2000/07/25 14:42:07 jlam Exp $
+$NetBSD: patch-ak,v 1.10 2000/10/23 19:45:17 jlam Exp $
 
 --- include/Motif-1.2/Xm/Makefile.am.orig	Sun Apr 11 08:28:42 1999
-+++ include/Motif-1.2/Xm/Makefile.am	Tue Jul 25 08:20:43 2000
++++ include/Motif-1.2/Xm/Makefile.am
 @@ -46,10 +46,3 @@
  xm_DATA = Xm.h
  
diff --git a/x11/lesstif/patches/patch-al b/x11/lesstif/patches/patch-al
index befb55299a6..c4555641716 100644
--- a/x11/lesstif/patches/patch-al
+++ b/x11/lesstif/patches/patch-al
@@ -1,7 +1,7 @@
-$NetBSD: patch-al,v 1.8 2000/07/25 14:42:08 jlam Exp $
+$NetBSD: patch-al,v 1.9 2000/10/23 19:45:18 jlam Exp $
 
 --- include/Motif-2.0/Mrm/Makefile.am.orig	Sun Jan  2 08:22:55 2000
-+++ include/Motif-2.0/Mrm/Makefile.am	Tue Jul 25 08:18:13 2000
++++ include/Motif-2.0/Mrm/Makefile.am
 @@ -11,7 +11,7 @@
  # Lets put the headers in a sub directory to avoid
  # poluting /usr/local with more directories for default installs.
diff --git a/x11/lesstif/patches/patch-am b/x11/lesstif/patches/patch-am
index 26023fb2c51..eb419a95cf6 100644
--- a/x11/lesstif/patches/patch-am
+++ b/x11/lesstif/patches/patch-am
@@ -1,7 +1,7 @@
-$NetBSD: patch-am,v 1.7 2000/07/25 14:42:08 jlam Exp $
+$NetBSD: patch-am,v 1.8 2000/10/23 19:45:18 jlam Exp $
 
---- include/Motif-2.0/Xm/Makefile.am.orig	Wed Mar 22 16:43:44 2000
-+++ include/Motif-2.0/Xm/Makefile.am	Tue Jul 25 08:18:13 2000
+--- include/Motif-2.0/Xm/Makefile.am.orig	Wed Aug 16 12:39:26 2000
++++ include/Motif-2.0/Xm/Makefile.am
 @@ -11,7 +11,7 @@
  # Lets put the headers in a sub directory to avoid
  # poluting /usr/local with more directories for default installs.
@@ -11,7 +11,7 @@ $NetBSD: patch-am,v 1.7 2000/07/25 14:42:08 jlam Exp $
  
  HEADERS1_2 = \
  	ArrowB.h ArrowBG.h AtomMgr.h \
-@@ -72,11 +72,4 @@
+@@ -73,11 +73,4 @@
  	   fi ; \
  	  done
  
diff --git a/x11/lesstif/patches/patch-an b/x11/lesstif/patches/patch-an
index c06da457496..c2717c73c8f 100644
--- a/x11/lesstif/patches/patch-an
+++ b/x11/lesstif/patches/patch-an
@@ -1,7 +1,7 @@
-$NetBSD: patch-an,v 1.9 2000/07/26 07:23:23 jlam Exp $
+$NetBSD: patch-an,v 1.10 2000/10/23 19:45:18 jlam Exp $
 
 --- lib/Makefile.am.orig	Tue May  2 17:05:15 2000
-+++ lib/Makefile.am	Wed Jul 26 03:18:20 2000
++++ lib/Makefile.am
 @@ -3,4 +3,20 @@
  #
  MAINTAINERCLEANFILES=Makefile.in
diff --git a/x11/lesstif/patches/patch-ao b/x11/lesstif/patches/patch-ao
index 64bf68bd20c..ea138725e80 100644
--- a/x11/lesstif/patches/patch-ao
+++ b/x11/lesstif/patches/patch-ao
@@ -1,17 +1,17 @@
-$NetBSD: patch-ao,v 1.7 2000/07/25 14:43:16 jlam Exp $
+$NetBSD: patch-ao,v 1.8 2000/10/23 19:45:18 jlam Exp $
 
---- lib/Mrm-2.0/Makefile.am.orig	Tue Jan  4 17:59:29 2000
-+++ lib/Mrm-2.0/Makefile.am	Tue Jul 25 08:18:13 2000
-@@ -41,8 +41,6 @@
- 		-DX_LIB_PATH=\"@x_libraries@\" \
- 		-DLESSTIFHOME=\"@prefix@\"
+--- lib/Mrm-2.0/Makefile.am.orig	Wed Aug 30 12:15:23 2000
++++ lib/Mrm-2.0/Makefile.am
+@@ -45,8 +45,6 @@
+           -DX_LIB_PATH=\"@x_libraries@\" \
+           -DLESSTIFHOME=\"@prefix@\"
  
 -libdir = $(prefix)/LessTif/Motif2.0/lib
 -
- lib_LTLIBRARIES=	libMrm.la
+ lib_LTLIBRARIES= libMrm.la
  
  libMrm_la_SOURCES= ${SRCS_1_2:%=../Mrm/%} ${SRCS_2_0}
-@@ -61,24 +59,4 @@
+@@ -67,24 +65,4 @@
  	      rm $$i; \
  	   fi ; \
  	  done
diff --git a/x11/lesstif/patches/patch-ap b/x11/lesstif/patches/patch-ap
index ec1eeff9711..a18871501e7 100644
--- a/x11/lesstif/patches/patch-ap
+++ b/x11/lesstif/patches/patch-ap
@@ -1,7 +1,7 @@
-$NetBSD: patch-ap,v 1.6 2000/07/25 14:42:09 jlam Exp $
+$NetBSD: patch-ap,v 1.7 2000/10/23 19:45:18 jlam Exp $
 
 --- lib/Mrm/Makefile.am.orig	Fri Oct 22 08:49:34 1999
-+++ lib/Mrm/Makefile.am	Tue Jul 25 08:18:13 2000
++++ lib/Mrm/Makefile.am
 @@ -24,22 +24,3 @@
  			lookup.h misc.h uil.h
  
diff --git a/x11/lesstif/patches/patch-aq b/x11/lesstif/patches/patch-aq
index 3d637d8b0fc..84d6aef79bd 100644
--- a/x11/lesstif/patches/patch-aq
+++ b/x11/lesstif/patches/patch-aq
@@ -1,8 +1,8 @@
-$NetBSD: patch-aq,v 1.7 2000/07/25 14:42:09 jlam Exp $
+$NetBSD: patch-aq,v 1.8 2000/10/23 19:45:18 jlam Exp $
 
---- lib/Xm-2.0/Makefile.am.orig	Tue Feb 15 18:52:24 2000
-+++ lib/Xm-2.0/Makefile.am	Tue Jul 25 08:18:13 2000
-@@ -68,8 +68,6 @@
+--- lib/Xm-2.0/Makefile.am.orig	Tue Aug  8 18:21:12 2000
++++ lib/Xm-2.0/Makefile.am
+@@ -69,8 +69,6 @@
  # Lets put the headers in a sub directory to avoid
  # poluting /usr/local with more directories for default installs.
  #
@@ -11,7 +11,7 @@ $NetBSD: patch-aq,v 1.7 2000/07/25 14:42:09 jlam Exp $
  lib_LTLIBRARIES=	libXm.la
  
  libXm_la_SOURCES= ${SRCS_1_2:%=../Xm/%} ${SRCS_2_0}
-@@ -86,24 +84,4 @@
+@@ -87,24 +85,4 @@
  	      rm $$i; \
  	   fi ; \
  	  done
diff --git a/x11/lesstif/patches/patch-ar b/x11/lesstif/patches/patch-ar
index 50a155c5776..4f2955afa97 100644
--- a/x11/lesstif/patches/patch-ar
+++ b/x11/lesstif/patches/patch-ar
@@ -1,7 +1,7 @@
-$NetBSD: patch-ar,v 1.5 2000/07/25 14:42:10 jlam Exp $
+$NetBSD: patch-ar,v 1.6 2000/10/23 19:45:18 jlam Exp $
 
 --- lib/Xm/Makefile.am.orig	Thu Jun 22 15:37:11 2000
-+++ lib/Xm/Makefile.am	Tue Jul 25 08:18:13 2000
++++ lib/Xm/Makefile.am
 @@ -54,22 +54,3 @@
  	Xmos.c alloca.c misc.c $(XDND_SRCS)
  
diff --git a/x11/lesstif/patches/patch-as b/x11/lesstif/patches/patch-as
index 6a1cd4d8609..732b334c86d 100644
--- a/x11/lesstif/patches/patch-as
+++ b/x11/lesstif/patches/patch-as
@@ -1,11 +1,24 @@
-$NetBSD: patch-as,v 1.5 2000/07/25 14:42:10 jlam Exp $
+$NetBSD: patch-as,v 1.6 2000/10/23 19:45:19 jlam Exp $
 
---- lib/config/Makefile.am.orig	Wed May 12 14:48:53 1999
-+++ lib/config/Makefile.am	Tue Jul 25 08:18:13 2000
-@@ -4,5 +4,5 @@
- MAINTAINERCLEANFILES=Makefile.in
- bin_SCRIPTS=	mxmkmf
+--- lib/config/LessTif.tmpl.orig	Tue Aug 29 11:04:58 2000
++++ lib/config/LessTif.tmpl
+@@ -165,7 +165,7 @@
+ #endif
  
--configdir=	$(libdir)/X11/config
-+configdir=	$(libdir)/X11/lesstif
- config_DATA=	Imake.tmpl Motif.rules Motif.tmpl
+ #ifndef LessTifXmVersion
+-# define LessTifXmVersion	1	/* configure-time option */
++# define LessTifXmVersion	2	/* NetBSD installs Xm-2.0 be default */
+ #endif
+ 
+ #if LessTifXmVersion == 1
+@@ -176,8 +176,8 @@
+ #  define LTDepXpLib		/**/
+ #elif LessTifXmVersion == 2
+ #  define XmVersion		2
+-#  define XmRevision		1
+-#  define MotifSharedRev	2.1	/* why 2.0? */
++#  define XmRevision		0
++#  define MotifSharedRev	2.0
+ #  define LTXpLib 		$(XPLIB)
+ #  define LTDepXpLib		$(DEPXPLIB)
+ #else
diff --git a/x11/lesstif/patches/patch-at b/x11/lesstif/patches/patch-at
index e19754fe71a..1b7c7ade416 100644
--- a/x11/lesstif/patches/patch-at
+++ b/x11/lesstif/patches/patch-at
@@ -1,10 +1,17 @@
-$NetBSD: patch-at,v 1.6 2000/07/25 14:43:17 jlam Exp $
+$NetBSD: patch-at,v 1.7 2000/10/23 19:45:19 jlam Exp $
 
---- lib/config/mxmkmf.in.orig	Thu Sep  2 19:51:36 1999
-+++ lib/config/mxmkmf.in	Tue Jul 25 08:18:13 2000
-@@ -7,4 +7,4 @@
- #
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--imake -DUseInstalled -I@libdir@/X11/config -I@x_libraries@/X11/config
-+imake -DUseInstalled -I@libdir@/X11/lesstif -I@x_libraries@/X11/config
+--- lib/config/Makefile.am.orig	Wed Aug 30 09:48:20 2000
++++ lib/config/Makefile.am
+@@ -6,10 +6,10 @@
+ 
+ configdir=	$(libdir)/X11/config
+ 
+-EXTRA_DIST =    LessTif.rules LessTif.tmpl host.def Imake.tmpl
++EXTRA_DIST =    LessTif.rules LessTif.tmpl LessTif.def Imake.tmpl
+ 
+ if XIsR6
+-config_DATA=	LessTif.rules LessTif.tmpl host.def
++config_DATA=	LessTif.rules LessTif.tmpl LessTif.def
+ else
+ # so being R5 
+ config_DATA=	Imake.tmpl LessTif.rules LessTif.tmpl
diff --git a/x11/lesstif/patches/patch-au b/x11/lesstif/patches/patch-au
index 2d4f8921334..27dbb0f21e3 100644
--- a/x11/lesstif/patches/patch-au
+++ b/x11/lesstif/patches/patch-au
@@ -1,7 +1,7 @@
-$NetBSD: patch-au,v 1.4 2000/07/25 14:42:10 jlam Exp $
+$NetBSD: patch-au,v 1.5 2000/10/23 19:45:19 jlam Exp $
 
 --- scripts/autoconf/Makefile.am.orig	Sun Sep 12 07:13:53 1999
-+++ scripts/autoconf/Makefile.am	Tue Jul 25 08:18:13 2000
++++ scripts/autoconf/Makefile.am
 @@ -5,10 +5,6 @@
  
  EXTRA_DIST=	ac_find_motif.m4
diff --git a/x11/lesstif/pkg/DEINSTALL b/x11/lesstif/pkg/DEINSTALL
new file mode 100644
index 00000000000..072dd4eec1e
--- /dev/null
+++ b/x11/lesstif/pkg/DEINSTALL
@@ -0,0 +1,32 @@
+#!/bin/sh
+#
+# $NetBSD: DEINSTALL,v 1.1 2000/10/23 19:45:23 jlam Exp $
+
+PKGNAME=$1
+STAGE=$2
+
+case ${STAGE} in
+DEINSTALL)
+	;;
+POST-DEINSTALL)
+	LOCALBASE=@LOCALBASE@
+	X11_HOSTDEF=${PKG_PREFIX}/lib/X11/config/host.def
+
+	echo -n "Updating ${X11_HOSTDEF}..."
+	cp -f ${X11_HOSTDEF} ${X11_HOSTDEF}.bak
+	( grep -v LessTif ${X11_HOSTDEF}.bak || true ) \
+		> ${X11_HOSTDEF}
+	echo "done."
+
+	if [ ${PKG_PREFIX} != ${LOCALBASE} ]
+	then
+		rm -f ${LOCALBASE}/share/aclocal/ac_find_motif.m4
+		rmdir -p ${PKG_PREFIX}/share/aclocal 2>/dev/null || true
+	fi
+	;;
+*)
+	echo "Unexpected argument: ${STAGE}"
+	exit 1
+	;;
+esac
+exit 0
diff --git a/x11/lesstif/pkg/INSTALL b/x11/lesstif/pkg/INSTALL
new file mode 100644
index 00000000000..bed2b5a712e
--- /dev/null
+++ b/x11/lesstif/pkg/INSTALL
@@ -0,0 +1,32 @@
+#!/bin/sh
+#
+# $NetBSD: INSTALL,v 1.1 2000/10/23 19:45:24 jlam Exp $
+
+PKGNAME=$1
+STAGE=$2
+
+case ${STAGE} in
+PRE-INSTALL)
+	;;
+POST-INSTALL)
+	LOCALBASE=@LOCALBASE@
+	X11_HOSTDEF=${PKG_PREFIX}/lib/X11/config/host.def
+
+	echo -n "Updating ${X11_HOSTDEF}..."
+	cp -f ${X11_HOSTDEF} ${X11_HOSTDEF}.bak
+	( grep -v LessTif ${X11_HOSTDEF}.bak; echo '#include <LessTif.def>' ) \
+		> ${X11_HOSTDEF}
+	echo "done."
+
+	if [ ${PKG_PREFIX} != ${LOCALBASE} ]
+	then
+		ln -fs ${PKG_PREFIX}/share/aclocal/ac_find_motif.m4 \
+			${LOCALBASE}/share/aclocal/ac_find_motif.m4
+	fi
+	;;
+*)
+	echo "Unexpected argument: ${STAGE}"
+	exit 1
+	;;
+esac
+exit 0
diff --git a/x11/lesstif/pkg/PLIST b/x11/lesstif/pkg/PLIST
index 94d763dbced..8257d6f20d7 100644
--- a/x11/lesstif/pkg/PLIST
+++ b/x11/lesstif/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.26 2000/07/25 14:42:13 jlam Exp $
+@comment $NetBSD: PLIST,v 1.27 2000/10/23 19:45:24 jlam Exp $
 bin/mwm
 bin/mxmkmf
 bin/uil
@@ -18,6 +18,7 @@ include/Xm/BaseClassP.h
 include/Xm/BulletinB.h
 include/Xm/BulletinBP.h
 include/Xm/CSText.h
+include/Xm/CSTextP.h
 include/Xm/CacheP.h
 include/Xm/CareVisualT.h
 include/Xm/CascadeB.h
@@ -155,10 +156,12 @@ include/Xm/XmAll.h
 include/Xm/XmP.h
 include/Xm/XmStrDefs.h
 include/Xm/XmosP.h
+include/Xm/Xpm.h
+include/Xm/XpmP.h
 lib/X11/app-defaults/Mwm
-lib/X11/lesstif/Imake.tmpl
-lib/X11/lesstif/Motif.rules
-lib/X11/lesstif/Motif.tmpl
+lib/X11/config/LessTif.def
+lib/X11/config/LessTif.rules
+lib/X11/config/LessTif.tmpl
 lib/X11/mwm/README
 lib/X11/mwm/alt.map
 lib/X11/mwm/system.mwmrc
@@ -231,69 +234,71 @@ man/man3/XmVendorShell.3
 man/man3/XmWorld.3
 man/man5/mwmrc.5
 share/aclocal/ac_find_motif.m4
-share/doc/lesstif/release-notes.html
+share/doc/html/lesstif/Advocacy.html
+share/doc/html/lesstif/All.html
+share/doc/html/lesstif/COPYING.LIB.html
+share/doc/html/lesstif/Clipboard.txt
+share/doc/html/lesstif/DragAndDrop.txt
+share/doc/html/lesstif/FAQ.html
+share/doc/html/lesstif/Form.txt
+share/doc/html/lesstif/GeoUtils.txt
+share/doc/html/lesstif/Geometry.html
+share/doc/html/lesstif/INSTALL.html
+share/doc/html/lesstif/SyntheticResources.txt
+share/doc/html/lesstif/UIL.txt
+share/doc/html/lesstif/Xbae.html
+share/doc/html/lesstif/Xlt.html
+share/doc/html/lesstif/XmStrings.txt
+share/doc/html/lesstif/apps.html
+share/doc/html/lesstif/bugs.html
+share/doc/html/lesstif/cdrom.html
+share/doc/html/lesstif/core.html
+share/doc/html/lesstif/current.html
+share/doc/html/lesstif/cvs.html
+share/doc/html/lesstif/download.html
+share/doc/html/lesstif/feedback.html
+share/doc/html/lesstif/help.html
+share/doc/html/lesstif/images/hungry.png
+share/doc/html/lesstif/images/lesstif-realsmall.png
+share/doc/html/lesstif/images/lesstif-small.png
+share/doc/html/lesstif/images/lesstif.jpg
+share/doc/html/lesstif/images/lesstif.png
+share/doc/html/lesstif/images/ltsunlogo.jpg
+share/doc/html/lesstif/images/ltsunlogo.png
+share/doc/html/lesstif/images/vh32.jpg
+share/doc/html/lesstif/images/vh32.png
+share/doc/html/lesstif/images/vh40.jpg
+share/doc/html/lesstif/images/vh40.png
+share/doc/html/lesstif/index.html
+share/doc/html/lesstif/known.html
+share/doc/html/lesstif/links.html
+share/doc/html/lesstif/lists.html
+share/doc/html/lesstif/mirrors.html
+share/doc/html/lesstif/platforms.html
+share/doc/html/lesstif/release-notes.html
+share/doc/html/lesstif/release-policy.html
+share/doc/html/lesstif/test_policy.html
+share/doc/html/lesstif/test_summary.html
+share/doc/html/lesstif/testers.html
+share/doc/html/lesstif/thread.html
+share/doc/html/lesstif/versions.html
+share/doc/html/lesstif/web_button.html
 share/doc/lesstif/AUTHORS
-share/doc/lesstif/Advocacy.html
-share/doc/lesstif/All.html
 share/doc/lesstif/BUG-REPORTING
 share/doc/lesstif/COPYING
 share/doc/lesstif/COPYING.LIB
-share/doc/lesstif/COPYING.LIB.html
 share/doc/lesstif/CREDITS
-share/doc/lesstif/Clipboard.txt
-share/doc/lesstif/DragAndDrop.txt
 share/doc/lesstif/FAQ
-share/doc/lesstif/FAQ.html
-share/doc/lesstif/Form.txt
-share/doc/lesstif/GeoUtils.txt
-share/doc/lesstif/Geometry.html
-share/doc/lesstif/INSTALL.html
 share/doc/lesstif/Install
 share/doc/lesstif/KNOWN_BUGS
 share/doc/lesstif/NEWS
 share/doc/lesstif/README
 share/doc/lesstif/RELEASE-POLICY
-share/doc/lesstif/SyntheticResources.txt
 share/doc/lesstif/TODO
-share/doc/lesstif/UIL.txt
-share/doc/lesstif/Xbae.html
-share/doc/lesstif/Xlt.html
-share/doc/lesstif/XmStrings.txt
-share/doc/lesstif/apps.html
-share/doc/lesstif/bugs.html
-share/doc/lesstif/cdrom.html
-share/doc/lesstif/core.html
-share/doc/lesstif/current.html
-share/doc/lesstif/cvs.html
-share/doc/lesstif/download.html
-share/doc/lesstif/help.html
-share/doc/lesstif/images/hungry.png
-share/doc/lesstif/images/lesstif-realsmall.png
-share/doc/lesstif/images/lesstif-small.png
-share/doc/lesstif/images/lesstif.jpg
-share/doc/lesstif/images/lesstif.png
-share/doc/lesstif/images/ltsunlogo.jpg
-share/doc/lesstif/images/ltsunlogo.png
-share/doc/lesstif/index.html
-share/doc/lesstif/known.html
-share/doc/lesstif/links.html
-share/doc/lesstif/lists.html
-share/doc/lesstif/mirrors.html
-share/doc/lesstif/platforms.html
 share/doc/lesstif/release-notes.txt
-share/doc/lesstif/release-policy.html
-share/doc/lesstif/test_policy.html
-share/doc/lesstif/test_summary.html
-share/doc/lesstif/testers.html
-share/doc/lesstif/thread.html
-share/doc/lesstif/versions.html
-share/doc/lesstif/web_button.html
-@dirrm share/doc/lesstif/images
 @dirrm share/doc/lesstif
+@dirrm share/doc/html/lesstif/images
+@dirrm share/doc/html/lesstif
 @dirrm lib/X11/mwm
-@dirrm lib/X11/lesstif
 @dirrm include/Xm
 @dirrm include/Mrm
-@exec test %D = ${LOCALBASE} || ln -fs %D/share/aclocal/ac_find_motif.m4 ${LOCALBASE}/share/aclocal/ac_find_motif.m4
-@unexec test %D = ${LOCALBASE} || rm ${LOCALBASE}/share/aclocal/ac_find_motif.m4
-@unexec rmdir %D/share/aclocal 2>/dev/null || true
diff --git a/x11/lesstif12/Makefile b/x11/lesstif12/Makefile
index 70b563a74e4..d0583497e68 100644
--- a/x11/lesstif12/Makefile
+++ b/x11/lesstif12/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/07/25 14:44:48 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2000/10/23 19:45:26 jlam Exp $
 
 PKGNAME=		lesstif12-${LESSTIF_VERSION}
 
@@ -11,6 +11,7 @@ CONFIGURE_ARGS+=	--disable-build-20
 CONFIGURE_ARGS+=	--enable-default-12
 
 post-install:
+	${RMDIR} -p ${PREFIX}/share/doc/html/lesstif 2> /dev/null || ${TRUE}
 	${RMDIR} -p ${PREFIX}/share/doc/lesstif 2> /dev/null || ${TRUE}
 
 .include "../../x11/lesstif/Makefile.common"