From fbda2d586440de735acadb03f614912d4105e3f1 Mon Sep 17 00:00:00 2001
From: brad <brad@openbsd.org>
Date: Thu, 22 Apr 1999 16:07:23 +0000
Subject: [PATCH] upgrade to lesstif 0.88.1

---
 x11/lesstif/Makefile           |  6 +++---
 x11/lesstif/files/md5          |  6 +++---
 x11/lesstif/patches/patch-aa   |  6 +++---
 x11/lesstif/patches/patch-ab   |  8 ++++----
 x11/lesstif/patches/patch-ad   | 18 +++++++++---------
 x11/lesstif/patches/patch-ae   | 18 ++++++++----------
 x11/lesstif/patches/patch-af   |  6 +++---
 x11/lesstif/patches/patch-ag   |  6 +++---
 x11/lesstif/patches/patch-ah   |  6 +++---
 x11/lesstif/patches/patch-ai   | 16 ++++++++--------
 x11/lesstif/patches/patch-aj   |  8 ++++----
 x11/lesstif/patches/patch-ak   |  6 +++---
 x11/lesstif/patches/patch-al   | 10 +++++-----
 x11/lesstif/pkg/PLIST          |  7 +++----
 x11/lesstif/pkg/PLIST.noshared |  5 +++--
 15 files changed, 65 insertions(+), 67 deletions(-)

diff --git a/x11/lesstif/Makefile b/x11/lesstif/Makefile
index 292ba00de39..aeea2136af0 100644
--- a/x11/lesstif/Makefile
+++ b/x11/lesstif/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.21 1999/04/14 19:23:44 brad Exp $
+# $OpenBSD: Makefile,v 1.22 1999/04/22 16:07:23 brad Exp $
 # $FreeBSD: Makefile,v 1.17 1998/03/28 14:12:55 steve Exp $
 
-DISTNAME=	lesstif-0.88.0
+DISTNAME=	lesstif-0.88.1
 CATEGORIES=	x11
 
 NEED_VERSION=	1.73
@@ -16,7 +16,7 @@ USE_X11=	yes
 SEPARATE_BUILD=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
-CONFIGURE_ARGS+= --disable-debug --enable-build-12 --enable-static
+CONFIGURE_ARGS+= --enable-static --disable-debug --enable-build-12
 CONFIGURE_ENV=	${SETENV}
 
 .if defined(HAVE_MOTIF)
diff --git a/x11/lesstif/files/md5 b/x11/lesstif/files/md5
index 8fdf2212089..d6415da4605 100644
--- a/x11/lesstif/files/md5
+++ b/x11/lesstif/files/md5
@@ -1,3 +1,3 @@
-MD5 (lesstif-0.88.0.tar.gz) = 621eb9a3526dd1becb1272df526c384a
-RMD160 (lesstif-0.88.0.tar.gz) = e85620b7b2dbfab94dd78d44e977749113da8141
-SHA1 (lesstif-0.88.0.tar.gz) = 80e12fd2eaed8c43c022e040666c00d4a315ddc2
+MD5 (lesstif-0.88.1.tar.gz) = 4d52989b2f93235082ff1117b22ef55e
+RMD160 (lesstif-0.88.1.tar.gz) = fb7ae93548f6472a910240620b43b78379bc7c46
+SHA1 (lesstif-0.88.1.tar.gz) = 2e12529ba7d41310a6f85c9a282ec1fee884bdc4
diff --git a/x11/lesstif/patches/patch-aa b/x11/lesstif/patches/patch-aa
index 266e4a2c1c6..5b0e9f9f94f 100644
--- a/x11/lesstif/patches/patch-aa
+++ b/x11/lesstif/patches/patch-aa
@@ -1,6 +1,6 @@
---- doc/www.lesstif.org/imgs/Makefile.in.orig	Sat Mar 20 19:02:30 1999
-+++ doc/www.lesstif.org/imgs/Makefile.in	Sat Mar 20 19:03:07 1999
-@@ -116,7 +116,7 @@
+--- doc/www.lesstif.org/imgs/Makefile.in.orig	Wed Apr 21 17:11:59 1999
++++ doc/www.lesstif.org/imgs/Makefile.in	Wed Apr 21 17:12:18 1999
+@@ -120,7 +120,7 @@
  # Lets put the informational stuff in a sub directory to avoid 
  # poluting /usr/local for default installs.
  #
