Update lesstif to 0.91.4. Only minor bug fixes and some improvements

to the Xbae widget set.  As a package, split out the Motif-1.2-compatible
libraries into a separate package.  This package now contains just the
main (Motif-2.0-compatible) LessTif libraries, headers, and documentation.

24 files changed, 459 insertions, 479 deletions

diff --git a/x11/lesstif/Makefile b/x11/lesstif/Makefile
index a3b893f395e..d76193ce01a 100644
--- a/x11/lesstif/Makefile
+++ b/x11/lesstif/Makefile
@@ -1,31 +1,12 @@
-# $NetBSD: Makefile,v 1.50 2000/06/21 05:31:43 jlam Exp $
+# $NetBSD: Makefile,v 1.51 2000/07/25 14:42:00 jlam Exp $
 # FreeBSD Id: Makefile,v 1.13 1997/09/08 08:34:13 tg Exp
 #
 
-DISTNAME=		lesstif-0.91.0
-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/
-
-MAINTAINER=		packages@netbsd.org
-HOMEPAGE=		http://www.lesstif.org/
-
 BUILD_DEPENDS+=		lynx:../../www/lynx
 
-USE_X11BASE=		# defined
-USE_LIBTOOL=		# defined
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig \
-			${WRKSRC}/Xlt/ltconfig \
-			${WRKSRC}/Xbae/ltconfig
-
-GNU_CONFIGURE=		# defined
-CONFIGURE_ARGS+=	--enable-build-12	# needed for www/Mosaic
-CONFIGURE_ARGS+=	--enable-build-20 --enable-default-20 \
-			--enable-production --disable-debug
+CONFIGURE_ARGS+=	--disable-build-12
+CONFIGURE_ARGS+=	--enable-build-20
+CONFIGURE_ARGS+=	--enable-default-20
 PLIST_SUBST+=		LOCALBASE=${LOCALBASE}
 
 post-install:
@@ -33,4 +14,4 @@ post-install:
 	${LN} -fs ${PREFIX}/share/aclocal/ac_find_motif.m4 \
 		${LOCALBASE}/share/aclocal/ac_find_motif.m4
 
-.include "../../mk/bsd.pkg.mk"
+.include "../../x11/lesstif/Makefile.common"
diff --git a/x11/lesstif/Makefile.common b/x11/lesstif/Makefile.common
new file mode 100644
index 00000000000..dd3deaf7dd0
--- /dev/null
+++ b/x11/lesstif/Makefile.common
@@ -0,0 +1,35 @@
+# $NetBSD: Makefile.common,v 1.1 2000/07/25 14:42:00 jlam Exp $
+
+DISTNAME=		lesstif-${LESSTIF_VERSION}
+LESSTIF_VERSION=	0.91.4
+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/
+
+MAINTAINER=		packages@netbsd.org
+HOMEPAGE=		http://www.lesstif.org/
+
+BUILD_DEPENDS+=		autoreconf:../../devel/autoconf
+BUILD_DEPENDS+=		automake:../../devel/automake
+
+USE_X11BASE=		# defined
+USE_GMAKE=		# defined
+USE_LIBTOOL=		# defined
+LTCONFIG_OVERRIDE+=	${WRKSRC}/ltconfig
+LTCONFIG_OVERRIDE+=	${WRKSRC}/Xlt/ltconfig
+LTCONFIG_OVERRIDE+=	${WRKSRC}/Xbae/ltconfig
+
+GNU_CONFIGURE=		# defined
+CONFIGURE_ARGS+=	--enable-production --disable-debug
+
+FILESDIR=		${.CURDIR}/../../x11/lesstif/files
+PATCHDIR=		${.CURDIR}/../../x11/lesstif/patches
+
+pre-configure:
+	cd ${WRKSRC} && autoreconf && automake
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/lesstif/files/md5 b/x11/lesstif/files/md5
index 986a2c90290..b5eeb187403 100644
--- a/x11/lesstif/files/md5
+++ b/x11/lesstif/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.19 2000/05/25 15:25:44 drochner Exp $
+$NetBSD: md5,v 1.20 2000/07/25 14:42:02 jlam Exp $
 
-MD5 (lesstif-0.91.0.tar.gz) = 5c42293a1bd6de9661babb94a096d798
+MD5 (lesstif-0.91.4.tar.gz) = 264ddee653cb7ea7d0bc9ae6e99a9ef7
diff --git a/x11/lesstif/files/patch-sum b/x11/lesstif/files/patch-sum
index 6067716f2ba..ffcf7154ea4 100644
--- a/x11/lesstif/files/patch-sum
+++ b/x11/lesstif/files/patch-sum
@@ -1,20 +1,23 @@
-$NetBSD: patch-sum,v 1.13 2000/06/21 05:31:45 jlam Exp $
+$NetBSD: patch-sum,v 1.14 2000/07/25 14:42:02 jlam Exp $
 
-MD5 (patch-aa) = dc3d7561b3f2518bd207d776abfa5cfe
-MD5 (patch-ab) = b1bd93fae6d1c4aaef8d28689a6129f9
-MD5 (patch-ac) = 2a32b8550c086d5aab57baeb31557a37
-MD5 (patch-ad) = 7ada1aa00d303437903143dd9e03b859
-MD5 (patch-ae) = e84801e762360783c3bd3c731e80490c
-MD5 (patch-af) = 67e67fabe405adcb69b9894fb242c361
-MD5 (patch-ag) = 4398f0a97996dade07c5381ec61b839a
-MD5 (patch-ah) = 5e5e0a0d0b74adf8fcb31e962dc92bd1
-MD5 (patch-ai) = a9a98fa10eecf8d799f77c601bd59fc9
-MD5 (patch-ak) = 84c3d99bbd2a79e518b8ec4e49d971cd
-MD5 (patch-al) = 3a8da44462633b73278f9a287d1e713e
-MD5 (patch-am) = f399cac161a25dd53a8557a470062f86
-MD5 (patch-an) = 5fddd2f301619a4f7839f2d7c3a535ce
-MD5 (patch-ap) = a3d430fe3d5bf982e3109425ed80f3af
-MD5 (patch-aq) = e070fc7ffcc1538753ced9a45ede4735
-MD5 (patch-ar) = e768c238af22b0d47d0a9a103c527719
-MD5 (patch-as) = 5671178e8122af44940facfbba30e1a3
-MD5 (patch-au) = e607aa06d793e8f4b5fc51c691ec112f
+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) = d4b2652bf541eacb1fafb70b0cc431de
+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
diff --git a/x11/lesstif/patches/patch-aa b/x11/lesstif/patches/patch-aa
index 3b0771fb50d..7c057c4fdd8 100644
--- a/x11/lesstif/patches/patch-aa
+++ b/x11/lesstif/patches/patch-aa
@@ -1,22 +1,57 @@
-$NetBSD: patch-aa,v 1.13 2000/05/25 15:25:44 drochner Exp $
+$NetBSD: patch-aa,v 1.14 2000/07/25 14:42:02 jlam Exp $
 
