Update to 0.89.0. Renumbered patches because it got increasingly difficult

to track patches to individual files.

Changes from 0.88.9:

   * Add FontChooser widget to Xlt.
   * Fix to XmText to make a second call to SetValues with the same
     pointer still work.
   * Added a directory tree lib/Xbae which contains the Xbae widget set
     (XbaeMatrix, XbaeCaption, and XbaeInput).
   * Made build system changes to build Xbae in the same way as Xlt.
   * Add build system options to Xlt and/or Xbae can be compiled together
     with LessTif.
     Use the --enable-build-Xlt and --enable-build-Xbae options.
   * Xbae contains both automake-based and Imake based build support;
     we're not sure how actively we'll support Imake though.
   * RowColumn tear-off segfault fix.
   * Fixed segfault with xmgrace.
   * various fixes for openDX
   * VaSimpleOption fix for Xquote
   * fixes for mapCallback for DialogShells with BulletionBoard children
   * Even though binary compatibility is not our true goal,
     Netscape-dynMotif (4.61) now runs out-of-the-box with lesstif!
   * Initial attempts at making lesstif threadsafe (PushB, PushBG)
   * mxftp should now work
   * XmScrolledWindow/XmScrollBar geometry fixes

23 files changed, 370 insertions, 228 deletions

diff --git a/x11/lesstif/Makefile b/x11/lesstif/Makefile
index 9bfdf4295fa..a2881543272 100644
--- a/x11/lesstif/Makefile
+++ b/x11/lesstif/Makefile
@@ -1,23 +1,25 @@
-# $NetBSD: Makefile,v 1.41 1999/09/04 23:23:22 tron Exp $
+# $NetBSD: Makefile,v 1.42 1999/11/03 04:18:46 jlam Exp $
 # FreeBSD Id: Makefile,v 1.13 1997/09/08 08:34:13 tg Exp
 #
 
-DISTNAME=	lesstif-0.88.9
-CATEGORIES=	x11
-MASTER_SITES=	ftp://linux.mathematik.tu-darmstadt.de/pub/linux/mirrors/misc/lesstif/srcdist/ \
-		http://gd.tuwien.ac.at/hci/lesstif/srcdist/ \
-		ftp://ftp.lesstif.org/pub/hungry/lesstif/srcdist/
+DISTNAME=		lesstif-0.89.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/
+MAINTAINER=		packages@netbsd.org
+HOMEPAGE=		http://www.lesstif.org/
 
-GNU_CONFIGURE=  yes
-USE_GMAKE=	yes
-USE_LIBTOOL=	yes
-USE_X11BASE=	yes
+USE_LIBTOOL=		yes
+USE_X11BASE=		yes
 
-CONFIGURE_ARGS+=	--prefix=${PREFIX} --with-x --enable-production
-CONFIGURE_ARGS+=	--enable-default-20 --disable-debug
-CONFIGURE_ENV=		CCFLAGS="${CFLAGS}"
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--enable-build-12	# needed for www/Mosaic
+CONFIGURE_ARGS+=	--enable-build-20 --enable-default-20 \
+			--enable-production --disable-debug
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/lesstif/files/md5 b/x11/lesstif/files/md5
index 6fe02d6d3d3..57efa43a0fb 100644
--- a/x11/lesstif/files/md5
+++ b/x11/lesstif/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.14 1999/09/03 19:45:12 drochner Exp $
+$NetBSD: md5,v 1.15 1999/11/03 04:18:47 jlam Exp $
 
-MD5 (lesstif-0.88.9.tar.gz) = 4eb8fabb824bf7ab34b9f063d199bb8e
+MD5 (lesstif-0.89.0.tar.gz) = 946c61a92cb105239aa53f00f2f790d9
diff --git a/x11/lesstif/files/patch-sum b/x11/lesstif/files/patch-sum
index ea474f52bb0..51d72722e3d 100644
--- a/x11/lesstif/files/patch-sum
+++ b/x11/lesstif/files/patch-sum
@@ -1,19 +1,22 @@
-$NetBSD: patch-sum,v 1.2 1999/09/03 19:45:12 drochner Exp $
+$NetBSD: patch-sum,v 1.3 1999/11/03 04:18:47 jlam Exp $
 
