Defuzz patches.

6 files changed, 49 insertions, 49 deletions

diff --git a/x11/lesstif/files/patch-sum b/x11/lesstif/files/patch-sum
index b57cc8028d0..ba3a7e9150f 100644
--- a/x11/lesstif/files/patch-sum
+++ b/x11/lesstif/files/patch-sum
@@ -1,19 +1,19 @@
-$NetBSD: patch-sum,v 1.11 2000/05/25 15:25:44 drochner Exp $
+$NetBSD: patch-sum,v 1.12 2000/05/30 07:38:53 tron Exp $
 
 MD5 (patch-aa) = dc3d7561b3f2518bd207d776abfa5cfe
 MD5 (patch-ab) = b1bd93fae6d1c4aaef8d28689a6129f9
-MD5 (patch-ac) = 14477942b7ec6c1024aeb28229ef0cfe
+MD5 (patch-ac) = 03c65526b4eec511b33011be4fdef0b6
 MD5 (patch-ad) = 7ada1aa00d303437903143dd9e03b859
-MD5 (patch-ae) = 5f7a08d39acc997de946666cedd113f0
-MD5 (patch-af) = 54f138e42f607259f204181e2e2da5b7
-MD5 (patch-ag) = f6825d19e47cedfc76104772120ef74b
+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-ao) = 6be234eeb43fd43b72708909eb3272bc
+MD5 (patch-ao) = 2bba3851ec2d27a67eecf40ef787404c
 MD5 (patch-ap) = a3d430fe3d5bf982e3109425ed80f3af
 MD5 (patch-aq) = e070fc7ffcc1538753ced9a45ede4735
 MD5 (patch-ar) = e768c238af22b0d47d0a9a103c527719
diff --git a/x11/lesstif/patches/patch-ac b/x11/lesstif/patches/patch-ac
index 343589e62a0..8c585371b4d 100644
--- a/x11/lesstif/patches/patch-ac
+++ b/x11/lesstif/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.7 2000/04/27 13:14:50 tron Exp $
+$NetBSD: patch-ac,v 1.8 2000/05/30 07:38:54 tron Exp $
 
---- configure.orig	Sat Apr 15 16:40:00 2000
-+++ configure	Thu Apr 27 13:17:47 2000
-@@ -1551,6 +1551,7 @@
+--- configure.orig	Mon May 15 02:49:27 2000
++++ configure	Tue May 30 09:14:23 2000
+@@ -2151,6 +2151,7 @@
  fi
  
  
@@ -10,7 +10,7 @@ $NetBSD: patch-ac,v 1.7 2000/04/27 13:14:50 tron Exp $
  # 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"
-@@ -1708,6 +1709,7 @@
+@@ -2321,6 +2322,7 @@
  # Redirect the config.log output again, so that the ltconfig log is not
  # clobbered by the next message.
  exec 5>>./config.log
@@ -18,7 +18,7 @@ $NetBSD: patch-ac,v 1.7 2000/04/27 13:14:50 tron Exp $
  
  
  if (aclocal --print-ac-dir) </dev/null >/dev/null 2>&1 && test -w `aclocal --print-ac-dir`; then
-@@ -2321,6 +2323,7 @@
+@@ -2905,6 +2907,7 @@
  echo "$ac_t""$debug_flag $conversions_flag $verbose_flag $production_flag" 1>&6
  
  
@@ -26,7 +26,7 @@ $NetBSD: patch-ac,v 1.7 2000/04/27 13:14:50 tron Exp $
  if ${CONFIG_SHELL-/bin/sh} ./libtool --features | grep "enable shared" > /dev/null 2>&1; then
  	lt_libtool_shared="yes"
  fi
-@@ -2348,6 +2351,7 @@
+@@ -2932,6 +2935,7 @@
    LibtoolStatic_TRUE='#'
    LibtoolStatic_FALSE=
  fi
@@ -34,7 +34,7 @@ $NetBSD: patch-ac,v 1.7 2000/04/27 13:14:50 tron Exp $
  
  
  # Extract the first word of "ar", so it can be a program name with args.
-@@ -5595,10 +5599,12 @@
+@@ -6252,10 +6256,12 @@
      top_srcdir="$ac_dots$ac_given_srcdir" ;;
    esac
  
@@ -47,7 +47,7 @@ $NetBSD: patch-ac,v 1.7 2000/04/27 13:14:50 tron Exp $
  
    echo creating "$ac_file"
    rm -f "$ac_file"
-@@ -5819,10 +5825,12 @@
+@@ -6476,10 +6482,12 @@
        *) # Relative path.
          ac_sub_cache_file="$ac_dots$cache_file" ;;
        esac
@@ -58,5 +58,5 @@ $NetBSD: patch-ac,v 1.7 2000/04/27 13:14:50 tron Exp $
          esac
 +  fi
  
-       echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
+       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.
diff --git a/x11/lesstif/patches/patch-ae b/x11/lesstif/patches/patch-ae
index 9e3577e29fc..f84868524f9 100644
--- a/x11/lesstif/patches/patch-ae
+++ b/x11/lesstif/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.11 2000/04/27 13:14:50 tron Exp $
+$NetBSD: patch-ae,v 1.12 2000/05/30 07:38:54 tron Exp $
 