---- Makefile.in.orig	Mon May 15 02:49:26 2000
-+++ Makefile.in	Thu May 18 19:57:07 2000
-@@ -131,7 +131,7 @@
+--- Makefile.am.orig	Tue May  2 17:05:14 2000
++++ Makefile.am	Tue Jul 25 08:18:13 2000
+@@ -3,31 +3,38 @@
+ #
+ 
+ MAINTAINERCLEANFILES=Makefile.in configure libtool config.guess config.sub ltconfig ltmain.sh aclocal.m4 config.h.in install-sh missing mkinstalldirs
++
++if Version_1_2
++SUBDIRS	= include lib
++
++DIST_SUBDIRS = include lib test
++else
+ SUBDIRS	= include lib clients scripts doc @BuildTestDir@
+ 
+ DIST_SUBDIRS = include lib clients scripts doc test
++endif
+ 
+ AUTOMAKE_OPTIONS = 1.4
+ 
++EXTRA_DIST=	acconfig.h configure \
++		BUG-REPORTING CREDITS KNOWN_BUGS RELEASE-POLICY NOTES
++
++# Only install the documentation if installing 2.0-compatible libraries.
++#
++if Version_2_0
+ #
+ # Install some information files
+ #
  # Lets put the informational stuff in a sub directory to avoid 
  # poluting /usr/local for default installs.
  #
--rootdir = $(exec_prefix)/LessTif
-+rootdir = $(exec_prefix)/share/doc/lesstif
- root_DATA = AUTHORS BUG-REPORTING COPYING COPYING.LIB CREDITS \
- 	KNOWN_BUGS NEWS README RELEASE-POLICY TODO release-notes.txt
+-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
+ 
+ @MAINT@changelog:
+ @MAINT@	@( cd $(srcdir)/lib/Xm ; cvs -Q log -rrelease_@MAJOR_VERSION@_@MINOR_VERSION@_@PICO_VERSION@: ) | $(srcdir)/scripts/parselog >ChangeLog
  
-@@ -140,7 +140,7 @@
- 		BUG-REPORTING CREDITS KNOWN_BUGS RELEASE-POLICY NOTES
+-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 @@
  
--htmldir = $(exec_prefix)/LessTif/doc
-+htmldir = $(exec_prefix)/share/doc/lesstif
- html_DATA = release-notes.html
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ #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 ba5a8d4e0a0..7d9501214da 100644
--- a/x11/lesstif/patches/patch-ab
+++ b/x11/lesstif/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.9 2000/04/27 13:14:49 tron Exp $
+$NetBSD: patch-ab,v 1.10 2000/07/25 14:42:03 jlam Exp $
 
---- clients/Motif-1.2/mwm/system.mwmrc.orig	Wed Jan 13 16:11:05 1999
-+++ clients/Motif-1.2/mwm/system.mwmrc	Wed Nov 24 17:30:51 1999
+--- 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
 @@ -4,7 +4,7 @@
  Menu DefaultRootMenu
  {
diff --git a/x11/lesstif/patches/patch-ac b/x11/lesstif/patches/patch-ac
index 6ace05d4164..c5f944e0058 100644
--- a/x11/lesstif/patches/patch-ac
+++ b/x11/lesstif/patches/patch-ac
@@ -1,30 +1,25 @@
-$NetBSD: patch-ac,v 1.9 2000/06/21 05:31:46 jlam Exp $
+$NetBSD: patch-ac,v 1.10 2000/07/25 14:42:03 jlam Exp $
 
---- configure.orig	Sun May 14 20:49:27 2000
-+++ configure	Wed Jun 21 00:37:20 2000
-@@ -6252,10 +6252,12 @@
-     top_srcdir="$ac_dots$ac_given_srcdir" ;;
-   esac
+--- configure.in.orig	Mon Jul  3 18:38:20 2000
++++ configure.in	Tue Jul 25 08:18:13 2000
+@@ -503,7 +503,7 @@
+ dnl We provide for such a translation via Debian's man2html.
+ dnl
  
-+  if false; then
-   case "$ac_given_INSTALL" in
-   [/$]*) INSTALL="$ac_given_INSTALL" ;;
-   *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-   esac
-+  fi
+-AC_CHECK_PROG(VarHaveMan2html, man2html, yes, no)
++dnl AC_CHECK_PROG(VarHaveMan2html, man2html, yes, no)
+ AM_CONDITIONAL(HaveMan2html, test x$VarHaveMan2html = xyes)
  
-   echo creating "$ac_file"
-   rm -f "$ac_file"
-@@ -6476,10 +6478,12 @@
-       *) # Relative path.
-         ac_sub_cache_file="$ac_dots$cache_file" ;;
-       esac
-+  if false; then
-   case "$ac_given_INSTALL" in
-         [/$]*) INSTALL="$ac_given_INSTALL" ;;
-         *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-         esac
-+  fi
+ dnl
+@@ -606,6 +606,11 @@
  
-       echo "running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
-       # The eval makes quoting arguments work.
+ dnl AC_SUBST(libdir)
+ AC_SUBST(bindir)
++
++docdir='${prefix}/share/doc/lesstif'
++htmldir='${prefix}/share/doc/html/lesstif'
++AC_SUBST(docdir)
++AC_SUBST(htmldir)
+ 
+ dnl AC_SUBST(version)
+ AC_SUBST(version_suffix)
diff --git a/x11/lesstif/patches/patch-ad b/x11/lesstif/patches/patch-ad
index a9309c6a667..9abf5450fe0 100644
--- a/x11/lesstif/patches/patch-ad
+++ b/x11/lesstif/patches/patch-ad
@@ -1,13 +1,14 @@
-$NetBSD: patch-ad,v 1.12 2000/05/25 15:25:44 drochner Exp $
+$NetBSD: patch-ad,v 1.13 2000/07/25 14:42:04 jlam Exp $
 
---- doc/Makefile.in.orig	Mon May 15 02:47:14 2000
-+++ doc/Makefile.in	Thu May 18 19:59:59 2000
-@@ -123,7 +123,7 @@
+--- doc/Makefile.am.orig	Fri Jan  7 11:57:44 2000
++++ doc/Makefile.am	Tue Jul 25 08:18:13 2000
+@@ -6,8 +6,7 @@
  
- SUBDIRS = www.lesstif.org lessdox
+ SUBDIRS	= www.lesstif.org lessdox
  
--rootdir = $(exec_prefix)/LessTif/doc
-+rootdir = $(exec_prefix)/share/doc/lesstif
- root_DATA = All.html Clipboard.txt DragAndDrop.txt Form.txt \
+-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 \
  		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 f84868524f9..d57e82151e0 100644
--- a/x11/lesstif/patches/patch-ae
+++ b/x11/lesstif/patches/patch-ae
@@ -1,37 +1,26 @@
-$NetBSD: patch-ae,v 1.12 2000/05/30 07:38:54 tron Exp $
+$NetBSD: patch-ae,v 1.13 2000/07/25 14:42:04 jlam Exp $
 
