5 files changed, 54 insertions, 59 deletions

diff --git a/x11-wm/fvwm2/Makefile b/x11-wm/fvwm2/Makefile
index 07950d66a944..f4d04ee69f4a 100644
--- a/x11-wm/fvwm2/Makefile
+++ b/x11-wm/fvwm2/Makefile
@@ -1,41 +1,27 @@
-# New ports collection makefile for:	Internationalized fvwm2
-# Version required:	2.0.46
+# New ports collection makefile for:	Fvwm2
+# Version required:	2.2
 # Date created:		20 Jan 1996
 # Whom:			peter
 #
-# $Id: Makefile,v 1.14 1998/09/15 11:13:35 asami Exp $
+# $Id: Makefile,v 1.15 1998/09/17 00:32:57 asami Exp $
 #
 
-DISTNAME=	fvwm-2.0.46
+DISTNAME=	fvwm-2.2
 CATEGORIES=	x11-wm
-MASTER_SITES=	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/ \
-		ftp://ftp.hpc.uh.edu/pub/fvwm/version-2/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} fvwm-users-jp-kits.97Oct04.tar.gz
+MASTER_SITES=	ftp://ftp.fvwm.org/pub/fvwm/version-2/
 
-MAINTAINER=	matusita@jp.freebsd.org
+MAINTAINER=	jcwells@u.washington.edu
 
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 
-USE_IMAKE=	yes
-MAN1= 		FvwmAudio.1 FvwmAuto.1 FvwmBacker.1 FvwmBanner.1 \
-		FvwmButtons.1 FvwmCascade.1 FvwmCpp.1 FvwmForm.1 \
-		FvwmIconBox.1 FvwmIconMan.1 FvwmIdent.1 FvwmM4.1 FvwmPager.1 \
-		FvwmSave.1 FvwmSaveDesk.1 FvwmScroll.1 FvwmTalk.1 FvwmTile.1 \
+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
-MANCOMPRESSED=	yes
-
-# filenames.
-PATCH_FIXIT=	kits/patch/fix-2.0.46
-PATCH_I18N=	kits/patch/PATCH.I18N
-USE_PATCHFILES=	${PATCH_FIXIT} ${PATCH_I18N}
-
-pre-patch:
-	@for i in ${USE_PATCHFILES}; do \
-		${PATCH} ${PATCH_DIST_ARGS} < ${WRKDIR}/$$i; \
-	 done;
 
 post-install:
 	@${MKDIR} ${PREFIX}/lib/X11/fvwm2/pixmaps
diff --git a/x11-wm/fvwm2/distinfo b/x11-wm/fvwm2/distinfo
index d79a410db3be..4b0c4cce41c0 100644
--- a/x11-wm/fvwm2/distinfo
+++ b/x11-wm/fvwm2/distinfo
@@ -1,2 +1 @@
-MD5 (fvwm-2.0.46.tar.gz) = da4a7d4c4e81e5de3ecdc02026fa1fa9
-MD5 (fvwm-users-jp-kits.97Oct04.tar.gz) = 7e4b5da259634142a76d0eb9e681a6ea
+MD5 (fvwm-2.2.tar.gz) = 6f2f57d60895c8c01057be6d0be3b21a
diff --git a/x11-wm/fvwm2/pkg-comment b/x11-wm/fvwm2/pkg-comment
index 3a72054508be..920519c3372d 100644
--- a/x11-wm/fvwm2/pkg-comment
+++ b/x11-wm/fvwm2/pkg-comment
@@ -1 +1 @@
-Internationalized fvwm version 2, a window manager for X
+The ever popular Fvwm, version 2.2.
diff --git a/x11-wm/fvwm2/pkg-descr b/x11-wm/fvwm2/pkg-descr
index 3e859e68de61..f611c9d3a231 100644
--- a/x11-wm/fvwm2/pkg-descr
+++ b/x11-wm/fvwm2/pkg-descr
@@ -4,8 +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.
 
-This package uses fvwm-users-jp-kits also, to add internationalized
-feature (based on X itself) to fvwm and its modules.
+See the official Fvwm home page: http://fvwm.math.uh.edu/
 
-With this package, you may use fonts of your own language, display
-characters in everywhere in fvwm, and have fun ;-)
+Jason C. Wells
+jcwells@u.washington.edu
diff --git a/x11-wm/fvwm2/pkg-plist b/x11-wm/fvwm2/pkg-plist
index af31397f3be4..df8ba6dc3c24 100644
--- a/x11-wm/fvwm2/pkg-plist
+++ b/x11-wm/fvwm2/pkg-plist
@@ -1,39 +1,20 @@
 bin/fvwm2
 bin/xpmroot
-lib/X11/fvwm2/FvwmAudio
-lib/X11/fvwm2/FvwmAuto
-lib/X11/fvwm2/FvwmBacker
-lib/X11/fvwm2/FvwmBanner
-lib/X11/fvwm2/FvwmButtons
-lib/X11/fvwm2/FvwmCascade
-lib/X11/fvwm2/FvwmCpp
-lib/X11/fvwm2/FvwmForm
-lib/X11/fvwm2/FvwmIconBox
-lib/X11/fvwm2/FvwmIconMan
-lib/X11/fvwm2/FvwmIdent
-lib/X11/fvwm2/FvwmM4
-lib/X11/fvwm2/FvwmPager
-lib/X11/fvwm2/FvwmSave
-lib/X11/fvwm2/FvwmSaveDesk
-lib/X11/fvwm2/FvwmScroll
-lib/X11/fvwm2/FvwmTalk
-lib/X11/fvwm2/FvwmTile
-lib/X11/fvwm2/FvwmWinList
-lib/X11/fvwm2/fvwmrc_convert
-lib/X11/fvwm2/quantize_pixmaps
-lib/X11/fvwm2/decor_examples
-lib/X11/fvwm2/system.fvwm2rc
-lib/X11/fvwm2/system.fvwm2rc-sample-1
-lib/X11/fvwm2/system.fvwm2rc-sample-2
 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/ccode.icon
 lib/X11/fvwm2/pixmaps/clamp.xpm
 lib/X11/fvwm2/pixmaps/colormap.xpm
@@ -86,9 +67,13 @@ 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
@@ -129,6 +114,7 @@ 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
@@ -143,6 +129,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
@@ -151,5 +138,29 @@ 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
 @dirrm lib/X11/fvwm2/pixmaps
 @dirrm lib/X11/fvwm2
+@dirrm libexec/fvwm/2.2
+@dirrm libexec/fvwm