update lesstif to 0.88.9,

from Adam Ciarcinski (adam@albedo.com.pl) per PR pkg/8299

21 files changed, 343 insertions, 198 deletions

diff --git a/x11/lesstif/Makefile b/x11/lesstif/Makefile
index ba0c471131c..2b1f3a31cf5 100644
--- a/x11/lesstif/Makefile
+++ b/x11/lesstif/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.38 1999/05/20 20:09:52 tron Exp $
+# $NetBSD: Makefile,v 1.39 1999/09/03 19:45:11 drochner Exp $
 # FreeBSD Id: Makefile,v 1.13 1997/09/08 08:34:13 tg Exp
 #
 
-DISTNAME=	lesstif-0.87.1
+DISTNAME=	lesstif-0.88.9
 CATEGORIES=	x11
 MASTER_SITES=	ftp://linux.gt.ed.net/pub/linux/libs/lesstif/srcdist/ \
 		ftp://ftp.lesstif.org/pub/hungry/lesstif/srcdist/
@@ -11,23 +11,13 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.lesstif.org/
 
 GNU_CONFIGURE=  yes
+USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 USE_X11BASE=	yes
 
-# disable this for debugging
-CONFIGURE_ARGS+=--enable-production
-
-CONFIGURE_ENV=	CCFLAGS="-O -pipe" VarHaveMan2html=0
-
-pre-fetch:
-	@if [ -d ${X11BASE}/include/Xm ]; then 				\
-		if [ -d ${X11BASE}/lib/X11/lesstif ]; then 		\
-			${ECHO} "Upgrading a previous Lesstif installation"; \
-			return 0; 					\
-		fi; 							\
-		${ECHO} "Motif is already installed in ${X11BASE}";	\
-		${ECHO} "To install lesstif, first delete Motif from ${X11BASE}"; \
-		return 1;						\
-	fi
+CONFIGURE_ARGS+=	--prefix=${PREFIX} --with-x --enable-production
+CONFIGURE_ARGS+=	--disable-build-12 --enable-default-20
+CONFIGURE_ARGS+=	--disable-debug
+CONFIGURE_ENV=		CCFLAGS="${CFLAGS}"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/lesstif/files/md5 b/x11/lesstif/files/md5
index aef3eb24530..6fe02d6d3d3 100644
--- a/x11/lesstif/files/md5
+++ b/x11/lesstif/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.13 1999/01/12 23:17:34 frueauf Exp $
+$NetBSD: md5,v 1.14 1999/09/03 19:45:12 drochner Exp $
 
-MD5 (lesstif-0.87.1.tar.gz) = 2cb5e1ffd87fea5af00c77161c1d64f4
+MD5 (lesstif-0.88.9.tar.gz) = 4eb8fabb824bf7ab34b9f063d199bb8e
diff --git a/x11/lesstif/files/patch-sum b/x11/lesstif/files/patch-sum
index 97339996ebf..ea474f52bb0 100644
--- a/x11/lesstif/files/patch-sum
+++ b/x11/lesstif/files/patch-sum
@@ -1,13 +1,19 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 14:23:28 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/09/03 19:45:12 drochner Exp $
 
-MD5 (patch-aa) = 2cff448bca5df9b88a9f268cf0aacd54
-MD5 (patch-ab) = 8a773530277519eaa25e5654d189ea02
-MD5 (patch-ac) = 6f9bd83672f2a8ded7204287f8c03bc2
-MD5 (patch-ad) = 82015e811c6a80dbe1a9d99ec0c6e542
-MD5 (patch-ae) = eac385fd518599c06038ea60eb921df6
-MD5 (patch-af) = 754409ba57d1301e10053c667c8f7c12
-MD5 (patch-ag) = bc54806efe3af380d64c52191fef8543
-MD5 (patch-ah) = 773b7c779359ecf501e53cd1a966237f
-MD5 (patch-ai) = 24119b5f2deab1838f0d06d723908c81
-MD5 (patch-aj) = 85412875acac1fdfe2c0d60904215f61
-MD5 (patch-ak) = b4c174a2280fb8cf25781d780493d783
+MD5 (patch-aa) = 35d4391de5b6998f42b64c41c7f878cd
+MD5 (patch-ab) = 49ed65a88be3086717713b8a761c09f9
+MD5 (patch-ac) = f0f6424401136eceb334d6bc99f06ca8
+MD5 (patch-ad) = 2db5ec73949debcfab67d21e8f126006
+MD5 (patch-ae) = b0eae7437e1e9fbcd91531d58c5a75de
+MD5 (patch-af) = 5dbeacd76b279841a9dfa83c8e211f59
+MD5 (patch-ag) = 26412e81b1ec5bb64c0a18cb4756839a
+MD5 (patch-ah) = 51e5b7cfe76360b70f68dfe2659f88d6
+MD5 (patch-ai) = e6f1edd484fb1a0b8bae1f94da3b1be4
+MD5 (patch-aj) = e789fe35c66ba1a6442d9d5632f0ccde
+MD5 (patch-ak) = dd66d5fe6bf5efdc6bfb51e3c3765fb7
+MD5 (patch-al) = 02e2eb53b4ab279b438184c85d2c2220
+MD5 (patch-am) = 5111dc969eca7add5dc0a12ca4a257a6
+MD5 (patch-ca) = c51d5f86f43a87a051d3f93c2b0f6095
+MD5 (patch-cb) = a37655eecb6e38fb09bdc2fa580509ab
+MD5 (patch-cc) = 40254c73dc8c161227eb3d44cc305992
+MD5 (patch-cd) = b32a502b4333525cc3b878ff479c1b34
diff --git a/x11/lesstif/patches/patch-aa b/x11/lesstif/patches/patch-aa
index 6304d94e259..651c57402fd 100644
--- a/x11/lesstif/patches/patch-aa
+++ b/x11/lesstif/patches/patch-aa
@@ -1,30 +1,28 @@
-$NetBSD: patch-aa,v 1.6 1998/08/07 11:18:08 agc Exp $
-
---- configure.orig	Thu Jul  2 22:43:41 1998
-+++ configure	Fri Jul 17 12:47:52 1998
-@@ -1307,6 +1307,7 @@
-   echo "$ac_t""no" 1>&6
- fi
+$NetBSD: patch-aa,v 1.7 1999/09/03 19:45:12 drochner Exp $
+--- configure.orig	Tue Jul 13 16:21:33 1999
++++ configure	Mon Aug 16 02:05:20 1999
+@@ -1403,6 +1403,7 @@
  
