Upgraded fvwm95 port to version 2.0.43a.

The fvwm95 developement team makes good progress ;-))

One thing I doesn't understand when making the port:

When doing make package, then the first @cwd in PLIST isn't
used, so fvwm96 is packaged as /usr/local/bin/fvwm95 instead
of /usr/X11R6/bin/fvwm95.

Would someone please be so kind to look at this. Is it me or
is pkg_add misbehaving ?!

18 files changed, 642 insertions, 570 deletions

diff --git a/x11-wm/fvwm95-i18n/Makefile b/x11-wm/fvwm95-i18n/Makefile
index a53857d48f37..bf8eac9cf75c 100644
--- a/x11-wm/fvwm95-i18n/Makefile
+++ b/x11-wm/fvwm95-i18n/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	fvwm95-2
-# Version required:	2.0.41f
-# Date created:		Wed Apr 10 21:57:17 MET DST 1996
+# Version required:	2.0.43a
+# Date created:		Sa   1 Feb 1997 14:46:05 MET
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.5 1996/10/19 09:13:13 andreas Exp $
+# $Id: Makefile,v 1.6 1996/11/18 11:43:08 asami Exp $
 #
 
-DISTNAME=	fvwm95-2.0.41f
+DISTNAME=	fvwm95-2.0.43a-Autoconf
 CATEGORIES=	x11
 MASTER_SITES=	ftp://mitac11.uia.ac.be/pub/
 EXTRACT_SUFX=	.tgz
@@ -14,39 +14,14 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	andreas@klemm.gtn.com
 
 LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+BUILD_DEPENDS=	${PREFIX}/lib/librplay.a:${PORTSDIR}/audio/rplay
 
-USE_IMAKE=	yes
-#XMKMF=		xmkmf
-#ALL_TARGET=	Makefiles all
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS+=	--prefix=/usr/X11R6 \
+			--includedir=${PREFIX}/include \
+			--libdir=${PREFIX}/lib
 
