Update to fvwm-2.4.0. Addresses PR #13373.

Highlights:
-----------

 ** A new "Theme" module called FvwmTheme and "colour sets"
    including 8 kinds of gradients and pixmap support controlling
    the appearance of borders, title bars, frames, 3D shadows,
    menus and modules.

 ** GNOME compliance.
    GNOME hints can be turned on and off for individual windows.

 ** Mouse stroke support.
    You will need the libstroke library, found at

      http://www.etla.net/~willey/projects/libstroke/

 ** Much more flexibility and control in menu definition and menu
    styles including dynamically generated menus and some menu
    generating scripts.

 ** Almost all commands, including Key, Mouse and Style, take
    effect immediately.  The Recapture command is no longer needed
    to activate most changes.

 ** The old StaysOnTop style option has been generalised into the
    concept of layers.  See the fvwm2 man page for details.

 ** Using Alt-Tab now works exactly like the other one.

 ** A derived package fvwm-themes standardises FVWM Themes issues.
    More info is available at

      http://fvwm-themes.sourceforge.net/

 ** Improved multi head support.

5 files changed, 371 insertions, 135 deletions

diff --git a/wm/fvwm2/Makefile b/wm/fvwm2/Makefile
index b2a0d63c512..2e73d7f7332 100644
--- a/wm/fvwm2/Makefile
+++ b/wm/fvwm2/Makefile
@@ -1,48 +1,46 @@
-# $NetBSD: Makefile,v 1.6 2001/03/19 19:09:52 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2001/07/10 20:03:28 nra Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/10/11 10:42:43 jkh Exp
 #
 
-FVWM_VER=	2.2.5
 DISTNAME=	fvwm-${FVWM_VER}
 PKGNAME=	fvwm2-${FVWM_VER}
 CATEGORIES=	x11 wm
-MASTER_SITES=	ftp://ftp.hpc.uh.edu/pub/fvwm/version-2/ \
-		ftp://ftp.ics.es.osaka-u.ac.jp/pub/CFAN/sources/2.0.x/ \
-		ftp://ftp.ics.es.osaka-u.ac.jp/pub/CFAN/fvwm-users-jp/kits/ \
-		ftp://ftp.TokyoNet.AD.JP/pub/X/fvwm/sources/2.0.x/ \
-		ftp://ftp.TokyoNet.AD.JP/pub/X/fvwm/fvwm-users-jp/kits/
+MASTER_SITES=	ftp://ftp.fvwm.org/pub/fvwm/version-2/ \
+		http://www.fvwm.org/generated/icon_download/ \
+		ftp://ftp.hpc.uh.edu/pub/fvwm/version-2/
+DISTFILES+=	fvwm-${FVWM_VER}.tar.gz fvwm_icons.tgz
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.fvwm.org/
 COMMENT=	Newer version of X11 Virtual window manager
 
 DEPENDS+=	xpmroot-2.*:../../x11/xpmroot
-DEPENDS+=	readline-*:../../devel/readline
-DEPENDS+=	rplay-3.*:../../audio/rplay
 
 CONFLICTS=	fvwm-2.*
+EXTRACT_ONLY=	${DISTNAME}.tar.gz
+FVWM_VER=	2.4.0
 
-USE_X11BASE=	yes
-GNU_CONFIGURE=	yes
+USE_X11BASE=		YES
+GNU_CONFIGURE=		YES
+USE_GNU_READLINE=	YES
 
 PLIST_SUBST+=	FVWM_VER=${FVWM_VER}
 
 EVAL_PREFIX+=		XPMDIR=xpm
-CONFIGURE_ARGS+=	--enable-extras
+CONFIGURE_ARGS+=	--enable-extras --without-gnome
 CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/lib/X11/fvwm2
 CONFIGURE_ARGS+=	--libexecdir=${PREFIX}/lib/X11
 CONFIGURE_ARGS+=	--with-xpm-includes=${XPMDIR}/include
-CONFIGURE_ARGS+=	--with-readline-includes=${LOCALBASE}/include
-CONFIGURE_ARGS+=	--with-rplay-includes=${LOCALBASE}/include
 CONFIGURE_ARGS+=	--with-iconpath=${PREFIX}/lib/X11/fvwm2/pixmaps:${X11BASE}/include/X11/bitmaps:${X11BASE}/include/X11/pixmaps
 