-+if false; then
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
  
-@@ -1352,7 +1353,7 @@
- ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \
- $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
- || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
--
+ # Check for any special flags to pass to ltconfig.
++if false; then
+ libtool_flags="--cache-file=$cache_file"
+ test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
+ test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
+@@ -1559,6 +1560,7 @@
+ # Redirect the config.log output again, so that the ltconfig log is not
+ # clobbered by the next message.
+ exec 5>>./config.log
 +fi
  
- version=1.2
- version_suffix=""
-@@ -4107,7 +4108,7 @@
+ 
+ subdirs="lib/Xlt test"
+@@ -4812,7 +4814,7 @@
  
  lexicographic_readdir=1
  
--CFLAGS="$debug_flag $conversions_flag $verbose_flag $production_flag"
-+CFLAGS="$CCFLAGS $conversions_flag $verbose_flag $production_flag"
+-CFLAGS="$debug_flag $conversions_flag $verbose_flag $sverbose_flag $production_flag"
++CFLAGS="${CCFLAGS} $conversions_flag $verbose_flag $sverbose_flag $production_flag"
  GPROF_FLAGS="-pg"
  GPROF_CFLAGS=""
  EXTRACFLAGS=""
diff --git a/x11/lesstif/patches/patch-ab b/x11/lesstif/patches/patch-ab
index 565b43d6395..bb2940d0560 100644
--- a/x11/lesstif/patches/patch-ab
+++ b/x11/lesstif/patches/patch-ab
@@ -1,13 +1,12 @@
-$NetBSD: patch-ab,v 1.4 1998/08/07 11:18:08 agc Exp $
-
---- lib/config/Makefile.in-orig	Sun Mar 22 19:46:26 1998
-+++ lib/config/Makefile.in	Sun Mar 22 19:45:27 1998
-@@ -97,7 +97,7 @@
- MAINTAINERCLEANFILES=Makefile.in
- bin_SCRIPTS=	mxmkmf
+$NetBSD: patch-ab,v 1.5 1999/09/03 19:45:12 drochner Exp $
+--- lib/config/Makefile.in.orig	Sun Aug 15 11:51:22 1999
++++ lib/config/Makefile.in	Sun Aug 15 11:51:50 1999
+@@ -114,7 +114,7 @@
+ MAINTAINERCLEANFILES = Makefile.in
+ bin_SCRIPTS = mxmkmf
  
--configdir=	$(libdir)/X11/config
-+configdir=	$(libdir)/X11/lesstif
- config_DATA=	Imake.tmpl Motif.rules Motif.tmpl
+-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
diff --git a/x11/lesstif/patches/patch-ac b/x11/lesstif/patches/patch-ac
index b66b9643a4a..52da9d42ae7 100644
--- a/x11/lesstif/patches/patch-ac
+++ b/x11/lesstif/patches/patch-ac
@@ -1,10 +1,9 @@
-$NetBSD: patch-ac,v 1.2 1998/08/07 11:18:08 agc Exp $
-
---- lib/config/mxmkmf.in.orig	Wed Feb 19 20:53:22 1997
-+++ lib/config/mxmkmf.in	Tue Feb 25 11:24:59 1997
+$NetBSD: patch-ac,v 1.3 1999/09/03 19:45:12 drochner Exp $
+--- lib/config/mxmkmf.in.orig	Sun Aug 15 11:37:11 1999
++++ lib/config/mxmkmf.in	Sun Aug 15 11:37:44 1999
 @@ -5,4 +5,4 @@
  # Make sure to read the LessTif configuration first, to pick up
  # that version of Imake.tmpl
  #
--imake -DUseInstalled -I@prefix@/lib/config -I@x_lib_path@/X11/config
-+imake -DUseInstalled -I@prefix@/lib/X11/lesstif -I@x_lib_path@/X11/config
+-imake -DUseInstalled -I@prefix@/lib/config -I@x_libraries@/X11/config
++imake -DUseInstalled -I@prefix@/lib/X11/lesstif -I@x_libraries@/X11/config
diff --git a/x11/lesstif/patches/patch-ad b/x11/lesstif/patches/patch-ad
index 70f336aa2a5..424d2650fcd 100644
--- a/x11/lesstif/patches/patch-ad
+++ b/x11/lesstif/patches/patch-ad
@@ -1,13 +1,12 @@
-$NetBSD: patch-ad,v 1.4 1998/08/07 11:18:09 agc Exp $
-
---- doc/Makefile.in-orig	Sat Mar 14 16:50:01 1998
-+++ doc/Makefile.in	Sun Mar 22 22:33:30 1998
-@@ -98,7 +98,7 @@
+$NetBSD: patch-ad,v 1.5 1999/09/03 19:45:12 drochner Exp $
+--- doc/Makefile.in.orig	Sun Aug 15 11:38:41 1999
++++ doc/Makefile.in	Sun Aug 15 11:39:23 1999
+@@ -116,7 +116,7 @@
  
