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.

13 files changed, 653 insertions, 0 deletions

diff --git a/wm/fvwm95/Makefile b/wm/fvwm95/Makefile
new file mode 100644
index 00000000000..c732961694a
--- /dev/null
+++ b/wm/fvwm95/Makefile
@@ -0,0 +1,26 @@
+# $NetBSD: Makefile,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $
+# FreeBSD: Makefile,v 1.17 1997/12/24 01:21:18 alex Exp
+#
+
+DISTNAME=	fvwm95-2.0.43a-Autoconf
+PKGNAME=	fvwm95-2.0.43a
+CATEGORIES=	x11 wm
+MASTER_SITES=	ftp://mitac11.uia.ac.be/pub/fvwm95/
+EXTRACT_SUFX=	.tgz
+
+MAINTAINER=	packages@netbsd.org
+HOMEPAGE=	ftp://mitac11.uia.ac.be/html-test/fvwm95.html
+
+DEPENDS+=	rplay-3.*:../../audio/rplay
+DEPENDS+=	xpmroot-2.*:../../x11/xpmroot
+
+USE_X11BASE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS= --includedir=${LOCALBASE}/include \
+		--libdir=${LOCALBASE}/lib
+
+post-install:
+		@${INSTALL_MAN}	${WRKSRC}/fvwm/fvwm95.man \
+			${PREFIX}/man/man1/fvwm95.1
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/wm/fvwm95/files/md5 b/wm/fvwm95/files/md5
new file mode 100644
index 00000000000..4465260ab00
--- /dev/null
+++ b/wm/fvwm95/files/md5
@@ -0,0 +1,3 @@
+$NetBSD: md5,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $
+
+MD5 (fvwm95-2.0.43a-Autoconf.tgz) = 6dd2d55de04b74ac7ad1d64202e7c9bf
diff --git a/wm/fvwm95/files/patch-sum b/wm/fvwm95/files/patch-sum
new file mode 100644
index 00000000000..dd2e89fd033
--- /dev/null
+++ b/wm/fvwm95/files/patch-sum
@@ -0,0 +1,9 @@
+$NetBSD: patch-sum,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $
+
+MD5 (patch-aa) = 19b0e5b9a3cb07f7980cf178bf7aa5d7
+MD5 (patch-ab) = ba019151ac941271f02f4e1718b3bf8a
+MD5 (patch-ac) = 354c9e9be13feaf915d7df485201076d
+MD5 (patch-ad) = 59d5607de3faa1421c8794d0a506abbb
+MD5 (patch-ae) = 1a69966ecca0a7c45c8639f1508f48f6
+MD5 (patch-af) = e71b425d6d14288ed2bb6f6bcb31924f
+MD5 (patch-ag) = 47bbe8f121632cd7c9ed6312f51f2ec0
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
+ 
diff --git a/wm/fvwm95/pkg/COMMENT b/wm/fvwm95/pkg/COMMENT
new file mode 100644
index 00000000000..11d22d488b5
--- /dev/null
+++ b/wm/fvwm95/pkg/COMMENT
@@ -0,0 +1 @@
+Win95 lookalike version of the fvwm2 window manager
diff --git a/wm/fvwm95/pkg/DESCR b/wm/fvwm95/pkg/DESCR
new file mode 100644
index 00000000000..bf34c985f6e
--- /dev/null
+++ b/wm/fvwm95/pkg/DESCR
@@ -0,0 +1,16 @@
+Fvwm95 is a hack based on fvwm2.x. It tries to emulate the good
+features of a well known product without bloating the regular 
+fvwm code. The main aspects are: 
+
+A familiar look and feel. It can be interesting for users moving
+from the MS-World to Unix, or for those who have to switch 
+regularly between the two.
+
+Or for those that simply would like to have the same MS look and feel 
+in Unix, or for those that just want to have another window manager...
+
+But before all, it's meant to be useful, simple and efficient:
+	o same flexible and easy configuration as the native fvwm
+	o functionality extensible via loadable modules;
+	o a taskbar: find quickly an application window and don't 
+	  take space with icon windows; 
diff --git a/wm/fvwm95/pkg/PLIST b/wm/fvwm95/pkg/PLIST
new file mode 100644
index 00000000000..a95e42f878d
--- /dev/null
+++ b/wm/fvwm95/pkg/PLIST
@@ -0,0 +1,245 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $
+bin/fvwm95
+icons/Mosaic.xpm
+icons/Xfm.xpm
+icons/arrdown2.xpm
+icons/arrows2.xpm
+icons/arrup2.xpm
+icons/bckgnd1.xpm
+icons/bckgnd3.xpm
+icons/bomb.xpm
+icons/ccode.icon
+icons/clamp.xpm
+icons/colormap.xpm
+icons/datebook.xpm
+icons/default.xbm
+icons/desk.xpm
+icons/dialog_box.xpm
+icons/documents.xpm
+icons/doombig.xpm
+icons/doomface.xpm
+icons/editres.xpm
+icons/eps.xpm
+icons/exit.xpm
+icons/find1.xpm
+icons/flow_chart.xpm
+icons/folder.xpm
+icons/folder2.xpm
+icons/folders.xpm
+icons/fvwm-menu.xpm
+icons/fvwm.bitmap
+icons/fvwm.xpm
+icons/fvwm2.xpm
+icons/fvwm2_big.xpm
+icons/fvwm3.xpm
+icons/gnu-animal.xpm
+icons/graphs.xpm
+icons/gv.xpm
+icons/hcode.icon
+icons/help.xpm
+icons/jewelbig.xpm
+icons/k.xpm
+icons/k2.xpm
+icons/lemacs.xpm
+icons/linux-menu.xpm
+icons/mag_glass.xpm
+icons/mail1.xpm
+icons/mail2.xpm
+icons/map.xpm
+icons/math4.xpm
+icons/mini-arch.xpm
+icons/mini-ball.xpm
+icons/mini-bball.xpm
+icons/mini-bomb.xpm
+icons/mini-book1.xpm
+icons/mini-book2.xpm
+icons/mini-books.xpm
+icons/mini-briefcase.xpm
+icons/mini-bug1.xpm
+icons/mini-bug2.xpm
+icons/mini-bx2.xpm
+icons/mini-calc.xpm
+icons/mini-camera.xpm
+icons/mini-cat.xpm
+icons/mini-cave.xpm
+icons/mini-cd.xpm
+icons/mini-cdlabel.xpm
+icons/mini-chinese.xpm
+icons/mini-clipboard.xpm
+icons/mini-clock.xpm
+icons/mini-colors.xpm
+icons/mini-connect.xpm
+icons/mini-crosbone.xpm
+icons/mini-cross.xpm
+icons/mini-desktop.xpm
+icons/mini-diff.xpm
+icons/mini-diskette.xpm
+icons/mini-display.xpm
+icons/mini-doc.xpm
+icons/mini-doc1.xpm
+icons/mini-dog.xpm
+icons/mini-edit.xpm
+icons/mini-espada.xpm
+icons/mini-exclam.xpm
+icons/mini-exp.xpm
+icons/mini-eye.xpm
+icons/mini-eyes.xpm
+icons/mini-fax.xpm
+icons/mini-fdisk.xpm
+icons/mini-filemgr.xpm
+icons/mini-folder.xpm
+icons/mini-font.xpm
+icons/mini-fractal.xpm
+icons/mini-frame.xpm
+icons/mini-ftp.xpm
+icons/mini-gball.xpm
+icons/mini-go.xpm
+icons/mini-gopher.xpm
+icons/mini-graph.xpm
+icons/mini-gv.xpm
+icons/mini-hammer.xpm
+icons/mini-happy.xpm
+icons/mini-hdisk.xpm
+icons/mini-heart.xpm
+icons/mini-hex.xpm
+icons/mini-hextris.xpm
+icons/mini-icons.xpm
+icons/mini-keyboard.xpm
+icons/mini-lock.xpm
+icons/mini-lower.xpm
+icons/mini-mail.xpm
+icons/mini-manual.xpm
+icons/mini-max1.xpm
+icons/mini-maze.xpm
+icons/mini-modules.xpm
+icons/mini-monitor.xpm
+icons/mini-move.xpm
+icons/mini-move1.xpm
+icons/mini-mwm.xpm
+icons/mini-news.xpm
+icons/mini-nscape.xpm
+icons/mini-ofolder.xpm
+icons/mini-olwm.xpm
+icons/mini-pager.xpm
+icons/mini-paint.xpm
+icons/mini-palette.xpm
+icons/mini-pdf.xpm
+icons/mini-pencil.xpm
+icons/mini-penguin.xpm
+icons/mini-perf.xpm
+icons/mini-question.xpm
+icons/mini-raise.xpm
+icons/mini-ray.xpm
+icons/mini-rball.xpm
+icons/mini-resize.xpm
+icons/mini-roach.xpm
+icons/mini-run.xpm
+icons/mini-sh.xpm
+icons/mini-sh1.xpm
+icons/mini-slon.xpm
+icons/mini-sound.xpm
+icons/mini-start.xpm
+icons/mini-stop.xpm
+icons/mini-telnet.xpm
+icons/mini-term.xpm
+icons/mini-tetris.xpm
+icons/mini-trebol.xpm
+icons/mini-turn.xpm
+icons/mini-twm.xpm
+icons/mini-window.xpm
+icons/mini-windows.xpm
+icons/mini-x.xpm
+icons/mini-x2.xpm
+icons/mini-xfig.xpm
+icons/mini-xjewel.xpm
+icons/mini-xkeycaps.xpm
+icons/mini-xlander.xpm
+icons/mini-xmahjongg.xpm
+icons/mini-xsnow.xpm
+icons/mini-xv.xpm
+icons/mini-zoom.xpm
+icons/mini.audiovol.xpm
+icons/mini.checkmark.xpm
+icons/mini.cut.xpm
+icons/mini.destroy.xpm
+icons/mini.excl.xpm
+icons/mini.exit.xpm
+icons/mini.fvwm.xpm
+icons/mini.letter.xpm
+icons/mini.lower.xpm
+icons/mini.move.xpm
+icons/mini.netscape.xpm
+icons/mini.raise.xpm
+icons/mini.resize.xpm
+icons/mini.xarchie.xpm
+icons/mini.xboing.xpm
+icons/mini.xlock.xpm
+icons/mini.xpm
+icons/mini.xterm.xpm
+icons/mini.zircon.xpm
+icons/nscape.xpm
+icons/ocode.icon
+icons/page.xpm
+icons/page2.xpm
+icons/prog.icon
+icons/programs.xpm
+icons/ps.xpm
+icons/question.xpm
+icons/rbomb.xpm
+icons/rcalc.xpm
+icons/rterm.xpm
+icons/run.xpm
+icons/settings.xpm
+icons/shutdown.xpm
+icons/term.xpm
+icons/textedit.xpm
+icons/tiff2.xpm
+icons/toolbox.xpm
+icons/unknown1.xpm
+icons/utilities-menu.xpm
+icons/wierd_page3.xpm
+icons/word_processor.xpm
+icons/world.xpm
+icons/wterm.xpm
+icons/xboingbig.xpm
+icons/xcalc.xpm
+icons/xemacs.xpm
+icons/xlock.xpm
+icons/xman.xpm
+icons/xpaint.xpm
+icons/xterm-axp.xpm
+icons/xterm-blank.xpm
+icons/xterm-dec.xpm
+icons/xterm-sgi.xpm
+icons/xterm-sol.xpm
+icons/xterm-sun.xpm
+icons/xterm.xpm
+icons/xv.xpm
+icons/xview.xpm
+lib/X11/fvwm95/FvwmAudio
+lib/X11/fvwm95/FvwmAuto
+lib/X11/fvwm95/FvwmBacker
+lib/X11/fvwm95/FvwmBanner
+lib/X11/fvwm95/FvwmButtons
+lib/X11/fvwm95/FvwmConsole
+lib/X11/fvwm95/FvwmCpp
+lib/X11/fvwm95/FvwmDebug
+lib/X11/fvwm95/FvwmForm
+lib/X11/fvwm95/FvwmIconBox
+lib/X11/fvwm95/FvwmIconMan
+lib/X11/fvwm95/FvwmIdent
+lib/X11/fvwm95/FvwmM4
+lib/X11/fvwm95/FvwmPager
+lib/X11/fvwm95/FvwmSave
+lib/X11/fvwm95/FvwmSaveDesk
+lib/X11/fvwm95/FvwmScroll
+lib/X11/fvwm95/FvwmTalk
+lib/X11/fvwm95/FvwmTaskBar
+lib/X11/fvwm95/FvwmWinList
+lib/X11/fvwm95/fvwmrc_convert
+lib/X11/fvwm95/quantize_pixmaps
+lib/X11/fvwm95/system.fvwm95rc
+lib/libfvwm95.a
+man/man1/fvwm95.1
+@dirrm icons
+@dirrm lib/X11/fvwm95