Update to 2.4.0

Give originator maintainership
Export PORTVERSION to PLIST
Update and sort MAN pages in Makefile
Add hooks for GNOME
Adjust patch file to install files in correct directory

PR:		28709
Submitted by:	Pete Fritchman <petef@databits.net>

10 files changed, 898 insertions, 394 deletions

diff --git a/x11-wm/fvwm2/Makefile b/x11-wm/fvwm2/Makefile
index 2091cd69a9a8..daddd1d195e3 100644
--- a/x11-wm/fvwm2/Makefile
+++ b/x11-wm/fvwm2/Makefile
@@ -6,36 +6,58 @@
 #
 
 PORTNAME=	fvwm
-PORTVERSION=	2.2.5
+PORTVERSION=	2.4.0
 CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.fvwm.org/pub/fvwm/version-2/ \
 		http://www.fvwm.org/generated/icon_download/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} fvwm_icons.tgz
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	petef@databits.net
 
-USE_X_PREFIX=	yes
+USE_GMAKE=	yes
+USE_GTK=	yes
+USE_IMLIB=	yes
 USE_XPM=	yes
+USE_X_PREFIX=	yes
+WANT_GNOME=	yes
+
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-extras --prefix=${PREFIX}
-USE_GMAKE=	yes
 
-MAN1=	FvwmAnimate.1 FvwmAudio.1 FvwmAuto.1 FvwmBacker.1 FvwmBanner.1 \
-	FvwmButtons.1 FvwmCommand.1 FvwmConfig.1 FvwmConsole.1 \
-	FvwmCpp.1 FvwmDebug.1 FvwmEvent.1 FvwmForm.1 FvwmGoodStuff.1 \
-	FvwmIconBox.1 FvwmIconMan.1 FvwmIdent.1 FvwmM4.1 FvwmPager.1 \
-	FvwmRearrange.1 FvwmSave.1 FvwmSaveDesk.1 FvwmScript.1 FvwmScroll.1 \
-	FvwmTalk.1 FvwmTaskBar.1 FvwmWharf.1 FvwmWinList.1 fvwm2.1 xpmroot.1 \
-	FvwmConsoleC.pl.1
+PLIST_SUB+=	FVWM_VERSION="${PORTVERSION}"
+
+.include <bsd.port.pre.mk>
+
+.if defined(HAVE_GNOME)
+USE_GNOME=	yes
+PLIST_SUB+=	GNOME=""
+.else
+CONFIGURE_ARGS+=	--disable-gnome
+PLIST_SUB+=	GNOME="@comment "
+.endif
+
+MAN1=	FvwmAnimate.1 FvwmAuto.1 FvwmBacker.1 FvwmBanner.1 FvwmButtons.1 \
+	FvwmCommand.1 FvwmConsole.1 FvwmConsoleC.pl.1 FvwmCpp.1 FvwmDebug.1 \
+	FvwmDragWell.1 FvwmEvent.1 FvwmForm.1 FvwmGtk.1 FvwmIconBox.1 \
+	FvwmIconMan.1 FvwmIdent.1 FvwmM4.1 FvwmPager.1 FvwmRearrange.1 \
+	FvwmSave.1 FvwmSaveDesk.1 FvwmScript.1 FvwmScroll.1 FvwmTaskBar.1 \
+	FvwmTheme.1 FvwmWharf.1 FvwmWinList.1 fvwm-menu-desktop.1 \
+	fvwm-menu-directory.1 fvwm-menu-headlines.1 fvwm-menu-xlock.1 \
+	fvwm2.1 fvwm24_convert.1 fvwmbug.1 fvwmrc_convert.1 xpmroot.1
+
+post-extract:
+	@${MKDIR} ${WRKDIR}/icons
+	@${TAR} -xzf ${DISTDIR}/fvwm_icons.tgz -C ${WRKDIR}/icons
 
 post-install:
-	@${MKDIR} ${PREFIX}/etc
-	@${CP} ${WRKSRC}/sample.fvwmrc/system.fvwm2rc ${PREFIX}/etc/system.fvwm2rc.dist
+	@${INSTALL_DATA} ${WRKSRC}/sample.fvwmrc/system.fvwm2rc \
+		${PREFIX}/etc/system.fvwm2rc.dist
 	@if [ ! -e ${PREFIX}/etc/system.fvwm2rc ]; then \
-		${CP} ${WRKSRC}/sample.fvwmrc/system.fvwm2rc ${PREFIX}/etc/system.fvwm2rc; \
+		${INSTALL_DATA} ${WRKSRC}/sample.fvwmrc/system.fvwm2rc \
+			${PREFIX}/etc/system.fvwm2rc; \
 	fi
