3 files changed, 48 insertions, 27 deletions

diff --git a/x11-wm/fvwm95/Makefile b/x11-wm/fvwm95/Makefile
index 69ea93ba52c4..e2c7a120ba25 100644
--- a/x11-wm/fvwm95/Makefile
+++ b/x11-wm/fvwm95/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Sa   1 Feb 1997 14:46:05 MET
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.9 1997/02/06 07:58:40 asami Exp $
+# $Id: Makefile,v 1.10 1997/06/09 19:16:35 andreas Exp $
 #
 
 DISTNAME=	fvwm95-2.0.43a-Autoconf
@@ -27,5 +27,6 @@ MAN1=		fvwm95.1
 post-install:
 		@${INSTALL_MAN}	$(WRKSRC)/fvwm/fvwm95.man \
 				$(PREFIX)/man/man1/fvwm95.1
+		(cd ${PREFIX}/icons; tar xzf ${FILESDIR}/fbsd-icons.tar.gz)
 
 .include <bsd.port.mk>
diff --git a/x11-wm/fvwm95/files/patch-ad b/x11-wm/fvwm95/files/patch-ad
index 4cf8e6e68296..7f380ce034be 100644
--- a/x11-wm/fvwm95/files/patch-ad
+++ b/x11-wm/fvwm95/files/patch-ad
@@ -1,5 +1,5 @@
---- sample.fvwmrc/system.fvwm95rc.orig	Mon Jun  9 20:49:46 1997
-+++ sample.fvwmrc/system.fvwm95rc	Mon Jun  9 20:50:01 1997
+--- 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
  #
@@ -20,6 +20,15 @@
  #+ "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" \
diff --git a/x11-wm/fvwm95/pkg-plist b/x11-wm/fvwm95/pkg-plist
index f7bb365f6456..e091cd11845e 100644
--- a/x11-wm/fvwm95/pkg-plist
+++ b/x11-wm/fvwm95/pkg-plist
@@ -1,29 +1,5 @@
 bin/fvwm95
 bin/xpmroot
-lib/libfvwm95.a
-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
 icons/Mosaic.xpm
 icons/Xfm.xpm
 icons/arrdown2.xpm
@@ -33,6 +9,7 @@ icons/bckgnd1.xpm
 icons/bckgnd3.xpm
 icons/bomb.xpm
 icons/ccode.icon
+icons/chuck.xpm
 icons/clamp.xpm
 icons/colormap.xpm
 icons/datebook.xpm
@@ -50,6 +27,9 @@ icons/flow_chart.xpm
 icons/folder.xpm
 icons/folder2.xpm
 icons/folders.xpm
+icons/freebsd-menu.xpm
+icons/freebsd2-menu.xpm
+icons/freebsd3-menu.xpm
 icons/fvwm-menu.xpm
 icons/fvwm.bitmap
 icons/fvwm.xpm
@@ -72,6 +52,7 @@ icons/mail2.xpm
 icons/map.xpm
 icons/math4.xpm
 icons/mini-arch.xpm
+icons/mini-backup.xpm
 icons/mini-ball.xpm
 icons/mini-bball.xpm
 icons/mini-bomb.xpm
@@ -128,7 +109,11 @@ icons/mini-heart.xpm
 icons/mini-hex.xpm
 icons/mini-hextris.xpm
 icons/mini-icons.xpm
+icons/mini-info.xpm
+icons/mini-internet.xpm
+icons/mini-iris.xpm
 icons/mini-keyboard.xpm
+icons/mini-kfm.xpm
 icons/mini-lock.xpm
 icons/mini-lower.xpm
 icons/mini-mail.xpm
@@ -158,6 +143,7 @@ icons/mini-rball.xpm
 icons/mini-resize.xpm
 icons/mini-roach.xpm
 icons/mini-run.xpm
+icons/mini-run2.xpm
 icons/mini-sh.xpm
 icons/mini-sh1.xpm
 icons/mini-slon.xpm
@@ -172,6 +158,7 @@ icons/mini-turn.xpm
 icons/mini-twm.xpm
 icons/mini-window.xpm
 icons/mini-windows.xpm
+icons/mini-world.xpm
 icons/mini-x.xpm
 icons/mini-x2.xpm
 icons/mini-xfig.xpm
@@ -240,4 +227,28 @@ 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.gz