diff --git a/x11/lesstif/patches/patch-ab b/x11/lesstif/patches/patch-ab
index b28b58137ea..eed837e90b6 100644
--- a/x11/lesstif/patches/patch-ab
+++ b/x11/lesstif/patches/patch-ab
@@ -1,10 +1,10 @@
---- lib/config/Makefile.in.orig	Sat Mar 20 19:05:40 1999
-+++ lib/config/Makefile.in	Sat Mar 20 19:06:04 1999
-@@ -110,7 +110,7 @@
+--- lib/config/Makefile.in.orig	Wed Apr 21 17:13:14 1999
++++ lib/config/Makefile.in	Wed Apr 21 17:14:46 1999
+@@ -114,7 +114,7 @@
  MAINTAINERCLEANFILES = Makefile.in
  bin_SCRIPTS = mxmkmf
  
--configdir = $(libdir)/X11/config
+-configdir = $(libdir)/config
 +configdir = $(libdir)/X11/lesstif
  config_DATA = Imake.tmpl Motif.rules Motif.tmpl
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/x11/lesstif/patches/patch-ad b/x11/lesstif/patches/patch-ad
index adfe00e770f..4a6f4d9e5b1 100644
--- a/x11/lesstif/patches/patch-ad
+++ b/x11/lesstif/patches/patch-ad
@@ -1,8 +1,8 @@
---- ltmain.sh.orig	Sat Mar 20 21:05:45 1999
-+++ ltmain.sh	Sat Mar 20 21:06:04 1999
-@@ -2037,40 +2037,6 @@
-       done
-     fi
+--- ltmain.sh.orig	Wed Apr 21 17:49:14 1999
++++ ltmain.sh	Wed Apr 21 17:49:33 1999
+@@ -3326,40 +3326,6 @@
+     # Exit here if they wanted silent mode.
+     test "$show" = : && exit 0
  
 -    echo "----------------------------------------------------------------------"
 -    echo "Libraries have been installed in:"
@@ -10,10 +10,10 @@
 -      echo "   $libdir"
 -    done
 -    echo
--    echo "To link against installed libraries in a given directory, LIBDIR,"
--    echo "you must use the \`-LLIBDIR' flag during linking."
--    echo
--    echo " You will also need to do at least one of the following:"
+-    echo "If you ever happen to want to link against installed libraries"
+-    echo "in a given directory, LIBDIR, you must either use libtool, and"
+-    echo "specify the full pathname of the library, or use \`-LLIBDIR'"
+-    echo "flag during linking and do at least one of the following:"
 -    if test -n "$shlibpath_var"; then
 -      echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
 -      echo "     during execution"
diff --git a/x11/lesstif/patches/patch-ae b/x11/lesstif/patches/patch-ae
index 668fc7a4196..80ea5a267b7 100644
--- a/x11/lesstif/patches/patch-ae
+++ b/x11/lesstif/patches/patch-ae
@@ -1,6 +1,6 @@
---- doc/lessdox/widgets/Makefile.in.orig	Sat Mar 20 19:09:23 1999
-+++ doc/lessdox/widgets/Makefile.in	Sat Mar 20 19:15:20 1999
-@@ -110,10 +110,10 @@
+--- doc/lessdox/widgets/Makefile.in.orig	Mon Apr 19 19:27:06 1999
++++ doc/lessdox/widgets/Makefile.in	Thu Apr 22 11:33:42 1999
+@@ -114,10 +114,10 @@
  EXTRA_DIST =  $(man1_DATA) $(man3_DATA) $(man5_DATA)
  SUFFIXES = .1 .3 .5 .html
  
@@ -14,8 +14,8 @@
 +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 XmVendorShellExt.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
-@@ -129,7 +129,7 @@
+ 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.
  #
  
@@ -24,14 +24,12 @@
  
  @HaveMan2html_TRUE@html_DATA = ${man1_DATA:.1=.html} ${man3_DATA:.3=.html}                 ${man5_DATA:.5=.html}
  