-#post-configure:
-#	@ln ${WRKSRC}/fvwm/fvwm2.man ${WRKSRC}/fvwm/fvwm95-2.man
-
-post-install:
-	@echo "installing default system.fvwmrc file..."
-	@-mv -f ${PREFIX}/lib/X11/fvwm95-2/system.fvwmrc \
-		${PREFIX}/lib/X11/fvwm95-2/system.fvwmrc.old
-	${INSTALL} -c -m 444 ${WRKSRC}/example.fvwm2rc95 \
-		${PREFIX}/lib/X11/fvwm95-2/system.fvwmrc
-	@echo "installing icons in ${PREFIX}/lib/X11/fvwm95-2/..."
-	@mkdir -p ${PREFIX}/lib/X11/fvwm95-2/icons
-	${INSTALL} -c -m 444 ${WRKSRC}/icons/*.x?m \
-		${PREFIX}/lib/X11/fvwm95-2/icons
-	${INSTALL} -c -m 444 ${FILESDIR}/*.x?m \
-		${PREFIX}/lib/X11/fvwm95-2/icons
-	@mkdir -p ${PREFIX}/lib/X11/fvwm95-2/mini-icons
-	${INSTALL} -c -m 444 ${WRKSRC}/mini-icons/*.x?m \
-		${PREFIX}/lib/X11/fvwm95-2/mini-icons
-	@echo ""
-	@echo "=========== INSTALLATION INSTRUCTIONS ======================"
-	@echo "To use fvwm95-2 you have to execute the following command:"
-	@echo ""
-	@echo "    cp ${PREFIX}/lib/X11/fvwm95-2/system.fvwmrc ~/.fvwm2rc95"
-	@echo ""
-	@echo "That's it - have fun"
-	@echo ""
-	@echo "Andreas Klemm"
-	@echo ""
-	@echo ""
+post-configure:
+	@${ECHO} "See the sample.fvwm95rc file in the files directory"
 
 .include <bsd.port.mk>
diff --git a/x11-wm/fvwm95-i18n/distinfo b/x11-wm/fvwm95-i18n/distinfo
index 5f9853373c62..72bfd4e8dad3 100644
--- a/x11-wm/fvwm95-i18n/distinfo
+++ b/x11-wm/fvwm95-i18n/distinfo
@@ -1 +1 @@
-MD5 (fvwm95-2.0.41f.tgz) = d0ce2333380f5a9d2a50fb651ab86962
+MD5 (fvwm95-2.0.43a-Autoconf.tgz) = 6dd2d55de04b74ac7ad1d64202e7c9bf
diff --git a/x11-wm/fvwm95-i18n/files/patch-aa b/x11-wm/fvwm95-i18n/files/patch-aa
new file mode 100644
index 000000000000..a4df0f298e31
--- /dev/null
+++ b/x11-wm/fvwm95-i18n/files/patch-aa
@@ -0,0 +1,25 @@
+--- 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@
diff --git a/x11-wm/fvwm95-i18n/files/patch-ab b/x11-wm/fvwm95-i18n/files/patch-ab
new file mode 100644
index 000000000000..2dd9e45c0c44
--- /dev/null
+++ b/x11-wm/fvwm95-i18n/files/patch-ab
@@ -0,0 +1,16 @@
+--- 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/x11-wm/fvwm95-i18n/files/patch-ac b/x11-wm/fvwm95-i18n/files/patch-ac
new file mode 100644
index 000000000000..096346a5dba1
--- /dev/null
+++ b/x11-wm/fvwm95-i18n/files/patch-ac
@@ -0,0 +1,11 @@
+--- 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/x11-wm/fvwm95-i18n/files/patch-ad b/x11-wm/fvwm95-i18n/files/patch-ad
deleted file mode 100644
index 548d2519ef24..000000000000
--- a/x11-wm/fvwm95-i18n/files/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
---- sample.fvwmrc/system.fvwm2rc95.orig	Sun May 19 23:53:55 1996
-+++ sample.fvwmrc/system.fvwm2rc95	Sat May 25 21:04:42 1996
-@@ -83,8 +83,8 @@
- # ModulePath is a colon-separated list, just like regular unix PATH
- #
- ModulePath /usr/X11R6/lib/X11/fvwm95-2/
--PixmapPath /usr/include/X11/pixmaps/:/usr/local/mini-icons/
--IconPath   /usr/include/X11/bitmaps/:/usr/local/icons/
-+PixmapPath /usr/X11R6/include/X11/pixmaps/
-+IconPath   /usr/X11R6/include/X11/bitmaps/
- 
- #========================================================================#
- 
diff --git a/x11-wm/fvwm95-i18n/files/patch-ae b/x11-wm/fvwm95-i18n/files/patch-ae
deleted file mode 100644
index 6c26334b13db..000000000000
--- a/x11-wm/fvwm95-i18n/files/patch-ae
+++ /dev/null
@@ -1,43 +0,0 @@
---- Fvwm.tmpl.orig	Sat May 25 21:09:38 1996
-+++ Fvwm.tmpl	Sat May 25 21:12:21 1996
-@@ -30,6 +30,8 @@
-  ***************************************************************************/
- 
- /* #define FvwmIconPath /usr/include/X11/bitmaps\:/usr/include/X11/pixmaps */
-+#define FvwmIconPath /usr/X11R6/lib/X11/fvwm95-2/mini-icons\:/usr/X11R6/lib/X11
-+/fvwm95-2/icons\:/usr/X11R6/include/X11/pixmaps\:/usr/X11R6/include/X11/bitmaps
- 
- 
- /***************************************************************************
-@@ -80,7 +82,7 @@
-  * Set this to YES if you would like the programs in the utils directory
-  * installed.
-  *************************************************************************/
--#define InstallUtils NO
-+#define InstallUtils YES
- 
- 
- /**************************************************************************
-@@ -149,17 +151,17 @@
-  ***************************************************************************/
- 
- /* Where do you want the fvwm binaries installed. */
--/* #define FvwmBinDir      /usr/local/X11R6/bin */
-+#define FvwmBinDir      /usr/X11R6/bin
- 
- /* Where do you want the fvwm modules installed. */
--/* #define FvwmDir         /usr/local/X11R6/lib/X11/fvwm95-2 */
-+#define FvwmDir         /usr/X11R6/lib/X11/fvwm95-2
- 
- /* Where do you want the fvwm libraries installed. */
--/* #define FvwmLibDir      /usr/local/X11R6/lib */
-+#define FvwmLibDir      /usr/X11R6/lib
- 
- /* Where do you want the fvwm man pages installed. */
--/* #define FvwmManPath     /usr/local/X11R6/man */
--/* #define FvwmManSuffix   1 */
-+#define FvwmManPath     /usr/X11R6/man
-+#define FvwmManSuffix   1
- 
- 
- /***************************************************************************
diff --git a/x11-wm/fvwm95-i18n/pkg-descr b/x11-wm/fvwm95-i18n/pkg-descr
index 2263587615b5..e94c4f1ea801 100644
--- a/x11-wm/fvwm95-i18n/pkg-descr
+++ b/x11-wm/fvwm95-i18n/pkg-descr
@@ -1,18 +1,18 @@
-This is fvwm-2.0.41 (with the pixmap cache patch) hacked for a look and
-feel similar to Windows-95. 
+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: 
 
-It's also included a hacked version of the Win95WinList module from
-David Barth (original from Mike Finger), whichs looks very close
-to the Windows-95 task bar. There is a clock and incoming mail
-indicator on it, it can also swallow other modules. The module is
-named FvwmTaskBar, for more information read the README file in
-the modules/FvwmTaskBar directory. 
+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.
 
-For more informations see also:
+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...
 
-	http://ltiwww.epfl.ch/~barth
-	http://ltiwww.epfl.ch/~barth/fvwm95.html
+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; 
 
-Have fun
-
-	Andreas Klemm ///
+Home Page: http://www.terraware.net/ftp/pub/Mirrors/FVWM95/fvwm95.html
diff --git a/x11-wm/fvwm95-i18n/pkg-plist b/x11-wm/fvwm95-i18n/pkg-plist
index 1294b77facfe..62d5db4b6209 100644
--- a/x11-wm/fvwm95-i18n/pkg-plist
+++ b/x11-wm/fvwm95-i18n/pkg-plist
@@ -1,179 +1,244 @@
-bin/fvwm95-2
+@cwd /usr/X11R6
+bin/fvwm95
+@cwd /usr/X11R6
 bin/xpmroot
-lib/X11/fvwm95-2/FvwmAudio
-lib/X11/fvwm95-2/FvwmAuto
-lib/X11/fvwm95-2/FvwmBacker
-lib/X11/fvwm95-2/FvwmBanner
-lib/X11/fvwm95-2/FvwmButtons
-lib/X11/fvwm95-2/FvwmCpp
-lib/X11/fvwm95-2/FvwmDebug
-lib/X11/fvwm95-2/FvwmForm
-lib/X11/fvwm95-2/FvwmIconBox
-lib/X11/fvwm95-2/FvwmIdent
-lib/X11/fvwm95-2/FvwmM4
-lib/X11/fvwm95-2/FvwmPager
-lib/X11/fvwm95-2/FvwmSave
-lib/X11/fvwm95-2/FvwmSaveDesk
-lib/X11/fvwm95-2/FvwmScroll
-lib/X11/fvwm95-2/FvwmTalk
-lib/X11/fvwm95-2/FvwmTaskBar
-lib/X11/fvwm95-2/FvwmWinList
-lib/X11/fvwm95-2/fvwmrc_convert 
-lib/X11/fvwm95-2/icons/Mosaic.xpm
-lib/X11/fvwm95-2/icons/arrdown2.xpm
-lib/X11/fvwm95-2/icons/arrows2.xpm
-lib/X11/fvwm95-2/icons/arrup2.xpm
-lib/X11/fvwm95-2/icons/bomb.xpm
-lib/X11/fvwm95-2/icons/clamp.xpm
-lib/X11/fvwm95-2/icons/colormap.xpm
-lib/X11/fvwm95-2/icons/datebook.xpm
-lib/X11/fvwm95-2/icons/default.xbm
-lib/X11/fvwm95-2/icons/desk.xpm
-lib/X11/fvwm95-2/icons/dialog_box.xpm
-lib/X11/fvwm95-2/icons/doombig.xpm
-lib/X11/fvwm95-2/icons/doomface.xpm
-lib/X11/fvwm95-2/icons/editres.xpm
-lib/X11/fvwm95-2/icons/eps.xpm
-lib/X11/fvwm95-2/icons/exit.xpm
-lib/X11/fvwm95-2/icons/flow_chart.xpm
-lib/X11/fvwm95-2/icons/folder2.xpm
-lib/X11/fvwm95-2/icons/folders.xpm
-lib/X11/fvwm95-2/icons/fvwm.xpm
-lib/X11/fvwm95-2/icons/fvwm2.xpm
-lib/X11/fvwm95-2/icons/fvwm2_big.xpm
-lib/X11/fvwm95-2/icons/fvwm3.xpm
-lib/X11/fvwm95-2/icons/gnu-animal.xpm
-lib/X11/fvwm95-2/icons/graphs.xpm
-lib/X11/fvwm95-2/icons/jewelbig.xpm
-lib/X11/fvwm95-2/icons/k.xpm
-lib/X11/fvwm95-2/icons/k2.xpm
-lib/X11/fvwm95-2/icons/lemacs.xpm
-lib/X11/fvwm95-2/icons/mag_glass.xpm
-lib/X11/fvwm95-2/icons/mail1.xpm
-lib/X11/fvwm95-2/icons/mail2.xpm
-lib/X11/fvwm95-2/icons/map.xpm
-lib/X11/fvwm95-2/icons/math4.xpm
-lib/X11/fvwm95-2/icons/mini.audiovol.xpm
-lib/X11/fvwm95-2/icons/mini.checkmark.xpm
-lib/X11/fvwm95-2/icons/mini.cut.xpm
-lib/X11/fvwm95-2/icons/mini.destroy.xpm
-lib/X11/fvwm95-2/icons/mini.excl.xpm
-lib/X11/fvwm95-2/icons/mini.exit.xpm
-lib/X11/fvwm95-2/icons/mini.fvwm.xpm
-lib/X11/fvwm95-2/icons/mini.letter.xpm
-lib/X11/fvwm95-2/icons/mini.lower.xpm
-lib/X11/fvwm95-2/icons/mini.move.xpm
-lib/X11/fvwm95-2/icons/mini.netscape.xpm
-lib/X11/fvwm95-2/icons/mini.raise.xpm
-lib/X11/fvwm95-2/icons/mini.resize.xpm
-lib/X11/fvwm95-2/icons/mini.xarchie.xpm
-lib/X11/fvwm95-2/icons/mini.xboing.xpm
-lib/X11/fvwm95-2/icons/mini.xlock.xpm
-lib/X11/fvwm95-2/icons/mini.xpm
-lib/X11/fvwm95-2/icons/mini.xterm.xpm
-lib/X11/fvwm95-2/icons/mini.zircon.xpm
-lib/X11/fvwm95-2/icons/netscape.xpm
-lib/X11/fvwm95-2/icons/page.xpm
-lib/X11/fvwm95-2/icons/page2.xpm
-lib/X11/fvwm95-2/icons/ps.xpm
-lib/X11/fvwm95-2/icons/question.xpm
-lib/X11/fvwm95-2/icons/rbomb.xpm
-lib/X11/fvwm95-2/icons/rcalc.xpm
-lib/X11/fvwm95-2/icons/rterm.xpm
-lib/X11/fvwm95-2/icons/term.xpm
-lib/X11/fvwm95-2/icons/tiff2.xpm
-lib/X11/fvwm95-2/icons/toolbox.xpm
-lib/X11/fvwm95-2/icons/unknown1.xpm
-lib/X11/fvwm95-2/icons/wierd_page3.xpm
-lib/X11/fvwm95-2/icons/word_processor.xpm
-lib/X11/fvwm95-2/icons/world.xpm
-lib/X11/fvwm95-2/icons/xboingbig.xpm
-lib/X11/fvwm95-2/icons/xcalc.xpm
-lib/X11/fvwm95-2/icons/xemacs.xpm
-lib/X11/fvwm95-2/icons/xlock.xpm
-lib/X11/fvwm95-2/icons/xman.xpm
-lib/X11/fvwm95-2/icons/xpaint.xpm
-lib/X11/fvwm95-2/icons/xterm-axp.xpm
-lib/X11/fvwm95-2/icons/xterm-blank.xpm
-lib/X11/fvwm95-2/icons/xterm-dec.xpm
-lib/X11/fvwm95-2/icons/xterm-sgi.xpm
-lib/X11/fvwm95-2/icons/xterm-sol.xpm
-lib/X11/fvwm95-2/icons/xterm-sun.xpm
-lib/X11/fvwm95-2/icons/xterm.xpm
-lib/X11/fvwm95-2/icons/xv.xpm
-lib/X11/fvwm95-2/mini-icons/mini-ball.xpm
-lib/X11/fvwm95-2/mini-icons/mini-bball.xpm
-lib/X11/fvwm95-2/mini-icons/mini-book1.xpm
-lib/X11/fvwm95-2/mini-icons/mini-book2.xpm
-lib/X11/fvwm95-2/mini-icons/mini-bug1.xpm
-lib/X11/fvwm95-2/mini-icons/mini-bug2.xpm
-lib/X11/fvwm95-2/mini-icons/mini-bx2.xpm
-lib/X11/fvwm95-2/mini-icons/mini-calc.xpm
-lib/X11/fvwm95-2/mini-icons/mini-camera.xpm
-lib/X11/fvwm95-2/mini-icons/mini-cdlabel.xpm
-lib/X11/fvwm95-2/mini-icons/mini-clock.xpm
-lib/X11/fvwm95-2/mini-icons/mini-colors.xpm
-lib/X11/fvwm95-2/mini-icons/mini-connect.xpm
-lib/X11/fvwm95-2/mini-icons/mini-cross.xpm
-lib/X11/fvwm95-2/mini-icons/mini-display.xpm
-lib/X11/fvwm95-2/mini-icons/mini-doc.xpm
-lib/X11/fvwm95-2/mini-icons/mini-edit.xpm
-lib/X11/fvwm95-2/mini-icons/mini-exclam.xpm
-lib/X11/fvwm95-2/mini-icons/mini-exp.xpm
-lib/X11/fvwm95-2/mini-icons/mini-eyes.xpm
-lib/X11/fvwm95-2/mini-icons/mini-filemgr.xpm
-lib/X11/fvwm95-2/mini-icons/mini-fractal.xpm
-lib/X11/fvwm95-2/mini-icons/mini-gball.xpm
-lib/X11/fvwm95-2/mini-icons/mini-gv.xpm
-lib/X11/fvwm95-2/mini-icons/mini-hammer.xpm
-lib/X11/fvwm95-2/mini-icons/mini-happy.xpm
-lib/X11/fvwm95-2/mini-icons/mini-lock.xpm
-lib/X11/fvwm95-2/mini-icons/mini-mail.xpm
-lib/X11/fvwm95-2/mini-icons/mini-manual.xpm
-lib/X11/fvwm95-2/mini-icons/mini-maze.xpm
-lib/X11/fvwm95-2/mini-icons/mini-modules.xpm
-lib/X11/fvwm95-2/mini-icons/mini-nscape.xpm
-lib/X11/fvwm95-2/mini-icons/mini-olwm.xpm
-lib/X11/fvwm95-2/mini-icons/mini-paint.xpm
-lib/X11/fvwm95-2/mini-icons/mini-pencil.xpm
-lib/X11/fvwm95-2/mini-icons/mini-question.xpm
-lib/X11/fvwm95-2/mini-icons/mini-ray.xpm
-lib/X11/fvwm95-2/mini-icons/mini-rball.xpm
-lib/X11/fvwm95-2/mini-icons/mini-run.xpm
-lib/X11/fvwm95-2/mini-icons/mini-sh.xpm
-lib/X11/fvwm95-2/mini-icons/mini-sh1.xpm
-lib/X11/fvwm95-2/mini-icons/mini-slon.xpm
-lib/X11/fvwm95-2/mini-icons/mini-stop.xpm
-lib/X11/fvwm95-2/mini-icons/mini-term.xpm
-lib/X11/fvwm95-2/mini-icons/mini-tetris.xpm
-lib/X11/fvwm95-2/mini-icons/mini-turn.xpm
-lib/X11/fvwm95-2/mini-icons/mini-windows.xpm
-lib/X11/fvwm95-2/mini-icons/mini-x.xpm
-lib/X11/fvwm95-2/mini-icons/mini-x2.xpm
-lib/X11/fvwm95-2/mini-icons/mini-xv.xpm
-lib/X11/fvwm95-2/mini-icons/mini-zoom.xpm
-lib/X11/fvwm95-2/quantize_pixmaps
-lib/X11/fvwm95-2/system.fvwmrc
-man/man1/FvwmAudio.1.gz
-man/man1/FvwmAuto.1.gz
-man/man1/FvwmBacker.1.gz
-man/man1/FvwmBanner.1.gz
-man/man1/FvwmButtons.1.gz
-man/man1/FvwmCpp.1.gz
-man/man1/FvwmDebug.1.gz
-man/man1/FvwmForm.1.gz
-man/man1/FvwmIconBox.1.gz
-man/man1/FvwmIdent.1.gz
-man/man1/FvwmM4.1.gz
-man/man1/FvwmPager.1.gz
-man/man1/FvwmSave.1.gz
-man/man1/FvwmSaveDesk.1.gz
-man/man1/FvwmScroll.1.gz
-man/man1/FvwmTalk.1.gz
-man/man1/FvwmTaskBar.1.gz
-man/man1/FvwmWinList.1.gz
-man/man1/fvwm95-2.1.gz
-man/man1/xpmroot.1.gz
-lib/X11/fvwm95-2/icons/mailtool.xpm
-lib/X11/fvwm95-2/icons/xfm_icon.xpm
-lib/X11/fvwm95-2/icons/xrn.goodnews.xpm
+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
+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
diff --git a/x11-wm/fvwm95/Makefile b/x11-wm/fvwm95/Makefile
index a53857d48f37..bf8eac9cf75c 100644
--- a/x11-wm/fvwm95/Makefile
+++ b/x11-wm/fvwm95/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	fvwm95-2
-# Version required:	2.0.41f
-# Date created:		Wed Apr 10 21:57:17 MET DST 1996
+# Version required:	2.0.43a
+# Date created:		Sa   1 Feb 1997 14:46:05 MET
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.5 1996/10/19 09:13:13 andreas Exp $
+# $Id: Makefile,v 1.6 1996/11/18 11:43:08 asami Exp $
 #
 
-DISTNAME=	fvwm95-2.0.41f
+DISTNAME=	fvwm95-2.0.43a-Autoconf
 CATEGORIES=	x11
 MASTER_SITES=	ftp://mitac11.uia.ac.be/pub/
 EXTRACT_SUFX=	.tgz
@@ -14,39 +14,14 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	andreas@klemm.gtn.com
 
 LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+BUILD_DEPENDS=	${PREFIX}/lib/librplay.a:${PORTSDIR}/audio/rplay
 
-USE_IMAKE=	yes
-#XMKMF=		xmkmf
-#ALL_TARGET=	Makefiles all
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS+=	--prefix=/usr/X11R6 \
+			--includedir=${PREFIX}/include \
+			--libdir=${PREFIX}/lib
 
-#post-configure:
-#	@ln ${WRKSRC}/fvwm/fvwm2.man ${WRKSRC}/fvwm/fvwm95-2.man
-
-post-install:
-	@echo "installing default system.fvwmrc file..."
-	@-mv -f ${PREFIX}/lib/X11/fvwm95-2/system.fvwmrc \
-		${PREFIX}/lib/X11/fvwm95-2/system.fvwmrc.old
-	${INSTALL} -c -m 444 ${WRKSRC}/example.fvwm2rc95 \
-		${PREFIX}/lib/X11/fvwm95-2/system.fvwmrc
-	@echo "installing icons in ${PREFIX}/lib/X11/fvwm95-2/..."
-	@mkdir -p ${PREFIX}/lib/X11/fvwm95-2/icons
-	${INSTALL} -c -m 444 ${WRKSRC}/icons/*.x?m \
-		${PREFIX}/lib/X11/fvwm95-2/icons
-	${INSTALL} -c -m 444 ${FILESDIR}/*.x?m \
-		${PREFIX}/lib/X11/fvwm95-2/icons
-	@mkdir -p ${PREFIX}/lib/X11/fvwm95-2/mini-icons
-	${INSTALL} -c -m 444 ${WRKSRC}/mini-icons/*.x?m \
-		${PREFIX}/lib/X11/fvwm95-2/mini-icons
-	@echo ""
-	@echo "=========== INSTALLATION INSTRUCTIONS ======================"
-	@echo "To use fvwm95-2 you have to execute the following command:"
-	@echo ""
-	@echo "    cp ${PREFIX}/lib/X11/fvwm95-2/system.fvwmrc ~/.fvwm2rc95"
-	@echo ""
-	@echo "That's it - have fun"
-	@echo ""
-	@echo "Andreas Klemm"
-	@echo ""
-	@echo ""
+post-configure:
+	@${ECHO} "See the sample.fvwm95rc file in the files directory"
 
 .include <bsd.port.mk>
diff --git a/x11-wm/fvwm95/distinfo b/x11-wm/fvwm95/distinfo
index 5f9853373c62..72bfd4e8dad3 100644
--- a/x11-wm/fvwm95/distinfo
+++ b/x11-wm/fvwm95/distinfo
@@ -1 +1 @@
-MD5 (fvwm95-2.0.41f.tgz) = d0ce2333380f5a9d2a50fb651ab86962
+MD5 (fvwm95-2.0.43a-Autoconf.tgz) = 6dd2d55de04b74ac7ad1d64202e7c9bf
diff --git a/x11-wm/fvwm95/files/patch-aa b/x11-wm/fvwm95/files/patch-aa
new file mode 100644
index 000000000000..a4df0f298e31
--- /dev/null
+++ b/x11-wm/fvwm95/files/patch-aa
@@ -0,0 +1,25 @@
+--- 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@
diff --git a/x11-wm/fvwm95/files/patch-ab b/x11-wm/fvwm95/files/patch-ab
new file mode 100644
index 000000000000..2dd9e45c0c44
--- /dev/null
+++ b/x11-wm/fvwm95/files/patch-ab
@@ -0,0 +1,16 @@
+--- 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/x11-wm/fvwm95/files/patch-ac b/x11-wm/fvwm95/files/patch-ac
new file mode 100644
index 000000000000..096346a5dba1
--- /dev/null
+++ b/x11-wm/fvwm95/files/patch-ac
@@ -0,0 +1,11 @@
+--- 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/x11-wm/fvwm95/files/patch-ad b/x11-wm/fvwm95/files/patch-ad
deleted file mode 100644
index 548d2519ef24..000000000000
--- a/x11-wm/fvwm95/files/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
---- sample.fvwmrc/system.fvwm2rc95.orig	Sun May 19 23:53:55 1996
-+++ sample.fvwmrc/system.fvwm2rc95	Sat May 25 21:04:42 1996
-@@ -83,8 +83,8 @@
- # ModulePath is a colon-separated list, just like regular unix PATH
- #
- ModulePath /usr/X11R6/lib/X11/fvwm95-2/
--PixmapPath /usr/include/X11/pixmaps/:/usr/local/mini-icons/
--IconPath   /usr/include/X11/bitmaps/:/usr/local/icons/
-+PixmapPath /usr/X11R6/include/X11/pixmaps/
-+IconPath   /usr/X11R6/include/X11/bitmaps/
- 
- #========================================================================#
- 
diff --git a/x11-wm/fvwm95/files/patch-ae b/x11-wm/fvwm95/files/patch-ae
deleted file mode 100644
index 6c26334b13db..000000000000
--- a/x11-wm/fvwm95/files/patch-ae
+++ /dev/null
@@ -1,43 +0,0 @@
---- Fvwm.tmpl.orig	Sat May 25 21:09:38 1996
-+++ Fvwm.tmpl	Sat May 25 21:12:21 1996
-@@ -30,6 +30,8 @@
-  ***************************************************************************/
- 
- /* #define FvwmIconPath /usr/include/X11/bitmaps\:/usr/include/X11/pixmaps */
-+#define FvwmIconPath /usr/X11R6/lib/X11/fvwm95-2/mini-icons\:/usr/X11R6/lib/X11
-+/fvwm95-2/icons\:/usr/X11R6/include/X11/pixmaps\:/usr/X11R6/include/X11/bitmaps
- 
- 
- /***************************************************************************
-@@ -80,7 +82,7 @@
-  * Set this to YES if you would like the programs in the utils directory
-  * installed.
-  *************************************************************************/
--#define InstallUtils NO
-+#define InstallUtils YES
- 
- 
- /**************************************************************************
-@@ -149,17 +151,17 @@
-  ***************************************************************************/
- 
- /* Where do you want the fvwm binaries installed. */
--/* #define FvwmBinDir      /usr/local/X11R6/bin */
-+#define FvwmBinDir      /usr/X11R6/bin
- 
- /* Where do you want the fvwm modules installed. */
--/* #define FvwmDir         /usr/local/X11R6/lib/X11/fvwm95-2 */
-+#define FvwmDir         /usr/X11R6/lib/X11/fvwm95-2
- 
- /* Where do you want the fvwm libraries installed. */
--/* #define FvwmLibDir      /usr/local/X11R6/lib */
-+#define FvwmLibDir      /usr/X11R6/lib
- 
- /* Where do you want the fvwm man pages installed. */
--/* #define FvwmManPath     /usr/local/X11R6/man */
--/* #define FvwmManSuffix   1 */
-+#define FvwmManPath     /usr/X11R6/man
-+#define FvwmManSuffix   1
- 
- 
- /***************************************************************************
diff --git a/x11-wm/fvwm95/pkg-descr b/x11-wm/fvwm95/pkg-descr
index 2263587615b5..e94c4f1ea801 100644
--- a/x11-wm/fvwm95/pkg-descr
+++ b/x11-wm/fvwm95/pkg-descr
@@ -1,18 +1,18 @@
-This is fvwm-2.0.41 (with the pixmap cache patch) hacked for a look and
-feel similar to Windows-95. 
+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: 
 
-It's also included a hacked version of the Win95WinList module from
-David Barth (original from Mike Finger), whichs looks very close
-to the Windows-95 task bar. There is a clock and incoming mail
-indicator on it, it can also swallow other modules. The module is
-named FvwmTaskBar, for more information read the README file in
-the modules/FvwmTaskBar directory. 
+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.
 
-For more informations see also:
+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...
 
-	http://ltiwww.epfl.ch/~barth
-	http://ltiwww.epfl.ch/~barth/fvwm95.html
+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; 
 
-Have fun
-
-	Andreas Klemm ///
+Home Page: http://www.terraware.net/ftp/pub/Mirrors/FVWM95/fvwm95.html
diff --git a/x11-wm/fvwm95/pkg-plist b/x11-wm/fvwm95/pkg-plist
index 1294b77facfe..62d5db4b6209 100644
--- a/x11-wm/fvwm95/pkg-plist
+++ b/x11-wm/fvwm95/pkg-plist
@@ -1,179 +1,244 @@
-bin/fvwm95-2
+@cwd /usr/X11R6
+bin/fvwm95
+@cwd /usr/X11R6
 bin/xpmroot
-lib/X11/fvwm95-2/FvwmAudio
-lib/X11/fvwm95-2/FvwmAuto
-lib/X11/fvwm95-2/FvwmBacker
-lib/X11/fvwm95-2/FvwmBanner
-lib/X11/fvwm95-2/FvwmButtons
-lib/X11/fvwm95-2/FvwmCpp
-lib/X11/fvwm95-2/FvwmDebug
-lib/X11/fvwm95-2/FvwmForm
-lib/X11/fvwm95-2/FvwmIconBox
-lib/X11/fvwm95-2/FvwmIdent
-lib/X11/fvwm95-2/FvwmM4
-lib/X11/fvwm95-2/FvwmPager
-lib/X11/fvwm95-2/FvwmSave
-lib/X11/fvwm95-2/FvwmSaveDesk
-lib/X11/fvwm95-2/FvwmScroll
-lib/X11/fvwm95-2/FvwmTalk
-lib/X11/fvwm95-2/FvwmTaskBar
-lib/X11/fvwm95-2/FvwmWinList
-lib/X11/fvwm95-2/fvwmrc_convert 
-lib/X11/fvwm95-2/icons/Mosaic.xpm
-lib/X11/fvwm95-2/icons/arrdown2.xpm
-lib/X11/fvwm95-2/icons/arrows2.xpm
-lib/X11/fvwm95-2/icons/arrup2.xpm
-lib/X11/fvwm95-2/icons/bomb.xpm
-lib/X11/fvwm95-2/icons/clamp.xpm
-lib/X11/fvwm95-2/icons/colormap.xpm
-lib/X11/fvwm95-2/icons/datebook.xpm
-lib/X11/fvwm95-2/icons/default.xbm
-lib/X11/fvwm95-2/icons/desk.xpm
-lib/X11/fvwm95-2/icons/dialog_box.xpm
-lib/X11/fvwm95-2/icons/doombig.xpm
-lib/X11/fvwm95-2/icons/doomface.xpm
-lib/X11/fvwm95-2/icons/editres.xpm
-lib/X11/fvwm95-2/icons/eps.xpm
-lib/X11/fvwm95-2/icons/exit.xpm
-lib/X11/fvwm95-2/icons/flow_chart.xpm
-lib/X11/fvwm95-2/icons/folder2.xpm
-lib/X11/fvwm95-2/icons/folders.xpm
-lib/X11/fvwm95-2/icons/fvwm.xpm
-lib/X11/fvwm95-2/icons/fvwm2.xpm
-lib/X11/fvwm95-2/icons/fvwm2_big.xpm
-lib/X11/fvwm95-2/icons/fvwm3.xpm
-lib/X11/fvwm95-2/icons/gnu-animal.xpm
-lib/X11/fvwm95-2/icons/graphs.xpm
-lib/X11/fvwm95-2/icons/jewelbig.xpm
-lib/X11/fvwm95-2/icons/k.xpm
-lib/X11/fvwm95-2/icons/k2.xpm
-lib/X11/fvwm95-2/icons/lemacs.xpm
-lib/X11/fvwm95-2/icons/mag_glass.xpm
-lib/X11/fvwm95-2/icons/mail1.xpm
-lib/X11/fvwm95-2/icons/mail2.xpm
-lib/X11/fvwm95-2/icons/map.xpm
-lib/X11/fvwm95-2/icons/math4.xpm
-lib/X11/fvwm95-2/icons/mini.audiovol.xpm
-lib/X11/fvwm95-2/icons/mini.checkmark.xpm
-lib/X11/fvwm95-2/icons/mini.cut.xpm
-lib/X11/fvwm95-2/icons/mini.destroy.xpm
-lib/X11/fvwm95-2/icons/mini.excl.xpm
-lib/X11/fvwm95-2/icons/mini.exit.xpm
-lib/X11/fvwm95-2/icons/mini.fvwm.xpm
-lib/X11/fvwm95-2/icons/mini.letter.xpm
-lib/X11/fvwm95-2/icons/mini.lower.xpm
-lib/X11/fvwm95-2/icons/mini.move.xpm
-lib/X11/fvwm95-2/icons/mini.netscape.xpm
-lib/X11/fvwm95-2/icons/mini.raise.xpm
-lib/X11/fvwm95-2/icons/mini.resize.xpm
-lib/X11/fvwm95-2/icons/mini.xarchie.xpm
-lib/X11/fvwm95-2/icons/mini.xboing.xpm
-lib/X11/fvwm95-2/icons/mini.xlock.xpm
-lib/X11/fvwm95-2/icons/mini.xpm
-lib/X11/fvwm95-2/icons/mini.xterm.xpm
-lib/X11/fvwm95-2/icons/mini.zircon.xpm
-lib/X11/fvwm95-2/icons/netscape.xpm
-lib/X11/fvwm95-2/icons/page.xpm
-lib/X11/fvwm95-2/icons/page2.xpm
-lib/X11/fvwm95-2/icons/ps.xpm
-lib/X11/fvwm95-2/icons/question.xpm
-lib/X11/fvwm95-2/icons/rbomb.xpm
-lib/X11/fvwm95-2/icons/rcalc.xpm
-lib/X11/fvwm95-2/icons/rterm.xpm
-lib/X11/fvwm95-2/icons/term.xpm
-lib/X11/fvwm95-2/icons/tiff2.xpm
-lib/X11/fvwm95-2/icons/toolbox.xpm
-lib/X11/fvwm95-2/icons/unknown1.xpm
-lib/X11/fvwm95-2/icons/wierd_page3.xpm
-lib/X11/fvwm95-2/icons/word_processor.xpm
-lib/X11/fvwm95-2/icons/world.xpm
-lib/X11/fvwm95-2/icons/xboingbig.xpm
-lib/X11/fvwm95-2/icons/xcalc.xpm
-lib/X11/fvwm95-2/icons/xemacs.xpm
-lib/X11/fvwm95-2/icons/xlock.xpm
-lib/X11/fvwm95-2/icons/xman.xpm
-lib/X11/fvwm95-2/icons/xpaint.xpm
-lib/X11/fvwm95-2/icons/xterm-axp.xpm
-lib/X11/fvwm95-2/icons/xterm-blank.xpm
-lib/X11/fvwm95-2/icons/xterm-dec.xpm
-lib/X11/fvwm95-2/icons/xterm-sgi.xpm
-lib/X11/fvwm95-2/icons/xterm-sol.xpm
-lib/X11/fvwm95-2/icons/xterm-sun.xpm
-lib/X11/fvwm95-2/icons/xterm.xpm
-lib/X11/fvwm95-2/icons/xv.xpm
-lib/X11/fvwm95-2/mini-icons/mini-ball.xpm
-lib/X11/fvwm95-2/mini-icons/mini-bball.xpm
-lib/X11/fvwm95-2/mini-icons/mini-book1.xpm
-lib/X11/fvwm95-2/mini-icons/mini-book2.xpm
-lib/X11/fvwm95-2/mini-icons/mini-bug1.xpm
-lib/X11/fvwm95-2/mini-icons/mini-bug2.xpm
-lib/X11/fvwm95-2/mini-icons/mini-bx2.xpm
-lib/X11/fvwm95-2/mini-icons/mini-calc.xpm
-lib/X11/fvwm95-2/mini-icons/mini-camera.xpm
-lib/X11/fvwm95-2/mini-icons/mini-cdlabel.xpm
-lib/X11/fvwm95-2/mini-icons/mini-clock.xpm
-lib/X11/fvwm95-2/mini-icons/mini-colors.xpm
-lib/X11/fvwm95-2/mini-icons/mini-connect.xpm
-lib/X11/fvwm95-2/mini-icons/mini-cross.xpm
-lib/X11/fvwm95-2/mini-icons/mini-display.xpm
-lib/X11/fvwm95-2/mini-icons/mini-doc.xpm
-lib/X11/fvwm95-2/mini-icons/mini-edit.xpm
-lib/X11/fvwm95-2/mini-icons/mini-exclam.xpm
-lib/X11/fvwm95-2/mini-icons/mini-exp.xpm
-lib/X11/fvwm95-2/mini-icons/mini-eyes.xpm
-lib/X11/fvwm95-2/mini-icons/mini-filemgr.xpm
-lib/X11/fvwm95-2/mini-icons/mini-fractal.xpm
-lib/X11/fvwm95-2/mini-icons/mini-gball.xpm
-lib/X11/fvwm95-2/mini-icons/mini-gv.xpm
-lib/X11/fvwm95-2/mini-icons/mini-hammer.xpm
-lib/X11/fvwm95-2/mini-icons/mini-happy.xpm
-lib/X11/fvwm95-2/mini-icons/mini-lock.xpm
-lib/X11/fvwm95-2/mini-icons/mini-mail.xpm
-lib/X11/fvwm95-2/mini-icons/mini-manual.xpm
-lib/X11/fvwm95-2/mini-icons/mini-maze.xpm
-lib/X11/fvwm95-2/mini-icons/mini-modules.xpm
-lib/X11/fvwm95-2/mini-icons/mini-nscape.xpm
-lib/X11/fvwm95-2/mini-icons/mini-olwm.xpm
-lib/X11/fvwm95-2/mini-icons/mini-paint.xpm
-lib/X11/fvwm95-2/mini-icons/mini-pencil.xpm
-lib/X11/fvwm95-2/mini-icons/mini-question.xpm
-lib/X11/fvwm95-2/mini-icons/mini-ray.xpm
-lib/X11/fvwm95-2/mini-icons/mini-rball.xpm
-lib/X11/fvwm95-2/mini-icons/mini-run.xpm
-lib/X11/fvwm95-2/mini-icons/mini-sh.xpm
-lib/X11/fvwm95-2/mini-icons/mini-sh1.xpm
-lib/X11/fvwm95-2/mini-icons/mini-slon.xpm
-lib/X11/fvwm95-2/mini-icons/mini-stop.xpm
-lib/X11/fvwm95-2/mini-icons/mini-term.xpm
-lib/X11/fvwm95-2/mini-icons/mini-tetris.xpm
-lib/X11/fvwm95-2/mini-icons/mini-turn.xpm
-lib/X11/fvwm95-2/mini-icons/mini-windows.xpm
-lib/X11/fvwm95-2/mini-icons/mini-x.xpm
-lib/X11/fvwm95-2/mini-icons/mini-x2.xpm
-lib/X11/fvwm95-2/mini-icons/mini-xv.xpm
-lib/X11/fvwm95-2/mini-icons/mini-zoom.xpm
-lib/X11/fvwm95-2/quantize_pixmaps
-lib/X11/fvwm95-2/system.fvwmrc
-man/man1/FvwmAudio.1.gz
-man/man1/FvwmAuto.1.gz
-man/man1/FvwmBacker.1.gz
-man/man1/FvwmBanner.1.gz
-man/man1/FvwmButtons.1.gz
-man/man1/FvwmCpp.1.gz
-man/man1/FvwmDebug.1.gz
-man/man1/FvwmForm.1.gz
-man/man1/FvwmIconBox.1.gz
-man/man1/FvwmIdent.1.gz
-man/man1/FvwmM4.1.gz
-man/man1/FvwmPager.1.gz
-man/man1/FvwmSave.1.gz
-man/man1/FvwmSaveDesk.1.gz
-man/man1/FvwmScroll.1.gz
-man/man1/FvwmTalk.1.gz
-man/man1/FvwmTaskBar.1.gz
-man/man1/FvwmWinList.1.gz
-man/man1/fvwm95-2.1.gz
-man/man1/xpmroot.1.gz
-lib/X11/fvwm95-2/icons/mailtool.xpm
-lib/X11/fvwm95-2/icons/xfm_icon.xpm
-lib/X11/fvwm95-2/icons/xrn.goodnews.xpm
+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
+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