From 700569ed2bf5c89de4c590e80c193d8f410e9be4 Mon Sep 17 00:00:00 2001
From: asami <asami@FreeBSD.org>
Date: Tue, 3 Jun 1997 08:09:43 +0000
Subject: Update to 0.7.1.

PR:		3708
Submitted by:	Nakai@Mlab.t.u-tokyo.ac.jp
---
 x11-wm/mlvwm/files/patch-aa | 43 ++++++++++++++++++++--------------------
 x11-wm/mlvwm/files/patch-ab | 48 ++++++++++++++-------------------------------
 x11-wm/mlvwm/files/patch-ac | 19 ++++++++++++++++++
 3 files changed, 55 insertions(+), 55 deletions(-)
 create mode 100644 x11-wm/mlvwm/files/patch-ac

(limited to 'x11-wm/mlvwm/files')

diff --git a/x11-wm/mlvwm/files/patch-aa b/x11-wm/mlvwm/files/patch-aa
index 843c5290af8c..01f781fa53b6 100644
--- a/x11-wm/mlvwm/files/patch-aa
+++ b/x11-wm/mlvwm/files/patch-aa
@@ -1,22 +1,21 @@
---- configure.h.orig	Fri Dec 27 09:17:07 1996
-+++ configure.h	Sun Feb 16 23:15:49 1997
-@@ -17,8 +17,8 @@
- 
- XCOMM The directory name of bindir and libdir.
- 
--#define MlvwmBinDir /usr/local/X11R6/bin
--#define MlvwmLibDirk /usr/local/X11R6/lib/X11/mlvwm
-+#define MlvwmBinDir /usr/X11R6/bin
-+#define MlvwmLibDir /usr/X11R6/lib/X11/mlvwm
- 
- XCOMM
- XCOMM Cannot modify as follows:
-@@ -71,7 +71,7 @@
- XCOMM     DEBUG_OPTIONS =  -D_DEBUG_
- XCOMM       CDEBUGFLAGS = -g -Wall -Wshadow
- XCOMM            CDEBUGFLAGS = -O2 -Wall
--            CDEBUGFLAGS = -g -Wall
-+            CDEBUGFLAGS = -pipe -O2
- 
- MLVWMDEFINES = $(CDEBUGFLAGS) $(Locale_DEFINES)
- MLVWMLIBRARIES = $(Locale_LIBRARIES)
+*** configure.h.orig	Sun May 25 18:23:55 1997
+--- configure.h	Sun May 25 18:25:07 1997
+***************
+*** 17,24 ****
+  
+  XCOMM The directory name of bindir and libdir.
+  
+! #define MlvwmBinDir /home/tak/bin
+! XCOMM #define MlvwmLibDir /home2/tak/bin/mlvwm-lib
+  
+  XCOMM
+  XCOMM Cannot modify as follows:
+--- 17,24 ----
+  
+  XCOMM The directory name of bindir and libdir.
+  
+! #define MlvwmBinDir /usr/X11R6/bin
+! #define MlvwmLibDir /usr/X11R6/lib/X11/mlvwm
+  
+  XCOMM
+  XCOMM Cannot modify as follows:
diff --git a/x11-wm/mlvwm/files/patch-ab b/x11-wm/mlvwm/files/patch-ab
index c2cbc9afdebd..ef9cc0dfb37e 100644
--- a/x11-wm/mlvwm/files/patch-ab
+++ b/x11-wm/mlvwm/files/patch-ab
@@ -1,56 +1,38 @@
-*** sample_rc/Mlvwmrc.orig	Mon Jan 20 00:19:09 1997
---- sample_rc/Mlvwmrc	Mon Jan 20 00:21:26 1997
+*** sample_rc/Mlvwmrc.orig	Thu Apr 10 23:17:40 1997
+--- sample_rc/Mlvwmrc	Sun May 25 19:11:32 1997
 ***************
-*** 14,32 ****
+*** 20,26 ****
   DoubleClickTime 300
   
   # Set icon search path. It needs before "Style".
 ! IconPath /usr/local/include/X11/pixmaps:/home2/tak/bin/pixmap
   IconMenuIcon label2.xpm
   
