unify patches; don't patch file twice.

4 files changed, 268 insertions, 403 deletions

diff --git a/x11/fvwm95/files/patch-sum b/x11/fvwm95/files/patch-sum
index 63a5cb3c2d5..c229df527c3 100644
--- a/x11/fvwm95/files/patch-sum
+++ b/x11/fvwm95/files/patch-sum
@@ -1,10 +1,9 @@
-$NetBSD: patch-sum,v 1.2 2000/01/11 01:09:30 simonb Exp $
+$NetBSD: patch-sum,v 1.3 2000/07/20 23:45:35 wiz Exp $
 
-MD5 (patch-aa) = b8f12cac4d1f41a7b7ae864f3d2b6837
+MD5 (patch-aa) = 19b0e5b9a3cb07f7980cf178bf7aa5d7
 MD5 (patch-ab) = ba019151ac941271f02f4e1718b3bf8a
 MD5 (patch-ac) = 354c9e9be13feaf915d7df485201076d
-MD5 (patch-ad) = 206ea7c2ba3d1d35baaa1c3bfd51a60c
+MD5 (patch-ad) = a2a6d9684d8b8688609f648d55f7c2f4
 MD5 (patch-ae) = 1a69966ecca0a7c45c8639f1508f48f6
 MD5 (patch-af) = e71b425d6d14288ed2bb6f6bcb31924f
 MD5 (patch-ag) = 47bbe8f121632cd7c9ed6312f51f2ec0
-MD5 (patch-ah) = 1e7fabec7b9f60fa2cb41bb161b4b1e6
diff --git a/x11/fvwm95/patches/patch-aa b/x11/fvwm95/patches/patch-aa
index 82c4699811a..40ebd4a1236 100644
--- a/x11/fvwm95/patches/patch-aa
+++ b/x11/fvwm95/patches/patch-aa
@@ -1,40 +1,28 @@
-$NetBSD: patch-aa,v 1.2 1998/08/07 11:18:03 agc Exp $
+$NetBSD: patch-aa,v 1.3 2000/07/20 23:45:37 wiz Exp $
 
-*** modules/FvwmAudio/Makefile.in.orig	Tue Sep 10 22:25:33 1996
---- modules/FvwmAudio/Makefile.in	Fri Jun 13 21:41:10 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} -I${includedir}
-  CFLAGS=${INCLUDES} @CFLAGS@ ${EXTRA_DEFINES} 
-  MAKEDEPEND=@MAKEDEPEND@
-  INSTALL=@INSTALL@
+--- modules/FvwmAudio/Makefile.in.orig	Fri Jul 21 01:28:12 2000
++++ modules/FvwmAudio/Makefile.in	Fri Jul 21 01:29:31 2000
+@@ -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} -Wl,-R${libdir} ${RPLAY_LIBRARY}
+ 
+-EXTRA_DEFINES=-DXPM -DSHAPE
++EXTRA_DEFINES=-DXPM -DSHAPE -DHAVE_RPLAY
+ CC=@CC@
+-INCLUDES=-I${top_srcdir}/include ${x_includes}
++INCLUDES=-I${top_srcdir}/include ${x_includes} -I${includedir}
+ CFLAGS=${INCLUDES} @CFLAGS@ ${EXTRA_DEFINES} 
+ MAKEDEPEND=@MAKEDEPEND@
+ INSTALL=@INSTALL@
diff --git a/x11/fvwm95/patches/patch-ad b/x11/fvwm95/patches/patch-ad
index ea472d04d3b..12f0b0e642f 100644
--- a/x11/fvwm95/patches/patch-ad
+++ b/x11/fvwm95/patches/patch-ad
@@ -1,348 +1,239 @@
-$NetBSD: patch-ad,v 1.2 1998/08/07 11:18:04 agc Exp $
+$NetBSD: patch-ad,v 1.3 2000/07/20 23:45:37 wiz Exp $
 
-*** sample.fvwmrc/system.fvwm95rc.orig	Wed Dec 11 23:24:54 1996
---- sample.fvwmrc/system.fvwm95rc	Sun Jun 15 04:08:00 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
+--- sample.fvwmrc/system.fvwm95rc.orig	Wed Dec 11 21:24:54 1996
++++ sample.fvwmrc/system.fvwm95rc	Fri Jul 21 01:29:30 2000
+@@ -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
+ 
+@@ -845,3 +861,16 @@
+ 
+ *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
diff --git a/x11/fvwm95/patches/patch-ah b/x11/fvwm95/patches/patch-ah
deleted file mode 100644
index 631567c97b6..00000000000
--- a/x11/fvwm95/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2000/01/11 01:08:25 simonb Exp $
-
---- modules/FvwmAudio/Makefile.in.orig	Tue Jan 11 10:27:14 2000
-+++ modules/FvwmAudio/Makefile.in	Tue Jan 11 11:55:19 2000
-@@ -26,7 +26,7 @@
- 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}
-+LIBS=-L${top_srcdir}/libs ${x_libraries} ${FVWM_LIBRARY} ${XPM_LIBRARY} ${XEXT_LIBRARY} ${X_LIBRARY} -L${libdir} -Wl,-R${libdir} ${RPLAY_LIBRARY}
- 
- EXTRA_DEFINES=-DXPM -DSHAPE -DHAVE_RPLAY
- CC=@CC@