-@@ -341,8 +341,8 @@
+@@ -345,7 +345,7 @@
  # in both the http://www.lesstif.org and the locally installed case.
  #
  install-data-hook:
--#	if [ ! -h $(exec_prefix)/LessTif/doc/Lessdox ]; then ln -s $(htmldir) $(exec_prefix)/LessTif/doc/Lessdox; fi
--	if [ ! -h $(prefix)/LessTif/doc/Lessdox ]; then mkdir -p $(prefix)/LessTif/doc && cd $(prefix)/LessTif/doc && $(LN_S) html Lessdox; fi
-+	if [ ! -h $(exec_prefix)/LessTif ]; then ln -fs $(pkgdatadir) $(exec_prefix)/LessTif; fi
-+#	if [ ! -h $(prefix)/LessTif/doc/Lessdox ]; then mkdir -p $(prefix)/LessTif/doc && cd $(prefix)/LessTif/doc && $(LN_S) html Lessdox; fi
+-	if [ ! -h $(DESTDIR)$(prefix)/LessTif/doc/Lessdox ]; then mkdir -p $(DESTDIR)$(prefix)/LessTif/doc && cd $(DESTDIR)$(prefix)/LessTif/doc && $(LN_S) html Lessdox; fi
++#	if [ ! -h $(DESTDIR)$(prefix)/LessTif/doc/Lessdox ]; then mkdir -p $(DESTDIR)$(prefix)/LessTif/doc && cd $(DESTDIR)$(prefix)/LessTif/doc && $(LN_S) html Lessdox; fi
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/x11/lesstif/patches/patch-af b/x11/lesstif/patches/patch-af
index d42cf4d7799..a5c8e622e96 100644
--- a/x11/lesstif/patches/patch-af
+++ b/x11/lesstif/patches/patch-af
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Sat Mar 20 19:17:06 1999
-+++ Makefile.in	Sat Mar 20 19:17:34 1999
-@@ -118,7 +118,7 @@
+--- Makefile.in.orig	Wed Apr 21 17:23:34 1999
++++ Makefile.in	Wed Apr 21 17:23:55 1999
+@@ -122,7 +122,7 @@
  # Lets put the informational stuff in a sub directory to avoid 
  # poluting /usr/local for default installs.
  #
diff --git a/x11/lesstif/patches/patch-ag b/x11/lesstif/patches/patch-ag
index 42d10d9820c..a84297d3c93 100644
--- a/x11/lesstif/patches/patch-ag
+++ b/x11/lesstif/patches/patch-ag
@@ -1,6 +1,6 @@
---- doc/www.lesstif.org/images/Makefile.in.orig	Sat Mar 20 19:18:29 1999
-+++ doc/www.lesstif.org/images/Makefile.in	Sat Mar 20 19:18:57 1999
-@@ -116,7 +116,7 @@
+--- doc/www.lesstif.org/images/Makefile.in.orig	Wed Apr 21 17:26:04 1999
++++ doc/www.lesstif.org/images/Makefile.in	Wed Apr 21 17:26:23 1999
+@@ -120,7 +120,7 @@
  # Lets put the informational stuff in a sub directory to avoid 
  # poluting /usr/local for default installs.
  #
diff --git a/x11/lesstif/patches/patch-ah b/x11/lesstif/patches/patch-ah
index dd7ae2e5f69..9752318761c 100644
--- a/x11/lesstif/patches/patch-ah
+++ b/x11/lesstif/patches/patch-ah
@@ -1,6 +1,6 @@
---- doc/Makefile.in.orig	Sat Mar 20 19:20:18 1999
-+++ doc/Makefile.in	Sat Mar 20 19:20:33 1999
-@@ -112,7 +112,7 @@
+--- doc/Makefile.in.orig	Wed Apr 21 17:27:19 1999
++++ doc/Makefile.in	Wed Apr 21 17:27:34 1999
+@@ -116,7 +116,7 @@
  
  SUBDIRS = www.lesstif.org lessdox
  