- SUBDIRS	= www.lesstif.org lessdox
+ SUBDIRS = www.lesstif.org lessdox
  
--rootdir=	$(exec_prefix)/LessTif/doc
-+rootdir=	$(exec_prefix)/share/lesstif/doc
- root_DATA=	INSTALL.html
+-rootdir = $(exec_prefix)/LessTif/doc
++rootdir = $(exec_prefix)/share/lesstif/doc
+ root_DATA = INSTALL.html
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../include/LTconfig.h
diff --git a/x11/lesstif/patches/patch-ae b/x11/lesstif/patches/patch-ae
index 582c7373722..7e89ea46180 100644
--- a/x11/lesstif/patches/patch-ae
+++ b/x11/lesstif/patches/patch-ae
@@ -1,37 +1,36 @@
-$NetBSD: patch-ae,v 1.5 1998/08/07 11:18:09 agc Exp $
-
---- doc/lessdox/clients/Makefile.in.orig	Fri May 22 21:20:30 1998
-+++ doc/lessdox/clients/Makefile.in	Sat May 23 15:10:41 1998
-@@ -98,10 +98,10 @@
- MAINTAINERCLEANFILES=Makefile.in
- SUFFIXES=	.1 .3 .5 .html
+$NetBSD: patch-ae,v 1.6 1999/09/03 19:45:12 drochner Exp $
+--- doc/lessdox/clients/Makefile.in.orig	Tue Jul 13 18:21:26 1999
++++ doc/lessdox/clients/Makefile.in	Mon Aug 16 13:41:14 1999
+@@ -114,10 +114,10 @@
+ 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=	$(mandir)/man1
-+man3dir=	$(mandir)/man3
-+man5dir=	$(mandir)/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
++mandir = $(exec_prefix)/man
++man1dir = $(mandir)/man1
++man3dir = $(mandir)/man3
++man5dir = $(mandir)/man5
  
- man1_DATA=	mwm.1 xmbind.1 lesstif.1
- man3_DATA=
-@@ -116,7 +116,7 @@
+ man1_DATA = mwm.1 xmbind.1 lesstif.1
+ man3_DATA = 
+@@ -132,7 +132,7 @@
  # build them.
  #
  
--htmldir=	$(exec_prefix)/LessTif/doc/html
-+htmldir=	$(exec_prefix)/share/lesstif/doc/clients
+-htmldir = $(exec_prefix)/LessTif/doc/html
++htmldir = $(exec_prefix)/share/lesstif/doc/html
  
- @HaveMan2html_TRUE@html_DATA=	mwm.html mwmrc.html xmbind.html lesstif.html
+ @HaveMan2html_TRUE@html_DATA = mwm.html mwmrc.html xmbind.html lesstif.html
  
-@@ -245,7 +245,7 @@
- install-exec: 
- 	@$(NORMAL_INSTALL)
+@@ -269,7 +269,7 @@
+ install-exec-am:
+ install-exec: install-exec-am
  
--install-data: install-htmlDATA install-man1DATA install-man3DATA install-man5DATA
-+install-data: install-man1DATA install-man3DATA install-man5DATA
- 	@$(NORMAL_INSTALL)
+-install-data-am: install-htmlDATA install-man1DATA install-man3DATA \
++install-data-am: install-man1DATA install-man3DATA \
+ 		install-man5DATA
+ install-data: install-data-am
  
- install: install-exec install-data all
diff --git a/x11/lesstif/patches/patch-af b/x11/lesstif/patches/patch-af
index 4afa16a58e9..594005b83dd 100644
--- a/x11/lesstif/patches/patch-af
+++ b/x11/lesstif/patches/patch-af
@@ -1,13 +1,17 @@
-$NetBSD: patch-af,v 1.4 1998/08/12 22:44:21 frueauf Exp $
-
---- doc/www.lesstif.org/Makefile.in.orig	Wed Aug 12 03:37:30 1998
-+++ doc/www.lesstif.org/Makefile.in	Wed Aug 12 22:06:39 1998
-@@ -107,7 +107,7 @@
+$NetBSD: patch-af,v 1.5 1999/09/03 19:45:12 drochner Exp $
+--- doc/www.lesstif.org/Makefile.in.orig	Tue Jul 13 16:21:23 1999
++++ doc/www.lesstif.org/Makefile.in	Tue Aug 17 00:23:59 1999
+@@ -121,11 +121,11 @@
  # Lets put the informational stuff in a sub directory to avoid 
  # poluting /usr/local for default installs.
  #