+post-extract:
+	${MKDIR} ${WRKDIR}/icons
+	${GTAR} -xzf ${DISTDIR}/fvwm_icons.tgz -C ${WRKDIR}/icons
+
 post-install:
 	@${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/fvwm2/pixmaps
 	${INSTALL_DATA} \
-		${WRKSRC}/icons/*.xpm \
-		${WRKSRC}/icons/*.xbm \
-		${WRKSRC}/icons/*.bitmap \
-		${WRKSRC}/icons/*.icon \
+		${WRKDIR}/icons/*.xpm \
 		${PREFIX}/lib/X11/fvwm2/pixmaps
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/fvwm2
 	${INSTALL_DATA} \
@@ -58,4 +56,8 @@ post-install:
 			${PREFIX}/lib/X11/fvwm2/system.fvwm2rc ; \
 	fi
 
+.include "../../audio/rplay/buildlink.mk"
+.include "../../devel/readline/buildlink.mk"
+.include "../../graphics/imlib/buildlink.mk"
+.include "../../x11/gtk/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/fvwm2/distinfo b/wm/fvwm2/distinfo
index 93db5085160..e995e8bef2e 100644
--- a/wm/fvwm2/distinfo
+++ b/wm/fvwm2/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.2 2001/04/17 16:03:45 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/07/10 20:03:28 nra Exp $
 
-SHA1 (fvwm-2.2.5.tar.gz) = 2cb0c6dbd1a361987a301956315d9f3b9a68f78b
-Size (fvwm-2.2.5.tar.gz) = 1080046 bytes
-SHA1 (patch-aa) = ac1eb7da79fcc06bedc20994beb6accea5f75b4e
-SHA1 (patch-ab) = a6f4e367cad784c8f126a9498795b0c88a71fcbb
+SHA1 (fvwm-2.4.0.tar.gz) = b7c4c74a7bfad13f0e0a08f0a5d84e45b43fd129
+Size (fvwm-2.4.0.tar.gz) = 1636066 bytes
+SHA1 (fvwm_icons.tgz) = 418356862ab564ac0b771300b53004aea7c7c1ec
+Size (fvwm_icons.tgz) = 368640 bytes
+SHA1 (patch-aa) = eb9012612496251a3bd52f139b5cbab7a6ada531
+SHA1 (patch-ab) = f49788d4c5af55ef296bb37a9a856aa51717f964
diff --git a/wm/fvwm2/patches/patch-aa b/wm/fvwm2/patches/patch-aa
index 076b9fa8fbe..97e62fa2eb6 100644
--- a/wm/fvwm2/patches/patch-aa
+++ b/wm/fvwm2/patches/patch-aa
@@ -1,18 +1,21 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2001/07/10 20:03:28 nra Exp $
 
---- utils/Makefile.in.orig	Wed Jan 20 06:29:27 1999
-+++ utils/Makefile.in	Mon Feb 22 03:54:05 1999
-@@ -83,10 +83,10 @@
+--- utils/Makefile.in.orig	Tue Jul 10 14:44:32 2001
++++ utils/Makefile.in	Tue Jul 10 14:44:50 2001
+@@ -109,13 +109,13 @@
  xpm_CFLAGS = @xpm_CFLAGS@
  xpm_LIBS = @xpm_LIBS@
  
 -bin_PROGRAMS = @XPMROOT@
--EXTRA_PROGRAMS = xpmroot
 +#bin_PROGRAMS = @XPMROOT@
-+#EXTRA_PROGRAMS = xpmroot
+ bin_SCRIPTS = fvwm-config fvwmbug fvwm-menu-xlock fvwm-menu-directory 	fvwm-menu-desktop fvwm-menu-headlines fvwm24_convert
  
--man_MANS = xpmroot.1
-+#man_MANS = xpmroot.1
- EXTRA_DIST = BuildXLockMenu fvwmrc_convert quantize_pixmaps $(man_MANS)
  
- LDADD = -L$(top_builddir)/libs -lfvwm $(xpm_LIBS) 	$(X_LIBS) $(X_PRE_LIBS) -lXext -lX11 $(X_EXTRA_LIBS)
+-EXTRA_PROGRAMS = xpmroot xselection
++EXTRA_PROGRAMS = xselection
+ 
+-man_MANS = xpmroot.1 fvwmbug.1 fvwmrc_convert.1 fvwm24_convert.1 	fvwm-menu-xlock.1 fvwm-menu-directory.1 	fvwm-menu-desktop.1 fvwm-menu-headlines.1
++man_MANS = fvwmbug.1 fvwmrc_convert.1 fvwm24_convert.1 	fvwm-menu-xlock.1 fvwm-menu-directory.1 	fvwm-menu-desktop.1 fvwm-menu-headlines.1
+ 
+ EXTRA_DIST = fvwmrc_convert fvwm24_convert.in quantize_pixmaps $(man_MANS)
+ 
diff --git a/wm/fvwm2/patches/patch-ab b/wm/fvwm2/patches/patch-ab
index 37033cf0644..6d1ddf42158 100644
--- a/wm/fvwm2/patches/patch-ab
+++ b/wm/fvwm2/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2001/03/13 20:59:15 wiz Exp $
+$NetBSD: patch-ab,v 1.4 2001/07/10 20:03:28 nra Exp $
 
---- configure.orig	Mon Nov 29 10:07:03 1999
-+++ configure	Mon Jan  1 22:23:09 2001
-@@ -654,7 +654,7 @@
+--- configure.orig	Tue Jul 10 14:17:06 2001
++++ configure	Tue Jul 10 14:18:19 2001
+@@ -666,7 +666,7 @@
  # It thinks the first close brace ends the variable substitution.
  test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
  
@@ -11,16 +11,16 @@ $NetBSD: patch-ab,v 1.3 2001/03/13 20:59:15 wiz Exp $
  
  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  
-@@ -743,7 +743,7 @@
+@@ -755,7 +755,7 @@
  fi
  
  
 -PACKAGE=fvwm
 +PACKAGE=fvwm2
  
- VERSION=2.2.5
+ VERSION=2.4.0
  
-@@ -2984,7 +2984,7 @@
+@@ -3724,7 +3724,7 @@
  # It thinks the first close brace ends the variable substitution.
  test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
  
diff --git a/wm/fvwm2/pkg/PLIST b/wm/fvwm2/pkg/PLIST
index ead5adc2d93..092cf08b666 100644
--- a/wm/fvwm2/pkg/PLIST
+++ b/wm/fvwm2/pkg/PLIST
@@ -1,130 +1,348 @@
-@comment $NetBSD: PLIST,v 1.3 2001/03/13 20:59:15 wiz Exp $
-bin/fvwm2
+@comment $NetBSD: PLIST,v 1.4 2001/07/10 20:03:29 nra Exp $
 bin/FvwmCommand
+bin/fvwm-config
+bin/fvwm-menu-desktop
+bin/fvwm-menu-directory
+bin/fvwm-menu-headlines
+bin/fvwm-menu-xlock
+bin/fvwm2
+bin/fvwm24_convert
+bin/fvwmbug
+lib/X11/fvwm2/2.4.0/FvwmAnimate
+lib/X11/fvwm2/2.4.0/FvwmAudio
+lib/X11/fvwm2/2.4.0/FvwmAuto
+lib/X11/fvwm2/2.4.0/FvwmBacker
+lib/X11/fvwm2/2.4.0/FvwmBanner
+lib/X11/fvwm2/2.4.0/FvwmButtons
+lib/X11/fvwm2/2.4.0/FvwmCascade
+lib/X11/fvwm2/2.4.0/FvwmCommand.pm
+lib/X11/fvwm2/2.4.0/FvwmCommand.sh
+lib/X11/fvwm2/2.4.0/FvwmCommandS
+lib/X11/fvwm2/2.4.0/FvwmConsole
+lib/X11/fvwm2/2.4.0/FvwmConsoleC
+lib/X11/fvwm2/2.4.0/FvwmConsoleC.pl
+lib/X11/fvwm2/2.4.0/FvwmCpp
+lib/X11/fvwm2/2.4.0/FvwmDebug
+lib/X11/fvwm2/2.4.0/FvwmDragWell
+lib/X11/fvwm2/2.4.0/FvwmEvent
+lib/X11/fvwm2/2.4.0/FvwmForm
+lib/X11/fvwm2/2.4.0/FvwmGtk
+lib/X11/fvwm2/2.4.0/FvwmIconBox
+lib/X11/fvwm2/2.4.0/FvwmIconMan
+lib/X11/fvwm2/2.4.0/FvwmIdent
+lib/X11/fvwm2/2.4.0/FvwmM4
+lib/X11/fvwm2/2.4.0/FvwmPager
+lib/X11/fvwm2/2.4.0/FvwmRearrange
+lib/X11/fvwm2/2.4.0/FvwmSave
+lib/X11/fvwm2/2.4.0/FvwmSaveDesk
+lib/X11/fvwm2/2.4.0/FvwmScript
+lib/X11/fvwm2/2.4.0/FvwmScroll
+lib/X11/fvwm2/2.4.0/FvwmTalk
+lib/X11/fvwm2/2.4.0/FvwmTaskBar
+lib/X11/fvwm2/2.4.0/FvwmTheme
+lib/X11/fvwm2/2.4.0/FvwmTile
+lib/X11/fvwm2/2.4.0/FvwmWharf
+lib/X11/fvwm2/2.4.0/FvwmWinList
 lib/X11/fvwm2/decor_examples
-lib/X11/fvwm2/system.fvwm2rc-sample-1
-lib/X11/fvwm2/system.fvwm2rc-sample-2
-@unexec if diff >/dev/null %D/lib/X11/fvwm2/system.fvwm2rc.example %D/lib/X11/fvwm2/system.fvwm2rc ; then rm %D/lib/X11/fvwm2/system.fvwm2rc ; fi
-lib/X11/fvwm2/system.fvwm2rc.example
-@exec if [ ! -f %D/lib/X11/fvwm2/system.fvwm2rc ]; then echo "Installing system.fvwm2rc in %D/lib/X11/fvwm2" ; /usr/bin/install -c -o root -g wheel -m 0644 %D/lib/X11/fvwm2/system.fvwm2rc.example %D/lib/X11/fvwm2/system.fvwm2rc; fi
 lib/X11/fvwm2/pixmaps/Jlock.xpm
-lib/X11/fvwm2/pixmaps/Monitor.xpm
-lib/X11/fvwm2/pixmaps/button-close.xpm
-lib/X11/fvwm2/pixmaps/button-horiz.xpm
-lib/X11/fvwm2/pixmaps/button-max.xpm
-lib/X11/fvwm2/pixmaps/button-vert.xpm
-lib/X11/fvwm2/pixmaps/button.xpm
-lib/X11/fvwm2/pixmaps/side.fvwm2.xpm
 lib/X11/fvwm2/pixmaps/Jnews.xpm
 lib/X11/fvwm2/pixmaps/Jrecycle.xpm
 lib/X11/fvwm2/pixmaps/Jxlock.xpm
+lib/X11/fvwm2/pixmaps/Monitor.xpm
 lib/X11/fvwm2/pixmaps/Mosaic.xpm
+lib/X11/fvwm2/pixmaps/Xfm.xpm
 lib/X11/fvwm2/pixmaps/arrdown2.xpm
 lib/X11/fvwm2/pixmaps/arrows2.xpm
 lib/X11/fvwm2/pixmaps/arrup2.xpm
+lib/X11/fvwm2/pixmaps/banner.fvwm_blue_cursive.xpm
+lib/X11/fvwm2/pixmaps/banner.fvwm_bracket.xpm
+lib/X11/fvwm2/pixmaps/banner.fvwm_cat_thing.xpm
+lib/X11/fvwm2/pixmaps/banner.fvwm_red_3D.xpm
+lib/X11/fvwm2/pixmaps/banner.fvwm_red_cursive.xpm
+lib/X11/fvwm2/pixmaps/banner.fvwm_tiger.xpm
+lib/X11/fvwm2/pixmaps/banner.fvwm_tiger_tail.xpm
+lib/X11/fvwm2/pixmaps/bckgnd1.xpm
+lib/X11/fvwm2/pixmaps/bckgnd3.xpm
+lib/X11/fvwm2/pixmaps/bell.xpm
 lib/X11/fvwm2/pixmaps/bomb.xpm
-lib/X11/fvwm2/pixmaps/ccode.icon
+lib/X11/fvwm2/pixmaps/button-close.xpm
+lib/X11/fvwm2/pixmaps/button-horiz.xpm
+lib/X11/fvwm2/pixmaps/button-max.xpm
+lib/X11/fvwm2/pixmaps/button-vert.xpm
+lib/X11/fvwm2/pixmaps/button.xpm
 lib/X11/fvwm2/pixmaps/clamp.xpm
-lib/X11/fvwm2/pixmaps/colormap.xpm
+lib/X11/fvwm2/pixmaps/date.xpm
 lib/X11/fvwm2/pixmaps/datebook.xpm
-lib/X11/fvwm2/pixmaps/default.xbm
+lib/X11/fvwm2/pixmaps/default.xpm
 lib/X11/fvwm2/pixmaps/desk.xpm
+lib/X11/fvwm2/pixmaps/desktop.xpm
 lib/X11/fvwm2/pixmaps/dialog_box.xpm
+lib/X11/fvwm2/pixmaps/display.xpm
+lib/X11/fvwm2/pixmaps/documents.xpm
 lib/X11/fvwm2/pixmaps/doomface.xpm
 lib/X11/fvwm2/pixmaps/editres.xpm
 lib/X11/fvwm2/pixmaps/eps.xpm
 lib/X11/fvwm2/pixmaps/exit.xpm
+lib/X11/fvwm2/pixmaps/find1.xpm
 lib/X11/fvwm2/pixmaps/flow_chart.xpm
+lib/X11/fvwm2/pixmaps/folder.xpm
 lib/X11/fvwm2/pixmaps/folder2.xpm
 lib/X11/fvwm2/pixmaps/folders.xpm
-lib/X11/fvwm2/pixmaps/fvwm.bitmap
 lib/X11/fvwm2/pixmaps/fvwm.xpm
 lib/X11/fvwm2/pixmaps/fvwm2.xpm
 lib/X11/fvwm2/pixmaps/fvwm2_big.xpm
 lib/X11/fvwm2/pixmaps/fvwm3.xpm
+lib/X11/fvwm2/pixmaps/gimp.xpm
 lib/X11/fvwm2/pixmaps/gnu-animal.xpm
 lib/X11/fvwm2/pixmaps/graphs.xpm
-lib/X11/fvwm2/pixmaps/hcode.icon
-lib/X11/fvwm2/pixmaps/jball.xpm
-lib/X11/fvwm2/pixmaps/jbomb.xpm
-lib/X11/fvwm2/pixmaps/jbook1.xpm
-lib/X11/fvwm2/pixmaps/jbook2.xpm
-lib/X11/fvwm2/pixmaps/jcalc.xpm
-lib/X11/fvwm2/pixmaps/jclock.xpm
-lib/X11/fvwm2/pixmaps/jf.xpm
-lib/X11/fvwm2/pixmaps/jgraph.xpm
-lib/X11/fvwm2/pixmaps/jline.xpm
-lib/X11/fvwm2/pixmaps/jlower.xpm
-lib/X11/fvwm2/pixmaps/jmag.xpm
-lib/X11/fvwm2/pixmaps/jmail.xpm
-lib/X11/fvwm2/pixmaps/jmove.xpm
-lib/X11/fvwm2/pixmaps/jpaint.xpm
-lib/X11/fvwm2/pixmaps/jraise.xpm
-lib/X11/fvwm2/pixmaps/jresize.xpm
-lib/X11/fvwm2/pixmaps/jterm.xpm
-lib/X11/fvwm2/pixmaps/jwindow.xpm
+lib/X11/fvwm2/pixmaps/gv.xpm
+lib/X11/fvwm2/pixmaps/help.xpm
 lib/X11/fvwm2/pixmaps/jx.xpm
+lib/X11/fvwm2/pixmaps/keyboard.xpm
+lib/X11/fvwm2/pixmaps/lemacs.xpm
 lib/X11/fvwm2/pixmaps/mag_glass.xpm
 lib/X11/fvwm2/pixmaps/mail1.xpm
 lib/X11/fvwm2/pixmaps/mail2.xpm
 lib/X11/fvwm2/pixmaps/map.xpm
 lib/X11/fvwm2/pixmaps/math4.xpm
+lib/X11/fvwm2/pixmaps/menu.xpm
+lib/X11/fvwm2/pixmaps/mini.arch.xpm
 lib/X11/fvwm2/pixmaps/mini.audiovol.xpm
+lib/X11/fvwm2/pixmaps/mini.audiovol2.xpm
+lib/X11/fvwm2/pixmaps/mini.ball.xpm
+lib/X11/fvwm2/pixmaps/mini.ball2.xpm
+lib/X11/fvwm2/pixmaps/mini.bball.xpm
 lib/X11/fvwm2/pixmaps/mini.blah.xpm
 lib/X11/fvwm2/pixmaps/mini.bomb.xpm
+lib/X11/fvwm2/pixmaps/mini.bomb2.xpm
+lib/X11/fvwm2/pixmaps/mini.book1.xpm
+lib/X11/fvwm2/pixmaps/mini.book2.xpm
+lib/X11/fvwm2/pixmaps/mini.book3.xpm
+lib/X11/fvwm2/pixmaps/mini.book4.xpm
+lib/X11/fvwm2/pixmaps/mini.books.xpm
+lib/X11/fvwm2/pixmaps/mini.briefcase.xpm
+lib/X11/fvwm2/pixmaps/mini.bug1.xpm
+lib/X11/fvwm2/pixmaps/mini.bug2.xpm
+lib/X11/fvwm2/pixmaps/mini.bx2.xpm
+lib/X11/fvwm2/pixmaps/mini.calc.xpm
+lib/X11/fvwm2/pixmaps/mini.calc2.xpm
+lib/X11/fvwm2/pixmaps/mini.calendar.xpm
+lib/X11/fvwm2/pixmaps/mini.camera.xpm
+lib/X11/fvwm2/pixmaps/mini.cat.xpm
+lib/X11/fvwm2/pixmaps/mini.cave.xpm
+lib/X11/fvwm2/pixmaps/mini.cd.xpm
+lib/X11/fvwm2/pixmaps/mini.cdlabel.xpm
+lib/X11/fvwm2/pixmaps/mini.chart.xpm
 lib/X11/fvwm2/pixmaps/mini.checkmark.xpm
+lib/X11/fvwm2/pixmaps/mini.chinese.xpm
+lib/X11/fvwm2/pixmaps/mini.clipboard.xpm
+lib/X11/fvwm2/pixmaps/mini.clock.xpm
+lib/X11/fvwm2/pixmaps/mini.clock2.xpm
+lib/X11/fvwm2/pixmaps/mini.colors.xpm
+lib/X11/fvwm2/pixmaps/mini.connect.xpm
+lib/X11/fvwm2/pixmaps/mini.crosbone.xpm
+lib/X11/fvwm2/pixmaps/mini.cross.xpm
 lib/X11/fvwm2/pixmaps/mini.cut.xpm
+lib/X11/fvwm2/pixmaps/mini.delete.xpm
+lib/X11/fvwm2/pixmaps/mini.desktop.xpm
 lib/X11/fvwm2/pixmaps/mini.destroy.xpm
+lib/X11/fvwm2/pixmaps/mini.diff.xpm
+lib/X11/fvwm2/pixmaps/mini.directory.xpm
+lib/X11/fvwm2/pixmaps/mini.dirlink.xpm
+lib/X11/fvwm2/pixmaps/mini.diskette.xpm
+lib/X11/fvwm2/pixmaps/mini.display.xpm
+lib/X11/fvwm2/pixmaps/mini.doc.xpm
+lib/X11/fvwm2/pixmaps/mini.doc1.xpm
+lib/X11/fvwm2/pixmaps/mini.dog.xpm
+lib/X11/fvwm2/pixmaps/mini.ear.xpm
+lib/X11/fvwm2/pixmaps/mini.edit.xpm
+lib/X11/fvwm2/pixmaps/mini.espada.xpm
 lib/X11/fvwm2/pixmaps/mini.excl.xpm
+lib/X11/fvwm2/pixmaps/mini.exclam.xpm
 lib/X11/fvwm2/pixmaps/mini.exit.xpm
+lib/X11/fvwm2/pixmaps/mini.exp.xpm
 lib/X11/fvwm2/pixmaps/mini.eye.xpm
+lib/X11/fvwm2/pixmaps/mini.eye2.xpm
+lib/X11/fvwm2/pixmaps/mini.eyes.xpm
+lib/X11/fvwm2/pixmaps/mini.f1.xpm
+lib/X11/fvwm2/pixmaps/mini.fax.xpm
+lib/X11/fvwm2/pixmaps/mini.fdisk.xpm
+lib/X11/fvwm2/pixmaps/mini.file.xpm
+lib/X11/fvwm2/pixmaps/mini.filelink.xpm
+lib/X11/fvwm2/pixmaps/mini.filemgr.xpm
+lib/X11/fvwm2/pixmaps/mini.floppy.xpm
+lib/X11/fvwm2/pixmaps/mini.folder.xpm
+lib/X11/fvwm2/pixmaps/mini.font.xpm
+lib/X11/fvwm2/pixmaps/mini.fractal.xpm
+lib/X11/fvwm2/pixmaps/mini.frame.xpm
+lib/X11/fvwm2/pixmaps/mini.ftp.xpm
 lib/X11/fvwm2/pixmaps/mini.fvwm.xpm
+lib/X11/fvwm2/pixmaps/mini.gball.xpm
+lib/X11/fvwm2/pixmaps/mini.gimp.xpm
+lib/X11/fvwm2/pixmaps/mini.gnome.xpm
+lib/X11/fvwm2/pixmaps/mini.gnu.xpm
+lib/X11/fvwm2/pixmaps/mini.go.xpm
+lib/X11/fvwm2/pixmaps/mini.gopher.xpm
+lib/X11/fvwm2/pixmaps/mini.graph.xpm
+lib/X11/fvwm2/pixmaps/mini.graph2.xpm
+lib/X11/fvwm2/pixmaps/mini.gv.xpm
+lib/X11/fvwm2/pixmaps/mini.hammer.xpm
+lib/X11/fvwm2/pixmaps/mini.happy.xpm
+lib/X11/fvwm2/pixmaps/mini.hdisk.xpm
+lib/X11/fvwm2/pixmaps/mini.heart.xpm
+lib/X11/fvwm2/pixmaps/mini.hex.xpm
+lib/X11/fvwm2/pixmaps/mini.hextris.xpm
+lib/X11/fvwm2/pixmaps/mini.ibm.xpm
 lib/X11/fvwm2/pixmaps/mini.iconify.xpm
+lib/X11/fvwm2/pixmaps/mini.iconify1.xpm
+lib/X11/fvwm2/pixmaps/mini.icons.xpm
+lib/X11/fvwm2/pixmaps/mini.kde.xpm
+lib/X11/fvwm2/pixmaps/mini.keyboard.xpm
+lib/X11/fvwm2/pixmaps/mini.keys.xpm
 lib/X11/fvwm2/pixmaps/mini.letter.xpm
+lib/X11/fvwm2/pixmaps/mini.line.xpm
+lib/X11/fvwm2/pixmaps/mini.lock.xpm
 lib/X11/fvwm2/pixmaps/mini.lower.xpm
+lib/X11/fvwm2/pixmaps/mini.lower2.xpm
+lib/X11/fvwm2/pixmaps/mini.lower3.xpm
+lib/X11/fvwm2/pixmaps/mini.mag.xpm
+lib/X11/fvwm2/pixmaps/mini.mail.xpm
+lib/X11/fvwm2/pixmaps/mini.mail2.xpm
+lib/X11/fvwm2/pixmaps/mini.manual.xpm
+lib/X11/fvwm2/pixmaps/mini.max1.xpm
 lib/X11/fvwm2/pixmaps/mini.maximize-horiz.xpm
-lib/X11/fvwm2/pixmaps/ps.xpm
+lib/X11/fvwm2/pixmaps/mini.maximize-horiz1.xpm
 lib/X11/fvwm2/pixmaps/mini.maximize-vert.xpm
+lib/X11/fvwm2/pixmaps/mini.maximize-vert1.xpm
 lib/X11/fvwm2/pixmaps/mini.maximize.xpm
+lib/X11/fvwm2/pixmaps/mini.maximize1.xpm
 lib/X11/fvwm2/pixmaps/mini.maximize2.xpm
+lib/X11/fvwm2/pixmaps/mini.maze.xpm
+lib/X11/fvwm2/pixmaps/mini.modules.xpm
+lib/X11/fvwm2/pixmaps/mini.monitor.xpm
+lib/X11/fvwm2/pixmaps/mini.mouse.xpm
 lib/X11/fvwm2/pixmaps/mini.move.xpm
+lib/X11/fvwm2/pixmaps/mini.move1.xpm
+lib/X11/fvwm2/pixmaps/mini.move2.xpm
+lib/X11/fvwm2/pixmaps/mini.move3.xpm
+lib/X11/fvwm2/pixmaps/mini.mwm.xpm
 lib/X11/fvwm2/pixmaps/mini.netscape.xpm
+lib/X11/fvwm2/pixmaps/mini.news.xpm
+lib/X11/fvwm2/pixmaps/mini.nscape.xpm
+lib/X11/fvwm2/pixmaps/mini.ofolder.xpm
+lib/X11/fvwm2/pixmaps/mini.olwm.xpm
+lib/X11/fvwm2/pixmaps/mini.pager.xpm
+lib/X11/fvwm2/pixmaps/mini.paint.xpm
+lib/X11/fvwm2/pixmaps/mini.paint2.xpm
+lib/X11/fvwm2/pixmaps/mini.palette.xpm
+lib/X11/fvwm2/pixmaps/mini.paper.xpm
+lib/X11/fvwm2/pixmaps/mini.pdf.xpm
+lib/X11/fvwm2/pixmaps/mini.pencil.xpm
+lib/X11/fvwm2/pixmaps/mini.penguin.xpm
+lib/X11/fvwm2/pixmaps/mini.perf.xpm
+lib/X11/fvwm2/pixmaps/mini.picture.xpm
+lib/X11/fvwm2/pixmaps/mini.question.xpm
 lib/X11/fvwm2/pixmaps/mini.rainbow.xpm
 lib/X11/fvwm2/pixmaps/mini.raise.xpm
+lib/X11/fvwm2/pixmaps/mini.raise2.xpm
+lib/X11/fvwm2/pixmaps/mini.raise3.xpm
+lib/X11/fvwm2/pixmaps/mini.ray.xpm
+lib/X11/fvwm2/pixmaps/mini.rball.xpm
 lib/X11/fvwm2/pixmaps/mini.refresh.xpm
 lib/X11/fvwm2/pixmaps/mini.resize.xpm
 lib/X11/fvwm2/pixmaps/mini.resize2.xpm
+lib/X11/fvwm2/pixmaps/mini.resize3.xpm
+lib/X11/fvwm2/pixmaps/mini.resize4.xpm
+lib/X11/fvwm2/pixmaps/mini.roach.xpm
+lib/X11/fvwm2/pixmaps/mini.run.xpm
+lib/X11/fvwm2/pixmaps/mini.sh.xpm
+lib/X11/fvwm2/pixmaps/mini.sh1.xpm
+lib/X11/fvwm2/pixmaps/mini.shade1.xpm
+lib/X11/fvwm2/pixmaps/mini.slon.xpm
+lib/X11/fvwm2/pixmaps/mini.sound.xpm
+lib/X11/fvwm2/pixmaps/mini.start.xpm
 lib/X11/fvwm2/pixmaps/mini.stick.xpm
+lib/X11/fvwm2/pixmaps/mini.stick1.xpm
 lib/X11/fvwm2/pixmaps/mini.stick2.xpm
 lib/X11/fvwm2/pixmaps/mini.stickpressed.xpm
+lib/X11/fvwm2/pixmaps/mini.stop.xpm
+lib/X11/fvwm2/pixmaps/mini.telnet.xpm
+lib/X11/fvwm2/pixmaps/mini.term.xpm
+lib/X11/fvwm2/pixmaps/mini.term2.xpm
+lib/X11/fvwm2/pixmaps/mini.tetris.xpm
+lib/X11/fvwm2/pixmaps/mini.trebol.xpm
+lib/X11/fvwm2/pixmaps/mini.turn.xpm
+lib/X11/fvwm2/pixmaps/mini.twm.xpm
 lib/X11/fvwm2/pixmaps/mini.winXX-close.xpm
 lib/X11/fvwm2/pixmaps/mini.winXX-maximize.xpm
 lib/X11/fvwm2/pixmaps/mini.winXX-minimize.xpm
+lib/X11/fvwm2/pixmaps/mini.winXX-normalize.xpm
+lib/X11/fvwm2/pixmaps/mini.winXX-sysmenu.xpm
+lib/X11/fvwm2/pixmaps/mini.window.xpm
+lib/X11/fvwm2/pixmaps/mini.window2.xpm
+lib/X11/fvwm2/pixmaps/mini.windows.xpm
+lib/X11/fvwm2/pixmaps/mini.windowshade.xpm
+lib/X11/fvwm2/pixmaps/mini.x.xpm
+lib/X11/fvwm2/pixmaps/mini.x2.xpm
+lib/X11/fvwm2/pixmaps/mini.xaniroc.xpm
 lib/X11/fvwm2/pixmaps/mini.xarchie.xpm
 lib/X11/fvwm2/pixmaps/mini.xbiff.xpm
 lib/X11/fvwm2/pixmaps/mini.xboing.xpm
+lib/X11/fvwm2/pixmaps/mini.xfig.xpm
+lib/X11/fvwm2/pixmaps/mini.xjewel.xpm
+lib/X11/fvwm2/pixmaps/mini.xkeycaps.xpm
+lib/X11/fvwm2/pixmaps/mini.xlander.xpm
 lib/X11/fvwm2/pixmaps/mini.xlock.xpm
 lib/X11/fvwm2/pixmaps/mini.xmag.xpm
+lib/X11/fvwm2/pixmaps/mini.xmahjongg.xpm
 lib/X11/fvwm2/pixmaps/mini.xman.xpm
 lib/X11/fvwm2/pixmaps/mini.xpaint.xpm
-lib/X11/fvwm2/pixmaps/mini.xpm
+lib/X11/fvwm2/pixmaps/mini.xsnow.xpm
 lib/X11/fvwm2/pixmaps/mini.xterm.xpm
+lib/X11/fvwm2/pixmaps/mini.xv.xpm
 lib/X11/fvwm2/pixmaps/mini.zircon.xpm
-lib/X11/fvwm2/pixmaps/ocode.icon
+lib/X11/fvwm2/pixmaps/mini.zoom.xpm
+lib/X11/fvwm2/pixmaps/modules.xpm
+lib/X11/fvwm2/pixmaps/nscape.xpm
 lib/X11/fvwm2/pixmaps/page.xpm
 lib/X11/fvwm2/pixmaps/page2.xpm
-lib/X11/fvwm2/pixmaps/prog.icon
+lib/X11/fvwm2/pixmaps/pointer.xpm
+lib/X11/fvwm2/pixmaps/programs.xpm
+lib/X11/fvwm2/pixmaps/ps.xpm
 lib/X11/fvwm2/pixmaps/question.xpm
 lib/X11/fvwm2/pixmaps/rbomb.xpm
+lib/X11/fvwm2/pixmaps/rbomb2.xpm
 lib/X11/fvwm2/pixmaps/rcalc.xpm
+lib/X11/fvwm2/pixmaps/rcalc2.xpm
+lib/X11/fvwm2/pixmaps/resize.rainbow.xpm
 lib/X11/fvwm2/pixmaps/rterm.xpm
+lib/X11/fvwm2/pixmaps/rterm2.xpm
+lib/X11/fvwm2/pixmaps/run.xpm
+lib/X11/fvwm2/pixmaps/screen.xpm
+lib/X11/fvwm2/pixmaps/settings.xpm
+lib/X11/fvwm2/pixmaps/shells.xpm
+lib/X11/fvwm2/pixmaps/shutdown.xpm
+lib/X11/fvwm2/pixmaps/shutdown2.xpm
+lib/X11/fvwm2/pixmaps/side.fvwm2.xpm
+lib/X11/fvwm2/pixmaps/side.fvwm2_1.xpm
+lib/X11/fvwm2/pixmaps/side.fvwm2_2.xpm
+lib/X11/fvwm2/pixmaps/side.utilities.xpm
+lib/X11/fvwm2/pixmaps/small.Paint2.xpm
+lib/X11/fvwm2/pixmaps/small.Shell2.xpm
+lib/X11/fvwm2/pixmaps/small.exit.xpm
+lib/X11/fvwm2/pixmaps/small.lock.xpm
+lib/X11/fvwm2/pixmaps/small.man.next.xpm
+lib/X11/fvwm2/pixmaps/small.note.next.xpm
+lib/X11/fvwm2/pixmaps/small.tools2_3d.xpm
 lib/X11/fvwm2/pixmaps/term.xpm
+lib/X11/fvwm2/pixmaps/textedit.xpm
 lib/X11/fvwm2/pixmaps/tiff2.xpm
 lib/X11/fvwm2/pixmaps/toolbox.xpm
 lib/X11/fvwm2/pixmaps/unknown1.xpm
 lib/X11/fvwm2/pixmaps/wierd_page3.xpm
+lib/X11/fvwm2/pixmaps/window.xpm
 lib/X11/fvwm2/pixmaps/word_processor.xpm
-lib/X11/fvwm2/pixmaps/world.xpm
+lib/X11/fvwm2/pixmaps/wterm.xpm
 lib/X11/fvwm2/pixmaps/xcalc.xpm
 lib/X11/fvwm2/pixmaps/xemacs.xpm
 lib/X11/fvwm2/pixmaps/xlock.xpm
@@ -132,6 +350,7 @@ lib/X11/fvwm2/pixmaps/xman.xpm
 lib/X11/fvwm2/pixmaps/xpaint.xpm
 lib/X11/fvwm2/pixmaps/xterm-axp.xpm
 lib/X11/fvwm2/pixmaps/xterm-blank.xpm
+lib/X11/fvwm2/pixmaps/xterm-bsd.xpm
 lib/X11/fvwm2/pixmaps/xterm-dec.xpm
 lib/X11/fvwm2/pixmaps/xterm-linux.xpm
 lib/X11/fvwm2/pixmaps/xterm-sgi.xpm
@@ -140,74 +359,84 @@ lib/X11/fvwm2/pixmaps/xterm-sun.xpm
 lib/X11/fvwm2/pixmaps/xterm.xpm
 lib/X11/fvwm2/pixmaps/xv.xpm
 lib/X11/fvwm2/pixmaps/xv2.xpm
-lib/X11/fvwm2/pixmaps/mini.directory.xpm
-lib/X11/fvwm2/pixmaps/mini.dirlink.xpm
-lib/X11/fvwm2/pixmaps/mini.file.xpm
-lib/X11/fvwm2/pixmaps/mini.filelink.xpm
-lib/X11/fvwm2/pixmaps/xterm-bsd.xpm
-lib/X11/fvwm2/${FVWM_VER}/FvwmAnimate
-lib/X11/fvwm2/${FVWM_VER}/FvwmAudio
-lib/X11/fvwm2/${FVWM_VER}/FvwmAuto
-lib/X11/fvwm2/${FVWM_VER}/FvwmBacker
-lib/X11/fvwm2/${FVWM_VER}/FvwmBanner
-lib/X11/fvwm2/${FVWM_VER}/FvwmButtons
-lib/X11/fvwm2/${FVWM_VER}/FvwmCpp
-lib/X11/fvwm2/${FVWM_VER}/FvwmEvent
-lib/X11/fvwm2/${FVWM_VER}/FvwmForm
-lib/X11/fvwm2/${FVWM_VER}/FvwmIconBox
-lib/X11/fvwm2/${FVWM_VER}/FvwmIconMan
-lib/X11/fvwm2/${FVWM_VER}/FvwmIdent
-lib/X11/fvwm2/${FVWM_VER}/FvwmM4
-lib/X11/fvwm2/${FVWM_VER}/FvwmPager
-lib/X11/fvwm2/${FVWM_VER}/FvwmRearrange
-lib/X11/fvwm2/${FVWM_VER}/FvwmCascade
-lib/X11/fvwm2/${FVWM_VER}/FvwmTile
-lib/X11/fvwm2/${FVWM_VER}/FvwmSave
-lib/X11/fvwm2/${FVWM_VER}/FvwmSaveDesk
-lib/X11/fvwm2/${FVWM_VER}/FvwmScroll
-lib/X11/fvwm2/${FVWM_VER}/FvwmTalk
-lib/X11/fvwm2/${FVWM_VER}/FvwmWinList
-lib/X11/fvwm2/${FVWM_VER}/FvwmCommandS
-lib/X11/fvwm2/${FVWM_VER}/FvwmConfig
-lib/X11/fvwm2/${FVWM_VER}/FvwmConsole
-lib/X11/fvwm2/${FVWM_VER}/FvwmConsoleC
-lib/X11/fvwm2/${FVWM_VER}/FvwmConsoleC.pl
-lib/X11/fvwm2/${FVWM_VER}/FvwmDebug
-lib/X11/fvwm2/${FVWM_VER}/FvwmGoodStuff
-lib/X11/fvwm2/${FVWM_VER}/FvwmPipe
-lib/X11/fvwm2/${FVWM_VER}/FvwmScript
-lib/X11/fvwm2/${FVWM_VER}/FvwmTaskBar
-lib/X11/fvwm2/${FVWM_VER}/FvwmWharf
-@dirrm lib/X11/fvwm2/${FVWM_VER}
-@dirrm lib/X11/fvwm2/pixmaps
-@dirrm lib/X11/fvwm2
-man/man1/fvwm2.1
+lib/X11/fvwm2/pixmaps/xview.xpm
+lib/X11/fvwm2/system.fvwm2rc
+lib/X11/fvwm2/system.fvwm2rc-sample-1
+lib/X11/fvwm2/system.fvwm2rc-sample-2
+lib/X11/fvwm2/system.fvwm2rc-sample-95
+lib/X11/fvwm2/system.fvwm2rc.example
 man/man1/FvwmAnimate.1
-man/man1/FvwmAudio.1
 man/man1/FvwmAuto.1
 man/man1/FvwmBacker.1
 man/man1/FvwmBanner.1
 man/man1/FvwmButtons.1
+man/man1/FvwmCommand.1
+man/man1/FvwmConsole.1
+man/man1/FvwmConsoleC.pl.1
 man/man1/FvwmCpp.1
+man/man1/FvwmDebug.1
+man/man1/FvwmDragWell.1
 man/man1/FvwmEvent.1
 man/man1/FvwmForm.1
+man/man1/FvwmGtk.1
 man/man1/FvwmIconBox.1
 man/man1/FvwmIconMan.1
 man/man1/FvwmIdent.1
 man/man1/FvwmM4.1
 man/man1/FvwmPager.1
-man/man1/FvwmSave.1
 man/man1/FvwmRearrange.1
+man/man1/FvwmSave.1
 man/man1/FvwmSaveDesk.1
-man/man1/FvwmScroll.1
-man/man1/FvwmTalk.1
-man/man1/FvwmWinList.1
-man/man1/FvwmCommand.1
-man/man1/FvwmConfig.1
-man/man1/FvwmConsole.1
-man/man1/FvwmConsoleC.pl.1
-man/man1/FvwmDebug.1
-man/man1/FvwmGoodStuff.1
 man/man1/FvwmScript.1
+man/man1/FvwmScroll.1
 man/man1/FvwmTaskBar.1
+man/man1/FvwmTheme.1
 man/man1/FvwmWharf.1
+man/man1/FvwmWinList.1
+man/man1/fvwm-menu-desktop.1
+man/man1/fvwm-menu-directory.1
+man/man1/fvwm-menu-headlines.1
+man/man1/fvwm-menu-xlock.1
+man/man1/fvwm2.1
+man/man1/fvwm24_convert.1
+man/man1/fvwmbug.1
+man/man1/fvwmrc_convert.1
+share/fvwm2/ConfigFvwmBacker
+share/fvwm2/ConfigFvwmButtons
+share/fvwm2/ConfigFvwmDefaults
+share/fvwm2/ConfigFvwmIconBox
+share/fvwm2/ConfigFvwmIconMan
+share/fvwm2/ConfigFvwmIdent
+share/fvwm2/ConfigFvwmPager
+share/fvwm2/ConfigFvwmScroll
+share/fvwm2/ConfigFvwmSetup
+share/fvwm2/ConfigFvwmTaskBar
+share/fvwm2/ConfigFvwmWinList
+share/fvwm2/FvwmForm-Capture
+share/fvwm2/FvwmForm-Form
+share/fvwm2/FvwmForm-QuitVerify
+share/fvwm2/FvwmForm-Rlogin
+share/fvwm2/FvwmForm-RootCursor
+share/fvwm2/FvwmForm-Setup
+share/fvwm2/FvwmForm-Talk
+share/fvwm2/FvwmForm-TalkHelp
+share/fvwm2/FvwmScript-BaseConfig
+share/fvwm2/FvwmScript-BellSetup
+share/fvwm2/FvwmScript-Buttons
+share/fvwm2/FvwmScript-Colorset
+share/fvwm2/FvwmScript-Date
+share/fvwm2/FvwmScript-FileBrowser
+share/fvwm2/FvwmScript-Find
+share/fvwm2/FvwmScript-KeyboardSetup
+share/fvwm2/FvwmScript-PointerSetup
+share/fvwm2/FvwmScript-Quit
+share/fvwm2/FvwmScript-ScreenDump
+share/fvwm2/FvwmScript-ScreenSetup
+share/fvwm2/FvwmScript-Setup95
+share/fvwm2/FvwmScript-WidgetDemo
+share/fvwm2/fvwm-script-setup95.pl
+share/fvwm2/system.fvwm2rc-sample-95
+@dirrm share/fvwm2
+@dirrm lib/X11/fvwm2/pixmaps
+@dirrm lib/X11/fvwm2/2.4.0
+@dirrm lib/X11/fvwm2