-	@${MKDIR} ${PREFIX}/lib/X11/fvwm2/pixmaps
-	${INSTALL_DATA} ${WRKSRC}/icons/*.xpm \
-		${PREFIX}/lib/X11/fvwm2/pixmaps
+	@${MKDIR} ${PREFIX}/share/fvwm2/pixmaps
+	${INSTALL_DATA} ${WRKDIR}/icons/*.xpm \
+		${PREFIX}/share/fvwm2/pixmaps
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11-wm/fvwm2/distinfo b/x11-wm/fvwm2/distinfo
index 6172d2304249..bfada011b5aa 100644
--- a/x11-wm/fvwm2/distinfo
+++ b/x11-wm/fvwm2/distinfo
@@ -1,2 +1,2 @@
-MD5 (fvwm-2.2.5.tar.gz) = 4d871dc12d7534843f6b311add963030
+MD5 (fvwm-2.4.0.tar.gz) = b2fe8edec50cfbd46fdc2a5acd6c3139
 MD5 (fvwm_icons.tgz) = 7b254da269a236d77c790581701442cb
diff --git a/x11-wm/fvwm2/files/patch-ad b/x11-wm/fvwm2/files/patch-ad
index 6287675cc456..2497c3e5458d 100644
--- a/x11-wm/fvwm2/files/patch-ad
+++ b/x11-wm/fvwm2/files/patch-ad
@@ -1,11 +1,11 @@
---- extras/FvwmCommand/FvwmCommand.c.orig	Sun Jan 10 21:59:41 1999
-+++ extras/FvwmCommand/FvwmCommand.c	Sat Jun 10 20:50:13 2000
-@@ -700,7 +700,7 @@
- 
+--- modules/FvwmCommand/FvwmCommand.c.orig	Wed Jul  4 22:35:50 2001
++++ modules/FvwmCommand/FvwmCommand.c	Wed Jul  4 22:35:52 2001
+@@ -927,7 +927,7 @@
+ {
    printf( "           %-20s x %ld, y %ld, desk %ld, max x %ld, max y %ld\n",
- 	  "new page", 
--	  body[0], body[0], body[2], body[3], body[4]);
-+	  body[0], body[1], body[2], body[3], body[4]);
+ 	  "new page",
+-	  body[0], body[1], body[2], body[3], body[4]);
++	  body[0], body[0], body[2], body[3], body[4]);
  }
  
  /*************************************************************************
diff --git a/x11-wm/fvwm2/pkg-descr b/x11-wm/fvwm2/pkg-descr
index ea39f09e54d2..e43494a36477 100644
--- a/x11-wm/fvwm2/pkg-descr
+++ b/x11-wm/fvwm2/pkg-descr
@@ -6,5 +6,5 @@ functions or programs.
 
 WWW: http://www.fvwm.org/
 
-Jason C. Wells
-jcwells@u.washington.edu
+- Pete
+petef@databits.net
diff --git a/x11-wm/fvwm2/pkg-plist b/x11-wm/fvwm2/pkg-plist
index dcf1731633e5..d30eb3c24dbc 100644
--- a/x11-wm/fvwm2/pkg-plist
+++ b/x11-wm/fvwm2/pkg-plist
@@ -1,175 +1,405 @@
 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
 bin/xpmroot
 @unexec if cmp -s %D/etc/system.fvwm2rc %D/etc/system.fvwm2rc.dist; then rm -f %D/etc/system.fvwm2rc; fi
 etc/system.fvwm2rc.dist
 @exec [ -f %B/system.fvwm2rc ] || cp %B/%f %B/system.fvwm2rc
-lib/X11/fvwm2/pixmaps/Jlock.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/arrdown2.xpm
-lib/X11/fvwm2/pixmaps/arrows2.xpm
-lib/X11/fvwm2/pixmaps/arrup2.xpm
-lib/X11/fvwm2/pixmaps/bomb.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/clamp.xpm
-lib/X11/fvwm2/pixmaps/colormap.xpm
-lib/X11/fvwm2/pixmaps/datebook.xpm
-lib/X11/fvwm2/pixmaps/desk.xpm
-lib/X11/fvwm2/pixmaps/dialog_box.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/flow_chart.xpm
-lib/X11/fvwm2/pixmaps/folder2.xpm
-lib/X11/fvwm2/pixmaps/folders.xpm
-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/gnu-animal.xpm
-lib/X11/fvwm2/pixmaps/graphs.xpm
-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/jx.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/mini.audiovol.xpm
-lib/X11/fvwm2/pixmaps/mini.blah.xpm
-lib/X11/fvwm2/pixmaps/mini.bomb.xpm
-lib/X11/fvwm2/pixmaps/mini.checkmark.xpm
-lib/X11/fvwm2/pixmaps/mini.cut.xpm
-lib/X11/fvwm2/pixmaps/mini.destroy.xpm
-lib/X11/fvwm2/pixmaps/mini.directory.xpm
-lib/X11/fvwm2/pixmaps/mini.dirlink.xpm
-lib/X11/fvwm2/pixmaps/mini.excl.xpm
-lib/X11/fvwm2/pixmaps/mini.exit.xpm
-lib/X11/fvwm2/pixmaps/mini.eye.xpm
-lib/X11/fvwm2/pixmaps/mini.file.xpm
-lib/X11/fvwm2/pixmaps/mini.filelink.xpm
-lib/X11/fvwm2/pixmaps/mini.fvwm.xpm
-lib/X11/fvwm2/pixmaps/mini.iconify.xpm
-lib/X11/fvwm2/pixmaps/mini.letter.xpm
-lib/X11/fvwm2/pixmaps/mini.lower.xpm
-lib/X11/fvwm2/pixmaps/mini.maximize-horiz.xpm
-lib/X11/fvwm2/pixmaps/mini.maximize-vert.xpm
-lib/X11/fvwm2/pixmaps/mini.maximize.xpm
-lib/X11/fvwm2/pixmaps/mini.maximize2.xpm
-lib/X11/fvwm2/pixmaps/mini.move.xpm
-lib/X11/fvwm2/pixmaps/mini.netscape.xpm
-lib/X11/fvwm2/pixmaps/mini.rainbow.xpm
-lib/X11/fvwm2/pixmaps/mini.raise.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.stick.xpm
-lib/X11/fvwm2/pixmaps/mini.stick2.xpm
-lib/X11/fvwm2/pixmaps/mini.stickpressed.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.xarchie.xpm
-lib/X11/fvwm2/pixmaps/mini.xbiff.xpm
-lib/X11/fvwm2/pixmaps/mini.xboing.xpm
-lib/X11/fvwm2/pixmaps/mini.xlock.xpm
-lib/X11/fvwm2/pixmaps/mini.xmag.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.xterm.xpm
-lib/X11/fvwm2/pixmaps/mini.zircon.xpm
-lib/X11/fvwm2/pixmaps/page.xpm
-lib/X11/fvwm2/pixmaps/page2.xpm
-lib/X11/fvwm2/pixmaps/ps.xpm
-lib/X11/fvwm2/pixmaps/question.xpm
-lib/X11/fvwm2/pixmaps/rbomb.xpm
-lib/X11/fvwm2/pixmaps/rcalc.xpm
-lib/X11/fvwm2/pixmaps/rterm.xpm
-lib/X11/fvwm2/pixmaps/side.fvwm2.xpm
-lib/X11/fvwm2/pixmaps/term.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/word_processor.xpm
-lib/X11/fvwm2/pixmaps/world.xpm
-lib/X11/fvwm2/pixmaps/xcalc.xpm
-lib/X11/fvwm2/pixmaps/xemacs.xpm
-lib/X11/fvwm2/pixmaps/xlock.xpm
-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
-lib/X11/fvwm2/pixmaps/xterm-sol.xpm
-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
-libexec/fvwm/2.2.5/FvwmAnimate
-libexec/fvwm/2.2.5/FvwmAudio
-libexec/fvwm/2.2.5/FvwmAuto
-libexec/fvwm/2.2.5/FvwmBacker
-libexec/fvwm/2.2.5/FvwmBanner
-libexec/fvwm/2.2.5/FvwmButtons
-libexec/fvwm/2.2.5/FvwmCascade
-libexec/fvwm/2.2.5/FvwmCommandS
-libexec/fvwm/2.2.5/FvwmConfig
-libexec/fvwm/2.2.5/FvwmConsole
-libexec/fvwm/2.2.5/FvwmConsoleC
-libexec/fvwm/2.2.5/FvwmConsoleC.pl
-libexec/fvwm/2.2.5/FvwmCpp
-libexec/fvwm/2.2.5/FvwmDebug
-libexec/fvwm/2.2.5/FvwmEvent
-libexec/fvwm/2.2.5/FvwmForm
-libexec/fvwm/2.2.5/FvwmGoodStuff
-libexec/fvwm/2.2.5/FvwmIconBox
-libexec/fvwm/2.2.5/FvwmIconMan
-libexec/fvwm/2.2.5/FvwmIdent
-libexec/fvwm/2.2.5/FvwmM4
-libexec/fvwm/2.2.5/FvwmPager
-libexec/fvwm/2.2.5/FvwmPipe
-libexec/fvwm/2.2.5/FvwmRearrange
-libexec/fvwm/2.2.5/FvwmSave
-libexec/fvwm/2.2.5/FvwmSaveDesk
-libexec/fvwm/2.2.5/FvwmScript
-libexec/fvwm/2.2.5/FvwmScroll
-libexec/fvwm/2.2.5/FvwmTalk
-libexec/fvwm/2.2.5/FvwmTaskBar
-libexec/fvwm/2.2.5/FvwmTile
-libexec/fvwm/2.2.5/FvwmWharf
-libexec/fvwm/2.2.5/FvwmWinList
-@dirrm libexec/fvwm/2.2.5
+libexec/fvwm/%%FVWM_VERSION%%/FvwmAnimate
+libexec/fvwm/%%FVWM_VERSION%%/FvwmAudio
+libexec/fvwm/%%FVWM_VERSION%%/FvwmAuto
+libexec/fvwm/%%FVWM_VERSION%%/FvwmBacker
+libexec/fvwm/%%FVWM_VERSION%%/FvwmBanner
+libexec/fvwm/%%FVWM_VERSION%%/FvwmButtons
+libexec/fvwm/%%FVWM_VERSION%%/FvwmCascade
+libexec/fvwm/%%FVWM_VERSION%%/FvwmCommand.pm
+libexec/fvwm/%%FVWM_VERSION%%/FvwmCommand.sh
+libexec/fvwm/%%FVWM_VERSION%%/FvwmCommandS
+libexec/fvwm/%%FVWM_VERSION%%/FvwmConsole
+libexec/fvwm/%%FVWM_VERSION%%/FvwmConsoleC
+libexec/fvwm/%%FVWM_VERSION%%/FvwmConsoleC.pl
+libexec/fvwm/%%FVWM_VERSION%%/FvwmCpp
+libexec/fvwm/%%FVWM_VERSION%%/FvwmDebug
+libexec/fvwm/%%FVWM_VERSION%%/FvwmDragWell
+libexec/fvwm/%%FVWM_VERSION%%/FvwmEvent
+libexec/fvwm/%%FVWM_VERSION%%/FvwmForm
+libexec/fvwm/%%FVWM_VERSION%%/FvwmGtk
+libexec/fvwm/%%FVWM_VERSION%%/FvwmIconBox
+libexec/fvwm/%%FVWM_VERSION%%/FvwmIconMan
+libexec/fvwm/%%FVWM_VERSION%%/FvwmIdent
+libexec/fvwm/%%FVWM_VERSION%%/FvwmM4
+libexec/fvwm/%%FVWM_VERSION%%/FvwmPager
+libexec/fvwm/%%FVWM_VERSION%%/FvwmRearrange
+libexec/fvwm/%%FVWM_VERSION%%/FvwmSave
+libexec/fvwm/%%FVWM_VERSION%%/FvwmSaveDesk
+libexec/fvwm/%%FVWM_VERSION%%/FvwmScript
+libexec/fvwm/%%FVWM_VERSION%%/FvwmScroll
+libexec/fvwm/%%FVWM_VERSION%%/FvwmTalk
+libexec/fvwm/%%FVWM_VERSION%%/FvwmTaskBar
+libexec/fvwm/%%FVWM_VERSION%%/FvwmTheme
+libexec/fvwm/%%FVWM_VERSION%%/FvwmTile
+libexec/fvwm/%%FVWM_VERSION%%/FvwmWharf
+libexec/fvwm/%%FVWM_VERSION%%/FvwmWinList
+share/fvwm2/pixmaps/Jlock.xpm
+share/fvwm2/pixmaps/Jnews.xpm
+share/fvwm2/pixmaps/Jrecycle.xpm
+share/fvwm2/pixmaps/Jxlock.xpm
+share/fvwm2/pixmaps/Monitor.xpm
+share/fvwm2/pixmaps/Mosaic.xpm
+share/fvwm2/pixmaps/Xfm.xpm
+share/fvwm2/pixmaps/arrdown2.xpm
+share/fvwm2/pixmaps/arrows2.xpm
+share/fvwm2/pixmaps/arrup2.xpm
+share/fvwm2/pixmaps/banner.fvwm_blue_cursive.xpm
+share/fvwm2/pixmaps/banner.fvwm_bracket.xpm
+share/fvwm2/pixmaps/banner.fvwm_cat_thing.xpm
+share/fvwm2/pixmaps/banner.fvwm_red_3D.xpm
+share/fvwm2/pixmaps/banner.fvwm_red_cursive.xpm
+share/fvwm2/pixmaps/banner.fvwm_tiger.xpm
+share/fvwm2/pixmaps/banner.fvwm_tiger_tail.xpm
+share/fvwm2/pixmaps/bckgnd1.xpm
+share/fvwm2/pixmaps/bckgnd3.xpm
+share/fvwm2/pixmaps/bell.xpm
+share/fvwm2/pixmaps/bomb.xpm
+share/fvwm2/pixmaps/button-close.xpm
+share/fvwm2/pixmaps/button-horiz.xpm
+share/fvwm2/pixmaps/button-max.xpm
+share/fvwm2/pixmaps/button-vert.xpm
+share/fvwm2/pixmaps/button.xpm
+share/fvwm2/pixmaps/clamp.xpm
+share/fvwm2/pixmaps/date.xpm
+share/fvwm2/pixmaps/datebook.xpm
+share/fvwm2/pixmaps/default.xpm
+share/fvwm2/pixmaps/desk.xpm
+share/fvwm2/pixmaps/desktop.xpm
+share/fvwm2/pixmaps/dialog_box.xpm
+share/fvwm2/pixmaps/display.xpm
+share/fvwm2/pixmaps/documents.xpm
+share/fvwm2/pixmaps/doomface.xpm
+share/fvwm2/pixmaps/editres.xpm
+share/fvwm2/pixmaps/eps.xpm
+share/fvwm2/pixmaps/exit.xpm
+share/fvwm2/pixmaps/find1.xpm
+share/fvwm2/pixmaps/flow_chart.xpm
+share/fvwm2/pixmaps/folder.xpm
+share/fvwm2/pixmaps/folder2.xpm
+share/fvwm2/pixmaps/folders.xpm
+share/fvwm2/pixmaps/fvwm.xpm
+share/fvwm2/pixmaps/fvwm2.xpm
+share/fvwm2/pixmaps/fvwm2_big.xpm
+share/fvwm2/pixmaps/fvwm3.xpm
+share/fvwm2/pixmaps/gimp.xpm
+share/fvwm2/pixmaps/gnu-animal.xpm
+share/fvwm2/pixmaps/graphs.xpm
+share/fvwm2/pixmaps/gv.xpm
+share/fvwm2/pixmaps/help.xpm
+share/fvwm2/pixmaps/jx.xpm
+share/fvwm2/pixmaps/keyboard.xpm
+share/fvwm2/pixmaps/lemacs.xpm
+share/fvwm2/pixmaps/mag_glass.xpm
+share/fvwm2/pixmaps/mail1.xpm
+share/fvwm2/pixmaps/mail2.xpm
+share/fvwm2/pixmaps/map.xpm
+share/fvwm2/pixmaps/math4.xpm
+share/fvwm2/pixmaps/menu.xpm
+share/fvwm2/pixmaps/mini.arch.xpm
+share/fvwm2/pixmaps/mini.audiovol.xpm
+share/fvwm2/pixmaps/mini.audiovol2.xpm
+share/fvwm2/pixmaps/mini.ball.xpm
+share/fvwm2/pixmaps/mini.ball2.xpm
+share/fvwm2/pixmaps/mini.bball.xpm
+share/fvwm2/pixmaps/mini.blah.xpm
+share/fvwm2/pixmaps/mini.bomb.xpm
+share/fvwm2/pixmaps/mini.bomb2.xpm
+share/fvwm2/pixmaps/mini.book1.xpm
+share/fvwm2/pixmaps/mini.book2.xpm
+share/fvwm2/pixmaps/mini.book3.xpm
+share/fvwm2/pixmaps/mini.book4.xpm
+share/fvwm2/pixmaps/mini.books.xpm
+share/fvwm2/pixmaps/mini.briefcase.xpm
+share/fvwm2/pixmaps/mini.bug1.xpm
+share/fvwm2/pixmaps/mini.bug2.xpm
+share/fvwm2/pixmaps/mini.bx2.xpm
+share/fvwm2/pixmaps/mini.calc.xpm
+share/fvwm2/pixmaps/mini.calc2.xpm
+share/fvwm2/pixmaps/mini.calendar.xpm
+share/fvwm2/pixmaps/mini.camera.xpm
+share/fvwm2/pixmaps/mini.cat.xpm
+share/fvwm2/pixmaps/mini.cave.xpm
+share/fvwm2/pixmaps/mini.cd.xpm
+share/fvwm2/pixmaps/mini.cdlabel.xpm
+share/fvwm2/pixmaps/mini.chart.xpm
+share/fvwm2/pixmaps/mini.checkmark.xpm
+share/fvwm2/pixmaps/mini.chinese.xpm
+share/fvwm2/pixmaps/mini.clipboard.xpm
+share/fvwm2/pixmaps/mini.clock.xpm
+share/fvwm2/pixmaps/mini.clock2.xpm
+share/fvwm2/pixmaps/mini.colors.xpm
+share/fvwm2/pixmaps/mini.connect.xpm
+share/fvwm2/pixmaps/mini.crosbone.xpm
+share/fvwm2/pixmaps/mini.cross.xpm
+share/fvwm2/pixmaps/mini.cut.xpm
+share/fvwm2/pixmaps/mini.delete.xpm
+share/fvwm2/pixmaps/mini.desktop.xpm
+share/fvwm2/pixmaps/mini.destroy.xpm
+share/fvwm2/pixmaps/mini.diff.xpm
+share/fvwm2/pixmaps/mini.directory.xpm
+share/fvwm2/pixmaps/mini.dirlink.xpm
+share/fvwm2/pixmaps/mini.diskette.xpm
+share/fvwm2/pixmaps/mini.display.xpm
+share/fvwm2/pixmaps/mini.doc.xpm
+share/fvwm2/pixmaps/mini.doc1.xpm
+share/fvwm2/pixmaps/mini.dog.xpm
+share/fvwm2/pixmaps/mini.ear.xpm
+share/fvwm2/pixmaps/mini.edit.xpm
+share/fvwm2/pixmaps/mini.espada.xpm
+share/fvwm2/pixmaps/mini.excl.xpm
+share/fvwm2/pixmaps/mini.exclam.xpm
+share/fvwm2/pixmaps/mini.exit.xpm
+share/fvwm2/pixmaps/mini.exp.xpm
+share/fvwm2/pixmaps/mini.eye.xpm
+share/fvwm2/pixmaps/mini.eye2.xpm
+share/fvwm2/pixmaps/mini.eyes.xpm
+share/fvwm2/pixmaps/mini.f1.xpm
+share/fvwm2/pixmaps/mini.fax.xpm
+share/fvwm2/pixmaps/mini.fdisk.xpm
+share/fvwm2/pixmaps/mini.file.xpm
+share/fvwm2/pixmaps/mini.filelink.xpm
+share/fvwm2/pixmaps/mini.filemgr.xpm
+share/fvwm2/pixmaps/mini.floppy.xpm
+share/fvwm2/pixmaps/mini.folder.xpm
+share/fvwm2/pixmaps/mini.font.xpm
+share/fvwm2/pixmaps/mini.fractal.xpm
+share/fvwm2/pixmaps/mini.frame.xpm
+share/fvwm2/pixmaps/mini.ftp.xpm
+share/fvwm2/pixmaps/mini.fvwm.xpm
+share/fvwm2/pixmaps/mini.gball.xpm
+share/fvwm2/pixmaps/mini.gimp.xpm
+share/fvwm2/pixmaps/mini.gnome.xpm
+share/fvwm2/pixmaps/mini.gnu.xpm
+share/fvwm2/pixmaps/mini.go.xpm
+share/fvwm2/pixmaps/mini.gopher.xpm
+share/fvwm2/pixmaps/mini.graph.xpm
+share/fvwm2/pixmaps/mini.graph2.xpm
+share/fvwm2/pixmaps/mini.gv.xpm
+share/fvwm2/pixmaps/mini.hammer.xpm
+share/fvwm2/pixmaps/mini.happy.xpm
+share/fvwm2/pixmaps/mini.hdisk.xpm
+share/fvwm2/pixmaps/mini.heart.xpm
+share/fvwm2/pixmaps/mini.hex.xpm
+share/fvwm2/pixmaps/mini.hextris.xpm
+share/fvwm2/pixmaps/mini.ibm.xpm
+share/fvwm2/pixmaps/mini.iconify.xpm
+share/fvwm2/pixmaps/mini.iconify1.xpm
+share/fvwm2/pixmaps/mini.icons.xpm
+share/fvwm2/pixmaps/mini.kde.xpm
+share/fvwm2/pixmaps/mini.keyboard.xpm
+share/fvwm2/pixmaps/mini.keys.xpm
+share/fvwm2/pixmaps/mini.letter.xpm
+share/fvwm2/pixmaps/mini.line.xpm
+share/fvwm2/pixmaps/mini.lock.xpm
+share/fvwm2/pixmaps/mini.lower.xpm
+share/fvwm2/pixmaps/mini.lower2.xpm
+share/fvwm2/pixmaps/mini.lower3.xpm
+share/fvwm2/pixmaps/mini.mag.xpm
+share/fvwm2/pixmaps/mini.mail.xpm
+share/fvwm2/pixmaps/mini.mail2.xpm
+share/fvwm2/pixmaps/mini.manual.xpm
+share/fvwm2/pixmaps/mini.max1.xpm
+share/fvwm2/pixmaps/mini.maximize-horiz.xpm
+share/fvwm2/pixmaps/mini.maximize-horiz1.xpm
+share/fvwm2/pixmaps/mini.maximize-vert.xpm
+share/fvwm2/pixmaps/mini.maximize-vert1.xpm
+share/fvwm2/pixmaps/mini.maximize.xpm
+share/fvwm2/pixmaps/mini.maximize1.xpm
+share/fvwm2/pixmaps/mini.maximize2.xpm
+share/fvwm2/pixmaps/mini.maze.xpm
+share/fvwm2/pixmaps/mini.modules.xpm
+share/fvwm2/pixmaps/mini.monitor.xpm
+share/fvwm2/pixmaps/mini.mouse.xpm
+share/fvwm2/pixmaps/mini.move.xpm
+share/fvwm2/pixmaps/mini.move1.xpm
+share/fvwm2/pixmaps/mini.move2.xpm
+share/fvwm2/pixmaps/mini.move3.xpm
+share/fvwm2/pixmaps/mini.mwm.xpm
+share/fvwm2/pixmaps/mini.netscape.xpm
+share/fvwm2/pixmaps/mini.news.xpm
+share/fvwm2/pixmaps/mini.nscape.xpm
+share/fvwm2/pixmaps/mini.ofolder.xpm
+share/fvwm2/pixmaps/mini.olwm.xpm
+share/fvwm2/pixmaps/mini.pager.xpm
+share/fvwm2/pixmaps/mini.paint.xpm
+share/fvwm2/pixmaps/mini.paint2.xpm
+share/fvwm2/pixmaps/mini.palette.xpm
+share/fvwm2/pixmaps/mini.paper.xpm
+share/fvwm2/pixmaps/mini.pdf.xpm
+share/fvwm2/pixmaps/mini.pencil.xpm
+share/fvwm2/pixmaps/mini.penguin.xpm
+share/fvwm2/pixmaps/mini.perf.xpm
+share/fvwm2/pixmaps/mini.picture.xpm
+share/fvwm2/pixmaps/mini.question.xpm
+share/fvwm2/pixmaps/mini.rainbow.xpm
+share/fvwm2/pixmaps/mini.raise.xpm
+share/fvwm2/pixmaps/mini.raise2.xpm
+share/fvwm2/pixmaps/mini.raise3.xpm
+share/fvwm2/pixmaps/mini.ray.xpm
+share/fvwm2/pixmaps/mini.rball.xpm
+share/fvwm2/pixmaps/mini.refresh.xpm
+share/fvwm2/pixmaps/mini.resize.xpm
+share/fvwm2/pixmaps/mini.resize2.xpm
+share/fvwm2/pixmaps/mini.resize3.xpm
+share/fvwm2/pixmaps/mini.resize4.xpm
+share/fvwm2/pixmaps/mini.roach.xpm
+share/fvwm2/pixmaps/mini.run.xpm
+share/fvwm2/pixmaps/mini.sh.xpm
+share/fvwm2/pixmaps/mini.sh1.xpm
+share/fvwm2/pixmaps/mini.shade1.xpm
+share/fvwm2/pixmaps/mini.slon.xpm
+share/fvwm2/pixmaps/mini.sound.xpm
+share/fvwm2/pixmaps/mini.start.xpm
+share/fvwm2/pixmaps/mini.stick.xpm
+share/fvwm2/pixmaps/mini.stick1.xpm
+share/fvwm2/pixmaps/mini.stick2.xpm
+share/fvwm2/pixmaps/mini.stickpressed.xpm
+share/fvwm2/pixmaps/mini.stop.xpm
+share/fvwm2/pixmaps/mini.telnet.xpm
+share/fvwm2/pixmaps/mini.term.xpm
+share/fvwm2/pixmaps/mini.term2.xpm
+share/fvwm2/pixmaps/mini.tetris.xpm
+share/fvwm2/pixmaps/mini.trebol.xpm
+share/fvwm2/pixmaps/mini.turn.xpm
+share/fvwm2/pixmaps/mini.twm.xpm
+share/fvwm2/pixmaps/mini.winXX-close.xpm
+share/fvwm2/pixmaps/mini.winXX-maximize.xpm
+share/fvwm2/pixmaps/mini.winXX-minimize.xpm
+share/fvwm2/pixmaps/mini.winXX-normalize.xpm
+share/fvwm2/pixmaps/mini.winXX-sysmenu.xpm
+share/fvwm2/pixmaps/mini.window.xpm
+share/fvwm2/pixmaps/mini.window2.xpm
+share/fvwm2/pixmaps/mini.windows.xpm
+share/fvwm2/pixmaps/mini.windowshade.xpm
+share/fvwm2/pixmaps/mini.x.xpm
+share/fvwm2/pixmaps/mini.x2.xpm
+share/fvwm2/pixmaps/mini.xaniroc.xpm
+share/fvwm2/pixmaps/mini.xarchie.xpm
+share/fvwm2/pixmaps/mini.xbiff.xpm
+share/fvwm2/pixmaps/mini.xboing.xpm
+share/fvwm2/pixmaps/mini.xfig.xpm
+share/fvwm2/pixmaps/mini.xjewel.xpm
+share/fvwm2/pixmaps/mini.xkeycaps.xpm
+share/fvwm2/pixmaps/mini.xlander.xpm
+share/fvwm2/pixmaps/mini.xlock.xpm
+share/fvwm2/pixmaps/mini.xmag.xpm
+share/fvwm2/pixmaps/mini.xmahjongg.xpm
+share/fvwm2/pixmaps/mini.xman.xpm
+share/fvwm2/pixmaps/mini.xpaint.xpm
+share/fvwm2/pixmaps/mini.xsnow.xpm
+share/fvwm2/pixmaps/mini.xterm.xpm
+share/fvwm2/pixmaps/mini.xv.xpm
+share/fvwm2/pixmaps/mini.zircon.xpm
+share/fvwm2/pixmaps/mini.zoom.xpm
+share/fvwm2/pixmaps/modules.xpm
+share/fvwm2/pixmaps/nscape.xpm
+share/fvwm2/pixmaps/page.xpm
+share/fvwm2/pixmaps/page2.xpm
+share/fvwm2/pixmaps/pointer.xpm
+share/fvwm2/pixmaps/programs.xpm
+share/fvwm2/pixmaps/ps.xpm
+share/fvwm2/pixmaps/question.xpm
+share/fvwm2/pixmaps/rbomb.xpm
+share/fvwm2/pixmaps/rbomb2.xpm
+share/fvwm2/pixmaps/rcalc.xpm
+share/fvwm2/pixmaps/rcalc2.xpm
+share/fvwm2/pixmaps/resize.rainbow.xpm
+share/fvwm2/pixmaps/rterm.xpm
+share/fvwm2/pixmaps/rterm2.xpm
+share/fvwm2/pixmaps/run.xpm
+share/fvwm2/pixmaps/screen.xpm
+share/fvwm2/pixmaps/settings.xpm
+share/fvwm2/pixmaps/shells.xpm
+share/fvwm2/pixmaps/shutdown.xpm
+share/fvwm2/pixmaps/shutdown2.xpm
+share/fvwm2/pixmaps/side.fvwm2.xpm
+share/fvwm2/pixmaps/side.fvwm2_1.xpm
+share/fvwm2/pixmaps/side.fvwm2_2.xpm
+share/fvwm2/pixmaps/side.utilities.xpm
+share/fvwm2/pixmaps/small.Paint2.xpm
+share/fvwm2/pixmaps/small.Shell2.xpm
+share/fvwm2/pixmaps/small.exit.xpm
+share/fvwm2/pixmaps/small.lock.xpm
+share/fvwm2/pixmaps/small.man.next.xpm
+share/fvwm2/pixmaps/small.note.next.xpm
+share/fvwm2/pixmaps/small.tools2_3d.xpm
+share/fvwm2/pixmaps/term.xpm
+share/fvwm2/pixmaps/textedit.xpm
+share/fvwm2/pixmaps/tiff2.xpm
+share/fvwm2/pixmaps/toolbox.xpm
+share/fvwm2/pixmaps/unknown1.xpm
+share/fvwm2/pixmaps/wierd_page3.xpm
+share/fvwm2/pixmaps/window.xpm
+share/fvwm2/pixmaps/word_processor.xpm
+share/fvwm2/pixmaps/wterm.xpm
+share/fvwm2/pixmaps/xcalc.xpm
+share/fvwm2/pixmaps/xemacs.xpm
+share/fvwm2/pixmaps/xlock.xpm
+share/fvwm2/pixmaps/xman.xpm
+share/fvwm2/pixmaps/xpaint.xpm
+share/fvwm2/pixmaps/xterm-axp.xpm
+share/fvwm2/pixmaps/xterm-blank.xpm
+share/fvwm2/pixmaps/xterm-bsd.xpm
+share/fvwm2/pixmaps/xterm-dec.xpm
+share/fvwm2/pixmaps/xterm-linux.xpm
+share/fvwm2/pixmaps/xterm-sgi.xpm
+share/fvwm2/pixmaps/xterm-sol.xpm
+share/fvwm2/pixmaps/xterm-sun.xpm
+share/fvwm2/pixmaps/xterm.xpm
+share/fvwm2/pixmaps/xv.xpm
+share/fvwm2/pixmaps/xv2.xpm
+share/fvwm2/pixmaps/xview.xpm
+%%GNOME%%share/gnome/fvwm/ConfigFvwmBacker
+%%GNOME%%share/gnome/fvwm/ConfigFvwmButtons
+%%GNOME%%share/gnome/fvwm/ConfigFvwmDefaults
+%%GNOME%%share/gnome/fvwm/ConfigFvwmIconBox
+%%GNOME%%share/gnome/fvwm/ConfigFvwmIconMan
+%%GNOME%%share/gnome/fvwm/ConfigFvwmIdent
+%%GNOME%%share/gnome/fvwm/ConfigFvwmPager
+%%GNOME%%share/gnome/fvwm/ConfigFvwmScroll
+%%GNOME%%share/gnome/fvwm/ConfigFvwmSetup
+%%GNOME%%share/gnome/fvwm/ConfigFvwmTaskBar
+%%GNOME%%share/gnome/fvwm/ConfigFvwmWinList
+%%GNOME%%share/gnome/fvwm/FvwmForm-Capture
+%%GNOME%%share/gnome/fvwm/FvwmForm-Form
+%%GNOME%%share/gnome/fvwm/FvwmForm-QuitVerify
+%%GNOME%%share/gnome/fvwm/FvwmForm-Rlogin
+%%GNOME%%share/gnome/fvwm/FvwmForm-RootCursor
+%%GNOME%%share/gnome/fvwm/FvwmForm-Setup
+%%GNOME%%share/gnome/fvwm/FvwmForm-Talk
+%%GNOME%%share/gnome/fvwm/FvwmForm-TalkHelp
+%%GNOME%%share/gnome/fvwm/FvwmScript-BaseConfig
+%%GNOME%%share/gnome/fvwm/FvwmScript-BellSetup
+%%GNOME%%share/gnome/fvwm/FvwmScript-Buttons
+%%GNOME%%share/gnome/fvwm/FvwmScript-Colorset
+%%GNOME%%share/gnome/fvwm/FvwmScript-Date
+%%GNOME%%share/gnome/fvwm/FvwmScript-FileBrowser
+%%GNOME%%share/gnome/fvwm/FvwmScript-Find
+%%GNOME%%share/gnome/fvwm/FvwmScript-KeyboardSetup
+%%GNOME%%share/gnome/fvwm/FvwmScript-PointerSetup
+%%GNOME%%share/gnome/fvwm/FvwmScript-Quit
+%%GNOME%%share/gnome/fvwm/FvwmScript-ScreenDump
+%%GNOME%%share/gnome/fvwm/FvwmScript-ScreenSetup
+%%GNOME%%share/gnome/fvwm/FvwmScript-Setup95
+%%GNOME%%share/gnome/fvwm/FvwmScript-WidgetDemo
+%%GNOME%%share/gnome/fvwm/fvwm-script-setup95.pl
+%%GNOME%%share/gnome/fvwm/system.fvwm2rc-sample-95
+%%GNOME%%@dirrm share/gnome/fvwm
+%%GNOME%%@unexec rmdir %D/share/gnome 2>/dev/null || true
+@dirrm share/fvwm2/pixmaps
+@dirrm share/fvwm2
+@dirrm libexec/fvwm/%%FVWM_VERSION%%
 @dirrm libexec/fvwm
-@dirrm lib/X11/fvwm2/pixmaps
-@dirrm lib/X11/fvwm2
diff --git a/x11-wm/fvwm24/Makefile b/x11-wm/fvwm24/Makefile
index 2091cd69a9a8..daddd1d195e3 100644
--- a/x11-wm/fvwm24/Makefile
+++ b/x11-wm/fvwm24/Makefile
@@ -6,36 +6,58 @@
 #
 
 PORTNAME=	fvwm
-PORTVERSION=	2.2.5
+PORTVERSION=	2.4.0
 CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.fvwm.org/pub/fvwm/version-2/ \
 		http://www.fvwm.org/generated/icon_download/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} fvwm_icons.tgz
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	petef@databits.net
 
-USE_X_PREFIX=	yes
+USE_GMAKE=	yes
+USE_GTK=	yes
+USE_IMLIB=	yes
 USE_XPM=	yes
+USE_X_PREFIX=	yes
+WANT_GNOME=	yes
+
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-extras --prefix=${PREFIX}
-USE_GMAKE=	yes
 
-MAN1=	FvwmAnimate.1 FvwmAudio.1 FvwmAuto.1 FvwmBacker.1 FvwmBanner.1 \
-	FvwmButtons.1 FvwmCommand.1 FvwmConfig.1 FvwmConsole.1 \
-	FvwmCpp.1 FvwmDebug.1 FvwmEvent.1 FvwmForm.1 FvwmGoodStuff.1 \
-	FvwmIconBox.1 FvwmIconMan.1 FvwmIdent.1 FvwmM4.1 FvwmPager.1 \
-	FvwmRearrange.1 FvwmSave.1 FvwmSaveDesk.1 FvwmScript.1 FvwmScroll.1 \
-	FvwmTalk.1 FvwmTaskBar.1 FvwmWharf.1 FvwmWinList.1 fvwm2.1 xpmroot.1 \
-	FvwmConsoleC.pl.1
+PLIST_SUB+=	FVWM_VERSION="${PORTVERSION}"
+
+.include <bsd.port.pre.mk>
+
+.if defined(HAVE_GNOME)
+USE_GNOME=	yes
+PLIST_SUB+=	GNOME=""
+.else
+CONFIGURE_ARGS+=	--disable-gnome
+PLIST_SUB+=	GNOME="@comment "
+.endif
+
+MAN1=	FvwmAnimate.1 FvwmAuto.1 FvwmBacker.1 FvwmBanner.1 FvwmButtons.1 \
+	FvwmCommand.1 FvwmConsole.1 FvwmConsoleC.pl.1 FvwmCpp.1 FvwmDebug.1 \
+	FvwmDragWell.1 FvwmEvent.1 FvwmForm.1 FvwmGtk.1 FvwmIconBox.1 \
+	FvwmIconMan.1 FvwmIdent.1 FvwmM4.1 FvwmPager.1 FvwmRearrange.1 \
+	FvwmSave.1 FvwmSaveDesk.1 FvwmScript.1 FvwmScroll.1 FvwmTaskBar.1 \
+	FvwmTheme.1 FvwmWharf.1 FvwmWinList.1 fvwm-menu-desktop.1 \
+	fvwm-menu-directory.1 fvwm-menu-headlines.1 fvwm-menu-xlock.1 \
+	fvwm2.1 fvwm24_convert.1 fvwmbug.1 fvwmrc_convert.1 xpmroot.1
+
+post-extract:
+	@${MKDIR} ${WRKDIR}/icons
+	@${TAR} -xzf ${DISTDIR}/fvwm_icons.tgz -C ${WRKDIR}/icons
 
 post-install:
-	@${MKDIR} ${PREFIX}/etc
-	@${CP} ${WRKSRC}/sample.fvwmrc/system.fvwm2rc ${PREFIX}/etc/system.fvwm2rc.dist
+	@${INSTALL_DATA} ${WRKSRC}/sample.fvwmrc/system.fvwm2rc \
+		${PREFIX}/etc/system.fvwm2rc.dist
 	@if [ ! -e ${PREFIX}/etc/system.fvwm2rc ]; then \
-		${CP} ${WRKSRC}/sample.fvwmrc/system.fvwm2rc ${PREFIX}/etc/system.fvwm2rc; \
+		${INSTALL_DATA} ${WRKSRC}/sample.fvwmrc/system.fvwm2rc \
+			${PREFIX}/etc/system.fvwm2rc; \
 	fi
-	@${MKDIR} ${PREFIX}/lib/X11/fvwm2/pixmaps
-	${INSTALL_DATA} ${WRKSRC}/icons/*.xpm \
-		${PREFIX}/lib/X11/fvwm2/pixmaps
+	@${MKDIR} ${PREFIX}/share/fvwm2/pixmaps
+	${INSTALL_DATA} ${WRKDIR}/icons/*.xpm \
+		${PREFIX}/share/fvwm2/pixmaps
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11-wm/fvwm24/distinfo b/x11-wm/fvwm24/distinfo
index 6172d2304249..bfada011b5aa 100644
--- a/x11-wm/fvwm24/distinfo
+++ b/x11-wm/fvwm24/distinfo
@@ -1,2 +1,2 @@
-MD5 (fvwm-2.2.5.tar.gz) = 4d871dc12d7534843f6b311add963030
+MD5 (fvwm-2.4.0.tar.gz) = b2fe8edec50cfbd46fdc2a5acd6c3139
 MD5 (fvwm_icons.tgz) = 7b254da269a236d77c790581701442cb
diff --git a/x11-wm/fvwm24/files/patch-ad b/x11-wm/fvwm24/files/patch-ad
index 6287675cc456..2497c3e5458d 100644
--- a/x11-wm/fvwm24/files/patch-ad
+++ b/x11-wm/fvwm24/files/patch-ad
@@ -1,11 +1,11 @@
---- extras/FvwmCommand/FvwmCommand.c.orig	Sun Jan 10 21:59:41 1999
-+++ extras/FvwmCommand/FvwmCommand.c	Sat Jun 10 20:50:13 2000
-@@ -700,7 +700,7 @@
- 
+--- modules/FvwmCommand/FvwmCommand.c.orig	Wed Jul  4 22:35:50 2001
++++ modules/FvwmCommand/FvwmCommand.c	Wed Jul  4 22:35:52 2001
+@@ -927,7 +927,7 @@
+ {
    printf( "           %-20s x %ld, y %ld, desk %ld, max x %ld, max y %ld\n",
- 	  "new page", 
--	  body[0], body[0], body[2], body[3], body[4]);
-+	  body[0], body[1], body[2], body[3], body[4]);
+ 	  "new page",
+-	  body[0], body[1], body[2], body[3], body[4]);
++	  body[0], body[0], body[2], body[3], body[4]);
  }
  
  /*************************************************************************
diff --git a/x11-wm/fvwm24/pkg-descr b/x11-wm/fvwm24/pkg-descr
index ea39f09e54d2..e43494a36477 100644
--- a/x11-wm/fvwm24/pkg-descr
+++ b/x11-wm/fvwm24/pkg-descr
@@ -6,5 +6,5 @@ functions or programs.
 
 WWW: http://www.fvwm.org/
 
-Jason C. Wells
-jcwells@u.washington.edu
+- Pete
+petef@databits.net
diff --git a/x11-wm/fvwm24/pkg-plist b/x11-wm/fvwm24/pkg-plist
index dcf1731633e5..d30eb3c24dbc 100644
--- a/x11-wm/fvwm24/pkg-plist
+++ b/x11-wm/fvwm24/pkg-plist
@@ -1,175 +1,405 @@
 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
 bin/xpmroot
 @unexec if cmp -s %D/etc/system.fvwm2rc %D/etc/system.fvwm2rc.dist; then rm -f %D/etc/system.fvwm2rc; fi
 etc/system.fvwm2rc.dist
 @exec [ -f %B/system.fvwm2rc ] || cp %B/%f %B/system.fvwm2rc
-lib/X11/fvwm2/pixmaps/Jlock.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/arrdown2.xpm
-lib/X11/fvwm2/pixmaps/arrows2.xpm
-lib/X11/fvwm2/pixmaps/arrup2.xpm
-lib/X11/fvwm2/pixmaps/bomb.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/clamp.xpm
-lib/X11/fvwm2/pixmaps/colormap.xpm
-lib/X11/fvwm2/pixmaps/datebook.xpm
-lib/X11/fvwm2/pixmaps/desk.xpm
-lib/X11/fvwm2/pixmaps/dialog_box.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/flow_chart.xpm
-lib/X11/fvwm2/pixmaps/folder2.xpm
-lib/X11/fvwm2/pixmaps/folders.xpm
-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/gnu-animal.xpm
-lib/X11/fvwm2/pixmaps/graphs.xpm
-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/jx.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/mini.audiovol.xpm
-lib/X11/fvwm2/pixmaps/mini.blah.xpm
-lib/X11/fvwm2/pixmaps/mini.bomb.xpm
-lib/X11/fvwm2/pixmaps/mini.checkmark.xpm
-lib/X11/fvwm2/pixmaps/mini.cut.xpm
-lib/X11/fvwm2/pixmaps/mini.destroy.xpm
-lib/X11/fvwm2/pixmaps/mini.directory.xpm
-lib/X11/fvwm2/pixmaps/mini.dirlink.xpm
-lib/X11/fvwm2/pixmaps/mini.excl.xpm
-lib/X11/fvwm2/pixmaps/mini.exit.xpm
-lib/X11/fvwm2/pixmaps/mini.eye.xpm
-lib/X11/fvwm2/pixmaps/mini.file.xpm
-lib/X11/fvwm2/pixmaps/mini.filelink.xpm
-lib/X11/fvwm2/pixmaps/mini.fvwm.xpm
-lib/X11/fvwm2/pixmaps/mini.iconify.xpm
-lib/X11/fvwm2/pixmaps/mini.letter.xpm
-lib/X11/fvwm2/pixmaps/mini.lower.xpm
-lib/X11/fvwm2/pixmaps/mini.maximize-horiz.xpm
-lib/X11/fvwm2/pixmaps/mini.maximize-vert.xpm
-lib/X11/fvwm2/pixmaps/mini.maximize.xpm
-lib/X11/fvwm2/pixmaps/mini.maximize2.xpm
-lib/X11/fvwm2/pixmaps/mini.move.xpm
-lib/X11/fvwm2/pixmaps/mini.netscape.xpm
-lib/X11/fvwm2/pixmaps/mini.rainbow.xpm
-lib/X11/fvwm2/pixmaps/mini.raise.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.stick.xpm
-lib/X11/fvwm2/pixmaps/mini.stick2.xpm
-lib/X11/fvwm2/pixmaps/mini.stickpressed.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.xarchie.xpm
-lib/X11/fvwm2/pixmaps/mini.xbiff.xpm
-lib/X11/fvwm2/pixmaps/mini.xboing.xpm
-lib/X11/fvwm2/pixmaps/mini.xlock.xpm
-lib/X11/fvwm2/pixmaps/mini.xmag.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.xterm.xpm
-lib/X11/fvwm2/pixmaps/mini.zircon.xpm
-lib/X11/fvwm2/pixmaps/page.xpm
-lib/X11/fvwm2/pixmaps/page2.xpm
-lib/X11/fvwm2/pixmaps/ps.xpm
-lib/X11/fvwm2/pixmaps/question.xpm
-lib/X11/fvwm2/pixmaps/rbomb.xpm
-lib/X11/fvwm2/pixmaps/rcalc.xpm
-lib/X11/fvwm2/pixmaps/rterm.xpm
-lib/X11/fvwm2/pixmaps/side.fvwm2.xpm
-lib/X11/fvwm2/pixmaps/term.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/word_processor.xpm
-lib/X11/fvwm2/pixmaps/world.xpm
-lib/X11/fvwm2/pixmaps/xcalc.xpm
-lib/X11/fvwm2/pixmaps/xemacs.xpm
-lib/X11/fvwm2/pixmaps/xlock.xpm
-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
-lib/X11/fvwm2/pixmaps/xterm-sol.xpm
-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
-libexec/fvwm/2.2.5/FvwmAnimate
-libexec/fvwm/2.2.5/FvwmAudio
-libexec/fvwm/2.2.5/FvwmAuto
-libexec/fvwm/2.2.5/FvwmBacker
-libexec/fvwm/2.2.5/FvwmBanner
-libexec/fvwm/2.2.5/FvwmButtons
-libexec/fvwm/2.2.5/FvwmCascade
-libexec/fvwm/2.2.5/FvwmCommandS
-libexec/fvwm/2.2.5/FvwmConfig
-libexec/fvwm/2.2.5/FvwmConsole
-libexec/fvwm/2.2.5/FvwmConsoleC
-libexec/fvwm/2.2.5/FvwmConsoleC.pl
-libexec/fvwm/2.2.5/FvwmCpp
-libexec/fvwm/2.2.5/FvwmDebug
-libexec/fvwm/2.2.5/FvwmEvent
-libexec/fvwm/2.2.5/FvwmForm
-libexec/fvwm/2.2.5/FvwmGoodStuff
-libexec/fvwm/2.2.5/FvwmIconBox
-libexec/fvwm/2.2.5/FvwmIconMan
-libexec/fvwm/2.2.5/FvwmIdent
-libexec/fvwm/2.2.5/FvwmM4
-libexec/fvwm/2.2.5/FvwmPager
-libexec/fvwm/2.2.5/FvwmPipe
-libexec/fvwm/2.2.5/FvwmRearrange
-libexec/fvwm/2.2.5/FvwmSave
-libexec/fvwm/2.2.5/FvwmSaveDesk
-libexec/fvwm/2.2.5/FvwmScript
-libexec/fvwm/2.2.5/FvwmScroll
-libexec/fvwm/2.2.5/FvwmTalk
-libexec/fvwm/2.2.5/FvwmTaskBar
-libexec/fvwm/2.2.5/FvwmTile
-libexec/fvwm/2.2.5/FvwmWharf
-libexec/fvwm/2.2.5/FvwmWinList
-@dirrm libexec/fvwm/2.2.5
+libexec/fvwm/%%FVWM_VERSION%%/FvwmAnimate
+libexec/fvwm/%%FVWM_VERSION%%/FvwmAudio
+libexec/fvwm/%%FVWM_VERSION%%/FvwmAuto
+libexec/fvwm/%%FVWM_VERSION%%/FvwmBacker
+libexec/fvwm/%%FVWM_VERSION%%/FvwmBanner
+libexec/fvwm/%%FVWM_VERSION%%/FvwmButtons
+libexec/fvwm/%%FVWM_VERSION%%/FvwmCascade
+libexec/fvwm/%%FVWM_VERSION%%/FvwmCommand.pm
+libexec/fvwm/%%FVWM_VERSION%%/FvwmCommand.sh
+libexec/fvwm/%%FVWM_VERSION%%/FvwmCommandS
+libexec/fvwm/%%FVWM_VERSION%%/FvwmConsole
+libexec/fvwm/%%FVWM_VERSION%%/FvwmConsoleC
+libexec/fvwm/%%FVWM_VERSION%%/FvwmConsoleC.pl
+libexec/fvwm/%%FVWM_VERSION%%/FvwmCpp
+libexec/fvwm/%%FVWM_VERSION%%/FvwmDebug
+libexec/fvwm/%%FVWM_VERSION%%/FvwmDragWell
+libexec/fvwm/%%FVWM_VERSION%%/FvwmEvent
+libexec/fvwm/%%FVWM_VERSION%%/FvwmForm
+libexec/fvwm/%%FVWM_VERSION%%/FvwmGtk
+libexec/fvwm/%%FVWM_VERSION%%/FvwmIconBox
+libexec/fvwm/%%FVWM_VERSION%%/FvwmIconMan
+libexec/fvwm/%%FVWM_VERSION%%/FvwmIdent
+libexec/fvwm/%%FVWM_VERSION%%/FvwmM4
+libexec/fvwm/%%FVWM_VERSION%%/FvwmPager
+libexec/fvwm/%%FVWM_VERSION%%/FvwmRearrange
+libexec/fvwm/%%FVWM_VERSION%%/FvwmSave
+libexec/fvwm/%%FVWM_VERSION%%/FvwmSaveDesk
+libexec/fvwm/%%FVWM_VERSION%%/FvwmScript
+libexec/fvwm/%%FVWM_VERSION%%/FvwmScroll
+libexec/fvwm/%%FVWM_VERSION%%/FvwmTalk
+libexec/fvwm/%%FVWM_VERSION%%/FvwmTaskBar
+libexec/fvwm/%%FVWM_VERSION%%/FvwmTheme
+libexec/fvwm/%%FVWM_VERSION%%/FvwmTile
+libexec/fvwm/%%FVWM_VERSION%%/FvwmWharf
+libexec/fvwm/%%FVWM_VERSION%%/FvwmWinList
+share/fvwm2/pixmaps/Jlock.xpm
+share/fvwm2/pixmaps/Jnews.xpm
+share/fvwm2/pixmaps/Jrecycle.xpm
+share/fvwm2/pixmaps/Jxlock.xpm
+share/fvwm2/pixmaps/Monitor.xpm
+share/fvwm2/pixmaps/Mosaic.xpm
+share/fvwm2/pixmaps/Xfm.xpm
+share/fvwm2/pixmaps/arrdown2.xpm
+share/fvwm2/pixmaps/arrows2.xpm
+share/fvwm2/pixmaps/arrup2.xpm
+share/fvwm2/pixmaps/banner.fvwm_blue_cursive.xpm
+share/fvwm2/pixmaps/banner.fvwm_bracket.xpm
+share/fvwm2/pixmaps/banner.fvwm_cat_thing.xpm
+share/fvwm2/pixmaps/banner.fvwm_red_3D.xpm
+share/fvwm2/pixmaps/banner.fvwm_red_cursive.xpm
+share/fvwm2/pixmaps/banner.fvwm_tiger.xpm
+share/fvwm2/pixmaps/banner.fvwm_tiger_tail.xpm
+share/fvwm2/pixmaps/bckgnd1.xpm
+share/fvwm2/pixmaps/bckgnd3.xpm
+share/fvwm2/pixmaps/bell.xpm
+share/fvwm2/pixmaps/bomb.xpm
+share/fvwm2/pixmaps/button-close.xpm
+share/fvwm2/pixmaps/button-horiz.xpm
+share/fvwm2/pixmaps/button-max.xpm
+share/fvwm2/pixmaps/button-vert.xpm
+share/fvwm2/pixmaps/button.xpm
+share/fvwm2/pixmaps/clamp.xpm
+share/fvwm2/pixmaps/date.xpm
+share/fvwm2/pixmaps/datebook.xpm
+share/fvwm2/pixmaps/default.xpm
+share/fvwm2/pixmaps/desk.xpm
+share/fvwm2/pixmaps/desktop.xpm
+share/fvwm2/pixmaps/dialog_box.xpm
+share/fvwm2/pixmaps/display.xpm
+share/fvwm2/pixmaps/documents.xpm
+share/fvwm2/pixmaps/doomface.xpm
+share/fvwm2/pixmaps/editres.xpm
+share/fvwm2/pixmaps/eps.xpm
+share/fvwm2/pixmaps/exit.xpm
+share/fvwm2/pixmaps/find1.xpm
+share/fvwm2/pixmaps/flow_chart.xpm
+share/fvwm2/pixmaps/folder.xpm
+share/fvwm2/pixmaps/folder2.xpm
+share/fvwm2/pixmaps/folders.xpm
+share/fvwm2/pixmaps/fvwm.xpm
+share/fvwm2/pixmaps/fvwm2.xpm
+share/fvwm2/pixmaps/fvwm2_big.xpm
+share/fvwm2/pixmaps/fvwm3.xpm
+share/fvwm2/pixmaps/gimp.xpm
+share/fvwm2/pixmaps/gnu-animal.xpm
+share/fvwm2/pixmaps/graphs.xpm
+share/fvwm2/pixmaps/gv.xpm
+share/fvwm2/pixmaps/help.xpm
+share/fvwm2/pixmaps/jx.xpm
+share/fvwm2/pixmaps/keyboard.xpm
+share/fvwm2/pixmaps/lemacs.xpm
+share/fvwm2/pixmaps/mag_glass.xpm
+share/fvwm2/pixmaps/mail1.xpm
+share/fvwm2/pixmaps/mail2.xpm
+share/fvwm2/pixmaps/map.xpm
+share/fvwm2/pixmaps/math4.xpm
+share/fvwm2/pixmaps/menu.xpm
+share/fvwm2/pixmaps/mini.arch.xpm
+share/fvwm2/pixmaps/mini.audiovol.xpm
+share/fvwm2/pixmaps/mini.audiovol2.xpm
+share/fvwm2/pixmaps/mini.ball.xpm
+share/fvwm2/pixmaps/mini.ball2.xpm
+share/fvwm2/pixmaps/mini.bball.xpm
+share/fvwm2/pixmaps/mini.blah.xpm
+share/fvwm2/pixmaps/mini.bomb.xpm
+share/fvwm2/pixmaps/mini.bomb2.xpm
+share/fvwm2/pixmaps/mini.book1.xpm
+share/fvwm2/pixmaps/mini.book2.xpm
+share/fvwm2/pixmaps/mini.book3.xpm
+share/fvwm2/pixmaps/mini.book4.xpm
+share/fvwm2/pixmaps/mini.books.xpm
+share/fvwm2/pixmaps/mini.briefcase.xpm
+share/fvwm2/pixmaps/mini.bug1.xpm
+share/fvwm2/pixmaps/mini.bug2.xpm
+share/fvwm2/pixmaps/mini.bx2.xpm
+share/fvwm2/pixmaps/mini.calc.xpm
+share/fvwm2/pixmaps/mini.calc2.xpm
+share/fvwm2/pixmaps/mini.calendar.xpm
+share/fvwm2/pixmaps/mini.camera.xpm
+share/fvwm2/pixmaps/mini.cat.xpm
+share/fvwm2/pixmaps/mini.cave.xpm
+share/fvwm2/pixmaps/mini.cd.xpm
+share/fvwm2/pixmaps/mini.cdlabel.xpm
+share/fvwm2/pixmaps/mini.chart.xpm
+share/fvwm2/pixmaps/mini.checkmark.xpm
+share/fvwm2/pixmaps/mini.chinese.xpm
+share/fvwm2/pixmaps/mini.clipboard.xpm
+share/fvwm2/pixmaps/mini.clock.xpm
+share/fvwm2/pixmaps/mini.clock2.xpm
+share/fvwm2/pixmaps/mini.colors.xpm
+share/fvwm2/pixmaps/mini.connect.xpm
+share/fvwm2/pixmaps/mini.crosbone.xpm
+share/fvwm2/pixmaps/mini.cross.xpm
+share/fvwm2/pixmaps/mini.cut.xpm
+share/fvwm2/pixmaps/mini.delete.xpm
+share/fvwm2/pixmaps/mini.desktop.xpm
+share/fvwm2/pixmaps/mini.destroy.xpm
+share/fvwm2/pixmaps/mini.diff.xpm
+share/fvwm2/pixmaps/mini.directory.xpm
+share/fvwm2/pixmaps/mini.dirlink.xpm
+share/fvwm2/pixmaps/mini.diskette.xpm
+share/fvwm2/pixmaps/mini.display.xpm
+share/fvwm2/pixmaps/mini.doc.xpm
+share/fvwm2/pixmaps/mini.doc1.xpm
+share/fvwm2/pixmaps/mini.dog.xpm
+share/fvwm2/pixmaps/mini.ear.xpm
+share/fvwm2/pixmaps/mini.edit.xpm
+share/fvwm2/pixmaps/mini.espada.xpm
+share/fvwm2/pixmaps/mini.excl.xpm
+share/fvwm2/pixmaps/mini.exclam.xpm
+share/fvwm2/pixmaps/mini.exit.xpm
+share/fvwm2/pixmaps/mini.exp.xpm
+share/fvwm2/pixmaps/mini.eye.xpm
+share/fvwm2/pixmaps/mini.eye2.xpm
+share/fvwm2/pixmaps/mini.eyes.xpm
+share/fvwm2/pixmaps/mini.f1.xpm
+share/fvwm2/pixmaps/mini.fax.xpm
+share/fvwm2/pixmaps/mini.fdisk.xpm
+share/fvwm2/pixmaps/mini.file.xpm
+share/fvwm2/pixmaps/mini.filelink.xpm
+share/fvwm2/pixmaps/mini.filemgr.xpm
+share/fvwm2/pixmaps/mini.floppy.xpm
+share/fvwm2/pixmaps/mini.folder.xpm
+share/fvwm2/pixmaps/mini.font.xpm
+share/fvwm2/pixmaps/mini.fractal.xpm
+share/fvwm2/pixmaps/mini.frame.xpm
+share/fvwm2/pixmaps/mini.ftp.xpm
+share/fvwm2/pixmaps/mini.fvwm.xpm
+share/fvwm2/pixmaps/mini.gball.xpm
+share/fvwm2/pixmaps/mini.gimp.xpm
+share/fvwm2/pixmaps/mini.gnome.xpm
+share/fvwm2/pixmaps/mini.gnu.xpm
+share/fvwm2/pixmaps/mini.go.xpm
+share/fvwm2/pixmaps/mini.gopher.xpm
+share/fvwm2/pixmaps/mini.graph.xpm
+share/fvwm2/pixmaps/mini.graph2.xpm
+share/fvwm2/pixmaps/mini.gv.xpm
+share/fvwm2/pixmaps/mini.hammer.xpm
+share/fvwm2/pixmaps/mini.happy.xpm
+share/fvwm2/pixmaps/mini.hdisk.xpm
+share/fvwm2/pixmaps/mini.heart.xpm
+share/fvwm2/pixmaps/mini.hex.xpm
+share/fvwm2/pixmaps/mini.hextris.xpm
+share/fvwm2/pixmaps/mini.ibm.xpm
+share/fvwm2/pixmaps/mini.iconify.xpm
+share/fvwm2/pixmaps/mini.iconify1.xpm
+share/fvwm2/pixmaps/mini.icons.xpm
+share/fvwm2/pixmaps/mini.kde.xpm
+share/fvwm2/pixmaps/mini.keyboard.xpm
+share/fvwm2/pixmaps/mini.keys.xpm
+share/fvwm2/pixmaps/mini.letter.xpm
+share/fvwm2/pixmaps/mini.line.xpm
+share/fvwm2/pixmaps/mini.lock.xpm
+share/fvwm2/pixmaps/mini.lower.xpm
+share/fvwm2/pixmaps/mini.lower2.xpm
+share/fvwm2/pixmaps/mini.lower3.xpm
+share/fvwm2/pixmaps/mini.mag.xpm
+share/fvwm2/pixmaps/mini.mail.xpm
+share/fvwm2/pixmaps/mini.mail2.xpm
+share/fvwm2/pixmaps/mini.manual.xpm
+share/fvwm2/pixmaps/mini.max1.xpm
+share/fvwm2/pixmaps/mini.maximize-horiz.xpm
+share/fvwm2/pixmaps/mini.maximize-horiz1.xpm
+share/fvwm2/pixmaps/mini.maximize-vert.xpm
+share/fvwm2/pixmaps/mini.maximize-vert1.xpm
+share/fvwm2/pixmaps/mini.maximize.xpm
+share/fvwm2/pixmaps/mini.maximize1.xpm
+share/fvwm2/pixmaps/mini.maximize2.xpm
+share/fvwm2/pixmaps/mini.maze.xpm
+share/fvwm2/pixmaps/mini.modules.xpm
+share/fvwm2/pixmaps/mini.monitor.xpm
+share/fvwm2/pixmaps/mini.mouse.xpm
+share/fvwm2/pixmaps/mini.move.xpm
+share/fvwm2/pixmaps/mini.move1.xpm
+share/fvwm2/pixmaps/mini.move2.xpm
+share/fvwm2/pixmaps/mini.move3.xpm
+share/fvwm2/pixmaps/mini.mwm.xpm
+share/fvwm2/pixmaps/mini.netscape.xpm
+share/fvwm2/pixmaps/mini.news.xpm
+share/fvwm2/pixmaps/mini.nscape.xpm
+share/fvwm2/pixmaps/mini.ofolder.xpm
+share/fvwm2/pixmaps/mini.olwm.xpm
+share/fvwm2/pixmaps/mini.pager.xpm
+share/fvwm2/pixmaps/mini.paint.xpm
+share/fvwm2/pixmaps/mini.paint2.xpm
+share/fvwm2/pixmaps/mini.palette.xpm
+share/fvwm2/pixmaps/mini.paper.xpm
+share/fvwm2/pixmaps/mini.pdf.xpm
+share/fvwm2/pixmaps/mini.pencil.xpm
+share/fvwm2/pixmaps/mini.penguin.xpm
+share/fvwm2/pixmaps/mini.perf.xpm
+share/fvwm2/pixmaps/mini.picture.xpm
+share/fvwm2/pixmaps/mini.question.xpm
+share/fvwm2/pixmaps/mini.rainbow.xpm
+share/fvwm2/pixmaps/mini.raise.xpm
+share/fvwm2/pixmaps/mini.raise2.xpm
+share/fvwm2/pixmaps/mini.raise3.xpm
+share/fvwm2/pixmaps/mini.ray.xpm
+share/fvwm2/pixmaps/mini.rball.xpm
+share/fvwm2/pixmaps/mini.refresh.xpm
+share/fvwm2/pixmaps/mini.resize.xpm
+share/fvwm2/pixmaps/mini.resize2.xpm
+share/fvwm2/pixmaps/mini.resize3.xpm
+share/fvwm2/pixmaps/mini.resize4.xpm
+share/fvwm2/pixmaps/mini.roach.xpm
+share/fvwm2/pixmaps/mini.run.xpm
+share/fvwm2/pixmaps/mini.sh.xpm
+share/fvwm2/pixmaps/mini.sh1.xpm
+share/fvwm2/pixmaps/mini.shade1.xpm
+share/fvwm2/pixmaps/mini.slon.xpm
+share/fvwm2/pixmaps/mini.sound.xpm
+share/fvwm2/pixmaps/mini.start.xpm
+share/fvwm2/pixmaps/mini.stick.xpm
+share/fvwm2/pixmaps/mini.stick1.xpm
+share/fvwm2/pixmaps/mini.stick2.xpm
+share/fvwm2/pixmaps/mini.stickpressed.xpm
+share/fvwm2/pixmaps/mini.stop.xpm
+share/fvwm2/pixmaps/mini.telnet.xpm
+share/fvwm2/pixmaps/mini.term.xpm
+share/fvwm2/pixmaps/mini.term2.xpm
+share/fvwm2/pixmaps/mini.tetris.xpm
+share/fvwm2/pixmaps/mini.trebol.xpm
+share/fvwm2/pixmaps/mini.turn.xpm
+share/fvwm2/pixmaps/mini.twm.xpm
+share/fvwm2/pixmaps/mini.winXX-close.xpm
+share/fvwm2/pixmaps/mini.winXX-maximize.xpm
+share/fvwm2/pixmaps/mini.winXX-minimize.xpm
+share/fvwm2/pixmaps/mini.winXX-normalize.xpm
+share/fvwm2/pixmaps/mini.winXX-sysmenu.xpm
+share/fvwm2/pixmaps/mini.window.xpm
+share/fvwm2/pixmaps/mini.window2.xpm
+share/fvwm2/pixmaps/mini.windows.xpm
+share/fvwm2/pixmaps/mini.windowshade.xpm
+share/fvwm2/pixmaps/mini.x.xpm
+share/fvwm2/pixmaps/mini.x2.xpm
+share/fvwm2/pixmaps/mini.xaniroc.xpm
+share/fvwm2/pixmaps/mini.xarchie.xpm
+share/fvwm2/pixmaps/mini.xbiff.xpm
+share/fvwm2/pixmaps/mini.xboing.xpm
+share/fvwm2/pixmaps/mini.xfig.xpm
+share/fvwm2/pixmaps/mini.xjewel.xpm
+share/fvwm2/pixmaps/mini.xkeycaps.xpm
+share/fvwm2/pixmaps/mini.xlander.xpm
+share/fvwm2/pixmaps/mini.xlock.xpm
+share/fvwm2/pixmaps/mini.xmag.xpm
+share/fvwm2/pixmaps/mini.xmahjongg.xpm
+share/fvwm2/pixmaps/mini.xman.xpm
+share/fvwm2/pixmaps/mini.xpaint.xpm
+share/fvwm2/pixmaps/mini.xsnow.xpm
+share/fvwm2/pixmaps/mini.xterm.xpm
+share/fvwm2/pixmaps/mini.xv.xpm
+share/fvwm2/pixmaps/mini.zircon.xpm
+share/fvwm2/pixmaps/mini.zoom.xpm
+share/fvwm2/pixmaps/modules.xpm
+share/fvwm2/pixmaps/nscape.xpm
+share/fvwm2/pixmaps/page.xpm
+share/fvwm2/pixmaps/page2.xpm
+share/fvwm2/pixmaps/pointer.xpm
+share/fvwm2/pixmaps/programs.xpm
+share/fvwm2/pixmaps/ps.xpm
+share/fvwm2/pixmaps/question.xpm
+share/fvwm2/pixmaps/rbomb.xpm
+share/fvwm2/pixmaps/rbomb2.xpm
+share/fvwm2/pixmaps/rcalc.xpm
+share/fvwm2/pixmaps/rcalc2.xpm
+share/fvwm2/pixmaps/resize.rainbow.xpm
+share/fvwm2/pixmaps/rterm.xpm
+share/fvwm2/pixmaps/rterm2.xpm
+share/fvwm2/pixmaps/run.xpm
+share/fvwm2/pixmaps/screen.xpm
+share/fvwm2/pixmaps/settings.xpm
+share/fvwm2/pixmaps/shells.xpm
+share/fvwm2/pixmaps/shutdown.xpm
+share/fvwm2/pixmaps/shutdown2.xpm
+share/fvwm2/pixmaps/side.fvwm2.xpm
+share/fvwm2/pixmaps/side.fvwm2_1.xpm
+share/fvwm2/pixmaps/side.fvwm2_2.xpm
+share/fvwm2/pixmaps/side.utilities.xpm
+share/fvwm2/pixmaps/small.Paint2.xpm
+share/fvwm2/pixmaps/small.Shell2.xpm
+share/fvwm2/pixmaps/small.exit.xpm
+share/fvwm2/pixmaps/small.lock.xpm
+share/fvwm2/pixmaps/small.man.next.xpm
+share/fvwm2/pixmaps/small.note.next.xpm
+share/fvwm2/pixmaps/small.tools2_3d.xpm
+share/fvwm2/pixmaps/term.xpm
+share/fvwm2/pixmaps/textedit.xpm
+share/fvwm2/pixmaps/tiff2.xpm
+share/fvwm2/pixmaps/toolbox.xpm
+share/fvwm2/pixmaps/unknown1.xpm
+share/fvwm2/pixmaps/wierd_page3.xpm
+share/fvwm2/pixmaps/window.xpm
+share/fvwm2/pixmaps/word_processor.xpm
+share/fvwm2/pixmaps/wterm.xpm
+share/fvwm2/pixmaps/xcalc.xpm
+share/fvwm2/pixmaps/xemacs.xpm
+share/fvwm2/pixmaps/xlock.xpm
+share/fvwm2/pixmaps/xman.xpm
+share/fvwm2/pixmaps/xpaint.xpm
+share/fvwm2/pixmaps/xterm-axp.xpm
+share/fvwm2/pixmaps/xterm-blank.xpm
+share/fvwm2/pixmaps/xterm-bsd.xpm
+share/fvwm2/pixmaps/xterm-dec.xpm
+share/fvwm2/pixmaps/xterm-linux.xpm
+share/fvwm2/pixmaps/xterm-sgi.xpm
+share/fvwm2/pixmaps/xterm-sol.xpm
+share/fvwm2/pixmaps/xterm-sun.xpm
+share/fvwm2/pixmaps/xterm.xpm
+share/fvwm2/pixmaps/xv.xpm
+share/fvwm2/pixmaps/xv2.xpm
+share/fvwm2/pixmaps/xview.xpm
+%%GNOME%%share/gnome/fvwm/ConfigFvwmBacker
+%%GNOME%%share/gnome/fvwm/ConfigFvwmButtons
+%%GNOME%%share/gnome/fvwm/ConfigFvwmDefaults
+%%GNOME%%share/gnome/fvwm/ConfigFvwmIconBox
+%%GNOME%%share/gnome/fvwm/ConfigFvwmIconMan
+%%GNOME%%share/gnome/fvwm/ConfigFvwmIdent
+%%GNOME%%share/gnome/fvwm/ConfigFvwmPager
+%%GNOME%%share/gnome/fvwm/ConfigFvwmScroll
+%%GNOME%%share/gnome/fvwm/ConfigFvwmSetup
+%%GNOME%%share/gnome/fvwm/ConfigFvwmTaskBar
+%%GNOME%%share/gnome/fvwm/ConfigFvwmWinList
+%%GNOME%%share/gnome/fvwm/FvwmForm-Capture
+%%GNOME%%share/gnome/fvwm/FvwmForm-Form
+%%GNOME%%share/gnome/fvwm/FvwmForm-QuitVerify
+%%GNOME%%share/gnome/fvwm/FvwmForm-Rlogin
+%%GNOME%%share/gnome/fvwm/FvwmForm-RootCursor
+%%GNOME%%share/gnome/fvwm/FvwmForm-Setup
+%%GNOME%%share/gnome/fvwm/FvwmForm-Talk
+%%GNOME%%share/gnome/fvwm/FvwmForm-TalkHelp
+%%GNOME%%share/gnome/fvwm/FvwmScript-BaseConfig
+%%GNOME%%share/gnome/fvwm/FvwmScript-BellSetup
+%%GNOME%%share/gnome/fvwm/FvwmScript-Buttons
+%%GNOME%%share/gnome/fvwm/FvwmScript-Colorset
+%%GNOME%%share/gnome/fvwm/FvwmScript-Date
+%%GNOME%%share/gnome/fvwm/FvwmScript-FileBrowser
+%%GNOME%%share/gnome/fvwm/FvwmScript-Find
+%%GNOME%%share/gnome/fvwm/FvwmScript-KeyboardSetup
+%%GNOME%%share/gnome/fvwm/FvwmScript-PointerSetup
+%%GNOME%%share/gnome/fvwm/FvwmScript-Quit
+%%GNOME%%share/gnome/fvwm/FvwmScript-ScreenDump
+%%GNOME%%share/gnome/fvwm/FvwmScript-ScreenSetup
+%%GNOME%%share/gnome/fvwm/FvwmScript-Setup95
+%%GNOME%%share/gnome/fvwm/FvwmScript-WidgetDemo
+%%GNOME%%share/gnome/fvwm/fvwm-script-setup95.pl
+%%GNOME%%share/gnome/fvwm/system.fvwm2rc-sample-95
+%%GNOME%%@dirrm share/gnome/fvwm
+%%GNOME%%@unexec rmdir %D/share/gnome 2>/dev/null || true
+@dirrm share/fvwm2/pixmaps
+@dirrm share/fvwm2
+@dirrm libexec/fvwm/%%FVWM_VERSION%%
 @dirrm libexec/fvwm
-@dirrm lib/X11/fvwm2/pixmaps
-@dirrm lib/X11/fvwm2