diff --git a/x11/lesstif/patches/patch-ai b/x11/lesstif/patches/patch-ai
index aae7ecaa08d..c13e344c0d1 100644
--- a/x11/lesstif/patches/patch-ai
+++ b/x11/lesstif/patches/patch-ai
@@ -1,6 +1,6 @@
---- doc/lessdox/clients/Makefile.in.orig	Sat Mar 20 19:24:14 1999
-+++ doc/lessdox/clients/Makefile.in	Sat Mar 20 19:29:32 1999
-@@ -110,10 +110,10 @@
+--- doc/lessdox/clients/Makefile.in.orig	Wed Apr 21 17:28:27 1999
++++ doc/lessdox/clients/Makefile.in	Wed Apr 21 17:29:52 1999
+@@ -114,10 +114,10 @@
  EXTRA_DIST = $(man1_DATA) $(man3_DATA) $(man5_DATA)
  SUFFIXES = .1 .3 .5 .html
  
@@ -8,14 +8,14 @@
 -man1dir = $(exec_prefix)/LessTif/doc/man/man1
 -man3dir = $(exec_prefix)/LessTif/doc/man/man3
 -man5dir = $(exec_prefix)/LessTif/doc/man/man5
-+mandir=			@mandir@
-+man1dir=	$(mandir)/man1
-+man3dir=	$(mandir)/man3
-+man5dir=	$(mandir)/man5
++mandir =			@mandir@
++man1dir =	$(mandir)/man1
++man3dir =	$(mandir)/man3
++man5dir =	$(mandir)/man5
  
  man1_DATA = mwm.1 xmbind.1 lesstif.1
  man3_DATA = 
-@@ -128,7 +128,7 @@
+@@ -132,7 +132,7 @@
  # build them.
  #
  
diff --git a/x11/lesstif/patches/patch-aj b/x11/lesstif/patches/patch-aj
index 2c04534f98a..5ff22d8f2e5 100644
--- a/x11/lesstif/patches/patch-aj
+++ b/x11/lesstif/patches/patch-aj
@@ -1,6 +1,6 @@
---- doc/www.lesstif.org/Makefile.in.orig	Sat Mar 20 19:30:59 1999
-+++ doc/www.lesstif.org/Makefile.in	Sat Mar 20 19:31:28 1999
-@@ -117,7 +117,7 @@
+--- doc/www.lesstif.org/Makefile.in.orig	Wed Apr 21 17:30:53 1999
++++ doc/www.lesstif.org/Makefile.in	Wed Apr 21 17:31:08 1999
+@@ -121,7 +121,7 @@
  # Lets put the informational stuff in a sub directory to avoid 
  # poluting /usr/local for default installs.
  #
@@ -8,4 +8,4 @@
 +rootdir = $(pkgdatadir)/doc/html
  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
  
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ 
diff --git a/x11/lesstif/patches/patch-ak b/x11/lesstif/patches/patch-ak
index 05a233689c8..cdbcfea611b 100644
--- a/x11/lesstif/patches/patch-ak
+++ b/x11/lesstif/patches/patch-ak
@@ -1,6 +1,6 @@
---- lib/Makefile.in.orig	Sat Mar 20 19:32:42 1999
-+++ lib/Makefile.in	Sat Mar 20 19:35:08 1999
-@@ -108,7 +108,7 @@
+--- lib/Makefile.in.orig	Wed Apr 21 17:31:48 1999
++++ lib/Makefile.in	Wed Apr 21 17:32:17 1999
+@@ -112,7 +112,7 @@
  x_libraries = @x_libraries@
  
  MAINTAINERCLEANFILES = Makefile.in
diff --git a/x11/lesstif/patches/patch-al b/x11/lesstif/patches/patch-al
index ef08167b108..4511a868f51 100644
--- a/x11/lesstif/patches/patch-al
+++ b/x11/lesstif/patches/patch-al
@@ -1,6 +1,6 @@
---- doc/lessdox/functions/Makefile.in.orig	Tue Apr 13 22:12:26 1999
-+++ doc/lessdox/functions/Makefile.in	Tue Apr 13 22:21:07 1999
-@@ -110,10 +110,10 @@
+--- doc/lessdox/functions/Makefile.in.orig	Wed Apr 21 17:33:04 1999
++++ doc/lessdox/functions/Makefile.in	Wed Apr 21 17:34:41 1999
+@@ -114,10 +114,10 @@
  EXTRA_DIST =  $(man1_DATA) $(man3_DATA) $(man5_DATA)
  SUFFIXES = .1 .3 .5 .html
  