---- doc/lessdox/clients/Makefile.in.orig	Sat Apr 15 16:39:12 2000
-+++ doc/lessdox/clients/Makefile.in	Thu Apr 27 12:31:22 2000
-@@ -119,10 +119,10 @@
+--- 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 @@
  EXTRA_DIST = $(man1_DATA) $(man3_DATA) $(man5_DATA)
  SUFFIXES = .1 .3 .5 .html
  
@@ -17,16 +17,16 @@ $NetBSD: patch-ae,v 1.11 2000/04/27 13:14:50 tron Exp $
  
  man1_DATA = mwm.1 xmbind.1 lesstif.1 xbae.1 xlt.1
  man3_DATA = 
-@@ -137,7 +137,7 @@
+@@ -139,7 +139,7 @@
  # build them.
  #
  
 -htmldir = $(exec_prefix)/LessTif/doc/html
 +htmldir = $(exec_prefix)/share/doc/lesstif/html
  
- @HaveMan2html_TRUE@html_DATA = mwm.html mwmrc.html xmbind.html lesstif.html xlt.html xbae.html
- 
-@@ -274,7 +274,7 @@
+ @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
  
diff --git a/x11/lesstif/patches/patch-af b/x11/lesstif/patches/patch-af
index 85d4882596c..6529c8524c0 100644
--- a/x11/lesstif/patches/patch-af
+++ b/x11/lesstif/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.9 2000/04/27 13:14:51 tron Exp $
+$NetBSD: patch-af,v 1.10 2000/05/30 07:38:54 tron Exp $
 
---- doc/lessdox/functions/Makefile.in.orig	Sat Apr 15 16:39:13 2000
-+++ doc/lessdox/functions/Makefile.in	Thu Apr 27 12:51:29 2000
-@@ -119,10 +119,10 @@
+--- 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
  
@@ -17,16 +17,16 @@ $NetBSD: patch-af,v 1.9 2000/04/27 13:14:51 tron Exp $
  
  man1_DATA = 
  man3_DATA = 
-@@ -137,7 +137,7 @@
+@@ -139,7 +139,7 @@
  # build them.
  #
  
 -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}
- 
-@@ -274,7 +274,7 @@
+ @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
  
diff --git a/x11/lesstif/patches/patch-ag b/x11/lesstif/patches/patch-ag
index c28401d7158..924ba35eb84 100644
--- a/x11/lesstif/patches/patch-ag
+++ b/x11/lesstif/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.8 2000/04/27 13:14:51 tron Exp $
+$NetBSD: patch-ag,v 1.9 2000/05/30 07:38:54 tron Exp $
 
---- doc/lessdox/widgets/Makefile.in.orig	Sat Apr 15 16:39:12 2000
-+++ doc/lessdox/widgets/Makefile.in	Thu Apr 27 12:53:59 2000
-@@ -119,10 +119,10 @@
+--- 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
  
@@ -16,17 +16,17 @@ $NetBSD: patch-ag,v 1.8 2000/04/27 13:14:51 tron Exp $
 +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
-@@ -147,7 +147,7 @@
+ man3_DATA = \
+@@ -170,7 +170,7 @@
  # build them.
  #
  
 -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}
- 
-@@ -284,10 +284,9 @@
+ @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
  
diff --git a/x11/lesstif/patches/patch-ao b/x11/lesstif/patches/patch-ao
index 86de284a7db..f6e4452e9fd 100644
--- a/x11/lesstif/patches/patch-ao
+++ b/x11/lesstif/patches/patch-ao
@@ -1,8 +1,8 @@
-$NetBSD: patch-ao,v 1.4 2000/04/27 13:14:54 tron Exp $
+$NetBSD: patch-ao,v 1.5 2000/05/30 07:38:54 tron Exp $
 
---- lib/Xlt/configure.orig	Sat Apr 15 16:39:57 2000
-+++ lib/Xlt/configure	Thu Apr 27 13:27:55 2000
-@@ -1197,7 +1197,7 @@
+--- lib/Xlt/configure.orig	Mon May 15 02:47:21 2000
++++ lib/Xlt/configure	Tue May 30 09:35:32 2000
+@@ -560,7 +560,7 @@
  
  
  ac_aux_dir=
@@ -11,19 +11,19 @@ $NetBSD: patch-ao,v 1.4 2000/04/27 13:14:54 tron Exp $
    if test -f $ac_dir/install-sh; then
      ac_aux_dir=$ac_dir
      ac_install_sh="$ac_aux_dir/install-sh -c"
-@@ -2316,6 +2316,7 @@
- 
+@@ -2871,6 +2871,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"
-@@ -2473,6 +2474,7 @@
+@@ -3041,6 +3042,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:2479: checking whether to enable maintainer-specific portions of Makefiles" >&5
+ echo "configure:3047: checking whether to enable maintainer-specific portions of Makefiles" >&5