24 files changed, 172 insertions, 168 deletions

diff --git a/x11-wm/fvwm2-beta/Makefile b/x11-wm/fvwm2-beta/Makefile
index f4d04ee69f4a..a3a1b7d22581 100644
--- a/x11-wm/fvwm2-beta/Makefile
+++ b/x11-wm/fvwm2-beta/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	Fvwm2
-# Version required:	2.2
+# Version required:	2.2.2
 # Date created:		20 Jan 1996
 # Whom:			peter
 #
-# $Id: Makefile,v 1.15 1998/09/17 00:32:57 asami Exp $
+# $Id: Makefile,v 1.16 1999/05/04 22:26:56 steve Exp $
 #
 
-DISTNAME=	fvwm-2.2
+DISTNAME=	fvwm-2.2.2
 CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.fvwm.org/pub/fvwm/version-2/
 
@@ -17,11 +17,13 @@ LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-MAN1=		FvwmAnimate.1 FvwmAudio.1 FvwmAuto.1 FvwmBacker.1 FvwmBanner.1 \
-		FvwmButtons.1 FvwmCpp.1 FvwmEvent.1 FvwmForm.1 FvwmIconBox.1 \
-		FvwmIconMan.1 FvwmIdent.1 FvwmM4.1 FvwmPager.1 FvwmRearrange.1 \
-		FvwmSave.1 FvwmSaveDesk.1 FvwmScroll.1 FvwmTalk.1 \
-		FvwmWinList.1 fvwm2.1 xpmroot.1
+
+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
 
 post-install:
 	@${MKDIR} ${PREFIX}/lib/X11/fvwm2/pixmaps
diff --git a/x11-wm/fvwm2-beta/distinfo b/x11-wm/fvwm2-beta/distinfo
index 4b0c4cce41c0..8be4a6f47a72 100644
--- a/x11-wm/fvwm2-beta/distinfo
+++ b/x11-wm/fvwm2-beta/distinfo
@@ -1 +1 @@
-MD5 (fvwm-2.2.tar.gz) = 6f2f57d60895c8c01057be6d0be3b21a
+MD5 (fvwm-2.2.2.tar.gz) = 684c5100084c5958ca2cb74780e615d9
diff --git a/x11-wm/fvwm2-beta/pkg-comment b/x11-wm/fvwm2-beta/pkg-comment
index f0a495c8bd73..48b42bf761bc 100644
--- a/x11-wm/fvwm2-beta/pkg-comment
+++ b/x11-wm/fvwm2-beta/pkg-comment
@@ -1 +1 @@
-The ever popular Fvwm, version 2.2
+Popular virtual window manager for X.
diff --git a/x11-wm/fvwm2-beta/pkg-descr b/x11-wm/fvwm2-beta/pkg-descr
index f611c9d3a231..1903f5179b38 100644
--- a/x11-wm/fvwm2-beta/pkg-descr
+++ b/x11-wm/fvwm2-beta/pkg-descr
@@ -4,7 +4,7 @@ shaped/color icons. It gives a very good emulation of mwm. A nice
 button-bar can be used to provide convenient access to frequently used
 functions or programs.
 
-See the official Fvwm home page: http://fvwm.math.uh.edu/
+WWW: http://fvwm.math.uh.edu/
 
 Jason C. Wells
 jcwells@u.washington.edu
diff --git a/x11-wm/fvwm2-beta/pkg-message b/x11-wm/fvwm2-beta/pkg-message
index 2ba3f21a5f14..4d4ca35e6d57 100644
--- a/x11-wm/fvwm2-beta/pkg-message
+++ b/x11-wm/fvwm2-beta/pkg-message
@@ -1,10 +1,9 @@
-
 Notes for XFree86 3.3/3.3.1 and LANG=ja_JP.EUC:
 
 There are some bug (?) in already released XFree86 based on X11R6.3, i.e.,
 XFree86 3.3 and XFree86 3.3.1, when X client runs under LANG=ja_JP.EUC.
 