---- doc/lessdox/clients/Makefile.in.orig	Mon May 15 02:47:15 2000
-+++ doc/lessdox/clients/Makefile.in	Tue May 30 09:15:20 2000
-@@ -121,10 +121,10 @@
+--- 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
+@@ -6,10 +6,9 @@
  EXTRA_DIST = $(man1_DATA) $(man3_DATA) $(man5_DATA)
- SUFFIXES = .1 .3 .5 .html
+ SUFFIXES=	.1 .3 .5 .html
  
--mandir = $(exec_prefix)/LessTif/doc/man
--man1dir = $(exec_prefix)/LessTif/doc/man/man1
--man3dir = $(exec_prefix)/LessTif/doc/man/man3
--man5dir = $(exec_prefix)/LessTif/doc/man/man5
-+mandir = $(exec_prefix)/man
-+man1dir = $(exec_prefix)/man/man1
-+man3dir = $(exec_prefix)/man/man3
-+man5dir = $(exec_prefix)/man/man5
+-mandir=	$(exec_prefix)/LessTif/doc/man
+-man1dir=	$(exec_prefix)/LessTif/doc/man/man1
+-man3dir=	$(exec_prefix)/LessTif/doc/man/man3
+-man5dir=	$(exec_prefix)/LessTif/doc/man/man5
++man1dir=	$(mandir)/man1
++man3dir=	$(mandir)/man3
++man5dir=	$(mandir)/man5
  
- man1_DATA = mwm.1 xmbind.1 lesstif.1 xbae.1 xlt.1
- man3_DATA = 
-@@ -139,7 +139,7 @@
+ man1_DATA=	mwm.1 xmbind.1 lesstif.1 xbae.1 xlt.1
+ man3_DATA=
+@@ -24,7 +23,6 @@
  # build them.
  #
  
--htmldir = $(exec_prefix)/LessTif/doc/html
-+htmldir = $(exec_prefix)/share/doc/lesstif/html
- 
- @HaveMan2html_TRUE@html_DATA = \
- @HaveMan2html_TRUE@mwm.html mwmrc.html xmbind.html lesstif.html xlt.html xbae.html
-@@ -277,7 +277,7 @@
- install-exec-am:
- install-exec: install-exec-am
- 
--install-data-am: install-htmlDATA install-man1DATA install-man3DATA \
-+install-data-am: install-man1DATA install-man3DATA \
- 		install-man5DATA
- install-data: install-data-am
+-htmldir=	$(exec_prefix)/LessTif/doc/html
+ if	HaveMan2html
  
+ html_DATA=	mwm.html mwmrc.html xmbind.html lesstif.html xlt.html xbae.html
diff --git a/x11/lesstif/patches/patch-af b/x11/lesstif/patches/patch-af
index 6529c8524c0..00c01e4884c 100644
--- a/x11/lesstif/patches/patch-af
+++ b/x11/lesstif/patches/patch-af
@@ -1,37 +1,26 @@
-$NetBSD: patch-af,v 1.10 2000/05/30 07:38:54 tron Exp $
+$NetBSD: patch-af,v 1.11 2000/07/25 14:42:04 jlam Exp $
 
---- doc/lessdox/functions/Makefile.in.orig	Mon May 15 02:47:15 2000
-+++ doc/lessdox/functions/Makefile.in	Tue May 30 09:24:10 2000
-@@ -121,10 +121,10 @@
- EXTRA_DIST =  $(man1_DATA) $(man3_DATA) $(man5_DATA)
- SUFFIXES = .1 .3 .5 .html
+--- 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
+@@ -6,10 +6,9 @@
+ EXTRA_DIST += $(man1_DATA) $(man3_DATA) $(man5_DATA)
+ SUFFIXES=	.1 .3 .5 .html
  
--mandir = $(exec_prefix)/LessTif/doc/man
--man1dir = $(exec_prefix)/LessTif/doc/man/man1
--man3dir = $(exec_prefix)/LessTif/doc/man/man3
--man5dir = $(exec_prefix)/LessTif/doc/man/man5
-+mandir = $(exec_prefix)/man
-+man1dir = $(exec_prefix)/man/man1
-+man3dir = $(exec_prefix)/man/man3
-+man5dir = $(exec_prefix)/man/man5
+-mandir=	$(exec_prefix)/LessTif/doc/man
+-man1dir=	$(exec_prefix)/LessTif/doc/man/man1
+-man3dir=	$(exec_prefix)/LessTif/doc/man/man3
+-man5dir=	$(exec_prefix)/LessTif/doc/man/man5
++man1dir=	$(mandir)/man1
++man3dir=	$(mandir)/man3
++man5dir=	$(mandir)/man5
  
- man1_DATA = 
- man3_DATA = 
-@@ -139,7 +139,7 @@
+ man1_DATA=	
+ man3_DATA=
+@@ -24,7 +23,6 @@
  # build them.
  #
  
--htmldir = $(exec_prefix)/LessTif/doc/html
-+htmldir = $(exec_prefix)/share/doc/lesstif/html
- 
- @HaveMan2html_TRUE@html_DATA = \
- @HaveMan2html_TRUE@${man1_DATA:.1=.html} ${man3_DATA:.3=.html} \
-@@ -278,7 +278,7 @@
- install-exec-am:
- install-exec: install-exec-am
- 
--install-data-am: install-htmlDATA install-man1DATA install-man3DATA \
-+install-data-am: install-man1DATA install-man3DATA \
- 		install-man5DATA
- install-data: install-data-am
+-htmldir=	$(exec_prefix)/LessTif/doc/html
+ if	HaveMan2html
  
+ html_DATA=	${man1_DATA:.1=.html} ${man3_DATA:.3=.html} \
diff --git a/x11/lesstif/patches/patch-ag b/x11/lesstif/patches/patch-ag
index 924ba35eb84..73669ac02a2 100644
--- a/x11/lesstif/patches/patch-ag
+++ b/x11/lesstif/patches/patch-ag
@@ -1,40 +1,38 @@
-$NetBSD: patch-ag,v 1.9 2000/05/30 07:38:54 tron Exp $
+$NetBSD: patch-ag,v 1.10 2000/07/25 14:42:05 jlam Exp $
 
---- doc/lessdox/widgets/Makefile.in.orig	Mon May 15 02:47:15 2000
-+++ doc/lessdox/widgets/Makefile.in	Tue May 30 09:34:35 2000
-@@ -121,10 +121,10 @@
- EXTRA_DIST =  $(man1_DATA) $(man3_DATA) $(man5_DATA)
- SUFFIXES = .1 .3 .5 .html
+--- 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
+@@ -6,10 +6,9 @@
+ EXTRA_DIST += $(man1_DATA) $(man3_DATA) $(man5_DATA)
+ SUFFIXES=	.1 .3 .5 .html
  
--mandir = $(prefix)/LessTif/doc/man
--man1dir = $(prefix)/LessTif/doc/man/man1
--man3dir = $(prefix)/LessTif/doc/man/man3
--man5dir = $(prefix)/LessTif/doc/man/man5
-+mandir = $(prefix)/man
-+man1dir = $(prefix)/man/man1
-+man3dir = $(prefix)/man/man3
-+man5dir = $(prefix)/man/man5
+-mandir=	$(prefix)/LessTif/doc/man
+-man1dir=	$(prefix)/LessTif/doc/man/man1
+-man3dir=	$(prefix)/LessTif/doc/man/man3
+-man5dir=	$(prefix)/LessTif/doc/man/man5
++man1dir=	$(mandir)/man1
++man3dir=	$(mandir)/man3
++man5dir=	$(mandir)/man5
  
