Add new category wm for window managers, and move lots of package from

x11 here. Only changes are: `wm' in category added and some paths fixed.

7 files changed, 353 insertions, 0 deletions

diff --git a/wm/fvwm95/patches/patch-aa b/wm/fvwm95/patches/patch-aa
new file mode 100644
index 00000000000..0982c64d222
--- /dev/null
+++ b/wm/fvwm95/patches/patch-aa
@@ -0,0 +1,28 @@
+$NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $
+
+--- 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/wm/fvwm95/patches/patch-ab b/wm/fvwm95/patches/patch-ab
new file mode 100644
index 00000000000..99a62af3f84
--- /dev/null
+++ b/wm/fvwm95/patches/patch-ab
@@ -0,0 +1,18 @@
+$NetBSD: patch-ab,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $
+
+--- modules/FvwmForm/FvwmForm.c.orig	Sat Feb  1 14:02:05 1997
++++ modules/FvwmForm/FvwmForm.c	Sat Feb  1 14:03:13 1997
+@@ -16,7 +16,13 @@
+ #include <X11/cursorfont.h>
+ #define XK_MISCELLANY
+ #include <X11/keysymdef.h>
++
++#ifdef __FreeBSD__
++#include <stdlib.h>
++#else
+ #include <malloc.h>
++#endif
++
+ #include <string.h>
+ #include <sys/types.h>
+ #include <sys/time.h>
diff --git a/wm/fvwm95/patches/patch-ac b/wm/fvwm95/patches/patch-ac
new file mode 100644
index 00000000000..5ea9675bf1b
--- /dev/null
+++ b/wm/fvwm95/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $
+
+--- utils/Makefile.in.orig	Sat Feb  1 14:14:12 1997
++++ utils/Makefile.in	Sat Feb  1 14:15:12 1997
+@@ -12,7 +12,7 @@
+ fvwm_dir=${prefix}/lib/X11/${fvwm_name}
+ 
+ INSTALL=@INSTALL@
+-INSTALL_PROGRAM=@INSTALL_PROGRAM@
++INSTALL_PROGRAM=@INSTALL@ -m 555
+ RM=@RM@
+ 
+ SCRIPTS=fvwmrc_convert quantize_pixmaps
diff --git a/wm/fvwm95/patches/patch-ad b/wm/fvwm95/patches/patch-ad
new file mode 100644
index 00000000000..fca075dc5f5
--- /dev/null
+++ b/wm/fvwm95/patches/patch-ad
@@ -0,0 +1,239 @@
+$NetBSD: patch-ad,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $
+
+--- 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" \
+   "&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/wm/fvwm95/patches/patch-ae b/wm/fvwm95/patches/patch-ae
new file mode 100644
index 00000000000..a9bdfb4eda0
--- /dev/null
+++ b/wm/fvwm95/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $
+
+--- modules/FvwmTaskBar/Goodies.h.orig	Sun Aug  3 13:00:30 1997
++++ modules/FvwmTaskBar/Goodies.h	Sun Aug  3 13:00:09 1997
+@@ -1,4 +1,8 @@
++#ifdef __FreeBSD__
++#define DEFAULT_MAIL_PATH  "/var/mail/"
++#else
+ #define DEFAULT_MAIL_PATH  "/var/spool/mail/"
++#endif
+ #define DEFAULT_BELL_VOLUME 20
+ 
+ /* Tip window types */
diff --git a/wm/fvwm95/patches/patch-af b/wm/fvwm95/patches/patch-af
new file mode 100644
index 00000000000..8c6f60465e0
--- /dev/null
+++ b/wm/fvwm95/patches/patch-af
@@ -0,0 +1,29 @@
+$NetBSD: patch-af,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $
+
+--- configure.orig	Wed Dec 11 03:55:16 1996
++++ configure	Tue Jan 11 10:23:21 2000
+@@ -2126,7 +2126,7 @@
+ fvwm_icons="$x_includes/X11/bitmaps:$x_includes/X11/pixmaps:$prefix/icons"
+ 
+ if test "x$x_libraries" != x ; then
+-  x_libraries="-L$x_libraries"
++  x_libraries="-L$x_libraries -Wl,-R$x_libraries"
+ fi
+ if test "x$x_includes" != x ; then
+   x_includes="-I$x_includes"
+@@ -2247,7 +2247,6 @@
+           libs/Makefile \
+           mini-icons/Makefile \
+           utils/Makefile \
+-          xpmroot/Makefile \
+           sample.fvwmrc/Makefile \
+           modules/Makefile \
+           modules/FvwmAudio/Makefile \
+@@ -2329,7 +2328,6 @@
+           libs/Makefile \
+           mini-icons/Makefile \
+           utils/Makefile \
+-          xpmroot/Makefile \
+           sample.fvwmrc/Makefile \
+           modules/Makefile \
+           modules/FvwmAudio/Makefile \
diff --git a/wm/fvwm95/patches/patch-ag b/wm/fvwm95/patches/patch-ag
new file mode 100644
index 00000000000..e5b2bc4b575
--- /dev/null
+++ b/wm/fvwm95/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $
+
+--- Makefile.in.orig	Wed Jun 26 02:26:47 1996
++++ Makefile.in	Tue Jan 11 10:04:41 2000
+@@ -10,7 +10,7 @@
+ 
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+-subdirs=libs fvwm modules utils sample.fvwmrc xpmroot icons mini-icons
++subdirs=libs fvwm modules utils sample.fvwmrc icons mini-icons
+ 
+ CFLAGS = -O
+