-  # Window decoration
-  Style
-- "*" MiniIcon mini-cross.xpm, MaxmizeScale 90
-- "KTerm" MaxmizeScale 100, MiniIcon mini-term.xpm
-- "Netscape" MiniIcon mini-nscape.xpm
-- "Emacs" MiniIcon mini-edit.xpm
-- "xv" MiniIcon mini-xv.xpm, EnableScroll
-- "XCalc" MiniIcon mini-calc.xpm
-- "Xarchie" MiniIcon mini.xarchie.xpm
-- "Xmag" MiniIcon mini.xmag.xpm
-  "XMeter" NoSBarH, NoSBarV, NoResizeR, NoMinMaxR, NoTitle, NoCloseR
-  "XMeter" NoWinList, Sticky, SkipSelect
-  "*biff" NoSBarH, NoSBarV, NoResizeR, NoMinMaxR, NoWinList, NoCloseR
---- 14,24 ----
+  # Font Settings(without LOCALE)
+--- 20,26 ----
   DoubleClickTime 300
   
   # Set icon search path. It needs before "Style".
-! IconPath /usr/X11R6/lib/X11/mlvwm/pixmap
+! IconPath /usr/X11R6/lib/X11/mlvwm/pixmap:/home2/tak/bin/pixmap
   IconMenuIcon label2.xpm
   
-  # Window decoration
-  Style
-  "XMeter" NoSBarH, NoSBarV, NoResizeR, NoMinMaxR, NoTitle, NoCloseR
-  "XMeter" NoWinList, Sticky, SkipSelect
-  "*biff" NoSBarH, NoSBarV, NoResizeR, NoMinMaxR, NoWinList, NoCloseR
+  # Font Settings(without LOCALE)
 ***************
-*** 47,55 ****
-  Menu "Apple" Icon label1.xpm
+*** 44,51 ****
+  Menu Apple, Icon label1.xpm, Stick
   "About this Workstation..." NonSelect, Gray, Action About
   "" NonSelect
 ! "Terminal"	Icon mini-display.xpm, Action Exec "kterm" exec kterm -ls
 ! "Editor"  Action Exec "mule" exec mule, Icon mini-edit.xpm
-! "calculator" Action Exec "xcal" exec xcalc, Icon mini-calc.xpm
+  "calculator" Action Exec "xcal" exec xcalc, Icon mini-calc.xpm
   END
   
-  Menu "File" Left
---- 39,47 ----
-  Menu "Apple" Icon label1.xpm
+--- 44,51 ----
+  Menu Apple, Icon label1.xpm, Stick
   "About this Workstation..." NonSelect, Gray, Action About
   "" NonSelect
-! "Terminal"	Action Exec "xterm" exec xterm -ls
-! "Editor"  Action Exec "emacs" exec emacs
-! "calculator" Action Exec "xcal" exec xcalc
+! "Terminal"	Icon mini-display.xpm, Action Exec "xterm" exec xterm -ls
+! "Editor"  Action Exec "emacs" exec emacs, Icon mini-edit.xpm
+  "calculator" Action Exec "xcal" exec xcalc, Icon mini-calc.xpm
   END
   
-  Menu "File" Left
diff --git a/x11-wm/mlvwm/files/patch-ac b/x11-wm/mlvwm/files/patch-ac
new file mode 100644
index 000000000000..4186c4657ac0
--- /dev/null
+++ b/x11-wm/mlvwm/files/patch-ac
@@ -0,0 +1,19 @@
+*** sample_rc/Mlvwmrc-j.orig	Sun May 25 18:48:05 1997
+--- sample_rc/Mlvwmrc-j	Sun May 25 18:48:32 1997
+***************
+*** 13,19 ****
+  DoubleClickTime 300
+  
+  # IconPath の指定。Style の指定の前に必要
+! IconPath /usr/local/include/X11/pixmaps:/home2/tak/bin/pixmap
+  IconMenuIcon label2.xpm
+  
+  # Font 設定(LOCALE設定ありのサンプル)
+--- 13,19 ----
+  DoubleClickTime 300
+  
+  # IconPath の指定。Style の指定の前に必要
+! IconPath /usr/X11R6/lib/X11/mlvwm/pixmaps:/home2/tak/bin/pixmap
+  IconMenuIcon label2.xpm
+  
+  # Font 設定(LOCALE設定ありのサンプル)
-- 
cgit