3 files changed, 46 insertions, 32 deletions

diff --git a/x11-wm/fvwm24/Makefile b/x11-wm/fvwm24/Makefile
index fe104e307a56..ec6e824e2ad2 100644
--- a/x11-wm/fvwm24/Makefile
+++ b/x11-wm/fvwm24/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	Fvwm2
-# Version required:	2.2.2
+# Version required:	2.2.4
 # Date created:		20 Jan 1996
 # Whom:			peter
 #
 # $FreeBSD$
 #
 
-DISTNAME=	fvwm-2.2.2
+DISTNAME=	fvwm-2.2.4
 CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.fvwm.org/pub/fvwm/version-2/
 
@@ -16,14 +16,16 @@ LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=--enable-extras
 USE_GMAKE=	yes
 
-MAN1=	FvwmAudio.1 FvwmBacker.1 FvwmBanner.1 FvwmButtons.1 \
-	FvwmCpp.1 FvwmEvent.1 FvwmForm.1 FvwmIconMan.1 \
-	FvwmIdent.1 FvwmM4.1 FvwmPager.1 FvwmRearrange.1 \
-	FvwmSave.1 FvwmSaveDesk.1 FvwmScroll.1 FvwmTalk.1 \
-	fvwm2.1 xpmroot.1 FvwmAnimate.1 FvwmAuto.1 \
-	FvwmIconBox.1 FvwmWinList.1
+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
 
 post-install:
 	@${MKDIR} ${PREFIX}/lib/X11/fvwm2/pixmaps
diff --git a/x11-wm/fvwm24/distinfo b/x11-wm/fvwm24/distinfo
index 8be4a6f47a72..e3c5c85a98bd 100644
--- a/x11-wm/fvwm24/distinfo
+++ b/x11-wm/fvwm24/distinfo
@@ -1 +1 @@
-MD5 (fvwm-2.2.2.tar.gz) = 684c5100084c5958ca2cb74780e615d9
+MD5 (fvwm-2.2.4.tar.gz) = 14ec1ca8ba305345078b7ed4c9cfdcfb
diff --git a/x11-wm/fvwm24/pkg-plist b/x11-wm/fvwm24/pkg-plist
index d8ae1175b151..b33835991308 100644
--- a/x11-wm/fvwm24/pkg-plist
+++ b/x11-wm/fvwm24/pkg-plist
@@ -1,4 +1,5 @@
 bin/fvwm2
+bin/FvwmCommand
 bin/xpmroot
 lib/X11/fvwm2/pixmaps/Jlock.xpm
 lib/X11/fvwm2/pixmaps/Jnews.xpm
@@ -138,29 +139,40 @@ lib/X11/fvwm2/pixmaps/ccode.icon
 lib/X11/fvwm2/pixmaps/hcode.icon
 lib/X11/fvwm2/pixmaps/ocode.icon
 lib/X11/fvwm2/pixmaps/prog.icon
-libexec/fvwm/2.2.2/FvwmAnimate
-libexec/fvwm/2.2.2/FvwmAudio
-libexec/fvwm/2.2.2/FvwmAuto
-libexec/fvwm/2.2.2/FvwmBacker
-libexec/fvwm/2.2.2/FvwmBanner
-libexec/fvwm/2.2.2/FvwmButtons
-libexec/fvwm/2.2.2/FvwmCpp
-libexec/fvwm/2.2.2/FvwmEvent
-libexec/fvwm/2.2.2/FvwmForm
-libexec/fvwm/2.2.2/FvwmIconBox
-libexec/fvwm/2.2.2/FvwmIconMan
-libexec/fvwm/2.2.2/FvwmIdent
-libexec/fvwm/2.2.2/FvwmM4
-libexec/fvwm/2.2.2/FvwmPager
-libexec/fvwm/2.2.2/FvwmRearrange
-libexec/fvwm/2.2.2/FvwmCascade
-libexec/fvwm/2.2.2/FvwmTile
-libexec/fvwm/2.2.2/FvwmSave
-libexec/fvwm/2.2.2/FvwmSaveDesk
-libexec/fvwm/2.2.2/FvwmScroll
-libexec/fvwm/2.2.2/FvwmTalk
-libexec/fvwm/2.2.2/FvwmWinList
+libexec/fvwm/2.2.4/FvwmAnimate
+libexec/fvwm/2.2.4/FvwmAudio
+libexec/fvwm/2.2.4/FvwmAuto
+libexec/fvwm/2.2.4/FvwmBacker
+libexec/fvwm/2.2.4/FvwmBanner
+libexec/fvwm/2.2.4/FvwmButtons
+libexec/fvwm/2.2.4/FvwmCpp
+libexec/fvwm/2.2.4/FvwmEvent
+libexec/fvwm/2.2.4/FvwmForm
+libexec/fvwm/2.2.4/FvwmIconBox
+libexec/fvwm/2.2.4/FvwmIconMan
+libexec/fvwm/2.2.4/FvwmIdent
+libexec/fvwm/2.2.4/FvwmM4
+libexec/fvwm/2.2.4/FvwmPager
+libexec/fvwm/2.2.4/FvwmRearrange
+libexec/fvwm/2.2.4/FvwmCascade
+libexec/fvwm/2.2.4/FvwmTile
+libexec/fvwm/2.2.4/FvwmSave
+libexec/fvwm/2.2.4/FvwmSaveDesk
+libexec/fvwm/2.2.4/FvwmScroll
+libexec/fvwm/2.2.4/FvwmTalk
+libexec/fvwm/2.2.4/FvwmWinList
+libexec/fvwm/2.2.4/FvwmCommandS
+libexec/fvwm/2.2.4/FvwmConfig
+libexec/fvwm/2.2.4/FvwmConsole
+libexec/fvwm/2.2.4/FvwmConsoleC
+libexec/fvwm/2.2.4/FvwmConsoleC.pl
+libexec/fvwm/2.2.4/FvwmDebug
+libexec/fvwm/2.2.4/FvwmGoodStuff
+libexec/fvwm/2.2.4/FvwmPipe
+libexec/fvwm/2.2.4/FvwmScript
+libexec/fvwm/2.2.4/FvwmTaskBar
+libexec/fvwm/2.2.4/FvwmWharf
 @dirrm lib/X11/fvwm2/pixmaps
 @dirrm lib/X11/fvwm2
-@dirrm libexec/fvwm/2.2.2
+@dirrm libexec/fvwm/2.2.4
 @dirrm libexec/fvwm