- man1_DATA = 
- man3_DATA = \
-@@ -170,7 +170,7 @@
+ man1_DATA=	
+ man3_DATA= \
+@@ -54,8 +53,6 @@
  # build them.
  #
  
--htmldir = $(prefix)/LessTif/doc/html
-+htmldir = $(prefix)/share/doc/lesstif/html
+-htmldir=	$(prefix)/LessTif/doc/html
+-
+ if	HaveMan2html
  
- @HaveMan2html_TRUE@html_DATA = \
- @HaveMan2html_TRUE@${man1_DATA:.1=.html} ${man3_DATA:.3=.html} \
-@@ -309,10 +309,9 @@
- install-exec-am:
- install-exec: install-exec-am
+ html_DATA=	${man1_DATA:.1=.html} ${man3_DATA:.3=.html} \
+@@ -77,10 +74,3 @@
+ 	man2html -f <$(srcdir)/$*.5 >$*.html
  
--install-data-am: install-htmlDATA install-man1DATA install-man3DATA \
-+install-data-am: install-man1DATA install-man3DATA \
- 		install-man5DATA
- 	@$(NORMAL_INSTALL)
--	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
- install-data: install-data-am
- 
- install-am: all-am
+ endif
+-
+-#
+-# This installs an extra symbolic link to make the HTML links work right
+-# in both the http://www.lesstif.org and the locally installed case.
+-#
+-install-data-hook:
+-	if [ ! -h $(DESTDIR)$(prefix)/LessTif/doc/Lessdox ]; then mkdir -p $(DESTDIR)$(prefix)/LessTif/doc && cd $(DESTDIR)$(prefix)/LessTif/doc && $(LN_S) html Lessdox; fi
diff --git a/x11/lesstif/patches/patch-ah b/x11/lesstif/patches/patch-ah
index 2ffb91ad8b3..b3bb7f866a1 100644
--- a/x11/lesstif/patches/patch-ah
+++ b/x11/lesstif/patches/patch-ah
@@ -1,22 +1,28 @@
-$NetBSD: patch-ah,v 1.10 2000/05/25 15:25:44 drochner Exp $
+$NetBSD: patch-ah,v 1.11 2000/07/25 14:42:05 jlam Exp $
 
---- doc/www.lesstif.org/Makefile.in.orig	Mon May 15 02:47:15 2000
-+++ doc/www.lesstif.org/Makefile.in	Thu May 18 20:03:22 2000
-@@ -128,7 +128,7 @@
+--- 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 @@
  # Lets put the informational stuff in a sub directory to avoid 
  # polluting /usr/local for default installs.
  #
--docdir = $(exec_prefix)/LessTif/doc
-+docdir = $(exec_prefix)/share/doc/lesstif
- doc_DATA = COPYING.LIB.html FAQ.html INSTALL.html apps.html \
+-docdir=	$(exec_prefix)/LessTif/doc
+ doc_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 \
-@@ -138,7 +138,7 @@
+@@ -20,7 +19,7 @@
+ 		versions.html web_button.html known.html help.html \
  		Advocacy.html Xbae.html Xlt.html
  
+-rootdir=	$(exec_prefix)/LessTif
++rootdir=	$(docdir)
+ root_DATA=	Install
  
--rootdir = $(exec_prefix)/LessTif
-+rootdir = $(docdir)
- root_DATA = Install
+ all-local:      FAQ
+@@ -43,5 +42,5 @@
  
- root2dir = $(exec_prefix)/LessTif
+ endif
+ 
+-root2dir=	$(exec_prefix)/LessTif
++root2dir=	$(docdir)
+ root2_DATA=	FAQ
diff --git a/x11/lesstif/patches/patch-ai b/x11/lesstif/patches/patch-ai
index 4e189d5c98f..9177cd8580f 100644
--- a/x11/lesstif/patches/patch-ai
+++ b/x11/lesstif/patches/patch-ai
@@ -1,13 +1,13 @@
-$NetBSD: patch-ai,v 1.12 2000/05/25 15:25:44 drochner Exp $
+$NetBSD: patch-ai,v 1.13 2000/07/25 14:42:06 jlam Exp $
 
---- doc/www.lesstif.org/images/Makefile.in.orig	Thu May 18 20:05:44 2000
-+++ doc/www.lesstif.org/images/Makefile.in	Thu May 18 20:15:56 2000
-@@ -127,7 +127,7 @@
+--- 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
+@@ -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 = $(exec_prefix)/share/doc/lesstif/images
- root_DATA = hungry.png \
+-rootdir=	$(exec_prefix)/LessTif/doc/images
++rootdir=	$(docdir)/images
+ root_DATA=	hungry.png \
  		lesstif-realsmall.png lesstif-small.png lesstif.png \
  		ltsunlogo.png lesstif.jpg ltsunlogo.jpg
diff --git a/x11/lesstif/patches/patch-aj b/x11/lesstif/patches/patch-aj
new file mode 100644
index 00000000000..222972ff440
--- /dev/null
+++ b/x11/lesstif/patches/patch-aj
@@ -0,0 +1,16 @@
+$NetBSD: patch-aj,v 1.9 2000/07/25 14:42:06 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
+@@ -16,11 +16,3 @@
+ mrm_HEADERS=	MrmAppl.h MrmDecls.h MrmPrivate.h MrmPublic.h
+ 
+ endif
+-install-data-hook:
+-if Version_1_2
+-if DefaultVersion12
+-	if [ -d $(DESTDIR)$(prefix)/include/Mrm ]; then rm -rf $(DESTDIR)$(prefix)/include/Mrm; else rm -f $(DESTDIR)$(prefix)/include/Mrm; fi
+-	(mkdir -p $(DESTDIR)$(prefix)/include && cd $(DESTDIR)$(prefix)/include && $(LN_S) ../LessTif/Motif1.2/include/Mrm Mrm)
+-endif
+-endif
+-
diff --git a/x11/lesstif/patches/patch-ak b/x11/lesstif/patches/patch-ak
index 6545e13980d..7187f996fff 100644
--- a/x11/lesstif/patches/patch-ak
+++ b/x11/lesstif/patches/patch-ak
@@ -1,21 +1,15 @@
-$NetBSD: patch-ak,v 1.8 2000/05/25 15:25:44 drochner Exp $
+$NetBSD: patch-ak,v 1.9 2000/07/25 14:42:07 jlam Exp $
 