--rootdir=	$(exec_prefix)/LessTif/doc
-+rootdir=	$(exec_prefix)/share/lesstif/doc
- root_DATA=	COPYING.LIB.html FAQ.html apps.html bug-reporting.html \
- 		bugs.html button.html cdrom.html core.html current.html \
- 		cvs.html download.html index.html links.html lists.html \
+-rootdir = $(exec_prefix)/LessTif/doc
++rootdir = $(exec_prefix)/share/lesstif/doc
+ root_DATA = COPYING.LIB.html FAQ.html apps.html bug-reporting.html 		bugs.html button.html cdrom.html core.html current.html 		cvs.html download.html index.html links.html lists.html 		mirrors.html platforms.html release-policy.html 		test_policy.html test_summary.html testers.html 		versions.html web_button.html known.html help.html
+ 
+ 
+-root2dir = $(exec_prefix)/LessTif
++root2dir = $(exec_prefix)/share/lesstif
+ root2_DATA = FAQ
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../include/LTconfig.h
diff --git a/x11/lesstif/patches/patch-ag b/x11/lesstif/patches/patch-ag
index 301860db5a7..af90c602eb2 100644
--- a/x11/lesstif/patches/patch-ag
+++ b/x11/lesstif/patches/patch-ag
@@ -1,13 +1,12 @@
-$NetBSD: patch-ag,v 1.2 1998/08/07 11:18:10 agc Exp $
-
---- Makefile.in-orig	Sat Mar 14 16:49:51 1998
-+++ Makefile.in	Mon Mar 23 12:15:38 1998
-@@ -103,7 +103,7 @@
+$NetBSD: patch-ag,v 1.3 1999/09/03 19:45:12 drochner Exp $
+--- Makefile.in.orig	Sun Aug 15 11:44:51 1999
++++ Makefile.in	Sun Aug 15 11:45:09 1999
+@@ -122,7 +122,7 @@
  # 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/lesstif
- root_DATA=	AUTHORS BUG-REPORTING COPYING COPYING.LIB CREDITS \
- 	INSTALL KNOWN_BUGS NEWS README RELEASE-POLICY TODO
+-rootdir = $(exec_prefix)/LessTif
++rootdir = $(exec_prefix)/share/lesstif
+ root_DATA = AUTHORS BUG-REPORTING COPYING COPYING.LIB CREDITS 	INSTALL KNOWN_BUGS NEWS README RELEASE-POLICY TODO
+ 
  