-If you wanna use this fvwm2 with LANG=ja_JP.EUC (which means "run fvwm2,
+If you want to use this fvwm2 with LANG=ja_JP.EUC (which means "run fvwm2,
 with environment variable 'LANG' is set to 'ja_JP.EUC' to enable to display
 Japanese Kanji/Hiragana/Katakana characters"), apply following patch to
 /usr/X11R6/lib/X11/locale/ja/XLC_LOCALE (or equivalent).
diff --git a/x11-wm/fvwm2-beta/pkg-plist b/x11-wm/fvwm2-beta/pkg-plist
index df8ba6dc3c24..d8ae1175b151 100644
--- a/x11-wm/fvwm2-beta/pkg-plist
+++ b/x11-wm/fvwm2-beta/pkg-plist
@@ -15,11 +15,9 @@ 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/ccode.icon
 lib/X11/fvwm2/pixmaps/clamp.xpm
 lib/X11/fvwm2/pixmaps/colormap.xpm
 lib/X11/fvwm2/pixmaps/datebook.xpm
-lib/X11/fvwm2/pixmaps/default.xbm
 lib/X11/fvwm2/pixmaps/desk.xpm
 lib/X11/fvwm2/pixmaps/dialog_box.xpm
 lib/X11/fvwm2/pixmaps/doomface.xpm
@@ -29,14 +27,12 @@ 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.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/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
@@ -105,10 +101,8 @@ 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/ocode.icon
 lib/X11/fvwm2/pixmaps/page.xpm
 lib/X11/fvwm2/pixmaps/page2.xpm
-lib/X11/fvwm2/pixmaps/prog.icon
 lib/X11/fvwm2/pixmaps/ps.xpm
 lib/X11/fvwm2/pixmaps/question.xpm
 lib/X11/fvwm2/pixmaps/rbomb.xpm
@@ -138,29 +132,35 @@ 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/FvwmAnimate
-libexec/fvwm/2.2/FvwmAudio
-libexec/fvwm/2.2/FvwmAuto
-libexec/fvwm/2.2/FvwmBacker
-libexec/fvwm/2.2/FvwmBanner
-libexec/fvwm/2.2/FvwmButtons
-libexec/fvwm/2.2/FvwmCascade
-libexec/fvwm/2.2/FvwmCpp
-libexec/fvwm/2.2/FvwmEvent
-libexec/fvwm/2.2/FvwmForm
-libexec/fvwm/2.2/FvwmIconBox
-libexec/fvwm/2.2/FvwmIconMan
-libexec/fvwm/2.2/FvwmIdent
-libexec/fvwm/2.2/FvwmM4
-libexec/fvwm/2.2/FvwmPager
-libexec/fvwm/2.2/FvwmRearrange
-libexec/fvwm/2.2/FvwmSave
-libexec/fvwm/2.2/FvwmSaveDesk
-libexec/fvwm/2.2/FvwmScroll
-libexec/fvwm/2.2/FvwmTalk
-libexec/fvwm/2.2/FvwmTile
-libexec/fvwm/2.2/FvwmWinList
+lib/X11/fvwm2/pixmaps/default.xbm
+lib/X11/fvwm2/pixmaps/fvwm.bitmap
+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
 @dirrm lib/X11/fvwm2/pixmaps
 @dirrm lib/X11/fvwm2
-@dirrm libexec/fvwm/2.2
+@dirrm libexec/fvwm/2.2.2
 @dirrm libexec/fvwm
diff --git a/x11-wm/fvwm2-devel/Makefile b/x11-wm/fvwm2-devel/Makefile
index f4d04ee69f4a..a3a1b7d22581 100644
--- a/x11-wm/fvwm2-devel/Makefile
+++ b/x11-wm/fvwm2-devel/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	Fvwm2
-# Version required:	2.2
+# Version required:	2.2.2
 # Date created:		20 Jan 1996
 # Whom:			peter
 #
-# $Id: Makefile,v 1.15 1998/09/17 00:32:57 asami Exp $
+# $Id: Makefile,v 1.16 1999/05/04 22:26:56 steve Exp $
 #
 
-DISTNAME=	fvwm-2.2
+DISTNAME=	fvwm-2.2.2
 CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.fvwm.org/pub/fvwm/version-2/
 
@@ -17,11 +17,13 @@ LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-MAN1=		FvwmAnimate.1 FvwmAudio.1 FvwmAuto.1 FvwmBacker.1 FvwmBanner.1 \
-		FvwmButtons.1 FvwmCpp.1 FvwmEvent.1 FvwmForm.1 FvwmIconBox.1 \
-		FvwmIconMan.1 FvwmIdent.1 FvwmM4.1 FvwmPager.1 FvwmRearrange.1 \
-		FvwmSave.1 FvwmSaveDesk.1 FvwmScroll.1 FvwmTalk.1 \
-		FvwmWinList.1 fvwm2.1 xpmroot.1
+
+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
 
 post-install:
 	@${MKDIR} ${PREFIX}/lib/X11/fvwm2/pixmaps
diff --git a/x11-wm/fvwm2-devel/distinfo b/x11-wm/fvwm2-devel/distinfo
index 4b0c4cce41c0..8be4a6f47a72 100644
--- a/x11-wm/fvwm2-devel/distinfo
+++ b/x11-wm/fvwm2-devel/distinfo
@@ -1 +1 @@
-MD5 (fvwm-2.2.tar.gz) = 6f2f57d60895c8c01057be6d0be3b21a
+MD5 (fvwm-2.2.2.tar.gz) = 684c5100084c5958ca2cb74780e615d9
diff --git a/x11-wm/fvwm2-devel/pkg-comment b/x11-wm/fvwm2-devel/pkg-comment
index f0a495c8bd73..48b42bf761bc 100644
--- a/x11-wm/fvwm2-devel/pkg-comment
+++ b/x11-wm/fvwm2-devel/pkg-comment
@@ -1 +1 @@
-The ever popular Fvwm, version 2.2
+Popular virtual window manager for X.
diff --git a/x11-wm/fvwm2-devel/pkg-descr b/x11-wm/fvwm2-devel/pkg-descr
index f611c9d3a231..1903f5179b38 100644
--- a/x11-wm/fvwm2-devel/pkg-descr
+++ b/x11-wm/fvwm2-devel/pkg-descr
@@ -4,7 +4,7 @@ shaped/color icons. It gives a very good emulation of mwm. A nice
 button-bar can be used to provide convenient access to frequently used
 functions or programs.
 
-See the official Fvwm home page: http://fvwm.math.uh.edu/
+WWW: http://fvwm.math.uh.edu/
 
 Jason C. Wells
 jcwells@u.washington.edu
diff --git a/x11-wm/fvwm2-devel/pkg-message b/x11-wm/fvwm2-devel/pkg-message
index 2ba3f21a5f14..4d4ca35e6d57 100644
--- a/x11-wm/fvwm2-devel/pkg-message
+++ b/x11-wm/fvwm2-devel/pkg-message
@@ -1,10 +1,9 @@
-
 Notes for XFree86 3.3/3.3.1 and LANG=ja_JP.EUC:
 
 There are some bug (?) in already released XFree86 based on X11R6.3, i.e.,
 XFree86 3.3 and XFree86 3.3.1, when X client runs under LANG=ja_JP.EUC.
 
-If you wanna use this fvwm2 with LANG=ja_JP.EUC (which means "run fvwm2,
+If you want to use this fvwm2 with LANG=ja_JP.EUC (which means "run fvwm2,
 with environment variable 'LANG' is set to 'ja_JP.EUC' to enable to display
 Japanese Kanji/Hiragana/Katakana characters"), apply following patch to
 /usr/X11R6/lib/X11/locale/ja/XLC_LOCALE (or equivalent).
diff --git a/x11-wm/fvwm2-devel/pkg-plist b/x11-wm/fvwm2-devel/pkg-plist
index df8ba6dc3c24..d8ae1175b151 100644
--- a/x11-wm/fvwm2-devel/pkg-plist
+++ b/x11-wm/fvwm2-devel/pkg-plist
@@ -15,11 +15,9 @@ 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/ccode.icon
 lib/X11/fvwm2/pixmaps/clamp.xpm
 lib/X11/fvwm2/pixmaps/colormap.xpm
 lib/X11/fvwm2/pixmaps/datebook.xpm
-lib/X11/fvwm2/pixmaps/default.xbm
 lib/X11/fvwm2/pixmaps/desk.xpm
 lib/X11/fvwm2/pixmaps/dialog_box.xpm
 lib/X11/fvwm2/pixmaps/doomface.xpm
@@ -29,14 +27,12 @@ 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.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/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
@@ -105,10 +101,8 @@ 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/ocode.icon
 lib/X11/fvwm2/pixmaps/page.xpm
 lib/X11/fvwm2/pixmaps/page2.xpm
-lib/X11/fvwm2/pixmaps/prog.icon
 lib/X11/fvwm2/pixmaps/ps.xpm
 lib/X11/fvwm2/pixmaps/question.xpm
 lib/X11/fvwm2/pixmaps/rbomb.xpm
@@ -138,29 +132,35 @@ 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/FvwmAnimate
-libexec/fvwm/2.2/FvwmAudio
-libexec/fvwm/2.2/FvwmAuto
-libexec/fvwm/2.2/FvwmBacker
-libexec/fvwm/2.2/FvwmBanner
-libexec/fvwm/2.2/FvwmButtons
-libexec/fvwm/2.2/FvwmCascade
-libexec/fvwm/2.2/FvwmCpp
-libexec/fvwm/2.2/FvwmEvent
-libexec/fvwm/2.2/FvwmForm
-libexec/fvwm/2.2/FvwmIconBox
-libexec/fvwm/2.2/FvwmIconMan
-libexec/fvwm/2.2/FvwmIdent
-libexec/fvwm/2.2/FvwmM4
-libexec/fvwm/2.2/FvwmPager
-libexec/fvwm/2.2/FvwmRearrange
-libexec/fvwm/2.2/FvwmSave
-libexec/fvwm/2.2/FvwmSaveDesk
-libexec/fvwm/2.2/FvwmScroll
-libexec/fvwm/2.2/FvwmTalk
-libexec/fvwm/2.2/FvwmTile
-libexec/fvwm/2.2/FvwmWinList
+lib/X11/fvwm2/pixmaps/default.xbm
+lib/X11/fvwm2/pixmaps/fvwm.bitmap
+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
 @dirrm lib/X11/fvwm2/pixmaps
 @dirrm lib/X11/fvwm2
-@dirrm libexec/fvwm/2.2
+@dirrm libexec/fvwm/2.2.2
 @dirrm libexec/fvwm
diff --git a/x11-wm/fvwm2/Makefile b/x11-wm/fvwm2/Makefile
index f4d04ee69f4a..a3a1b7d22581 100644
--- a/x11-wm/fvwm2/Makefile
+++ b/x11-wm/fvwm2/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	Fvwm2
-# Version required:	2.2
+# Version required:	2.2.2
 # Date created:		20 Jan 1996
 # Whom:			peter
 #
-# $Id: Makefile,v 1.15 1998/09/17 00:32:57 asami Exp $
+# $Id: Makefile,v 1.16 1999/05/04 22:26:56 steve Exp $
 #
 
-DISTNAME=	fvwm-2.2
+DISTNAME=	fvwm-2.2.2
 CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.fvwm.org/pub/fvwm/version-2/
 
@@ -17,11 +17,13 @@ LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-MAN1=		FvwmAnimate.1 FvwmAudio.1 FvwmAuto.1 FvwmBacker.1 FvwmBanner.1 \
-		FvwmButtons.1 FvwmCpp.1 FvwmEvent.1 FvwmForm.1 FvwmIconBox.1 \
-		FvwmIconMan.1 FvwmIdent.1 FvwmM4.1 FvwmPager.1 FvwmRearrange.1 \
-		FvwmSave.1 FvwmSaveDesk.1 FvwmScroll.1 FvwmTalk.1 \
-		FvwmWinList.1 fvwm2.1 xpmroot.1
+
+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
 
 post-install:
 	@${MKDIR} ${PREFIX}/lib/X11/fvwm2/pixmaps
diff --git a/x11-wm/fvwm2/distinfo b/x11-wm/fvwm2/distinfo
index 4b0c4cce41c0..8be4a6f47a72 100644
--- a/x11-wm/fvwm2/distinfo
+++ b/x11-wm/fvwm2/distinfo
@@ -1 +1 @@
-MD5 (fvwm-2.2.tar.gz) = 6f2f57d60895c8c01057be6d0be3b21a
+MD5 (fvwm-2.2.2.tar.gz) = 684c5100084c5958ca2cb74780e615d9
diff --git a/x11-wm/fvwm2/pkg-comment b/x11-wm/fvwm2/pkg-comment
index f0a495c8bd73..48b42bf761bc 100644
--- a/x11-wm/fvwm2/pkg-comment
+++ b/x11-wm/fvwm2/pkg-comment
@@ -1 +1 @@
-The ever popular Fvwm, version 2.2
+Popular virtual window manager for X.
diff --git a/x11-wm/fvwm2/pkg-descr b/x11-wm/fvwm2/pkg-descr
index f611c9d3a231..1903f5179b38 100644
--- a/x11-wm/fvwm2/pkg-descr
+++ b/x11-wm/fvwm2/pkg-descr
@@ -4,7 +4,7 @@ shaped/color icons. It gives a very good emulation of mwm. A nice
 button-bar can be used to provide convenient access to frequently used
 functions or programs.
 
-See the official Fvwm home page: http://fvwm.math.uh.edu/
+WWW: http://fvwm.math.uh.edu/
 
 Jason C. Wells
 jcwells@u.washington.edu
diff --git a/x11-wm/fvwm2/pkg-message b/x11-wm/fvwm2/pkg-message
index 2ba3f21a5f14..4d4ca35e6d57 100644
--- a/x11-wm/fvwm2/pkg-message
+++ b/x11-wm/fvwm2/pkg-message
@@ -1,10 +1,9 @@
-
 Notes for XFree86 3.3/3.3.1 and LANG=ja_JP.EUC:
 
 There are some bug (?) in already released XFree86 based on X11R6.3, i.e.,
 XFree86 3.3 and XFree86 3.3.1, when X client runs under LANG=ja_JP.EUC.
 
-If you wanna use this fvwm2 with LANG=ja_JP.EUC (which means "run fvwm2,
+If you want to use this fvwm2 with LANG=ja_JP.EUC (which means "run fvwm2,
 with environment variable 'LANG' is set to 'ja_JP.EUC' to enable to display
 Japanese Kanji/Hiragana/Katakana characters"), apply following patch to
 /usr/X11R6/lib/X11/locale/ja/XLC_LOCALE (or equivalent).
diff --git a/x11-wm/fvwm2/pkg-plist b/x11-wm/fvwm2/pkg-plist
index df8ba6dc3c24..d8ae1175b151 100644
--- a/x11-wm/fvwm2/pkg-plist
+++ b/x11-wm/fvwm2/pkg-plist
@@ -15,11 +15,9 @@ 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/ccode.icon
 lib/X11/fvwm2/pixmaps/clamp.xpm
 lib/X11/fvwm2/pixmaps/colormap.xpm
 lib/X11/fvwm2/pixmaps/datebook.xpm
-lib/X11/fvwm2/pixmaps/default.xbm
 lib/X11/fvwm2/pixmaps/desk.xpm
 lib/X11/fvwm2/pixmaps/dialog_box.xpm
 lib/X11/fvwm2/pixmaps/doomface.xpm
@@ -29,14 +27,12 @@ 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.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/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
@@ -105,10 +101,8 @@ 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/ocode.icon
 lib/X11/fvwm2/pixmaps/page.xpm
 lib/X11/fvwm2/pixmaps/page2.xpm
-lib/X11/fvwm2/pixmaps/prog.icon
 lib/X11/fvwm2/pixmaps/ps.xpm
 lib/X11/fvwm2/pixmaps/question.xpm
 lib/X11/fvwm2/pixmaps/rbomb.xpm
@@ -138,29 +132,35 @@ 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/FvwmAnimate
-libexec/fvwm/2.2/FvwmAudio
-libexec/fvwm/2.2/FvwmAuto
-libexec/fvwm/2.2/FvwmBacker
-libexec/fvwm/2.2/FvwmBanner
-libexec/fvwm/2.2/FvwmButtons
-libexec/fvwm/2.2/FvwmCascade
-libexec/fvwm/2.2/FvwmCpp
-libexec/fvwm/2.2/FvwmEvent
-libexec/fvwm/2.2/FvwmForm
-libexec/fvwm/2.2/FvwmIconBox
-libexec/fvwm/2.2/FvwmIconMan
-libexec/fvwm/2.2/FvwmIdent
-libexec/fvwm/2.2/FvwmM4
-libexec/fvwm/2.2/FvwmPager
-libexec/fvwm/2.2/FvwmRearrange
-libexec/fvwm/2.2/FvwmSave
-libexec/fvwm/2.2/FvwmSaveDesk
-libexec/fvwm/2.2/FvwmScroll
-libexec/fvwm/2.2/FvwmTalk
-libexec/fvwm/2.2/FvwmTile
-libexec/fvwm/2.2/FvwmWinList
+lib/X11/fvwm2/pixmaps/default.xbm
+lib/X11/fvwm2/pixmaps/fvwm.bitmap
+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
 @dirrm lib/X11/fvwm2/pixmaps
 @dirrm lib/X11/fvwm2
-@dirrm libexec/fvwm/2.2
+@dirrm libexec/fvwm/2.2.2
 @dirrm libexec/fvwm
diff --git a/x11-wm/fvwm24/Makefile b/x11-wm/fvwm24/Makefile
index f4d04ee69f4a..a3a1b7d22581 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
+# Version required:	2.2.2
 # Date created:		20 Jan 1996
 # Whom:			peter
 #
-# $Id: Makefile,v 1.15 1998/09/17 00:32:57 asami Exp $
+# $Id: Makefile,v 1.16 1999/05/04 22:26:56 steve Exp $
 #
 
-DISTNAME=	fvwm-2.2
+DISTNAME=	fvwm-2.2.2
 CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.fvwm.org/pub/fvwm/version-2/
 
@@ -17,11 +17,13 @@ LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-MAN1=		FvwmAnimate.1 FvwmAudio.1 FvwmAuto.1 FvwmBacker.1 FvwmBanner.1 \
-		FvwmButtons.1 FvwmCpp.1 FvwmEvent.1 FvwmForm.1 FvwmIconBox.1 \
-		FvwmIconMan.1 FvwmIdent.1 FvwmM4.1 FvwmPager.1 FvwmRearrange.1 \
-		FvwmSave.1 FvwmSaveDesk.1 FvwmScroll.1 FvwmTalk.1 \
-		FvwmWinList.1 fvwm2.1 xpmroot.1
+
+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
 
 post-install:
 	@${MKDIR} ${PREFIX}/lib/X11/fvwm2/pixmaps
diff --git a/x11-wm/fvwm24/distinfo b/x11-wm/fvwm24/distinfo
index 4b0c4cce41c0..8be4a6f47a72 100644
--- a/x11-wm/fvwm24/distinfo
+++ b/x11-wm/fvwm24/distinfo
@@ -1 +1 @@
-MD5 (fvwm-2.2.tar.gz) = 6f2f57d60895c8c01057be6d0be3b21a
+MD5 (fvwm-2.2.2.tar.gz) = 684c5100084c5958ca2cb74780e615d9
diff --git a/x11-wm/fvwm24/pkg-comment b/x11-wm/fvwm24/pkg-comment
index f0a495c8bd73..48b42bf761bc 100644
--- a/x11-wm/fvwm24/pkg-comment
+++ b/x11-wm/fvwm24/pkg-comment
@@ -1 +1 @@
-The ever popular Fvwm, version 2.2
+Popular virtual window manager for X.
diff --git a/x11-wm/fvwm24/pkg-descr b/x11-wm/fvwm24/pkg-descr
index f611c9d3a231..1903f5179b38 100644
--- a/x11-wm/fvwm24/pkg-descr
+++ b/x11-wm/fvwm24/pkg-descr
@@ -4,7 +4,7 @@ shaped/color icons. It gives a very good emulation of mwm. A nice
 button-bar can be used to provide convenient access to frequently used
 functions or programs.
 
-See the official Fvwm home page: http://fvwm.math.uh.edu/
+WWW: http://fvwm.math.uh.edu/
 
 Jason C. Wells
 jcwells@u.washington.edu
diff --git a/x11-wm/fvwm24/pkg-message b/x11-wm/fvwm24/pkg-message
index 2ba3f21a5f14..4d4ca35e6d57 100644
--- a/x11-wm/fvwm24/pkg-message
+++ b/x11-wm/fvwm24/pkg-message
@@ -1,10 +1,9 @@
-
 Notes for XFree86 3.3/3.3.1 and LANG=ja_JP.EUC:
 
 There are some bug (?) in already released XFree86 based on X11R6.3, i.e.,
 XFree86 3.3 and XFree86 3.3.1, when X client runs under LANG=ja_JP.EUC.
 
-If you wanna use this fvwm2 with LANG=ja_JP.EUC (which means "run fvwm2,
+If you want to use this fvwm2 with LANG=ja_JP.EUC (which means "run fvwm2,
 with environment variable 'LANG' is set to 'ja_JP.EUC' to enable to display
 Japanese Kanji/Hiragana/Katakana characters"), apply following patch to
 /usr/X11R6/lib/X11/locale/ja/XLC_LOCALE (or equivalent).
diff --git a/x11-wm/fvwm24/pkg-plist b/x11-wm/fvwm24/pkg-plist
index df8ba6dc3c24..d8ae1175b151 100644
--- a/x11-wm/fvwm24/pkg-plist
+++ b/x11-wm/fvwm24/pkg-plist
@@ -15,11 +15,9 @@ 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/ccode.icon
 lib/X11/fvwm2/pixmaps/clamp.xpm
 lib/X11/fvwm2/pixmaps/colormap.xpm
 lib/X11/fvwm2/pixmaps/datebook.xpm
-lib/X11/fvwm2/pixmaps/default.xbm
 lib/X11/fvwm2/pixmaps/desk.xpm
 lib/X11/fvwm2/pixmaps/dialog_box.xpm
 lib/X11/fvwm2/pixmaps/doomface.xpm
@@ -29,14 +27,12 @@ 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.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/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
@@ -105,10 +101,8 @@ 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/ocode.icon
 lib/X11/fvwm2/pixmaps/page.xpm
 lib/X11/fvwm2/pixmaps/page2.xpm
-lib/X11/fvwm2/pixmaps/prog.icon
 lib/X11/fvwm2/pixmaps/ps.xpm
 lib/X11/fvwm2/pixmaps/question.xpm
 lib/X11/fvwm2/pixmaps/rbomb.xpm
@@ -138,29 +132,35 @@ 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/FvwmAnimate
-libexec/fvwm/2.2/FvwmAudio
-libexec/fvwm/2.2/FvwmAuto
-libexec/fvwm/2.2/FvwmBacker
-libexec/fvwm/2.2/FvwmBanner
-libexec/fvwm/2.2/FvwmButtons
-libexec/fvwm/2.2/FvwmCascade
-libexec/fvwm/2.2/FvwmCpp
-libexec/fvwm/2.2/FvwmEvent
-libexec/fvwm/2.2/FvwmForm
-libexec/fvwm/2.2/FvwmIconBox
-libexec/fvwm/2.2/FvwmIconMan
-libexec/fvwm/2.2/FvwmIdent
-libexec/fvwm/2.2/FvwmM4
-libexec/fvwm/2.2/FvwmPager
-libexec/fvwm/2.2/FvwmRearrange
-libexec/fvwm/2.2/FvwmSave
-libexec/fvwm/2.2/FvwmSaveDesk
-libexec/fvwm/2.2/FvwmScroll
-libexec/fvwm/2.2/FvwmTalk
-libexec/fvwm/2.2/FvwmTile
-libexec/fvwm/2.2/FvwmWinList
+lib/X11/fvwm2/pixmaps/default.xbm
+lib/X11/fvwm2/pixmaps/fvwm.bitmap
+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
 @dirrm lib/X11/fvwm2/pixmaps
 @dirrm lib/X11/fvwm2
-@dirrm libexec/fvwm/2.2
+@dirrm libexec/fvwm/2.2.2
 @dirrm libexec/fvwm