---- include/Motif-2.0/Mrm/Makefile.in.orig	Mon May 15 02:47:11 2000
-+++ include/Motif-2.0/Mrm/Makefile.in	Thu May 18 20:23:29 2000
-@@ -127,7 +127,7 @@
- # poluting /usr/local with more directories for default installs.
- #
- @Version_2_0_TRUE@mrmdir = \
--@Version_2_0_TRUE@$(prefix)/LessTif/Motif2.0/include/Mrm
-+@Version_2_0_TRUE@$(prefix)/include/Mrm
+--- 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
+@@ -46,10 +46,3 @@
+ xm_DATA = Xm.h
  
- @Version_2_0_TRUE@HEADERS1_2 = \
- @Version_2_0_TRUE@MrmAppl.h MrmDecls.h MrmPrivate.h MrmPublic.h
-@@ -230,7 +230,6 @@
- 
- install-data-am: install-mrmHEADERS
- 	@$(NORMAL_INSTALL)
--	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
- install-data: install-data-am
- 
- install-am: all-am
+ endif
+-install-data-hook:
+-if Version_1_2
+-if DefaultVersion12
+-	if [ -d $(DESTDIR)$(prefix)/include/Xm ]; then rm -rf $(DESTDIR)$(prefix)/include/Xm; else rm -f $(DESTDIR)$(prefix)/include/Xm; fi
+-	(mkdir -p $(DESTDIR)$(prefix)/include && cd $(DESTDIR)$(prefix)/include && $(LN_S) ../LessTif/Motif1.2/include/Xm Xm)
+-endif
+-endif
diff --git a/x11/lesstif/patches/patch-al b/x11/lesstif/patches/patch-al
index d9aba5d962c..befb55299a6 100644
--- a/x11/lesstif/patches/patch-al
+++ b/x11/lesstif/patches/patch-al
@@ -1,21 +1,25 @@
-$NetBSD: patch-al,v 1.7 2000/05/25 15:25:44 drochner Exp $
+$NetBSD: patch-al,v 1.8 2000/07/25 14:42:08 jlam Exp $
 
---- include/Motif-2.0/Xm/Makefile.in.orig	Mon May 15 02:47:11 2000
-+++ include/Motif-2.0/Xm/Makefile.in	Thu May 18 20:26:48 2000
-@@ -127,7 +127,7 @@
+--- 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
+@@ -11,7 +11,7 @@
+ # Lets put the headers in a sub directory to avoid
  # poluting /usr/local with more directories for default installs.
  #
- @Version_2_0_TRUE@xmdir = \
--@Version_2_0_TRUE@$(prefix)/LessTif/Motif2.0/include/Xm
-+@Version_2_0_TRUE@$(prefix)/include/Xm
+-mrmdir =	$(prefix)/LessTif/Motif2.0/include/Mrm
++mrmdir =	$(includedir)/Mrm
  
- @Version_2_0_TRUE@HEADERS1_2 = \
- @Version_2_0_TRUE@\
-@@ -296,7 +296,6 @@
+ HEADERS1_2 =	MrmAppl.h MrmDecls.h MrmPrivate.h MrmPublic.h
  
- install-data-am: install-xmDATA install-xmHEADERS
- 	@$(NORMAL_INSTALL)
--	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
- install-data: install-data-am
+@@ -30,11 +30,3 @@
+ 	  done
  
- install-am: all-am
+ endif
+-install-data-hook:
+-if Version_2_0
+-if DefaultVersion20
+-	if [ -d $(DESTDIR)$(prefix)/include/Mrm ]; then rm -rf $(DESTDIR)$(prefix)/include/Mrm; else rm -f $(DESTDIR)$(prefix)/include/Mrm; fi
+-	(mkdir -p $(DESTDIR)$(prefix)/include && cd $(DESTDIR)$(prefix)/include && $(LN_S) ../LessTif/Motif2.0/include/Mrm Mrm)
+-endif
+-endif
+-
diff --git a/x11/lesstif/patches/patch-am b/x11/lesstif/patches/patch-am
index ecbbaa56287..26023fb2c51 100644
--- a/x11/lesstif/patches/patch-am
+++ b/x11/lesstif/patches/patch-am
@@ -1,12 +1,25 @@
-$NetBSD: patch-am,v 1.6 2000/04/27 13:14:53 tron Exp $
+$NetBSD: patch-am,v 1.7 2000/07/25 14:42:08 jlam Exp $
 
---- lib/Mrm/Makefile.in.orig	Fri Nov  5 21:14:37 1999
-+++ lib/Mrm/Makefile.in	Wed Nov 24 17:30:53 1999
-@@ -297,7 +297,6 @@
+--- 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
+@@ -11,7 +11,7 @@
+ # Lets put the headers in a sub directory to avoid
+ # poluting /usr/local with more directories for default installs.
+ #
+-xmdir=	$(prefix)/LessTif/Motif2.0/include/Xm
++xmdir=	$(includedir)/Xm
  
- install-data-am:
- 	@$(NORMAL_INSTALL)
--	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
- install-data: install-data-am
+ HEADERS1_2 = \
+ 	ArrowB.h ArrowBG.h AtomMgr.h \
+@@ -72,11 +72,4 @@
+ 	   fi ; \
+ 	  done
  
- install-am: all-am
+-endif   
+-install-data-hook:
+-if Version_2_0
+-if DefaultVersion20
+-	if [ -d $(DESTDIR)$(prefix)/include/Xm ]; then rm -rf $(DESTDIR)$(prefix)/include/Xm; else rm -f $(DESTDIR)$(prefix)/include/Xm; fi
+-	(mkdir -p $(DESTDIR)$(prefix)/include && cd $(DESTDIR)$(prefix)/include && $(LN_S) ../LessTif/Motif2.0/include/Xm Xm)
+-endif   
+ endif   
diff --git a/x11/lesstif/patches/patch-an b/x11/lesstif/patches/patch-an
index b0270767c9a..8eefb367d82 100644
--- a/x11/lesstif/patches/patch-an
+++ b/x11/lesstif/patches/patch-an
@@ -1,21 +1,32 @@
-$NetBSD: patch-an,v 1.7 2000/05/25 15:25:44 drochner Exp $
+$NetBSD: patch-an,v 1.8 2000/07/25 14:42:08 jlam Exp $
 
