2 files changed, 384 insertions, 245 deletions

diff --git a/x11-wm/fvwm95/files/patch-aa b/x11-wm/fvwm95/files/patch-aa
index a4df0f298e31..19ade04157e5 100644
--- a/x11-wm/fvwm95/files/patch-aa
+++ b/x11-wm/fvwm95/files/patch-aa
@@ -1,25 +1,38 @@
---- modules/FvwmAudio/Makefile.in.orig	Sat Feb  1 13:23:37 1997
-+++ modules/FvwmAudio/Makefile.in	Sat Feb  1 13:23:23 1997
-@@ -10,6 +10,8 @@
- bin_dir=@exec_prefix@/bin
- x_includes=@x_includes@
- x_libraries=@x_libraries@
-+libdir=@libdir@
-+includedir=@includedir@
- fvwm_icons=@fvwm_icons@
- fvwm_rc=@fvwm_rc@
- fvwm_name=@fvwm_name@
-@@ -24,11 +26,11 @@
- XEXT_LIBRARY=-lXext
- FVWM_LIBRARY=-l${fvwm_name}
- RPLAY_LIBRARY=-lrplay
--LIBS=-L${top_srcdir}/libs ${x_libraries} ${FVWM_LIBRARY} ${XPM_LIBRARY} ${XEXT_LIBRARY} ${X_LIBRARY} ${RPLAY_LIBRARY}
-+LIBS=-L${top_srcdir}/libs ${x_libraries} ${FVWM_LIBRARY} ${XPM_LIBRARY} ${XEXT_LIBRARY} ${X_LIBRARY} -L${libdir} ${RPLAY_LIBRARY}
- 
- EXTRA_DEFINES=-DXPM -DSHAPE
- CC=@CC@
--INCLUDES=-I${top_srcdir}/include ${x_includes}
-+INCLUDES=-I${top_srcdir}/include ${x_includes} ${includedir}
- CFLAGS=${INCLUDES} @CFLAGS@ ${EXTRA_DEFINES} 
- MAKEDEPEND=@MAKEDEPEND@
- INSTALL=@INSTALL@
+*** modules/FvwmAudio/Makefile.in.orig	Tue Sep 10 22:25:33 1996
+--- modules/FvwmAudio/Makefile.in	Fri Jun 13 21:11:07 1997
+***************
+*** 10,15 ****
+--- 10,17 ----
+  bin_dir=@exec_prefix@/bin
+  x_includes=@x_includes@
+  x_libraries=@x_libraries@
++ libdir=@libdir@
++ includedir=@includedir@
+  fvwm_icons=@fvwm_icons@
+  fvwm_rc=@fvwm_rc@
+  fvwm_name=@fvwm_name@
+***************
+*** 24,34 ****
+  XEXT_LIBRARY=-lXext
+  FVWM_LIBRARY=-l${fvwm_name}
+  RPLAY_LIBRARY=-lrplay
+! LIBS=-L${top_srcdir}/libs ${x_libraries} ${FVWM_LIBRARY} ${XPM_LIBRARY} ${XEXT_LIBRARY} ${X_LIBRARY} ${RPLAY_LIBRARY}
+  
+! EXTRA_DEFINES=-DXPM -DSHAPE
+  CC=@CC@
+! INCLUDES=-I${top_srcdir}/include ${x_includes}
+  CFLAGS=${INCLUDES} @CFLAGS@ ${EXTRA_DEFINES} 
+  MAKEDEPEND=@MAKEDEPEND@
+  INSTALL=@INSTALL@
+--- 26,36 ----
+  XEXT_LIBRARY=-lXext
+  FVWM_LIBRARY=-l${fvwm_name}
+  RPLAY_LIBRARY=-lrplay
+! LIBS=-L${top_srcdir}/libs ${x_libraries} ${FVWM_LIBRARY} ${XPM_LIBRARY} ${XEXT_LIBRARY} ${X_LIBRARY} -L${libdir} ${RPLAY_LIBRARY}
+  
+! EXTRA_DEFINES=-DXPM -DSHAPE -DHAVE_RPLAY
+  CC=@CC@
+! INCLUDES=-I${top_srcdir}/include ${x_includes} ${includedir}
+  CFLAGS=${INCLUDES} @CFLAGS@ ${EXTRA_DEFINES} 
+  MAKEDEPEND=@MAKEDEPEND@
+  INSTALL=@INSTALL@
diff --git a/x11-wm/fvwm95/files/patch-ad b/x11-wm/fvwm95/files/patch-ad
index 7f380ce034be..22bceb741158 100644
--- a/x11-wm/fvwm95/files/patch-ad
+++ b/x11-wm/fvwm95/files/patch-ad
@@ -1,220 +1,346 @@
---- sample.fvwmrc/system.fvwm95rc.orig	Wed Dec 11 21:24:54 1996
-+++ sample.fvwmrc/system.fvwm95rc	Mon Jun  9 21:34:45 1997
-@@ -90,8 +90,8 @@
- # Paths are a colon-separated list, just like regular unix PATH
- #
- ModulePath /usr/X11R6/lib/X11/fvwm95/:/usr/local/lib/X11/fvwm95/
--PixmapPath /usr/include/X11/pixmaps/:/usr/local/mini-icons/
--IconPath   /usr/include/X11/bitmaps/:/usr/local/icons/
-+PixmapPath /usr/include/X11/pixmaps/:/usr/X11R6/icons/
-+IconPath   /usr/include/X11/bitmaps/:/usr/X11R6/icons/
- 
- #========================================================================#
- 
-@@ -173,7 +173,7 @@
- + "I"	Module FvwmTaskBar
- # uncomment the followin line to enable auto-raise with mouse focus:
- #+ "I"  Module FvwmAuto 500
--#+ "I"	Exec xv -root -quit /usr/local/icons/bckgnd3.xpm &
-+#+ "I"	Exec xv -root -quit /usr/X11R6/icons/bckgnd3.xpm &
- #+ "I"	Module FvwmButtons MiniButtons
- #+ "I"	Module FvwmBanner
- #+ "I"	Module FvwmPager 0 3
-@@ -269,7 +269,7 @@
- #--------- Taskbar's start menu
- 
- DestroyMenu "StartMenu"
--AddToMenu "StartMenu@linux-menu.xpm@^#808080^" \
-+AddToMenu "StartMenu@freebsd3-menu.xpm@^#808080^" \
-   "&Programs%programs.xpm%"	Popup Programs
- + "&Documents%documents.xpm%"	Popup Documents
- + "&Settings%settings.xpm%"	Popup Settings
-@@ -303,12 +303,12 @@
- DestroyMenu "Accessories"
- AddToMenu "Accessories" \
-   "View Running processes%mini-run.xpm%" Exec xterm -font 7x14 \
--                                              -bg \#c0c0c0 -fg black \
--                                              -T Top -n Top -e top & 
-+						-bg \#c0c0c0 -fg black \
-+						-T Top -n Top -e top & 
- + "Control processes%mini-hex.xpm%"	Exec tkps &
--+ "Hifs%mini-eyes.xpm%"			Exec xterm -ls -bg \#c0c0c0 -fg black \
--                                                   -T Hifs -name Hifs -geometry 26x24 \
--                                                   -e hifs &
-++ "Hifs%mini-eyes.xpm%"			Exec xterm -ls -bg \#c0c0c0 \
-+						-fg black -T Hifs -name Hifs \
-+						-geometry 26x24 -e hifs &
- + "System load%mini-perf.xpm%"		Exec xload &
- + "Memory usage%mini-perf.xpm%"		Exec xmem &
- + "Calculator%mini-calc.xpm%"		Exec xcalc &
-@@ -368,8 +368,12 @@
- DestroyMenu "Internet"
- AddToMenu "Internet" \
-   "Netscape%mini-nscape.xpm%"	Exec netscape -geometry 790x543+0+0 &
--+ "Mail (Pine)%mini-mail.xpm%"	Exec color_xterm -name Mail -T Mail -ls -fn 8x13 -e pine -i &
--+ "NcFTP%mini-ftp.xpm%"		Exec color_xterm -name NcFtp -T FTP -ls -fn 8x13 -e ncftp &
-++ "Mail (Pine)%mini-mail.xpm%"	Exec xterm +cm -tn xterm-color \
-+						-name Mail -T Mail \
-+						-ls -fn 8x13 -e pine -i &
-++ "NcFTP%mini-ftp.xpm%"		Exec xterm +cm -tn xterm-color \
-+						-name NcFtp -T FTP \
-+						-ls -fn 8x13 -e ncftp &
- 
- #--------- Editors
- 
-@@ -393,13 +397,13 @@
- 
- DestroyMenu "SciApps"
- AddToMenu "SciApps" \
--  "IDL%mini-zoom.xpm%"		Exec xterm -T "IDL prompt" -name IDL \
--                                           -font "-*-lucidatypewriter-medium-r-*-*-12-*" \
--                                           -e xterm_idl &
-+  "IDL%mini-zoom.xpm%"	Exec xterm -T "IDL prompt" -name IDL \
-+				-font "-*-lucidatypewriter-medium-r-*-*-12-*" \
-+				-e xterm_idl &
- + "IDL tool%mini-zoom.xpm%"	Exec xidl &
--+ "GNU plot%mini-zoom.xpm%"	Exec xterm -T "GNU plot" -name GNUplot \
--                                           -font "-*-lucidatypewriter-medium-r-*-*-12-*" \
--                                           -e gnuplot &
-++ "GNU plot%mini-zoom.xpm%" Exec xterm -T "GNU plot" -name GNUplot \
-+				-font "-*-lucidatypewriter-medium-r-*-*-12-*" \
-+				-e gnuplot &
- 
- #--------- File managers
- 
-@@ -414,21 +418,25 @@
- DestroyMenu "Shells"
- AddToMenu "Shells" \
-   "Xterm	(7x14 font)%mini-term.xpm%"	Exec xterm -sb -sl 500 \
--                                                     -j -ls -fn 7x14 &
-+							-j -ls -fn 7x14 &
- + "Color Rxvt	(VT100)%mini-term.xpm%"		Exec rxvt -font 7x14 -ls &
--+ "Color Xterm	(7x14 font)%mini-term.xpm%"	Exec color_xterm -sb -sl 500 \
--                                                     -j -ls -fn 7x14 \
--                                                     -fb 7x14bold \
--                                                     -title "Color xterm" &
--+ "Color Xterm	(8x13 font)%mini-term.xpm%"	Exec color_xterm -sb -sl 500 \
--                                                     -j -ls -fn 8x13 \
--                                                     -title "Color xterm" &
-++ "Color Xterm	(7x14 font)%mini-term.xpm%"	Exec xterm +cm -tn xterm-color \
-+							-sb -sl 500 \
-+							-j -ls -fn 7x14 \
-+							-fb 7x14bold \
-+							-title "Color xterm" &
-++ "Color Xterm	(8x13 font)%mini-term.xpm%"	Exec xterm +cm -tn xterm-color \
-+							-sb -sl 500 \
-+							-j -ls -fn 8x13 \
-+							-title "Color xterm" &
- + ""					    	Nop
- + "Large Xterm	(10x20 font)%mini-term.xpm%"	Exec xterm -sb -sl 500 \
--                                                     -j -ls -fn 10x20 &
-+							-j -ls -fn 10x20 &
- + "Large Rxvt	(10x20 font)%mini-term.xpm%"	Exec rxvt -font 10x20 -ls &
--+ "Large Color Xterm	(10x20 font)%mini-term.xpm%" Exec color_xterm -sb \
--                                                -sl 500 -j -ls -fn 10x20 &
-++ "Large Color Xterm	(10x20 font)%mini-term.xpm%" Exec xterm \
-+							+cm -tn xterm-color
-+							-sb -sl 500 \
-+							-j -ls -fn 10x20 &
- 
- #--------- Modules
- 
-@@ -561,16 +569,17 @@
- DestroyMenu "Utilities"
- AddToMenu "Utilities@utilities-menu.xpm@^white^" \
-   "Running processes%mini-run.xpm%"	Exec xterm -font 7x14 \
--                                             -bg \#c0c0c0 -fg black \
--                                             -T Top -n Top -e top & 
-+						-bg \#c0c0c0 -fg black \
-+						-T Top -n Top -e top & 
- + "Calculator%mini-calc.xpm%"		Exec xcalc &
- + "Manual pages%mini-book1.xpm%" 	Exec xman &
- + "Magnifying glass%mini-zoom.xpm%" 	Exec xmag &
- + "Oclock%mini-clock.xpm%" 		Exec oclock &
- + "Fvwm95 Explorer%mini-ofolder.xpm%"	Exec explorer &
--+ "Xterm%mini-term.xpm%" 		Exec color_xterm -sb -sl 500 -j \
--                                             -ls -fn 8x13 \
--                                             -title "Color xterm" &
-++ "Xterm%mini-term.xpm%" 		Exec xterm +cm -tn xterm-color \
-+						-sb -sl 500 -j \
-+						-ls -fn 8x13 \
-+						-title "Color xterm" &
- + ""					Nop
- + "Modules%mini-modules.xpm%"		Popup Module-Popup
- + ""					Nop
-@@ -754,26 +763,27 @@
- # Define the buttons to use.....
- 
- *FvwmButtons(Title xclock, \
--             Swallow(UseOld) "xclock" 'Exec xclock -bg \#c0c0c0 \
--             -padding 0 -geometry -1500-1500 &')
-+		Swallow(UseOld) "xclock" 'Exec xclock -bg \#c0c0c0 \
-+			-padding 0 -geometry -1500-1500 &')
- *FvwmButtons(2x1, Title load, \
--             Swallow(UseOld) "xload" 'Exec xload \
--                     -nolabel -bg grey60 -update 5 -geometry -1500-1500 &')
-+		Swallow(UseOld) "xload" 'Exec xload \
-+			-nolabel -bg grey60 -update 5 -geometry -1500-1500 &')
- *FvwmButtons(Title xterm, Icon rterm.xpm, \
--             Action 'Exec "XTerm" color_xterm \
--                     -ls -sb -fn 8x13 -title "Color xterm" &')
-+		Action 'Exec "XTerm" xterm \
-+			+cm -tn xterm-color \
-+			-ls -sb -fn 8x13 -title "Color xterm" &')
- *FvwmButtons(Title xfm, Icon Xfm.xpm, \
--             Action 'Exec "Xfm" xfm -title "File Manager" &') 
-+		Action 'Exec "Xfm" xfm -title "File Manager" &') 
- *FvwmButtons(Title textedit, Icon textedit.xpm, \
--             Action 'Exec "Textedit" textedit &')
-+		Action 'Exec "Textedit" textedit &')
- *FvwmButtons(Title xcalc, Icon rcalc.xpm, \
--             Action 'Exec "Calculator" xcalc &')
-+		Action 'Exec "Calculator" xcalc &')
- *FvwmButtons(Title xview, Icon xview.xpm, \
--             Action 'Exec "xv" xv &')
-+		Action 'Exec "xv" xv &')
- *FvwmButtons(Title gview, Icon gv.xpm, \
--             Action 'Exec "ghostview" ghostview &')
-+		Action 'Exec "ghostview" ghostview &')
- *FvwmButtons(Title netscape, Icon nscape.xpm, \
--             Action 'Exec "Netscape" netscape -geometry 920x622+90+5 &')
-+		Action 'Exec "Netscape" netscape -geometry 920x622+90+5 &')
- *FvwmButtons(Title kill, Icon rbomb.xpm, Action Destroy)
- *FvwmButtons(2x1, Swallow(UseOld) "Desktop" 'FvwmPager 0 0')
- 
-@@ -788,13 +798,17 @@
- *MiniButtonsRows 1
- *MiniButtonsPadding 1 1
- 
--*MiniButtons -   mini-term.xpm        Exec    "XTerm" color_xterm -ls -sb -fn 8x13 -title "Color xterm" &
--*MiniButtons -   mini-filemgr.xpm     Exec    "Xfm" xfm -title "File Manager" & 
--*MiniButtons -   mini-edit.xpm        Exec  "Textedit" textedit -En 32 &
--*MiniButtons -   mini-calc.xpm        Exec    "Calculator" xcalc &
--*MiniButtons -   mini-xv.xpm          Exec    "xv" xv &
--*MiniButtons -   mini-gv.xpm          Exec    "ghostview" ghostview &
--*MiniButtons -   mini-nscape.xpm      Exec    "Netscape" netscape -geometry 790x543+0+0 &
-+*MiniButtons -   mini-term.xpm        Exec "XTerm" xterm \
-+						+cm -tn xterm-color \
-+						-ls -sb -fn 8x13 \
-+						-title "Color xterm" &
-+*MiniButtons -   mini-filemgr.xpm     Exec "Xfm" xfm -title "File Manager" & 
-+*MiniButtons -   mini-edit.xpm        Exec "Textedit" textedit -En 32 &
-+*MiniButtons -   mini-calc.xpm        Exec "Calculator" xcalc &
-+*MiniButtons -   mini-xv.xpm          Exec "xv" xv &
-+*MiniButtons -   mini-gv.xpm          Exec "ghostview" ghostview &
-+*MiniButtons -   mini-nscape.xpm      Exec "Netscape" netscape \
-+						-geometry 790x543+0+0 &
- #*MiniButtons -   mini-bomb.xpm        Destroy
- 
- #------------------ Identify
-@@ -837,7 +851,9 @@
- #*FvwmTaskBarShowTransients
- #*FvwmTaskBarClockFormat %I:%M%p
- #*FvwmTaskBarHighlightFocus
--*FvwmTaskBarMailCommand Exec color_xterm -name Mail -T mail -ls -fn 8x13 -e pine -i 
-+*FvwmTaskBarMailCommand Exec xterm \
-+				+cm -tn xterm-color \
-+				-name Mail -T mail -ls -fn 8x13 -e pine -i 
- #*FvwmTaskBarAutoHide
- *FvwmTaskBarDeskOnly
- 
+*** sample.fvwmrc/system.fvwm95rc.orig	Wed Dec 11 23:24:54 1996
+--- sample.fvwmrc/system.fvwm95rc	Fri Jun 13 21:19:49 1997
+***************
+*** 90,97 ****
+  # Paths are a colon-separated list, just like regular unix PATH
+  #
+  ModulePath /usr/X11R6/lib/X11/fvwm95/:/usr/local/lib/X11/fvwm95/
+! PixmapPath /usr/include/X11/pixmaps/:/usr/local/mini-icons/
+! IconPath   /usr/include/X11/bitmaps/:/usr/local/icons/
+  
+  #========================================================================#
+  
+--- 90,97 ----
+  # Paths are a colon-separated list, just like regular unix PATH
+  #
+  ModulePath /usr/X11R6/lib/X11/fvwm95/:/usr/local/lib/X11/fvwm95/
+! PixmapPath /usr/include/X11/pixmaps/:/usr/X11R6/icons/
+! IconPath   /usr/include/X11/bitmaps/:/usr/X11R6/icons/
+  
+  #========================================================================#
+  
+***************
+*** 173,179 ****
+  + "I"	Module FvwmTaskBar
+  # uncomment the followin line to enable auto-raise with mouse focus:
+  #+ "I"  Module FvwmAuto 500
+! #+ "I"	Exec xv -root -quit /usr/local/icons/bckgnd3.xpm &
+  #+ "I"	Module FvwmButtons MiniButtons
+  #+ "I"	Module FvwmBanner
+  #+ "I"	Module FvwmPager 0 3
+--- 173,179 ----
+  + "I"	Module FvwmTaskBar
+  # uncomment the followin line to enable auto-raise with mouse focus:
+  #+ "I"  Module FvwmAuto 500
+! #+ "I"	Exec xv -root -quit /usr/X11R6/icons/bckgnd3.xpm &
+  #+ "I"	Module FvwmButtons MiniButtons
+  #+ "I"	Module FvwmBanner
+  #+ "I"	Module FvwmPager 0 3
+***************
+*** 269,275 ****
+  #--------- Taskbar's start menu
+  
+  DestroyMenu "StartMenu"
+! AddToMenu "StartMenu@linux-menu.xpm@^#808080^" \
+    "&Programs%programs.xpm%"	Popup Programs
+  + "&Documents%documents.xpm%"	Popup Documents
+  + "&Settings%settings.xpm%"	Popup Settings
+--- 269,275 ----
+  #--------- Taskbar's start menu
+  
+  DestroyMenu "StartMenu"
+! AddToMenu "StartMenu@freebsd3-menu.xpm@^#808080^" \
+    "&Programs%programs.xpm%"	Popup Programs
+  + "&Documents%documents.xpm%"	Popup Documents
+  + "&Settings%settings.xpm%"	Popup Settings
+***************
+*** 303,314 ****
+  DestroyMenu "Accessories"
+  AddToMenu "Accessories" \
+    "View Running processes%mini-run.xpm%" Exec xterm -font 7x14 \
+!                                               -bg \#c0c0c0 -fg black \
+!                                               -T Top -n Top -e top & 
+  + "Control processes%mini-hex.xpm%"	Exec tkps &
+! + "Hifs%mini-eyes.xpm%"			Exec xterm -ls -bg \#c0c0c0 -fg black \
+!                                                    -T Hifs -name Hifs -geometry 26x24 \
+!                                                    -e hifs &
+  + "System load%mini-perf.xpm%"		Exec xload &
+  + "Memory usage%mini-perf.xpm%"		Exec xmem &
+  + "Calculator%mini-calc.xpm%"		Exec xcalc &
+--- 303,314 ----
+  DestroyMenu "Accessories"
+  AddToMenu "Accessories" \
+    "View Running processes%mini-run.xpm%" Exec xterm -font 7x14 \
+! 						-bg \#c0c0c0 -fg black \
+! 						-T Top -n Top -e top & 
+  + "Control processes%mini-hex.xpm%"	Exec tkps &
+! + "Hifs%mini-eyes.xpm%"			Exec xterm -ls -bg \#c0c0c0 \
+! 						-fg black -T Hifs -name Hifs \
+! 						-geometry 26x24 -e hifs &
+  + "System load%mini-perf.xpm%"		Exec xload &
+  + "Memory usage%mini-perf.xpm%"		Exec xmem &
+  + "Calculator%mini-calc.xpm%"		Exec xcalc &
+***************
+*** 368,375 ****
+  DestroyMenu "Internet"
+  AddToMenu "Internet" \
+    "Netscape%mini-nscape.xpm%"	Exec netscape -geometry 790x543+0+0 &
+! + "Mail (Pine)%mini-mail.xpm%"	Exec color_xterm -name Mail -T Mail -ls -fn 8x13 -e pine -i &
+! + "NcFTP%mini-ftp.xpm%"		Exec color_xterm -name NcFtp -T FTP -ls -fn 8x13 -e ncftp &
+  
+  #--------- Editors
+  
+--- 368,379 ----
+  DestroyMenu "Internet"
+  AddToMenu "Internet" \
+    "Netscape%mini-nscape.xpm%"	Exec netscape -geometry 790x543+0+0 &
+! + "Mail (Pine)%mini-mail.xpm%"	Exec xterm +cm -tn xterm-color \
+! 						-name Mail -T Mail \
+! 						-ls -fn 8x13 -e pine -i &
+! + "NcFTP%mini-ftp.xpm%"		Exec xterm +cm -tn xterm-color \
+! 						-name NcFtp -T FTP \
+! 						-ls -fn 8x13 -e ncftp &
+  
+  #--------- Editors
+  
+***************
+*** 393,405 ****
+  
+  DestroyMenu "SciApps"
+  AddToMenu "SciApps" \
+!   "IDL%mini-zoom.xpm%"		Exec xterm -T "IDL prompt" -name IDL \
+!                                            -font "-*-lucidatypewriter-medium-r-*-*-12-*" \
+!                                            -e xterm_idl &
+  + "IDL tool%mini-zoom.xpm%"	Exec xidl &
+! + "GNU plot%mini-zoom.xpm%"	Exec xterm -T "GNU plot" -name GNUplot \
+!                                            -font "-*-lucidatypewriter-medium-r-*-*-12-*" \
+!                                            -e gnuplot &
+  
+  #--------- File managers
+  
+--- 397,409 ----
+  
+  DestroyMenu "SciApps"
+  AddToMenu "SciApps" \
+!   "IDL%mini-zoom.xpm%"	Exec xterm -T "IDL prompt" -name IDL \
+! 				-font "-*-lucidatypewriter-medium-r-*-*-12-*" \
+! 				-e xterm_idl &
+  + "IDL tool%mini-zoom.xpm%"	Exec xidl &
+! + "GNU plot%mini-zoom.xpm%" Exec xterm -T "GNU plot" -name GNUplot \
+! 				-font "-*-lucidatypewriter-medium-r-*-*-12-*" \
+! 				-e gnuplot &
+  
+  #--------- File managers
+  
+***************
+*** 414,434 ****
+  DestroyMenu "Shells"
+  AddToMenu "Shells" \
+    "Xterm	(7x14 font)%mini-term.xpm%"	Exec xterm -sb -sl 500 \
+!                                                      -j -ls -fn 7x14 &
+  + "Color Rxvt	(VT100)%mini-term.xpm%"		Exec rxvt -font 7x14 -ls &
+! + "Color Xterm	(7x14 font)%mini-term.xpm%"	Exec color_xterm -sb -sl 500 \
+!                                                      -j -ls -fn 7x14 \
+!                                                      -fb 7x14bold \
+!                                                      -title "Color xterm" &
+! + "Color Xterm	(8x13 font)%mini-term.xpm%"	Exec color_xterm -sb -sl 500 \
+!                                                      -j -ls -fn 8x13 \
+!                                                      -title "Color xterm" &
+  + ""					    	Nop
+  + "Large Xterm	(10x20 font)%mini-term.xpm%"	Exec xterm -sb -sl 500 \
+!                                                      -j -ls -fn 10x20 &
+  + "Large Rxvt	(10x20 font)%mini-term.xpm%"	Exec rxvt -font 10x20 -ls &
+! + "Large Color Xterm	(10x20 font)%mini-term.xpm%" Exec color_xterm -sb \
+!                                                 -sl 500 -j -ls -fn 10x20 &
+  
+  #--------- Modules
+  
+--- 418,442 ----
+  DestroyMenu "Shells"
+  AddToMenu "Shells" \
+    "Xterm	(7x14 font)%mini-term.xpm%"	Exec xterm -sb -sl 500 \
+! 							-j -ls -fn 7x14 &
+  + "Color Rxvt	(VT100)%mini-term.xpm%"		Exec rxvt -font 7x14 -ls &
+! + "Color Xterm	(7x14 font)%mini-term.xpm%"	Exec xterm +cm -tn xterm-color \
+! 							-sb -sl 500 \
+! 							-j -ls -fn 7x14 \
+! 							-fb 7x14bold \
+! 							-title "Color xterm" &
+! + "Color Xterm	(8x13 font)%mini-term.xpm%"	Exec xterm +cm -tn xterm-color \
+! 							-sb -sl 500 \
+! 							-j -ls -fn 8x13 \
+! 							-title "Color xterm" &
+  + ""					    	Nop
+  + "Large Xterm	(10x20 font)%mini-term.xpm%"	Exec xterm -sb -sl 500 \
+! 							-j -ls -fn 10x20 &
+  + "Large Rxvt	(10x20 font)%mini-term.xpm%"	Exec rxvt -font 10x20 -ls &
+! + "Large Color Xterm	(10x20 font)%mini-term.xpm%" Exec xterm \
+! 							+cm -tn xterm-color
+! 							-sb -sl 500 \
+! 							-j -ls -fn 10x20 &
+  
+  #--------- Modules
+  
+***************
+*** 561,576 ****
+  DestroyMenu "Utilities"
+  AddToMenu "Utilities@utilities-menu.xpm@^white^" \
+    "Running processes%mini-run.xpm%"	Exec xterm -font 7x14 \
+!                                              -bg \#c0c0c0 -fg black \
+!                                              -T Top -n Top -e top & 
+  + "Calculator%mini-calc.xpm%"		Exec xcalc &
+  + "Manual pages%mini-book1.xpm%" 	Exec xman &
+  + "Magnifying glass%mini-zoom.xpm%" 	Exec xmag &
+  + "Oclock%mini-clock.xpm%" 		Exec oclock &
+  + "Fvwm95 Explorer%mini-ofolder.xpm%"	Exec explorer &
+! + "Xterm%mini-term.xpm%" 		Exec color_xterm -sb -sl 500 -j \
+!                                              -ls -fn 8x13 \
+!                                              -title "Color xterm" &
+  + ""					Nop
+  + "Modules%mini-modules.xpm%"		Popup Module-Popup
+  + ""					Nop
+--- 569,585 ----
+  DestroyMenu "Utilities"
+  AddToMenu "Utilities@utilities-menu.xpm@^white^" \
+    "Running processes%mini-run.xpm%"	Exec xterm -font 7x14 \
+! 						-bg \#c0c0c0 -fg black \
+! 						-T Top -n Top -e top & 
+  + "Calculator%mini-calc.xpm%"		Exec xcalc &
+  + "Manual pages%mini-book1.xpm%" 	Exec xman &
+  + "Magnifying glass%mini-zoom.xpm%" 	Exec xmag &
+  + "Oclock%mini-clock.xpm%" 		Exec oclock &
+  + "Fvwm95 Explorer%mini-ofolder.xpm%"	Exec explorer &
+! + "Xterm%mini-term.xpm%" 		Exec xterm +cm -tn xterm-color \
+! 						-sb -sl 500 -j \
+! 						-ls -fn 8x13 \
+! 						-title "Color xterm" &
+  + ""					Nop
+  + "Modules%mini-modules.xpm%"		Popup Module-Popup
+  + ""					Nop
+***************
+*** 754,779 ****
+  # Define the buttons to use.....
+  
+  *FvwmButtons(Title xclock, \
+!              Swallow(UseOld) "xclock" 'Exec xclock -bg \#c0c0c0 \
+!              -padding 0 -geometry -1500-1500 &')
+  *FvwmButtons(2x1, Title load, \
+!              Swallow(UseOld) "xload" 'Exec xload \
+!                      -nolabel -bg grey60 -update 5 -geometry -1500-1500 &')
+  *FvwmButtons(Title xterm, Icon rterm.xpm, \
+!              Action 'Exec "XTerm" color_xterm \
+!                      -ls -sb -fn 8x13 -title "Color xterm" &')
+  *FvwmButtons(Title xfm, Icon Xfm.xpm, \
+!              Action 'Exec "Xfm" xfm -title "File Manager" &') 
+  *FvwmButtons(Title textedit, Icon textedit.xpm, \
+!              Action 'Exec "Textedit" textedit &')
+  *FvwmButtons(Title xcalc, Icon rcalc.xpm, \
+!              Action 'Exec "Calculator" xcalc &')
+  *FvwmButtons(Title xview, Icon xview.xpm, \
+!              Action 'Exec "xv" xv &')
+  *FvwmButtons(Title gview, Icon gv.xpm, \
+!              Action 'Exec "ghostview" ghostview &')
+  *FvwmButtons(Title netscape, Icon nscape.xpm, \
+!              Action 'Exec "Netscape" netscape -geometry 920x622+90+5 &')
+  *FvwmButtons(Title kill, Icon rbomb.xpm, Action Destroy)
+  *FvwmButtons(2x1, Swallow(UseOld) "Desktop" 'FvwmPager 0 0')
+  
+--- 763,789 ----
+  # Define the buttons to use.....
+  
+  *FvwmButtons(Title xclock, \
+! 		Swallow(UseOld) "xclock" 'Exec xclock -bg \#c0c0c0 \
+! 			-padding 0 -geometry -1500-1500 &')
+  *FvwmButtons(2x1, Title load, \
+! 		Swallow(UseOld) "xload" 'Exec xload \
+! 			-nolabel -bg grey60 -update 5 -geometry -1500-1500 &')
+  *FvwmButtons(Title xterm, Icon rterm.xpm, \
+! 		Action 'Exec "XTerm" xterm \
+! 			+cm -tn xterm-color \
+! 			-ls -sb -fn 8x13 -title "Color xterm" &')
+  *FvwmButtons(Title xfm, Icon Xfm.xpm, \
+! 		Action 'Exec "Xfm" xfm -title "File Manager" &') 
+  *FvwmButtons(Title textedit, Icon textedit.xpm, \
+! 		Action 'Exec "Textedit" textedit &')
+  *FvwmButtons(Title xcalc, Icon rcalc.xpm, \
+! 		Action 'Exec "Calculator" xcalc &')
+  *FvwmButtons(Title xview, Icon xview.xpm, \
+! 		Action 'Exec "xv" xv &')
+  *FvwmButtons(Title gview, Icon gv.xpm, \
+! 		Action 'Exec "ghostview" ghostview &')
+  *FvwmButtons(Title netscape, Icon nscape.xpm, \
+! 		Action 'Exec "Netscape" netscape -geometry 920x622+90+5 &')
+  *FvwmButtons(Title kill, Icon rbomb.xpm, Action Destroy)
+  *FvwmButtons(2x1, Swallow(UseOld) "Desktop" 'FvwmPager 0 0')
+  
+***************
+*** 788,800 ****
+  *MiniButtonsRows 1
+  *MiniButtonsPadding 1 1
+  
+! *MiniButtons -   mini-term.xpm        Exec    "XTerm" color_xterm -ls -sb -fn 8x13 -title "Color xterm" &
+! *MiniButtons -   mini-filemgr.xpm     Exec    "Xfm" xfm -title "File Manager" & 
+! *MiniButtons -   mini-edit.xpm        Exec  "Textedit" textedit -En 32 &
+! *MiniButtons -   mini-calc.xpm        Exec    "Calculator" xcalc &
+! *MiniButtons -   mini-xv.xpm          Exec    "xv" xv &
+! *MiniButtons -   mini-gv.xpm          Exec    "ghostview" ghostview &
+! *MiniButtons -   mini-nscape.xpm      Exec    "Netscape" netscape -geometry 790x543+0+0 &
+  #*MiniButtons -   mini-bomb.xpm        Destroy
+  
+  #------------------ Identify
+--- 798,814 ----
+  *MiniButtonsRows 1
+  *MiniButtonsPadding 1 1
+  
+! *MiniButtons -   mini-term.xpm        Exec "XTerm" xterm \
+! 						+cm -tn xterm-color \
+! 						-ls -sb -fn 8x13 \
+! 						-title "Color xterm" &
+! *MiniButtons -   mini-filemgr.xpm     Exec "Xfm" xfm -title "File Manager" & 
+! *MiniButtons -   mini-edit.xpm        Exec "Textedit" textedit -En 32 &
+! *MiniButtons -   mini-calc.xpm        Exec "Calculator" xcalc &
+! *MiniButtons -   mini-xv.xpm          Exec "xv" xv &
+! *MiniButtons -   mini-gv.xpm          Exec "ghostview" ghostview &
+! *MiniButtons -   mini-nscape.xpm      Exec "Netscape" netscape \
+! 						-geometry 790x543+0+0 &
+  #*MiniButtons -   mini-bomb.xpm        Destroy
+  
+  #------------------ Identify
+***************
+*** 837,843 ****
+  #*FvwmTaskBarShowTransients
+  #*FvwmTaskBarClockFormat %I:%M%p
+  #*FvwmTaskBarHighlightFocus
+! *FvwmTaskBarMailCommand Exec color_xterm -name Mail -T mail -ls -fn 8x13 -e pine -i 
+  #*FvwmTaskBarAutoHide
+  *FvwmTaskBarDeskOnly
+  
+--- 851,859 ----
+  #*FvwmTaskBarShowTransients
+  #*FvwmTaskBarClockFormat %I:%M%p
+  #*FvwmTaskBarHighlightFocus
+! *FvwmTaskBarMailCommand Exec xterm \
+! 				+cm -tn xterm-color \
+! 				-name Mail -T mail -ls -fn 8x13 -e pine -i 
+  #*FvwmTaskBarAutoHide
+  *FvwmTaskBarDeskOnly
+  
+***************
+*** 845,847 ****
+--- 861,876 ----
+  
+  *FvwmConfigFore Black
+  *FvwmConfigBack #c0c0c0
++ 
++ *FvwmAudioPlayCmd builtin-rplay
++ #*FvwmAudioDir /usr/lib/sounds
++ #*FvwmAudio startup Cheers.au
++ #*FvwmAudio shutdown Goodbye.au
++ #*FvwmAudio unknown doh.au
++ #*FvwmAudio add_window drip.au
++ #*FvwmAudio raise_window beep_pure_saw.au
++ #*FvwmAudio lower_window beep_pure_saw.au
++ #*FvwmAudio focus_change tap2.au
++ #*FvwmAudio destroy_window beep_drop_of_water.au
++ #*FvwmAudio iconify ploop.au
++ #*FvwmAudio deiconify beep_kind_warning.au