@@ -8,14 +8,14 @@
 -man1dir = $(exec_prefix)/LessTif/doc/man/man1
 -man3dir = $(exec_prefix)/LessTif/doc/man/man3
 -man5dir = $(exec_prefix)/LessTif/doc/man/man5
-+mandir =		@mandir@
++mandir =			@mandir@
 +man1dir =	$(mandir)/man1
 +man3dir =	$(mandir)/man3
 +man5dir =	$(mandir)/man5
  
  man1_DATA = 
  man3_DATA =  	XtConfigureObject.3 XtDestroyWidget.3         XtManageChild.3 XtUnmanageChild.3
-@@ -129,7 +129,7 @@
+@@ -133,7 +133,7 @@
  # build them.
  #
  
diff --git a/x11/lesstif/pkg/PLIST b/x11/lesstif/pkg/PLIST
index edb7a2f6941..4a48a845358 100644
--- a/x11/lesstif/pkg/PLIST
+++ b/x11/lesstif/pkg/PLIST
@@ -9,13 +9,13 @@ lib/X11/mwm/system.mwmrc
 lib/X11/mwm/alt.map
 lib/X11/mwm/README
 lib/libXm.so.1.2
-lib/libXm.so.1
 lib/libXm.so
 lib/libXm.la
+lib/libXm.a
 lib/libMrm.so.1.2
-lib/libMrm.so.1
 lib/libMrm.so
 lib/libMrm.la
+lib/libMrm.a
 @exec /sbin/ldconfig -m %B
 include/Xm
 include/Mrm
@@ -77,7 +77,6 @@ man/man3/XmText.3
 man/man3/XmTextField.3
 man/man3/XmToggleButton.3
 man/man3/XmToggleButtonGadget.3
-man/man3/XmVendorShellExt.3
 man/man3/XmWorld.3
 man/man3/XtConfigureObject.3
 man/man3/XtDestroyWidget.3
@@ -371,7 +370,7 @@ LessTif/Motif2.0/include/Mrm/MrmAppl.h
 LessTif/Motif2.0/include/Mrm/MrmDecls.h
 LessTif/Motif2.0/include/Mrm/MrmPrivate.h
 LessTif/Motif2.0/include/Mrm/MrmPublic.h
-LessTif/LessTif
+LessTif/FAQ
 share/LessTif/doc/html/images/hungry.gif
 share/LessTif/doc/html/images/lesstif-realsmall.gif
 share/LessTif/doc/html/images/lesstif-small.gif
diff --git a/x11/lesstif/pkg/PLIST.noshared b/x11/lesstif/pkg/PLIST.noshared
index 6dc2c6f9c83..08410b80824 100644
--- a/x11/lesstif/pkg/PLIST.noshared
+++ b/x11/lesstif/pkg/PLIST.noshared
@@ -9,7 +9,9 @@ lib/X11/mwm/system.mwmrc
 lib/X11/mwm/alt.map
 lib/X11/mwm/README
 lib/libXm.la
+lib/libXm.a
 lib/libMrm.la
+lib/libMrm.a
 include/Xm
 include/Mrm
 man/man1/mwm.1
@@ -70,7 +72,6 @@ man/man3/XmText.3
 man/man3/XmTextField.3
 man/man3/XmToggleButton.3
 man/man3/XmToggleButtonGadget.3
-man/man3/XmVendorShellExt.3
 man/man3/XmWorld.3
 man/man3/XtConfigureObject.3
 man/man3/XtDestroyWidget.3
@@ -362,7 +363,7 @@ LessTif/Motif2.0/include/Mrm/MrmAppl.h
 LessTif/Motif2.0/include/Mrm/MrmDecls.h
 LessTif/Motif2.0/include/Mrm/MrmPrivate.h
 LessTif/Motif2.0/include/Mrm/MrmPublic.h
-LessTif/LessTif
+LessTif/FAQ
 share/LessTif/doc/html/images/hungry.gif
 share/LessTif/doc/html/images/lesstif-realsmall.gif
 share/LessTif/doc/html/images/lesstif-small.gif