---- lib/Mrm-2.0/Makefile.in.orig	Mon May 15 02:47:10 2000
-+++ lib/Mrm-2.0/Makefile.in	Thu May 18 20:32:06 2000
-@@ -160,7 +160,7 @@
- @Version_2_0_TRUE@		-DLESSTIFHOME=\"@prefix@\"
- 
- @Version_2_0_TRUE@libdir = \
--@Version_2_0_TRUE@$(prefix)/LessTif/Motif2.0/lib
-+@Version_2_0_TRUE@$(prefix)/lib
- 
- @Version_2_0_TRUE@lib_LTLIBRARIES = \
- @Version_2_0_TRUE@libMrm.la
-@@ -338,7 +338,6 @@
- 
- install-data-am:
- 	@$(NORMAL_INSTALL)
--	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
- install-data: install-data-am
- 
- install-am: all-am
+--- lib/Makefile.am.orig	Tue May  2 17:05:15 2000
++++ lib/Makefile.am	Tue Jul 25 08:18:13 2000
+@@ -2,6 +2,22 @@
+ # $Header: /cvsroot/pkgsrc/x11/lesstif/patches/patch-an,v 1.8 2000/07/25 14:42:08 jlam Exp $
+ #
+ MAINTAINERCLEANFILES=Makefile.in
++
++if Version_1_2
++SUBDIRS= \
++		Xm Mrm Uil \
++		Xm-2.0 Mrm-2.0 Uil-2.0 \
++		Xm-2.1 Mrm-2.1 \
++		Xm-CDE Mrm-CDE \
++		@BuildXltDir@ @BuildXbaeDir@
++
++DIST_SUBDIRS= \
++		Xm Mrm Uil \
++		Xm-2.0 Mrm-2.0 Uil-2.0 \
++		Xm-2.1 Mrm-2.1 \
++		Xm-CDE Mrm-CDE \
++		Xlt Xbae
++else
+ SUBDIRS=	config \
+ 		Xm Mrm Uil \
+ 		Xm-2.0 Mrm-2.0 Uil-2.0 \
+@@ -15,3 +31,4 @@
+ 		Xm-2.1 Mrm-2.1 \
+ 		Xm-CDE Mrm-CDE \
+ 		Xlt Xbae
++endif
diff --git a/x11/lesstif/patches/patch-ap b/x11/lesstif/patches/patch-ap
index c08f8d7fa1f..ec1eeff9711 100644
--- a/x11/lesstif/patches/patch-ap
+++ b/x11/lesstif/patches/patch-ap
@@ -1,12 +1,27 @@
-$NetBSD: patch-ap,v 1.5 2000/04/27 13:14:54 tron Exp $
+$NetBSD: patch-ap,v 1.6 2000/07/25 14:42:09 jlam Exp $
 
---- lib/Xm/Makefile.in.orig	Fri Nov  5 21:14:36 1999
-+++ lib/Xm/Makefile.in	Wed Nov 24 17:30:54 1999
-@@ -444,7 +444,6 @@
+--- lib/Mrm/Makefile.am.orig	Fri Oct 22 08:49:34 1999
++++ lib/Mrm/Makefile.am	Tue Jul 25 08:18:13 2000
+@@ -24,22 +24,3 @@
+ 			lookup.h misc.h uil.h
  
- install-data-am:
- 	@$(NORMAL_INSTALL)
--	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
- install-data: install-data-am
- 
- install-am: all-am
+ endif
+-install-data-hook:
+-if Version_1_2
+-if LibtoolShared
+-	-rm -f $(DESTDIR)$(prefix)/lib/libMrm.so.1*
+-	(cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libMrm.so.1* .)
+-endif
+-if DefaultVersion12
+-	-rm -f $(DESTDIR)$(prefix)/lib/libMrm.la
+-	(cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libMrm.la .)
+-if LibtoolShared
+-	-rm -f $(DESTDIR)$(prefix)/lib/libMrm.so
+-	(cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libMrm.so .)
+-endif
+-if LibtoolStatic
+-	-rm -f $(DESTDIR)$(prefix)/lib/libMrm.a
+-	(cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libMrm.a .)
+-endif
+-endif
+-endif
diff --git a/x11/lesstif/patches/patch-aq b/x11/lesstif/patches/patch-aq
index 1292b429e1f..3d637d8b0fc 100644
--- a/x11/lesstif/patches/patch-aq
+++ b/x11/lesstif/patches/patch-aq
@@ -1,21 +1,38 @@
-$NetBSD: patch-aq,v 1.6 2000/05/25 15:25:44 drochner Exp $
+$NetBSD: patch-aq,v 1.7 2000/07/25 14:42:09 jlam Exp $
 
---- lib/Xm-2.0/Makefile.in.orig	Mon May 15 02:47:09 2000
-+++ lib/Xm-2.0/Makefile.in	Thu May 18 20:38:34 2000
-@@ -186,7 +186,7 @@
+--- 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 @@
+ # Lets put the headers in a sub directory to avoid
  # poluting /usr/local with more directories for default installs.
  #
- @Version_2_0_TRUE@libdir = \
--@Version_2_0_TRUE@$(prefix)/LessTif/Motif2.0/lib
-+@Version_2_0_TRUE@$(prefix)/lib
+-libdir = $(prefix)/LessTif/Motif2.0/lib
+-
+ lib_LTLIBRARIES=	libXm.la
  
- @Version_2_0_TRUE@lib_LTLIBRARIES = \
- @Version_2_0_TRUE@libXm.la
-@@ -390,7 +390,6 @@
- 
- install-data-am:
- 	@$(NORMAL_INSTALL)
--	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
- install-data: install-data-am
- 
- install-am: all-am
+ libXm_la_SOURCES= ${SRCS_1_2:%=../Xm/%} ${SRCS_2_0}
+@@ -86,24 +84,4 @@
+ 	      rm $$i; \
+ 	   fi ; \
+ 	  done
+-endif
+-
+-install-data-hook:
+-if Version_2_0
+-if LibtoolShared
+-	-rm -f $(DESTDIR)$(prefix)/lib/libXm.so.2*
+-	(cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif2.0/lib/libXm.so.2* .)
+-endif
+-if DefaultVersion20
+-	-rm -f $(DESTDIR)$(prefix)/lib/libXm.la
+-	(cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif2.0/lib/libXm.la .)
+-if LibtoolShared
+-	-rm -f $(DESTDIR)$(prefix)/lib/libXm.so
+-	(cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif2.0/lib/libXm.so .)
+-endif
+-if LibtoolStatic
+-	-rm -f $(DESTDIR)$(prefix)/lib/libXm.a
+-	(cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif2.0/lib/libXm.a .)
+-endif
+-endif
+ endif
diff --git a/x11/lesstif/patches/patch-ar b/x11/lesstif/patches/patch-ar
index de67a516be0..50a155c5776 100644
--- a/x11/lesstif/patches/patch-ar
+++ b/x11/lesstif/patches/patch-ar
@@ -1,13 +1,27 @@
-$NetBSD: patch-ar,v 1.4 2000/04/27 13:14:55 tron Exp $
+$NetBSD: patch-ar,v 1.5 2000/07/25 14:42:10 jlam Exp $
 
---- lib/config/Makefile.in.orig	Fri Nov  5 21:14:33 1999
-+++ lib/config/Makefile.in	Wed Nov 24 17:30:54 1999
-@@ -120,7 +120,7 @@
- MAINTAINERCLEANFILES = Makefile.in
- bin_SCRIPTS = mxmkmf
+--- lib/Xm/Makefile.am.orig	Thu Jun 22 15:37:11 2000
++++ lib/Xm/Makefile.am	Tue Jul 25 08:18:13 2000
+@@ -54,22 +54,3 @@
+ 	Xmos.c alloca.c misc.c $(XDND_SRCS)
  