-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
+MD5 (patch-aa) = b7e09274455802cecc8338a0ac348e7a
+MD5 (patch-ab) = a648bebb020be08def76a087fb82716e
+MD5 (patch-ac) = 3f0e9bd0870021a230bee0944bd2a54a
+MD5 (patch-ad) = b72bfde5c5874795a2385b64a74fa31f
+MD5 (patch-ae) = 3348f42082e0788206a5c81d3d716f04
+MD5 (patch-af) = 432449c6ac942be17f04b10f8069e539
+MD5 (patch-ag) = df995c9efebb15c2d16963b9081bc3ea
+MD5 (patch-ah) = f123c589bf5905f23eb1fa77d798bd5f
+MD5 (patch-ai) = aa7a9cc65c91dc557b71882ec3bc860a
+MD5 (patch-aj) = 886336a29b9d708360e3a67b97fff892
+MD5 (patch-ak) = d3f1b51e9134006702d9ae6cbe637f01
+MD5 (patch-al) = cd791ca0042d5e4d86f253b37715474d
+MD5 (patch-am) = d387f4fc0a9dc7e53553b6a946a1dbb2
+MD5 (patch-an) = 9d56a7501b244c4f682abb50f3d38d03
+MD5 (patch-ao) = aeb06cb17577dc4941b032312c5f522b
+MD5 (patch-ap) = a90b27b34328589d20a3621a9ee55fa2
+MD5 (patch-aq) = ab5b34bfa1041512edd4d30b894b2a09
+MD5 (patch-ar) = 7ab0e9a7ad7e11e5c72fa32e01af691c
+MD5 (patch-as) = e1283ad52f38fe773eba65f32b1251f7
+MD5 (patch-at) = e7a12198b845889ef84bea3f22c1a767
diff --git a/x11/lesstif/patches/patch-aa b/x11/lesstif/patches/patch-aa
index 651c57402fd..3f47f3cdeaf 100644
--- a/x11/lesstif/patches/patch-aa
+++ b/x11/lesstif/patches/patch-aa
@@ -1,28 +1,21 @@
-$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 @@
+$NetBSD: patch-aa,v 1.8 1999/11/03 04:18:47 jlam Exp $
+
+--- Makefile.in.orig	Mon Sep  6 17:13:29 1999
++++ Makefile.in	Tue Nov  2 22:16:16 1999
+@@ -124,14 +124,14 @@
+ # 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 	INSTALL KNOWN_BUGS NEWS README RELEASE-POLICY TODO
  
  
- # 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
+ EXTRA_DIST = acconfig.h configure 		BUG-REPORTING CREDITS KNOWN_BUGS RELEASE-POLICY
  
  
- subdirs="lib/Xlt test"
-@@ -4812,7 +4814,7 @@
- 
- lexicographic_readdir=1
- 
--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=""
+-htmldir = $(exec_prefix)/LessTif/doc
++htmldir = $(exec_prefix)/share/doc/lesstif
+ html_DATA = NOTES
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/x11/lesstif/patches/patch-ab b/x11/lesstif/patches/patch-ab
index bb2940d0560..acd8543c744 100644
--- a/x11/lesstif/patches/patch-ab
+++ b/x11/lesstif/patches/patch-ab
@@ -1,12 +1,13 @@
-$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
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../include/LTconfig.h
+$NetBSD: patch-ab,v 1.6 1999/11/03 04:18:47 jlam Exp $
+
+--- clients/Motif-1.2/mwm/system.mwmrc.orig	Wed Jan 13 10:11:05 1999
++++ clients/Motif-1.2/mwm/system.mwmrc	Tue Nov  2 22:16:16 1999
+@@ -4,7 +4,7 @@
+ Menu DefaultRootMenu
+ {
+ 	"Root Menu"		f.title
+-	"New Window"		f.exec "xterm -e /bin/bash &"
++	"New Window"		f.exec "xterm &"
+ 	"Shuffle Up"		f.circle_up
+ 	"Shuffle Down"		f.circle_down
+ 	"Refresh"		f.refresh
diff --git a/x11/lesstif/patches/patch-ac b/x11/lesstif/patches/patch-ac
index 52da9d42ae7..534cfe26c2c 100644
--- a/x11/lesstif/patches/patch-ac
+++ b/x11/lesstif/patches/patch-ac
@@ -1,9 +1,20 @@
-$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_libraries@/X11/config
-+imake -DUseInstalled -I@prefix@/lib/X11/lesstif -I@x_libraries@/X11/config
+$NetBSD: patch-ac,v 1.4 1999/11/03 04:18:47 jlam Exp $
+
+--- configure.orig	Mon Sep  6 17:14:00 1999
++++ configure	Tue Nov  2 22:16:16 1999
+@@ -1406,6 +1406,7 @@
+ fi
+ 
+ 
++if false; then
+ # Check for any special flags to pass to ltconfig.
+ libtool_flags="--cache-file=$cache_file"
+ test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
+@@ -1563,6 +1564,7 @@
+ # Redirect the config.log output again, so that the ltconfig log is not
+ # clobbered by the next message.
+ exec 5>>./config.log
++fi
+ 
+ 
+ subdirs="lib/Xlt lib/Xbae test"
diff --git a/x11/lesstif/patches/patch-ad b/x11/lesstif/patches/patch-ad
index 424d2650fcd..62af0abc3c9 100644
--- a/x11/lesstif/patches/patch-ad
+++ b/x11/lesstif/patches/patch-ad
@@ -1,12 +1,13 @@
-$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 @@
+$NetBSD: patch-ad,v 1.6 1999/11/03 04:18:47 jlam Exp $
+
+--- doc/Makefile.in.orig	Mon Sep  6 17:13:52 1999
++++ doc/Makefile.in	Tue Nov  2 22:16:16 1999
+@@ -118,7 +118,7 @@
  
  SUBDIRS = www.lesstif.org lessdox
  
 -rootdir = $(exec_prefix)/LessTif/doc
-+rootdir = $(exec_prefix)/share/lesstif/doc
- root_DATA = INSTALL.html
++rootdir = $(exec_prefix)/share/doc/lesstif
+ root_DATA = INSTALL.html All.html Clipboard.txt DragAndDrop.txt Form.txt 		GeoUtils.txt Geometry.html SyntheticResources.txt 		UIL.txt XmStrings.txt thread.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 7e89ea46180..c4310ea8f87 100644
--- a/x11/lesstif/patches/patch-ae
+++ b/x11/lesstif/patches/patch-ae
@@ -1,7 +1,8 @@
-$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 @@
+$NetBSD: patch-ae,v 1.7 1999/11/03 04:18:47 jlam Exp $
+
+--- doc/lessdox/clients/Makefile.in.orig	Mon Sep  6 17:13:55 1999
++++ doc/lessdox/clients/Makefile.in	Tue Nov  2 22:16:16 1999
+@@ -116,10 +116,10 @@
  EXTRA_DIST = $(man1_DATA) $(man3_DATA) $(man5_DATA)
  SUFFIXES = .1 .3 .5 .html
  
@@ -10,22 +11,22 @@ $NetBSD: patch-ae,v 1.6 1999/09/03 19:45:12 drochner Exp $
 -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
++man1dir = $(exec_prefix)/man/man1
++man3dir = $(exec_prefix)/man/man3
++man5dir = $(exec_prefix)/man/man5
  
  man1_DATA = mwm.1 xmbind.1 lesstif.1
  man3_DATA = 
-@@ -132,7 +132,7 @@
+@@ -134,7 +134,7 @@
  # build them.
  #
  
 -htmldir = $(exec_prefix)/LessTif/doc/html
-+htmldir = $(exec_prefix)/share/lesstif/doc/html
++htmldir = $(exec_prefix)/share/doc/lesstif/html
  
  @HaveMan2html_TRUE@html_DATA = mwm.html mwmrc.html xmbind.html lesstif.html
  
-@@ -269,7 +269,7 @@
+@@ -271,7 +271,7 @@
  install-exec-am:
  install-exec: install-exec-am
  
diff --git a/x11/lesstif/patches/patch-af b/x11/lesstif/patches/patch-af
index 594005b83dd..5e73d380844 100644
--- a/x11/lesstif/patches/patch-af
+++ b/x11/lesstif/patches/patch-af
@@ -1,17 +1,37 @@
-$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.
+$NetBSD: patch-af,v 1.6 1999/11/03 04:18:47 jlam Exp $
+
+--- doc/lessdox/functions/Makefile.in.orig	Mon Sep  6 17:13:56 1999
++++ doc/lessdox/functions/Makefile.in	Tue Nov  2 22:16:16 1999
+@@ -116,10 +116,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
+ 
+ man1_DATA = 
+ man3_DATA =  	XtConfigureObject.3 XtDestroyWidget.3         XtManageChild.3 XtUnmanageChild.3
+@@ -135,7 +135,7 @@
+ # build them.
  #
--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
  
+-htmldir = $(exec_prefix)/LessTif/doc/html
++htmldir = $(exec_prefix)/share/doc/lesstif/html
+ 
+ @HaveMan2html_TRUE@html_DATA = ${man1_DATA:.1=.html} ${man3_DATA:.3=.html}                 ${man5_DATA:.5=.html}
+ 
+@@ -272,7 +272,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
  
--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 af90c602eb2..88d73764757 100644
--- a/x11/lesstif/patches/patch-ag
+++ b/x11/lesstif/patches/patch-ag
@@ -1,12 +1,40 @@
-$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.
+$NetBSD: patch-ag,v 1.4 1999/11/03 04:18:47 jlam Exp $
+
+--- doc/lessdox/widgets/Makefile.in.orig	Mon Sep  6 17:13:55 1999
++++ doc/lessdox/widgets/Makefile.in	Tue Nov  2 22:16:16 1999
+@@ -116,10 +116,10 @@
+ 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
+ 
+ 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
+@@ -135,7 +135,7 @@
+ # build them.
  #
--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
  
+-htmldir = $(prefix)/LessTif/doc/html
++htmldir = $(prefix)/share/doc/lesstif/html
+ 
+ @HaveMan2html_TRUE@html_DATA = ${man1_DATA:.1=.html} ${man3_DATA:.3=.html}                 ${man5_DATA:.5=.html}
+ 
+@@ -272,10 +272,9 @@
+ 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
+ 	@$(NORMAL_INSTALL)
+-	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+ install-data: install-data-am
  
+ install-am: all-am
diff --git a/x11/lesstif/patches/patch-ah b/x11/lesstif/patches/patch-ah
index 7b3999acfc1..ac7063c1e3e 100644
--- a/x11/lesstif/patches/patch-ah
+++ b/x11/lesstif/patches/patch-ah
@@ -1,12 +1,18 @@
-$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 @@
+$NetBSD: patch-ah,v 1.4 1999/11/03 04:18:47 jlam Exp $
+
+--- doc/www.lesstif.org/Makefile.in.orig	Mon Sep  6 17:13:53 1999
++++ doc/www.lesstif.org/Makefile.in	Tue Nov  2 22:16:16 1999
+@@ -123,11 +123,11 @@
  # Lets put the informational stuff in a sub directory to avoid 
- # poluting /usr/local for default installs.
+ # polluting /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
++rootdir = $(exec_prefix)/share/doc/lesstif
+ 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 		Advocacy.html Xbae.html Xlt.html
  
+ 
+-root2dir = $(exec_prefix)/LessTif
++root2dir = $(exec_prefix)/share/doc/lesstif
+ root2_DATA = FAQ
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../include/LTconfig.h
diff --git a/x11/lesstif/patches/patch-ai b/x11/lesstif/patches/patch-ai
index 457b30fddcd..0f4155b11f2 100644
--- a/x11/lesstif/patches/patch-ai
+++ b/x11/lesstif/patches/patch-ai
@@ -1,35 +1,13 @@
-$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 = $(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 =  	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.
+$NetBSD: patch-ai,v 1.6 1999/11/03 04:18:47 jlam Exp $
+
+--- doc/www.lesstif.org/images/Makefile.in.orig	Mon Sep  6 17:13:53 1999
++++ doc/www.lesstif.org/images/Makefile.in	Tue Nov  2 22:16:16 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/doc/images
++rootdir = $(exec_prefix)/share/doc/lesstif/images
+ root_DATA = hungry.gif 		lesstif-realsmall.gif lesstif-small.gif lesstif.gif 		ltsunlogo.gif
  
--htmldir = $(prefix)/LessTif/doc/html
-+htmldir = $(prefix)/share/lesstif/doc/html
- 
- @HaveMan2html_TRUE@html_DATA = ${man1_DATA:.1=.html} ${man3_DATA:.3=.html}                 ${man5_DATA:.5=.html}
- 
-@@ -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-am: all-am
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/x11/lesstif/patches/patch-aj b/x11/lesstif/patches/patch-aj
index ae312513987..cc85b2ed898 100644
--- a/x11/lesstif/patches/patch-aj
+++ b/x11/lesstif/patches/patch-aj
@@ -1,12 +1,13 @@
-$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 @@
+$NetBSD: patch-aj,v 1.5 1999/11/03 04:18:47 jlam Exp $
+
+--- doc/www.lesstif.org/imgs/Makefile.in.orig	Mon Sep  6 17:13:54 1999
++++ doc/www.lesstif.org/imgs/Makefile.in	Tue Nov  2 22:16:16 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/doc/imgs
-+rootdir = $(exec_prefix)/share/lesstif/doc/imgs
++rootdir = $(exec_prefix)/share/doc/lesstif/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 67e056e9c56..dacdb76ce9d 100644
--- a/x11/lesstif/patches/patch-ak
+++ b/x11/lesstif/patches/patch-ak
@@ -1,27 +1,21 @@
-$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
- 
- man1_DATA = 
- man3_DATA =  	XtConfigureObject.3 XtDestroyWidget.3         XtManageChild.3 XtUnmanageChild.3
-@@ -133,7 +133,7 @@
- # build them.
+$NetBSD: patch-ak,v 1.3 1999/11/03 04:18:47 jlam Exp $
+
+--- include/Motif-2.0/Mrm/Makefile.in.orig	Mon Sep  6 17:13:39 1999
++++ include/Motif-2.0/Mrm/Makefile.in	Tue Nov  2 22:16:17 1999
+@@ -121,7 +121,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
  
--htmldir = $(exec_prefix)/LessTif/doc/html
-+htmldir = $(exec_prefix)/share/lesstif/doc/html
+@@ -220,7 +220,6 @@
  
- @HaveMan2html_TRUE@html_DATA = ${man1_DATA:.1=.html} ${man3_DATA:.3=.html}                 ${man5_DATA:.5=.html}
+ 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-al b/x11/lesstif/patches/patch-al
index dbef6985e58..0f9741ad3ba 100644
--- a/x11/lesstif/patches/patch-al
+++ b/x11/lesstif/patches/patch-al
@@ -1,19 +1,21 @@
-$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 @@
+$NetBSD: patch-al,v 1.2 1999/11/03 04:18:47 jlam Exp $
+
+--- include/Motif-2.0/Xm/Makefile.in.orig	Mon Sep  6 17:13:39 1999
++++ include/Motif-2.0/Xm/Makefile.in	Tue Nov  2 22:16:17 1999
+@@ -121,7 +121,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
  
- # 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
+@@ -250,7 +250,6 @@
  
- 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
+ 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-am b/x11/lesstif/patches/patch-am
index 38003d84519..3c6c350774d 100644
--- a/x11/lesstif/patches/patch-am
+++ b/x11/lesstif/patches/patch-am
@@ -1,28 +1,21 @@
-$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 @@
+$NetBSD: patch-am,v 1.2 1999/11/03 04:18:47 jlam Exp $
+
+--- lib/Mrm-2.0/Makefile.in.orig	Mon Sep  6 17:13:33 1999
++++ lib/Mrm-2.0/Makefile.in	Tue Nov  2 22:16:17 1999
+@@ -123,7 +123,7 @@
  
+ EXTRA_DIST = ${SRCS_2_0}
  
- # 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_2_0_TRUE@libdir = $(prefix)/LessTif/Motif2.0/lib
++@Version_2_0_TRUE@libdir = $(prefix)/lib
  
+ #
+ # Sources in another directory
+@@ -314,7 +314,6 @@
  
- version=1.2
-@@ -4363,7 +4365,7 @@
+ install-data-am:
+ 	@$(NORMAL_INSTALL)
+-	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+ install-data: install-data-am
  
- 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=""
+ install-am: all-am
diff --git a/x11/lesstif/patches/patch-an b/x11/lesstif/patches/patch-an
new file mode 100644
index 00000000000..b3fd0ecc0c0
--- /dev/null
+++ b/x11/lesstif/patches/patch-an
@@ -0,0 +1,12 @@
+$NetBSD: patch-an,v 1.1 1999/11/03 04:18:47 jlam Exp $
+
+--- lib/Mrm/Makefile.in.orig	Mon Sep  6 17:13:31 1999
++++ lib/Mrm/Makefile.in	Tue Nov  2 22:16:37 1999
+@@ -289,7 +289,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-ao b/x11/lesstif/patches/patch-ao
new file mode 100644
index 00000000000..4b5735a836a
--- /dev/null
+++ b/x11/lesstif/patches/patch-ao
@@ -0,0 +1,20 @@
+$NetBSD: patch-ao,v 1.1 1999/11/03 04:18:47 jlam Exp $
+
+--- lib/Xlt/configure.orig	Mon Sep  6 17:18:15 1999
++++ lib/Xlt/configure	Tue Nov  2 22:16:17 1999
+@@ -1972,6 +1972,7 @@
+ 
+ 
+ 
++if false; then
+ # Check for any special flags to pass to ltconfig.
+ libtool_flags="--cache-file=$cache_file"
+ test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
+@@ -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-ap b/x11/lesstif/patches/patch-ap
new file mode 100644
index 00000000000..67fef9f0c3e
--- /dev/null
+++ b/x11/lesstif/patches/patch-ap
@@ -0,0 +1,21 @@
+$NetBSD: patch-ap,v 1.1 1999/11/03 04:18:47 jlam Exp $
+
+--- lib/Xm-2.0/Makefile.in.orig	Mon Sep  6 17:13:33 1999
++++ lib/Xm-2.0/Makefile.in	Tue Nov  2 22:16:17 1999
+@@ -145,7 +145,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
+ 
+@@ -341,7 +341,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-aq b/x11/lesstif/patches/patch-aq
new file mode 100644
index 00000000000..a5e69e66e90
--- /dev/null
+++ b/x11/lesstif/patches/patch-aq
@@ -0,0 +1,12 @@
+$NetBSD: patch-aq,v 1.1 1999/11/03 04:18:47 jlam Exp $
+
+--- lib/Xm/Makefile.in.orig	Mon Sep  6 17:13:31 1999
++++ lib/Xm/Makefile.in	Tue Nov  2 22:19:27 1999
+@@ -323,7 +323,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-ar b/x11/lesstif/patches/patch-ar
new file mode 100644
index 00000000000..71ea3309b0e
--- /dev/null
+++ b/x11/lesstif/patches/patch-ar
@@ -0,0 +1,13 @@
+$NetBSD: patch-ar,v 1.1 1999/11/03 04:18:47 jlam Exp $
+
+--- lib/config/Makefile.in.orig	Mon Sep  6 17:13:30 1999
++++ lib/config/Makefile.in	Tue Nov  2 22:16:17 1999
+@@ -116,7 +116,7 @@
+ MAINTAINERCLEANFILES = Makefile.in
+ bin_SCRIPTS = mxmkmf
+ 
+-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-as b/x11/lesstif/patches/patch-as
new file mode 100644
index 00000000000..7a883cd4809
--- /dev/null
+++ b/x11/lesstif/patches/patch-as
@@ -0,0 +1,10 @@
+$NetBSD: patch-as,v 1.1 1999/11/03 04:18:48 jlam Exp $
+
+--- lib/config/mxmkmf.in.orig	Thu Sep  2 19:51:36 1999
++++ lib/config/mxmkmf.in	Tue Nov  2 22:16:17 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
diff --git a/x11/lesstif/patches/patch-at b/x11/lesstif/patches/patch-at
new file mode 100644
index 00000000000..8d1d9377c09
--- /dev/null
+++ b/x11/lesstif/patches/patch-at
@@ -0,0 +1,20 @@
+$NetBSD: patch-at,v 1.1 1999/11/03 04:18:48 jlam Exp $
+
+--- test/configure.orig	Mon Sep  6 17:21:32 1999
++++ test/configure	Tue Nov  2 22:16:17 1999
+@@ -1391,6 +1391,7 @@
+ fi
+ 
+ 
++if false; then
+ # Check for any special flags to pass to ltconfig.
+ libtool_flags="--cache-file=$cache_file"
+ test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
+@@ -1548,6 +1549,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