diff --git a/x11/lesstif/patches/patch-ah b/x11/lesstif/patches/patch-ah
index 4e8a6b60329..7b3999acfc1 100644
--- a/x11/lesstif/patches/patch-ah
+++ b/x11/lesstif/patches/patch-ah
@@ -1,13 +1,12 @@
-$NetBSD: patch-ah,v 1.2 1998/08/07 11:18:10 agc Exp $
-
---- doc/www.lesstif.org/images/Makefile.in-orig	Sat Mar 14 16:50:02 1998
-+++ doc/www.lesstif.org/images/Makefile.in	Mon Mar 23 12:48:24 1998
-@@ -102,7 +102,7 @@
+$NetBSD: patch-ah,v 1.3 1999/09/03 19:45:12 drochner Exp $
+--- doc/www.lesstif.org/images/Makefile.in.orig	Sun Aug 15 11:45:56 1999
++++ doc/www.lesstif.org/images/Makefile.in	Sun Aug 15 11:46:14 1999
+@@ -120,7 +120,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/lesstif/doc/images
- root_DATA=	hungry.gif \
- 		lesstif-realsmall.gif lesstif-small.gif lesstif.gif \
- 		ltsunlogo.gif
+-rootdir = $(exec_prefix)/LessTif/doc/images
++rootdir = $(exec_prefix)/share/lesstif/doc/images
+ root_DATA = hungry.gif 		lesstif-realsmall.gif lesstif-small.gif lesstif.gif 		ltsunlogo.gif
+ 
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/x11/lesstif/patches/patch-ai b/x11/lesstif/patches/patch-ai
index 728fd6d6383..457b30fddcd 100644
--- a/x11/lesstif/patches/patch-ai
+++ b/x11/lesstif/patches/patch-ai
@@ -1,36 +1,35 @@
-$NetBSD: patch-ai,v 1.4 1998/10/31 01:02:18 frueauf Exp $
-
---- doc/lessdox/widgets/Makefile.in.orig	Fri Oct 30 05:35:11 1998
-+++ doc/lessdox/widgets/Makefile.in	Sat Oct 31 00:40:43 1998
-@@ -107,10 +107,10 @@
- MAINTAINERCLEANFILES=Makefile.in
- SUFFIXES=	.1 .3 .5 .html
+$NetBSD: patch-ai,v 1.5 1999/09/03 19:45:12 drochner Exp $
+--- doc/lessdox/widgets/Makefile.in.orig	Tue Jul 13 18:21:27 1999
++++ doc/lessdox/widgets/Makefile.in	Mon Aug 16 13:40:19 1999
+@@ -114,10 +114,10 @@
+ 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 = $(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 = $(mandir)/man1
++man3dir = $(mandir)/man3
++man5dir = $(mandir)/man5
  
- man1_DATA=	
- man3_DATA= \
-@@ -150,7 +150,7 @@
+ man1_DATA = 
+ man3_DATA =  	XmClipboard.3 LessTifInternals.3 	XmArrowButton.3 XmArrowButtonGadget.3 XmBulletinBoard.3 	XmCascadeButton.3 XmCascadeButtonGadget.3 	XmComboBox.3 XmCommand.3 XmDesktop.3 	XmDialogShell.3 XmDialogShellExt.3 XmDisplay.3 	XmDragContext.3 XmDragIcon.3 XmDragOverShell.3 	XmDrawingArea.3 XmDrawnButton.3 XmDropSiteManager.3 	XmDropTransfer.3 XmFileSelectionBox.3 XmForm.3 	XmFrame.3 XmGadget.3 XmGrabShell.3 	XmIconGadget.3 XmLabel.3 	XmLabelGadget.3 XmList.3 	XmMainWindow.3 XmManager.3 XmMenuShell.3 	XmMessageBox.3 XmNotebook.3 XmPanedWindow.3 	XmPrimitive.3 XmProtocol.3 XmPushButton.3 	XmPushButtonGadget.3 XmRowColumn.3 	XmSash.3 XmScale.3 XmScreen.3 	XmScrollBar.3 XmScrolledWindow.3 XmSelectionBox.3 	XmSeparator.3 XmSeparatorGadget.3 	XmSpinBox.3 XmTearOffButton.3 XmText.3 	XmTextField.3 XmToggleButton.3 	XmToggleButtonGadget.3 XmVendorShell.3 XmWorld.3 		ApplicationShell.3 Composite.3 Core.3 Object.3 OverrideShell.3 	Shell.3 TopLevelShell.3 TransientShell.3 WmShell.3 	Rect.3 UnNamedObj.3 Constraint.3 VendorShell.3
+@@ -133,7 +133,7 @@
  # build them.
  #
  
--htmldir=	$(exec_prefix)/LessTif/doc/html
-+htmldir=	$(exec_prefix)/share/lesstif/doc
+-htmldir = $(prefix)/LessTif/doc/html
++htmldir = $(prefix)/share/lesstif/doc/html
  
- @HaveMan2html_TRUE@html_DATA=	${man1_DATA:.1=.html} ${man3_DATA:.3=.html} \
- @HaveMan2html_TRUE@                ${man5_DATA:.5=.html}
-@@ -281,7 +281,6 @@
+ @HaveMan2html_TRUE@html_DATA = ${man1_DATA:.1=.html} ${man3_DATA:.3=.html}                 ${man5_DATA:.5=.html}
  
- install-data: install-htmlDATA install-man1DATA install-man3DATA install-man5DATA
+@@ -273,7 +273,6 @@
+ install-data-am: install-htmlDATA install-man1DATA install-man3DATA \
+ 		install-man5DATA
  	@$(NORMAL_INSTALL)
 -	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+ install-data: install-data-am
  
- install: install-exec install-data all
- 	@:
+ install-am: all-am
diff --git a/x11/lesstif/patches/patch-aj b/x11/lesstif/patches/patch-aj
index 26b952d631e..ae312513987 100644
--- a/x11/lesstif/patches/patch-aj
+++ b/x11/lesstif/patches/patch-aj
@@ -1,13 +1,12 @@
-$NetBSD: patch-aj,v 1.3 1998/08/12 22:44:21 frueauf Exp $
-
---- doc/www.lesstif.org/imgs/Makefile.in-orig	Wed Aug 12 03:37:31 1998
-+++ doc/www.lesstif.org/imgs/Makefile.in	Wed Aug 12 23:08:45 1998
-@@ -106,7 +106,7 @@
+$NetBSD: patch-aj,v 1.4 1999/09/03 19:45:12 drochner Exp $
+--- doc/www.lesstif.org/imgs/Makefile.in.orig	Sun Aug 15 11:48:21 1999
++++ doc/www.lesstif.org/imgs/Makefile.in	Sun Aug 15 11:48:36 1999
+@@ -120,7 +120,7 @@
  # Lets put the informational stuff in a sub directory to avoid 
  # poluting /usr/local for default installs.
  #
--rootdir=	$(exec_prefix)/LessTif/doc/imgs
-+rootdir=	$(exec_prefix)/share/lesstif/doc/imgs
- root_DATA=	lesstif.jpg ltsunlogo.gif
+-rootdir = $(exec_prefix)/LessTif/doc/imgs
++rootdir = $(exec_prefix)/share/lesstif/doc/imgs
+ root_DATA = lesstif.jpg ltsunlogo.gif
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../../../include/LTconfig.h
diff --git a/x11/lesstif/patches/patch-ak b/x11/lesstif/patches/patch-ak
index b2f20012222..67e056e9c56 100644
--- a/x11/lesstif/patches/patch-ak
+++ b/x11/lesstif/patches/patch-ak
@@ -1,28 +1,27 @@
-$NetBSD: patch-ak,v 1.1 1998/10/31 01:02:18 frueauf Exp $
-
---- doc/lessdox/functions/Makefile.in.orig	Fri Oct 30 05:35:11 1998
-+++ doc/lessdox/functions/Makefile.in	Sat Oct 31 01:41:30 1998
-@@ -107,10 +107,10 @@
- MAINTAINERCLEANFILES=Makefile.in
- SUFFIXES=	.1 .3 .5 .html
+$NetBSD: patch-ak,v 1.2 1999/09/03 19:45:12 drochner Exp $
+--- doc/lessdox/functions/Makefile.in.orig	Sun Aug 15 11:49:11 1999
++++ doc/lessdox/functions/Makefile.in	Sun Aug 15 11:50:31 1999
+@@ -114,10 +114,10 @@
+ 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=	$(mandir)/man1
-+man3dir=	$(mandir)/man3
-+man5dir=	$(mandir)/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
++mandir = $(exec_prefix)/man
++man1dir = $(mandir)/man1
++man3dir = $(mandir)/man3
++man5dir = $(mandir)/man5
  
- man1_DATA=	
- man3_DATA= \
-@@ -127,7 +127,7 @@
+ man1_DATA = 
+ man3_DATA =  	XtConfigureObject.3 XtDestroyWidget.3         XtManageChild.3 XtUnmanageChild.3
+@@ -133,7 +133,7 @@
  # build them.
  #
  
--htmldir=	$(exec_prefix)/LessTif/doc/html
-+htmldir=	$(exec_prefix)/share/lesstif/doc
+-htmldir = $(exec_prefix)/LessTif/doc/html
++htmldir = $(exec_prefix)/share/lesstif/doc/html
+ 
+ @HaveMan2html_TRUE@html_DATA = ${man1_DATA:.1=.html} ${man3_DATA:.3=.html}                 ${man5_DATA:.5=.html}
  
- @HaveMan2html_TRUE@html_DATA=	${man1_DATA:.1=.html} ${man3_DATA:.3=.html} \
- @HaveMan2html_TRUE@                ${man5_DATA:.5=.html}
diff --git a/x11/lesstif/patches/patch-al b/x11/lesstif/patches/patch-al
new file mode 100644
index 00000000000..dbef6985e58
--- /dev/null
+++ b/x11/lesstif/patches/patch-al
@@ -0,0 +1,19 @@
+$NetBSD: patch-al,v 1.1 1999/09/03 19:45:12 drochner Exp $
+--- lib/Xlt/configure.orig	Mon Aug 16 01:13:22 1999
++++ lib/Xlt/configure	Mon Aug 16 01:41:30 1999
+@@ -1973,6 +1973,7 @@
+ 
+ 
+ # Check for any special flags to pass to ltconfig.
++if false; then
+ libtool_flags="--cache-file=$cache_file"
+ test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
+ test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
+@@ -2129,6 +2130,7 @@
+ # Redirect the config.log output again, so that the ltconfig log is not
+ # clobbered by the next message.
+ exec 5>>./config.log
++fi
+ 
+ echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
+ echo "configure:2135: checking whether to enable maintainer-specific portions of Makefiles" >&5
diff --git a/x11/lesstif/patches/patch-am b/x11/lesstif/patches/patch-am
new file mode 100644
index 00000000000..38003d84519
--- /dev/null
+++ b/x11/lesstif/patches/patch-am
@@ -0,0 +1,28 @@
+$NetBSD: patch-am,v 1.1 1999/09/03 19:45:12 drochner Exp $
+--- test/configure.orig	Mon Aug 16 01:19:46 1999
++++ test/configure	Mon Aug 16 02:14:10 1999
+@@ -1390,6 +1390,7 @@
+ 
+ 
+ # Check for any special flags to pass to ltconfig.
++if false; then
+ libtool_flags="--cache-file=$cache_file"
+ test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
+ test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
+@@ -1546,6 +1547,7 @@
+ # Redirect the config.log output again, so that the ltconfig log is not
+ # clobbered by the next message.
+ exec 5>>./config.log
++fi
+ 
+ 
+ version=1.2
+@@ -4363,7 +4365,7 @@
+ 
+ lexicographic_readdir=1
+ 
+-CFLAGS="$debug_flag $conversions_flag $verbose_flag $production_flag"
++CFLAGS="${CCFLAGS} $conversions_flag $verbose_flag $production_flag"
+ GPROF_FLAGS="-pg"
+ GPROF_CFLAGS=""
+ EXTRACFLAGS=""
diff --git a/x11/lesstif/patches/patch-ca b/x11/lesstif/patches/patch-ca
new file mode 100644
index 00000000000..a06170e0874
--- /dev/null
+++ b/x11/lesstif/patches/patch-ca
@@ -0,0 +1,20 @@
+$NetBSD: patch-ca,v 1.1 1999/09/03 19:45:12 drochner Exp $
+--- include/Motif-2.0/Mrm/Makefile.in.orig	Tue Aug 17 00:04:38 1999
++++ include/Motif-2.0/Mrm/Makefile.in	Tue Aug 17 00:05:35 1999
+@@ -119,7 +119,7 @@
+ # Lets put the headers in a sub directory to avoid
+ # poluting /usr/local with more directories for default installs.
+ #
+-@Version_2_0_TRUE@mrmdir = $(prefix)/LessTif/Motif2.0/include/Mrm
++@Version_2_0_TRUE@mrmdir = $(prefix)/include/Mrm
+ 
+ @Version_2_0_TRUE@HEADERS1_2 = MrmAppl.h MrmDecls.h MrmPrivate.h MrmPublic.h
+ 
+@@ -218,7 +218,6 @@
+ 
+ install-data-am: install-mrmHEADERS
+ 	@$(NORMAL_INSTALL)
+-	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+ install-data: install-data-am
+ 
+ install-am: all-am
diff --git a/x11/lesstif/patches/patch-cb b/x11/lesstif/patches/patch-cb
new file mode 100644
index 00000000000..c1e4cce714f
--- /dev/null
+++ b/x11/lesstif/patches/patch-cb
@@ -0,0 +1,20 @@
+$NetBSD: patch-cb,v 1.1 1999/09/03 19:45:12 drochner Exp $
+--- include/Motif-2.0/Xm/Makefile.in.orig	Tue Aug 17 00:06:46 1999
++++ include/Motif-2.0/Xm/Makefile.in	Tue Aug 17 00:07:17 1999
+@@ -119,7 +119,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 = $(prefix)/LessTif/Motif2.0/include/Xm
++@Version_2_0_TRUE@xmdir = $(prefix)/include/Xm
+ 
+ @Version_2_0_TRUE@HEADERS1_2 = 	ArrowB.h ArrowBG.h AtomMgr.h 	BaseClassP.h BulletinB.h BulletinBP.h CacheP.h CascadeB.h 	CascadeBG.h CascadeBGP.h CascadeBP.h Command.h CommandP.h 	CutPaste.h CutPasteP.h DesktopP.h DialogS.h DialogSEP.h 	DialogSP.h Display.h DisplayP.h DragC.h DragCP.h 	DragDrop.h DragIcon.h DragIconP.h DragOverS.h DragOverSP.h 	DrawingA.h DrawnB.h DrawnBP.h 	DropSMgr.h DropSMgrP.h DropTrans.h DropTransP.h ExtObjectP.h 	FileSB.h FileSBP.h Form.h FormP.h Frame.h FrameP.h 	Label.h LabelG.h LabelGP.h LabelP.h 	List.h ListP.h MainW.h MainWP.h 	MenuShell.h MenuUtilP.h MessageB.h MessageBP.h 	MwmUtil.h PanedW.h Protocols.h 	ProtocolsP.h PushB.h PushBG.h PushBGP.h PushBP.h 	RCUtilsP.h RepType.h RowColumn.h RowColumnP.h SashP.h Scale.h 	Screen.h ScreenP.h ScrollBar.h ScrollBarP.h 	ScrolledW.h SelectioB.h SelectioBP.h SeparatoG.h 	SeparatoGP.h Separator.h SeparatorP.h ShellEP.h TearOffBP.h 	TearOffP.h Text.h TextF.h TextFP.h TextFSelP.h TextInP.h 	TextOutP.h TextP.h TextSelP.h TextStrSoP.h ToggleB.h 	ToggleBG.h VaSimpleP.h 	VendorS.h VendorSEP.h VendorSP.h VirtKeys.h VirtKeysP.h 	WorldP.h XmosP.h
+ 
+@@ -248,7 +248,6 @@
+ 
+ install-data-am: install-xmDATA install-xmHEADERS
+ 	@$(NORMAL_INSTALL)
+-	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+ install-data: install-data-am
+ 
+ install-am: all-am
diff --git a/x11/lesstif/patches/patch-cc b/x11/lesstif/patches/patch-cc
new file mode 100644
index 00000000000..4288c146676
--- /dev/null
+++ b/x11/lesstif/patches/patch-cc
@@ -0,0 +1,20 @@
+$NetBSD: patch-cc,v 1.1 1999/09/03 19:45:12 drochner Exp $
+--- lib/Mrm-2.0/Makefile.in.orig	Tue Aug 17 00:08:08 1999
++++ lib/Mrm-2.0/Makefile.in	Tue Aug 17 00:09:41 1999
+@@ -121,7 +121,7 @@
+ 
+ EXTRA_DIST = ${SRCS_2_0}
+ 
+-@Version_2_0_TRUE@libdir = $(prefix)/LessTif/Motif2.0/lib
++@Version_2_0_TRUE@libdir = $(prefix)/lib
+ 
+ #
+ # Sources in another directory
+@@ -312,7 +312,6 @@
+ 
+ install-data-am:
+ 	@$(NORMAL_INSTALL)
+-	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+ install-data: install-data-am
+ 
+ install-am: all-am
diff --git a/x11/lesstif/patches/patch-cd b/x11/lesstif/patches/patch-cd
new file mode 100644
index 00000000000..16147718044
--- /dev/null
+++ b/x11/lesstif/patches/patch-cd
@@ -0,0 +1,20 @@
+$NetBSD: patch-cd,v 1.1 1999/09/03 19:45:12 drochner Exp $
+--- lib/Xm-2.0/Makefile.in.orig	Tue Aug 17 00:10:45 1999
++++ lib/Xm-2.0/Makefile.in	Tue Aug 17 00:11:08 1999
+@@ -143,7 +143,7 @@
+ # Lets put the headers in a sub directory to avoid
+ # poluting /usr/local with more directories for default installs.
+ #
+-@Version_2_0_TRUE@libdir = $(prefix)/LessTif/Motif2.0/lib
++@Version_2_0_TRUE@libdir = $(prefix)/lib
+ 
+ @Version_2_0_TRUE@lib_LTLIBRARIES = libXm.la
+ 
+@@ -339,7 +339,6 @@
+ 
+ install-data-am:
+ 	@$(NORMAL_INSTALL)
+-	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+ install-data: install-data-am
+ 
+ install-am: all-am
diff --git a/x11/lesstif/pkg/PLIST b/x11/lesstif/pkg/PLIST
index 000494406e8..b387a353d14 100644
--- a/x11/lesstif/pkg/PLIST
+++ b/x11/lesstif/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 1998/10/31 01:02:18 frueauf Exp $
+@comment $NetBSD: PLIST,v 1.16 1999/09/03 19:45:13 drochner Exp $
 bin/mwm
 bin/mxmkmf
 bin/uil
@@ -7,6 +7,8 @@ include/Mrm/MrmAppl.h
 include/Mrm/MrmDecls.h
 include/Mrm/MrmPrivate.h
 include/Mrm/MrmPublic.h
+include/Xm/AccTextT.h
+include/Xm/ActivatableT.h
 include/Xm/ArrowB.h
 include/Xm/ArrowBG.h
 include/Xm/ArrowBGP.h
@@ -15,13 +17,18 @@ include/Xm/AtomMgr.h
 include/Xm/BaseClassP.h
 include/Xm/BulletinB.h
 include/Xm/BulletinBP.h
+include/Xm/CSText.h
 include/Xm/CacheP.h
 include/Xm/CascadeB.h
 include/Xm/CascadeBG.h
 include/Xm/CascadeBGP.h
 include/Xm/CascadeBP.h
+include/Xm/ComboBox.h
+include/Xm/ComboBoxP.h
 include/Xm/Command.h
 include/Xm/CommandP.h
+include/Xm/Container.h
+include/Xm/ContainerT.h
 include/Xm/CutPaste.h
 include/Xm/CutPasteP.h
 include/Xm/DesktopP.h
@@ -53,15 +60,22 @@ include/Xm/Form.h
 include/Xm/FormP.h
 include/Xm/Frame.h
 include/Xm/FrameP.h
+include/Xm/Gadget.h
 include/Xm/GadgetP.h
+include/Xm/GrabShell.h
+include/Xm/GrabShellP.h
+include/Xm/IconG.h
+include/Xm/IconGP.h
 include/Xm/Label.h
 include/Xm/LabelG.h
 include/Xm/LabelGP.h
 include/Xm/LabelP.h
+include/Xm/LayoutT.h
 include/Xm/List.h
 include/Xm/ListP.h
 include/Xm/MainW.h
 include/Xm/MainWP.h
+include/Xm/Manager.h
 include/Xm/ManagerP.h
 include/Xm/MenuShell.h
 include/Xm/MenuShellP.h
@@ -69,8 +83,12 @@ include/Xm/MenuUtilP.h
 include/Xm/MessageB.h
 include/Xm/MessageBP.h
 include/Xm/MwmUtil.h
+include/Xm/NavigatorT.h
+include/Xm/Notebook.h
+include/Xm/NotebookP.h
 include/Xm/PanedW.h
 include/Xm/PanedWP.h
+include/Xm/Primitive.h
 include/Xm/PrimitiveP.h
 include/Xm/Protocols.h
 include/Xm/ProtocolsP.h
@@ -89,6 +107,7 @@ include/Xm/Screen.h
 include/Xm/ScreenP.h
 include/Xm/ScrollBar.h
 include/Xm/ScrollBarP.h
+include/Xm/ScrollFrameT.h
 include/Xm/ScrolledW.h
 include/Xm/ScrolledWP.h
 include/Xm/SelectioB.h
@@ -98,6 +117,8 @@ include/Xm/SeparatoGP.h
 include/Xm/Separator.h
 include/Xm/SeparatorP.h
 include/Xm/ShellEP.h
+include/Xm/SpinB.h
+include/Xm/SpinBP.h
 include/Xm/TearOffBP.h
 include/Xm/TearOffP.h
 include/Xm/Text.h
@@ -113,6 +134,9 @@ include/Xm/ToggleB.h
 include/Xm/ToggleBG.h
 include/Xm/ToggleBGP.h
 include/Xm/ToggleBP.h
+include/Xm/TraitP.h
+include/Xm/Transfer.h
+include/Xm/TransferP.h
 include/Xm/TransltnsP.h
 include/Xm/VaSimpleP.h
 include/Xm/VendorS.h
@@ -127,21 +151,22 @@ include/Xm/XmP.h
 include/Xm/XmStrDefs.h
 include/Xm/XmosP.h
 lib/X11/app-defaults/Mwm
-lib/X11/mwm/README
-lib/X11/mwm/alt.map
-lib/X11/mwm/system.mwmrc
 lib/X11/lesstif/Imake.tmpl
 lib/X11/lesstif/Motif.rules
 lib/X11/lesstif/Motif.tmpl
+lib/X11/mwm/README
+lib/X11/mwm/alt.map
+lib/X11/mwm/system.mwmrc
 lib/libMrm.a
-lib/libMrm.so.1.2
+lib/libMrm.so.2.0
 lib/libXm.a
-lib/libXm.so.1.2
+lib/libXm.so.2.0
 share/lesstif/AUTHORS
 share/lesstif/BUG-REPORTING
 share/lesstif/COPYING
 share/lesstif/COPYING.LIB
 share/lesstif/CREDITS
+share/lesstif/FAQ
 share/lesstif/INSTALL
 share/lesstif/KNOWN_BUGS
 share/lesstif/NEWS
@@ -168,6 +193,8 @@ share/lesstif/doc/images/ltsunlogo.gif
 share/lesstif/doc/imgs/lesstif.jpg
 share/lesstif/doc/imgs/ltsunlogo.gif
 share/lesstif/doc/index.html
+share/lesstif/doc/help.html
+share/lesstif/doc/known.html
 share/lesstif/doc/links.html
 share/lesstif/doc/lists.html
 share/lesstif/doc/mirrors.html
@@ -193,6 +220,7 @@ man/man3/Shell.3
 man/man3/TopLevelShell.3
 man/man3/TransientShell.3
 man/man3/UnNamedObj.3
+man/man3/VendorShell.3
 man/man3/WmShell.3
 man/man3/XmArrowButton.3
 man/man3/XmArrowButtonGadget.3
@@ -210,11 +238,11 @@ man/man3/XmDragContext.3
 man/man3/XmDragIcon.3
 man/man3/XmDragOverShell.3
 man/man3/XmDrawingArea.3
-man/man3/XmForm.3
 man/man3/XmDrawnButton.3
 man/man3/XmDropSiteManager.3
 man/man3/XmDropTransfer.3
 man/man3/XmFileSelectionBox.3
+man/man3/XmForm.3
 man/man3/XmFrame.3
 man/man3/XmGadget.3
 man/man3/XmGrabShell.3
@@ -246,9 +274,9 @@ man/man3/XmTearOffButton.3
 man/man3/XmText.3
 man/man3/XmTextField.3
 man/man3/XmToggleButton.3
-man/man3/XmWorld.3
 man/man3/XmToggleButtonGadget.3
-man/man3/XmVendorShellExt.3
+man/man3/XmVendorShell.3
+man/man3/XmWorld.3
 man/man3/XtConfigureObject.3
 man/man3/XtDestroyWidget.3
 man/man3/XtManageChild.3
@@ -260,5 +288,6 @@ man/man5/mwmrc.5
 @dirrm include/Mrm
 @dirrm share/lesstif/doc/images
 @dirrm share/lesstif/doc/imgs
+@dirrm share/lesstif/doc/html
 @dirrm share/lesstif/doc
 @dirrm share/lesstif