--configdir = $(libdir)/X11/config
-+configdir = $(libdir)/X11/lesstif
- config_DATA = Imake.tmpl Motif.rules Motif.tmpl
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../include/LTconfig.h
+ endif
+-install-data-hook:
+-if Version_1_2
+-if LibtoolShared
+-	-rm -f $(DESTDIR)$(prefix)/lib/libXm.so.1*
+-	(cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libXm.so.1* .)
+-endif
+-if DefaultVersion12
+-	-rm -f $(DESTDIR)$(prefix)/lib/libXm.la
+-	(cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libXm.la .)
+-if LibtoolShared
+-	-rm -f $(DESTDIR)$(prefix)/lib/libXm.so
+-	(cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libXm.so .)
+-endif
+-if LibtoolStatic
+-	-rm -f $(DESTDIR)$(prefix)/lib/libXm.a
+-	(cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libXm.a .)
+-endif
+-endif
+-endif
diff --git a/x11/lesstif/patches/patch-as b/x11/lesstif/patches/patch-as
index e6f831a580d..6a1cd4d8609 100644
--- a/x11/lesstif/patches/patch-as
+++ b/x11/lesstif/patches/patch-as
@@ -1,10 +1,11 @@
-$NetBSD: patch-as,v 1.4 2000/04/27 13:14:55 tron Exp $
+$NetBSD: patch-as,v 1.5 2000/07/25 14:42:10 jlam Exp $
 
---- lib/config/mxmkmf.in.orig	Fri Sep  3 01:51:36 1999
-+++ lib/config/mxmkmf.in	Wed Nov 24 17:30:54 1999
-@@ -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 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
+ 
+-configdir=	$(libdir)/X11/config
++configdir=	$(libdir)/X11/lesstif
+ config_DATA=	Imake.tmpl Motif.rules Motif.tmpl
diff --git a/x11/lesstif/patches/patch-au b/x11/lesstif/patches/patch-au
index 35f0f7bcffd..2d4f8921334 100644
--- a/x11/lesstif/patches/patch-au
+++ b/x11/lesstif/patches/patch-au
@@ -1,18 +1,16 @@
-$NetBSD: patch-au,v 1.3 2000/05/25 15:25:44 drochner Exp $
+$NetBSD: patch-au,v 1.4 2000/07/25 14:42:10 jlam Exp $
 
---- scripts/autoconf/Makefile.in.orig	Mon May 15 02:47:14 2000
-+++ scripts/autoconf/Makefile.in	Thu May 18 20:42:03 2000
-@@ -122,10 +122,10 @@
+--- scripts/autoconf/Makefile.am.orig	Sun Sep 12 07:13:53 1999
++++ scripts/autoconf/Makefile.am	Tue Jul 25 08:18:13 2000
+@@ -5,10 +5,6 @@
  
- EXTRA_DIST = ac_find_motif.m4
+ EXTRA_DIST=	ac_find_motif.m4
  
 -aclocaldir = @ACLOCALDIR@
+-
+-if Aclocal
 +aclocaldir = ${prefix}/share/aclocal
  
--@Aclocal_TRUE@aclocal_DATA = \
--@Aclocal_TRUE@ac_find_motif.m4
-+aclocal_DATA = \
-+ac_find_motif.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../include/LTconfig.h
- CONFIG_CLEAN_FILES = 
+ aclocal_DATA = ac_find_motif.m4
+-
+-endif
diff --git a/x11/lesstif/pkg/PLIST b/x11/lesstif/pkg/PLIST
index 618910996f7..94d763dbced 100644
--- a/x11/lesstif/pkg/PLIST
+++ b/x11/lesstif/pkg/PLIST
@@ -1,140 +1,4 @@
-@comment $NetBSD: PLIST,v 1.25 2000/06/21 05:31:55 jlam Exp $
-LessTif/FAQ
-LessTif/Motif1.2/include/Mrm/MrmAppl.h
-LessTif/Motif1.2/include/Mrm/MrmDecls.h
-LessTif/Motif1.2/include/Mrm/MrmPrivate.h
-LessTif/Motif1.2/include/Mrm/MrmPublic.h
-LessTif/Motif1.2/include/Xm/ArrowB.h
-LessTif/Motif1.2/include/Xm/ArrowBG.h
-LessTif/Motif1.2/include/Xm/ArrowBGP.h
-LessTif/Motif1.2/include/Xm/ArrowBP.h
-LessTif/Motif1.2/include/Xm/AtomMgr.h
-LessTif/Motif1.2/include/Xm/BaseClassP.h
-LessTif/Motif1.2/include/Xm/BulletinB.h
-LessTif/Motif1.2/include/Xm/BulletinBP.h
-LessTif/Motif1.2/include/Xm/CacheP.h
-LessTif/Motif1.2/include/Xm/CascadeB.h
-LessTif/Motif1.2/include/Xm/CascadeBG.h
-LessTif/Motif1.2/include/Xm/CascadeBGP.h
-LessTif/Motif1.2/include/Xm/CascadeBP.h
-LessTif/Motif1.2/include/Xm/Command.h
-LessTif/Motif1.2/include/Xm/CommandP.h
-LessTif/Motif1.2/include/Xm/CutPaste.h
-LessTif/Motif1.2/include/Xm/CutPasteP.h
-LessTif/Motif1.2/include/Xm/DesktopP.h
-LessTif/Motif1.2/include/Xm/DialogS.h
-LessTif/Motif1.2/include/Xm/DialogSEP.h
-LessTif/Motif1.2/include/Xm/DialogSP.h
-LessTif/Motif1.2/include/Xm/Display.h
-LessTif/Motif1.2/include/Xm/DisplayP.h
-LessTif/Motif1.2/include/Xm/DragC.h
-LessTif/Motif1.2/include/Xm/DragCP.h
-LessTif/Motif1.2/include/Xm/DragDrop.h
-LessTif/Motif1.2/include/Xm/DragIcon.h
-LessTif/Motif1.2/include/Xm/DragIconP.h
-LessTif/Motif1.2/include/Xm/DragOverS.h
-LessTif/Motif1.2/include/Xm/DragOverSP.h
-LessTif/Motif1.2/include/Xm/DrawP.h
-LessTif/Motif1.2/include/Xm/DrawingA.h
-LessTif/Motif1.2/include/Xm/DrawingAP.h
-LessTif/Motif1.2/include/Xm/DrawnB.h
-LessTif/Motif1.2/include/Xm/DrawnBP.h
-LessTif/Motif1.2/include/Xm/DropSMgr.h
-LessTif/Motif1.2/include/Xm/DropSMgrP.h
-LessTif/Motif1.2/include/Xm/DropTrans.h
-LessTif/Motif1.2/include/Xm/DropTransP.h
-LessTif/Motif1.2/include/Xm/ExtObjectP.h
-LessTif/Motif1.2/include/Xm/FileSB.h
-LessTif/Motif1.2/include/Xm/FileSBP.h
-LessTif/Motif1.2/include/Xm/Form.h
-LessTif/Motif1.2/include/Xm/FormP.h
-LessTif/Motif1.2/include/Xm/Frame.h
-LessTif/Motif1.2/include/Xm/FrameP.h
-LessTif/Motif1.2/include/Xm/GadgetP.h
-LessTif/Motif1.2/include/Xm/Label.h
-LessTif/Motif1.2/include/Xm/LabelG.h
-LessTif/Motif1.2/include/Xm/LabelGP.h
-LessTif/Motif1.2/include/Xm/LabelP.h
-LessTif/Motif1.2/include/Xm/List.h
-LessTif/Motif1.2/include/Xm/ListP.h
-LessTif/Motif1.2/include/Xm/MainW.h
-LessTif/Motif1.2/include/Xm/MainWP.h
-LessTif/Motif1.2/include/Xm/ManagerP.h
-LessTif/Motif1.2/include/Xm/MenuShell.h
-LessTif/Motif1.2/include/Xm/MenuShellP.h
-LessTif/Motif1.2/include/Xm/MenuUtilP.h
-LessTif/Motif1.2/include/Xm/MessageB.h
-LessTif/Motif1.2/include/Xm/MessageBP.h
-LessTif/Motif1.2/include/Xm/MwmUtil.h
-LessTif/Motif1.2/include/Xm/PanedW.h
-LessTif/Motif1.2/include/Xm/PanedWP.h
-LessTif/Motif1.2/include/Xm/PrimitiveP.h
-LessTif/Motif1.2/include/Xm/Protocols.h
-LessTif/Motif1.2/include/Xm/ProtocolsP.h
-LessTif/Motif1.2/include/Xm/PushB.h
-LessTif/Motif1.2/include/Xm/PushBG.h
-LessTif/Motif1.2/include/Xm/PushBGP.h
-LessTif/Motif1.2/include/Xm/PushBP.h
-LessTif/Motif1.2/include/Xm/RCUtilsP.h
-LessTif/Motif1.2/include/Xm/RepType.h
-LessTif/Motif1.2/include/Xm/RowColumn.h
-LessTif/Motif1.2/include/Xm/RowColumnP.h
-LessTif/Motif1.2/include/Xm/SashP.h
-LessTif/Motif1.2/include/Xm/Scale.h
-LessTif/Motif1.2/include/Xm/ScaleP.h
-LessTif/Motif1.2/include/Xm/Screen.h
-LessTif/Motif1.2/include/Xm/ScreenP.h
-LessTif/Motif1.2/include/Xm/ScrollBar.h
-LessTif/Motif1.2/include/Xm/ScrollBarP.h
-LessTif/Motif1.2/include/Xm/ScrolledW.h
-LessTif/Motif1.2/include/Xm/ScrolledWP.h
-LessTif/Motif1.2/include/Xm/SelectioB.h
-LessTif/Motif1.2/include/Xm/SelectioBP.h
-LessTif/Motif1.2/include/Xm/SeparatoG.h
-LessTif/Motif1.2/include/Xm/SeparatoGP.h
-LessTif/Motif1.2/include/Xm/Separator.h
-LessTif/Motif1.2/include/Xm/SeparatorP.h
-LessTif/Motif1.2/include/Xm/ShellEP.h
-LessTif/Motif1.2/include/Xm/TearOffBP.h
-LessTif/Motif1.2/include/Xm/TearOffP.h
-LessTif/Motif1.2/include/Xm/Text.h
-LessTif/Motif1.2/include/Xm/TextF.h
-LessTif/Motif1.2/include/Xm/TextFP.h
-LessTif/Motif1.2/include/Xm/TextFSelP.h
-LessTif/Motif1.2/include/Xm/TextInP.h
-LessTif/Motif1.2/include/Xm/TextOutP.h
-LessTif/Motif1.2/include/Xm/TextP.h
-LessTif/Motif1.2/include/Xm/TextSelP.h
-LessTif/Motif1.2/include/Xm/TextStrSoP.h
-LessTif/Motif1.2/include/Xm/ToggleB.h
-LessTif/Motif1.2/include/Xm/ToggleBG.h
-LessTif/Motif1.2/include/Xm/ToggleBGP.h
-LessTif/Motif1.2/include/Xm/ToggleBP.h
-LessTif/Motif1.2/include/Xm/TransltnsP.h
-LessTif/Motif1.2/include/Xm/VaSimpleP.h
-LessTif/Motif1.2/include/Xm/VendorS.h
-LessTif/Motif1.2/include/Xm/VendorSEP.h
-LessTif/Motif1.2/include/Xm/VendorSP.h
-LessTif/Motif1.2/include/Xm/VirtKeys.h
-LessTif/Motif1.2/include/Xm/VirtKeysP.h
-LessTif/Motif1.2/include/Xm/WorldP.h
-LessTif/Motif1.2/include/Xm/Xm.h
-LessTif/Motif1.2/include/Xm/XmAll.h
-LessTif/Motif1.2/include/Xm/XmP.h
-LessTif/Motif1.2/include/Xm/XmStrDefs.h
-LessTif/Motif1.2/include/Xm/XmosP.h
-LessTif/Motif1.2/lib/libMrm.a
-LessTif/Motif1.2/lib/libMrm.la
-LessTif/Motif1.2/lib/libMrm.so.1.2
-LessTif/Motif1.2/lib/libXm.a
-LessTif/Motif1.2/lib/libXm.la
-LessTif/Motif1.2/lib/libXm.so.1.2
-@dirrm LessTif/Motif1.2/lib
-@dirrm LessTif/Motif1.2/include/Xm
-@dirrm LessTif/Motif1.2/include/Mrm
-@dirrm LessTif/Motif1.2/include
-@dirrm LessTif/Motif1.2
-@dirrm LessTif
+@comment $NetBSD: PLIST,v 1.26 2000/07/25 14:42:13 jlam Exp $
 bin/mwm
 bin/mxmkmf
 bin/uil
@@ -291,8 +155,6 @@ include/Xm/XmAll.h
 include/Xm/XmP.h
 include/Xm/XmStrDefs.h
 include/Xm/XmosP.h
-@dirrm include/Xm
-@dirrm include/Mrm
 lib/X11/app-defaults/Mwm
 lib/X11/lesstif/Imake.tmpl
 lib/X11/lesstif/Motif.rules
@@ -306,8 +168,6 @@ lib/libMrm.so.2.0
 lib/libXm.a
 lib/libXm.la
 lib/libXm.so.2.0
-@dirrm lib/X11/mwm
-@dirrm lib/X11/lesstif
 man/man1/lesstif.1
 man/man1/mwm.1
 man/man1/xbae.1
@@ -371,6 +231,7 @@ 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/lesstif/AUTHORS
 share/doc/lesstif/Advocacy.html
 share/doc/lesstif/All.html
@@ -381,12 +242,13 @@ 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
 share/doc/lesstif/INSTALL.html
+share/doc/lesstif/Install
 share/doc/lesstif/KNOWN_BUGS
 share/doc/lesstif/NEWS
 share/doc/lesstif/README
@@ -405,13 +267,19 @@ 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.html
 share/doc/lesstif/release-notes.txt
 share/doc/lesstif/release-policy.html
 share/doc/lesstif/test_policy.html
@@ -420,15 +288,12 @@ share/doc/lesstif/testers.html
 share/doc/lesstif/thread.html
 share/doc/lesstif/versions.html
 share/doc/lesstif/web_button.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
 @dirrm share/doc/lesstif/images
 @dirrm share/doc/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