26 files changed, 838 insertions, 0 deletions

diff --git a/x11-wm/fvwm2-beta/Makefile b/x11-wm/fvwm2-beta/Makefile
new file mode 100644
index 000000000000..24330e910874
--- /dev/null
+++ b/x11-wm/fvwm2-beta/Makefile
@@ -0,0 +1,29 @@
+# New ports collection makefile for:	fvwm2
+# Version required:	2.0.39
+# Date created:		20 Jan 1996
+# Whom:			peter
+#
+# $Id$
+#
+
+DISTNAME=	fvwm-2.0.40
+CATEGORIES+=	x11
+MASTER_SITES=	ftp://ftp.hpc.uh.edu/pub/fvwm/version-2/
+
+MAINTAINER=	peter@FreeBSD.org
+
+LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+
+USE_IMAKE=	yes
+XMKMF=		xmkmf
+ALL_TARGET=	Makefiles all
+WRKSRC=		${WRKDIR}/fvwm
+
+post-configure:
+	cd ${WRKSRC}/modules/FvwmConfig; xmkmf
+
+post-install:
+	@mkdir -p ${PREFIX}/include/X11/pixmaps
+	cp ${WRKSRC}/fvwm_icons/*.xpm ${PREFIX}/include/X11/pixmaps
+
+.include <bsd.port.mk>
diff --git a/x11-wm/fvwm2-beta/distinfo b/x11-wm/fvwm2-beta/distinfo
new file mode 100644
index 000000000000..c63a27605234
--- /dev/null
+++ b/x11-wm/fvwm2-beta/distinfo
@@ -0,0 +1 @@
+MD5 (fvwm-2.0.40.tar.gz) = 2c31901e46240f0b65f60ee1bfe7a980
diff --git a/x11-wm/fvwm2-beta/pkg-comment b/x11-wm/fvwm2-beta/pkg-comment
new file mode 100644
index 000000000000..ad787c80f735
--- /dev/null
+++ b/x11-wm/fvwm2-beta/pkg-comment
@@ -0,0 +1 @@
+beta of the fvwm window manager - requires XPM
diff --git a/x11-wm/fvwm2-beta/pkg-descr b/x11-wm/fvwm2-beta/pkg-descr
new file mode 100644
index 000000000000..7115ae6ae14c
--- /dev/null
+++ b/x11-wm/fvwm2-beta/pkg-descr
@@ -0,0 +1,5 @@
+Fvwm is a another window manager for X11, which provides a simple virtual
+desktop, a 3-D look for windows decorations, and shaped, color icons. 
+It can be configured to use far less memory than twm, or to give a very 
+good emulation of mwm. A nice button-bar can be used to provide convenient 
+access to frequently used functions or programs.
diff --git a/x11-wm/fvwm2-beta/pkg-plist b/x11-wm/fvwm2-beta/pkg-plist
new file mode 100644
index 000000000000..d1b20282b4a4
--- /dev/null
+++ b/x11-wm/fvwm2-beta/pkg-plist
@@ -0,0 +1,124 @@
+bin/fvwm2
+bin/xpmroot
+lib/X11/fvwm2/.fvwm2rc
+lib/X11/fvwm2/FvwmAudio
+lib/X11/fvwm2/FvwmAuto
+lib/X11/fvwm2/FvwmBacker
+lib/X11/fvwm2/FvwmBanner
+lib/X11/fvwm2/FvwmButtons
+lib/X11/fvwm2/FvwmConfig
+lib/X11/fvwm2/FvwmCpp
+lib/X11/fvwm2/FvwmDebug
+lib/X11/fvwm2/FvwmForm
+lib/X11/fvwm2/FvwmIconBox
+lib/X11/fvwm2/FvwmIdent
+lib/X11/fvwm2/FvwmM4
+lib/X11/fvwm2/FvwmPager
+lib/X11/fvwm2/FvwmPrompt
+lib/X11/fvwm2/FvwmSave
+lib/X11/fvwm2/FvwmSaveDesk
+lib/X11/fvwm2/FvwmScroll
+lib/X11/fvwm2/FvwmTalk
+lib/X11/fvwm2/FvwmWinList
+lib/X11/fvwm2/fvwmrc_convert
+lib/X11/fvwm2/quantize_pixmaps
+man/man1/FvwmAudio.1.gz
+man/man1/FvwmAuto.1.gz
+man/man1/FvwmBacker.1.gz
+man/man1/FvwmBanner.1.gz
+man/man1/FvwmButtons.1.gz
+man/man1/FvwmConfig.1.gz
+man/man1/FvwmCpp.1.gz
+man/man1/FvwmDebug.1.gz
+man/man1/FvwmForm.1.gz
+man/man1/FvwmIconBox.1.gz
+man/man1/FvwmIdent.1.gz
+man/man1/FvwmM4.1.gz
+man/man1/FvwmPager.1.gz
+man/man1/FvwmPrompt.1.gz
+man/man1/FvwmSave.1.gz
+man/man1/FvwmSaveDesk.1.gz
+man/man1/FvwmScroll.1.gz
+man/man1/FvwmTalk.1.gz
+man/man1/FvwmWinList.1.gz
+man/man1/fvwm2.1.gz
+man/man1/xpmroot.1.gz
+include/X11/pixmaps/Mosaic.xpm
+include/X11/pixmaps/arrdown2.xpm
+include/X11/pixmaps/arrows2.xpm
+include/X11/pixmaps/arrup2.xpm
+include/X11/pixmaps/bomb.xpm
+include/X11/pixmaps/clamp.xpm
+include/X11/pixmaps/colormap.xpm
+include/X11/pixmaps/datebook.xpm
+include/X11/pixmaps/desk.xpm
+include/X11/pixmaps/dialog_box.xpm
+include/X11/pixmaps/doombig.xpm
+include/X11/pixmaps/doomface.xpm
+include/X11/pixmaps/editres.xpm
+include/X11/pixmaps/eps.xpm
+include/X11/pixmaps/exit.xpm
+include/X11/pixmaps/flow_chart.xpm
+include/X11/pixmaps/folder2.xpm
+include/X11/pixmaps/folders.xpm
+include/X11/pixmaps/fvwm.xpm
+include/X11/pixmaps/fvwm2.xpm
+include/X11/pixmaps/fvwm2_big.xpm
+include/X11/pixmaps/fvwm3.xpm
+include/X11/pixmaps/graphs.xpm
+include/X11/pixmaps/jewelbig.xpm
+include/X11/pixmaps/k.xpm
+include/X11/pixmaps/k2.xpm
+include/X11/pixmaps/lemacs.xpm
+include/X11/pixmaps/mag_glass.xpm
+include/X11/pixmaps/mail1.xpm
+include/X11/pixmaps/mail2.xpm
+include/X11/pixmaps/map.xpm
+include/X11/pixmaps/math4.xpm
+include/X11/pixmaps/mini.audiovol.xpm
+include/X11/pixmaps/mini.checkmark.xpm
+include/X11/pixmaps/mini.cut.xpm
+include/X11/pixmaps/mini.destroy.xpm
+include/X11/pixmaps/mini.excl.xpm
+include/X11/pixmaps/mini.exit.xpm
+include/X11/pixmaps/mini.fvwm.xpm
+include/X11/pixmaps/mini.letter.xpm
+include/X11/pixmaps/mini.lower.xpm
+include/X11/pixmaps/mini.move.xpm
+include/X11/pixmaps/mini.netscape.xpm
+include/X11/pixmaps/mini.raise.xpm
+include/X11/pixmaps/mini.resize.xpm
+include/X11/pixmaps/mini.xarchie.xpm
+include/X11/pixmaps/mini.xboing.xpm
+include/X11/pixmaps/mini.xlock.xpm
+include/X11/pixmaps/mini.xpm
+include/X11/pixmaps/mini.xterm.xpm
+include/X11/pixmaps/mini.zircon.xpm
+include/X11/pixmaps/page.xpm
+include/X11/pixmaps/page2.xpm
+include/X11/pixmaps/ps.xpm
+include/X11/pixmaps/question.xpm
+include/X11/pixmaps/rbomb.xpm
+include/X11/pixmaps/rcalc.xpm
+include/X11/pixmaps/rterm.xpm
+include/X11/pixmaps/term.xpm
+include/X11/pixmaps/tiff2.xpm
+include/X11/pixmaps/toolbox.xpm
+include/X11/pixmaps/unknown1.xpm
+include/X11/pixmaps/wierd_page3.xpm
+include/X11/pixmaps/word_processor.xpm
+include/X11/pixmaps/world.xpm
+include/X11/pixmaps/xboingbig.xpm
+include/X11/pixmaps/xcalc.xpm
+include/X11/pixmaps/xemacs.xpm
+include/X11/pixmaps/xlock.xpm
+include/X11/pixmaps/xman.xpm
+include/X11/pixmaps/xpaint.xpm
+include/X11/pixmaps/xterm-axp.xpm
+include/X11/pixmaps/xterm-blank.xpm
+include/X11/pixmaps/xterm-dec.xpm
+include/X11/pixmaps/xterm-sgi.xpm
+include/X11/pixmaps/xterm-sol.xpm
+include/X11/pixmaps/xterm-sun.xpm
+include/X11/pixmaps/xterm.xpm
+include/X11/pixmaps/xv.xpm
diff --git a/x11-wm/fvwm2-devel/Makefile b/x11-wm/fvwm2-devel/Makefile
new file mode 100644
index 000000000000..24330e910874
--- /dev/null
+++ b/x11-wm/fvwm2-devel/Makefile
@@ -0,0 +1,29 @@
+# New ports collection makefile for:	fvwm2
+# Version required:	2.0.39
+# Date created:		20 Jan 1996
+# Whom:			peter
+#
+# $Id$
+#
+
+DISTNAME=	fvwm-2.0.40
+CATEGORIES+=	x11
+MASTER_SITES=	ftp://ftp.hpc.uh.edu/pub/fvwm/version-2/
+
+MAINTAINER=	peter@FreeBSD.org
+
+LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+
+USE_IMAKE=	yes
+XMKMF=		xmkmf
+ALL_TARGET=	Makefiles all
+WRKSRC=		${WRKDIR}/fvwm
+
+post-configure:
+	cd ${WRKSRC}/modules/FvwmConfig; xmkmf
+
+post-install:
+	@mkdir -p ${PREFIX}/include/X11/pixmaps
+	cp ${WRKSRC}/fvwm_icons/*.xpm ${PREFIX}/include/X11/pixmaps
+
+.include <bsd.port.mk>
diff --git a/x11-wm/fvwm2-devel/distinfo b/x11-wm/fvwm2-devel/distinfo
new file mode 100644
index 000000000000..c63a27605234
--- /dev/null
+++ b/x11-wm/fvwm2-devel/distinfo
@@ -0,0 +1 @@
+MD5 (fvwm-2.0.40.tar.gz) = 2c31901e46240f0b65f60ee1bfe7a980
diff --git a/x11-wm/fvwm2-devel/pkg-comment b/x11-wm/fvwm2-devel/pkg-comment
new file mode 100644
index 000000000000..ad787c80f735
--- /dev/null
+++ b/x11-wm/fvwm2-devel/pkg-comment
@@ -0,0 +1 @@
+beta of the fvwm window manager - requires XPM
diff --git a/x11-wm/fvwm2-devel/pkg-descr b/x11-wm/fvwm2-devel/pkg-descr
new file mode 100644
index 000000000000..7115ae6ae14c
--- /dev/null
+++ b/x11-wm/fvwm2-devel/pkg-descr
@@ -0,0 +1,5 @@
+Fvwm is a another window manager for X11, which provides a simple virtual
+desktop, a 3-D look for windows decorations, and shaped, color icons. 
+It can be configured to use far less memory than twm, or to give a very 
+good emulation of mwm. A nice button-bar can be used to provide convenient 
+access to frequently used functions or programs.
diff --git a/x11-wm/fvwm2-devel/pkg-plist b/x11-wm/fvwm2-devel/pkg-plist
new file mode 100644
index 000000000000..d1b20282b4a4
--- /dev/null
+++ b/x11-wm/fvwm2-devel/pkg-plist
@@ -0,0 +1,124 @@
+bin/fvwm2
+bin/xpmroot
+lib/X11/fvwm2/.fvwm2rc
+lib/X11/fvwm2/FvwmAudio
+lib/X11/fvwm2/FvwmAuto
+lib/X11/fvwm2/FvwmBacker
+lib/X11/fvwm2/FvwmBanner
+lib/X11/fvwm2/FvwmButtons
+lib/X11/fvwm2/FvwmConfig
+lib/X11/fvwm2/FvwmCpp
+lib/X11/fvwm2/FvwmDebug
+lib/X11/fvwm2/FvwmForm
+lib/X11/fvwm2/FvwmIconBox
+lib/X11/fvwm2/FvwmIdent
+lib/X11/fvwm2/FvwmM4
+lib/X11/fvwm2/FvwmPager
+lib/X11/fvwm2/FvwmPrompt
+lib/X11/fvwm2/FvwmSave
+lib/X11/fvwm2/FvwmSaveDesk
+lib/X11/fvwm2/FvwmScroll
+lib/X11/fvwm2/FvwmTalk
+lib/X11/fvwm2/FvwmWinList
+lib/X11/fvwm2/fvwmrc_convert
+lib/X11/fvwm2/quantize_pixmaps
+man/man1/FvwmAudio.1.gz
+man/man1/FvwmAuto.1.gz
+man/man1/FvwmBacker.1.gz
+man/man1/FvwmBanner.1.gz
+man/man1/FvwmButtons.1.gz
+man/man1/FvwmConfig.1.gz
+man/man1/FvwmCpp.1.gz
+man/man1/FvwmDebug.1.gz
+man/man1/FvwmForm.1.gz
+man/man1/FvwmIconBox.1.gz
+man/man1/FvwmIdent.1.gz
+man/man1/FvwmM4.1.gz
+man/man1/FvwmPager.1.gz
+man/man1/FvwmPrompt.1.gz
+man/man1/FvwmSave.1.gz
+man/man1/FvwmSaveDesk.1.gz
+man/man1/FvwmScroll.1.gz
+man/man1/FvwmTalk.1.gz
+man/man1/FvwmWinList.1.gz
+man/man1/fvwm2.1.gz
+man/man1/xpmroot.1.gz
+include/X11/pixmaps/Mosaic.xpm
+include/X11/pixmaps/arrdown2.xpm
+include/X11/pixmaps/arrows2.xpm
+include/X11/pixmaps/arrup2.xpm
+include/X11/pixmaps/bomb.xpm
+include/X11/pixmaps/clamp.xpm
+include/X11/pixmaps/colormap.xpm
+include/X11/pixmaps/datebook.xpm
+include/X11/pixmaps/desk.xpm
+include/X11/pixmaps/dialog_box.xpm
+include/X11/pixmaps/doombig.xpm
+include/X11/pixmaps/doomface.xpm
+include/X11/pixmaps/editres.xpm
+include/X11/pixmaps/eps.xpm
+include/X11/pixmaps/exit.xpm
+include/X11/pixmaps/flow_chart.xpm
+include/X11/pixmaps/folder2.xpm
+include/X11/pixmaps/folders.xpm
+include/X11/pixmaps/fvwm.xpm
+include/X11/pixmaps/fvwm2.xpm
+include/X11/pixmaps/fvwm2_big.xpm
+include/X11/pixmaps/fvwm3.xpm
+include/X11/pixmaps/graphs.xpm
+include/X11/pixmaps/jewelbig.xpm
+include/X11/pixmaps/k.xpm
+include/X11/pixmaps/k2.xpm
+include/X11/pixmaps/lemacs.xpm
+include/X11/pixmaps/mag_glass.xpm
+include/X11/pixmaps/mail1.xpm
+include/X11/pixmaps/mail2.xpm
+include/X11/pixmaps/map.xpm
+include/X11/pixmaps/math4.xpm
+include/X11/pixmaps/mini.audiovol.xpm
+include/X11/pixmaps/mini.checkmark.xpm
+include/X11/pixmaps/mini.cut.xpm
+include/X11/pixmaps/mini.destroy.xpm
+include/X11/pixmaps/mini.excl.xpm
+include/X11/pixmaps/mini.exit.xpm
+include/X11/pixmaps/mini.fvwm.xpm
+include/X11/pixmaps/mini.letter.xpm
+include/X11/pixmaps/mini.lower.xpm
+include/X11/pixmaps/mini.move.xpm
+include/X11/pixmaps/mini.netscape.xpm
+include/X11/pixmaps/mini.raise.xpm
+include/X11/pixmaps/mini.resize.xpm
+include/X11/pixmaps/mini.xarchie.xpm
+include/X11/pixmaps/mini.xboing.xpm
+include/X11/pixmaps/mini.xlock.xpm
+include/X11/pixmaps/mini.xpm
+include/X11/pixmaps/mini.xterm.xpm
+include/X11/pixmaps/mini.zircon.xpm
+include/X11/pixmaps/page.xpm
+include/X11/pixmaps/page2.xpm
+include/X11/pixmaps/ps.xpm
+include/X11/pixmaps/question.xpm
+include/X11/pixmaps/rbomb.xpm
+include/X11/pixmaps/rcalc.xpm
+include/X11/pixmaps/rterm.xpm
+include/X11/pixmaps/term.xpm
+include/X11/pixmaps/tiff2.xpm
+include/X11/pixmaps/toolbox.xpm
+include/X11/pixmaps/unknown1.xpm
+include/X11/pixmaps/wierd_page3.xpm
+include/X11/pixmaps/word_processor.xpm
+include/X11/pixmaps/world.xpm
+include/X11/pixmaps/xboingbig.xpm
+include/X11/pixmaps/xcalc.xpm
+include/X11/pixmaps/xemacs.xpm
+include/X11/pixmaps/xlock.xpm
+include/X11/pixmaps/xman.xpm
+include/X11/pixmaps/xpaint.xpm
+include/X11/pixmaps/xterm-axp.xpm
+include/X11/pixmaps/xterm-blank.xpm
+include/X11/pixmaps/xterm-dec.xpm
+include/X11/pixmaps/xterm-sgi.xpm
+include/X11/pixmaps/xterm-sol.xpm
+include/X11/pixmaps/xterm-sun.xpm
+include/X11/pixmaps/xterm.xpm
+include/X11/pixmaps/xv.xpm
diff --git a/x11-wm/fvwm2-i18n/Makefile b/x11-wm/fvwm2-i18n/Makefile
new file mode 100644
index 000000000000..24330e910874
--- /dev/null
+++ b/x11-wm/fvwm2-i18n/Makefile
@@ -0,0 +1,29 @@
+# New ports collection makefile for:	fvwm2
+# Version required:	2.0.39
+# Date created:		20 Jan 1996
+# Whom:			peter
+#
+# $Id$
+#
+
+DISTNAME=	fvwm-2.0.40
+CATEGORIES+=	x11
+MASTER_SITES=	ftp://ftp.hpc.uh.edu/pub/fvwm/version-2/
+
+MAINTAINER=	peter@FreeBSD.org
+
+LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+
+USE_IMAKE=	yes
+XMKMF=		xmkmf
+ALL_TARGET=	Makefiles all
+WRKSRC=		${WRKDIR}/fvwm
+
+post-configure:
+	cd ${WRKSRC}/modules/FvwmConfig; xmkmf
+
+post-install:
+	@mkdir -p ${PREFIX}/include/X11/pixmaps
+	cp ${WRKSRC}/fvwm_icons/*.xpm ${PREFIX}/include/X11/pixmaps
+
+.include <bsd.port.mk>
diff --git a/x11-wm/fvwm2-i18n/distinfo b/x11-wm/fvwm2-i18n/distinfo
new file mode 100644
index 000000000000..c63a27605234
--- /dev/null
+++ b/x11-wm/fvwm2-i18n/distinfo
@@ -0,0 +1 @@
+MD5 (fvwm-2.0.40.tar.gz) = 2c31901e46240f0b65f60ee1bfe7a980
diff --git a/x11-wm/fvwm2-i18n/files/patch-aa b/x11-wm/fvwm2-i18n/files/patch-aa
new file mode 100644
index 000000000000..7937e33145a1
--- /dev/null
+++ b/x11-wm/fvwm2-i18n/files/patch-aa
@@ -0,0 +1,38 @@
+--- configure.h.dist	Wed Nov 15 02:59:28 1995
++++ configure.h	Sat Jan 20 10:46:27 1996
+@@ -21,12 +21,11 @@
+ #ifdef RENAME_FVWM2
+ #define FVWM fvwm2
+ #define FVWMRC ".fvwm2rc"
+-#define FVWMDIR "/usr/lib/X11/fvwm2"
+-/* #define FVWMDIR "/usr/local/X11R6/lib/X11/fvwm2" */
++#define FVWMDIR "/usr/X11R6/lib/X11/fvwm2"
+ #else
+ #define FVWM fvwm
+ #define FVWMRC ".fvwmrc"
+-#define FVWMDIR "/usr/lib/X11/fvwm"
++#define FVWMDIR "/usr/X11R6/lib/X11/fvwm"
+ #endif /* RENAME_FVWM2 */
+ 
+ /***************************************************************************
+@@ -49,8 +48,7 @@
+ /* #define FVWM_MANSUFFIX 1 */
+ 
+ /* Where do you want the fvwm icons to go. */
+-#define FVWM_ICONDIR "/usr/include/X11/bitmaps:/usr/include/X11/pixmaps"
+-/* #define FVWM_ICONDIR "/usr/local/X11R6/include/X11/bitmaps:/usr/local/X11R6/include/X11/pixmaps" */
++#define FVWM_ICONDIR "/usr/X11R6/include/X11/bitmaps:/usr/X11R6/include/X11/pixmaps"
+ 
+ /* What compiler over-ride's do you want. */
+ /* #define FVWM_COMPILER gcc -g -Wall */
+@@ -192,8 +190,8 @@
+ /***************************************************************************
+  * Define if you have uname. Otherwise, define gethostname
+  ***************************************************************************/
+-#define HAVE_UNAME 1
+-/* #define HAVE_GETHOSTNAME 1 */
++/* #define HAVE_UNAME 1 */
++#define HAVE_GETHOSTNAME 1
+ 
+ #endif /* End of do-it-yourself OS support section */
+ 
diff --git a/x11-wm/fvwm2-i18n/pkg-comment b/x11-wm/fvwm2-i18n/pkg-comment
new file mode 100644
index 000000000000..ad787c80f735
--- /dev/null
+++ b/x11-wm/fvwm2-i18n/pkg-comment
@@ -0,0 +1 @@
+beta of the fvwm window manager - requires XPM
diff --git a/x11-wm/fvwm2-i18n/pkg-descr b/x11-wm/fvwm2-i18n/pkg-descr
new file mode 100644
index 000000000000..7115ae6ae14c
--- /dev/null
+++ b/x11-wm/fvwm2-i18n/pkg-descr
@@ -0,0 +1,5 @@
+Fvwm is a another window manager for X11, which provides a simple virtual
+desktop, a 3-D look for windows decorations, and shaped, color icons. 
+It can be configured to use far less memory than twm, or to give a very 
+good emulation of mwm. A nice button-bar can be used to provide convenient 
+access to frequently used functions or programs.
diff --git a/x11-wm/fvwm2-i18n/pkg-plist b/x11-wm/fvwm2-i18n/pkg-plist
new file mode 100644
index 000000000000..d1b20282b4a4
--- /dev/null
+++ b/x11-wm/fvwm2-i18n/pkg-plist
@@ -0,0 +1,124 @@
+bin/fvwm2
+bin/xpmroot
+lib/X11/fvwm2/.fvwm2rc
+lib/X11/fvwm2/FvwmAudio
+lib/X11/fvwm2/FvwmAuto
+lib/X11/fvwm2/FvwmBacker
+lib/X11/fvwm2/FvwmBanner
+lib/X11/fvwm2/FvwmButtons
+lib/X11/fvwm2/FvwmConfig
+lib/X11/fvwm2/FvwmCpp
+lib/X11/fvwm2/FvwmDebug
+lib/X11/fvwm2/FvwmForm
+lib/X11/fvwm2/FvwmIconBox
+lib/X11/fvwm2/FvwmIdent
+lib/X11/fvwm2/FvwmM4
+lib/X11/fvwm2/FvwmPager
+lib/X11/fvwm2/FvwmPrompt
+lib/X11/fvwm2/FvwmSave
+lib/X11/fvwm2/FvwmSaveDesk
+lib/X11/fvwm2/FvwmScroll
+lib/X11/fvwm2/FvwmTalk
+lib/X11/fvwm2/FvwmWinList
+lib/X11/fvwm2/fvwmrc_convert
+lib/X11/fvwm2/quantize_pixmaps
+man/man1/FvwmAudio.1.gz
+man/man1/FvwmAuto.1.gz
+man/man1/FvwmBacker.1.gz
+man/man1/FvwmBanner.1.gz
+man/man1/FvwmButtons.1.gz
+man/man1/FvwmConfig.1.gz
+man/man1/FvwmCpp.1.gz
+man/man1/FvwmDebug.1.gz
+man/man1/FvwmForm.1.gz
+man/man1/FvwmIconBox.1.gz
+man/man1/FvwmIdent.1.gz
+man/man1/FvwmM4.1.gz
+man/man1/FvwmPager.1.gz
+man/man1/FvwmPrompt.1.gz
+man/man1/FvwmSave.1.gz
+man/man1/FvwmSaveDesk.1.gz
+man/man1/FvwmScroll.1.gz
+man/man1/FvwmTalk.1.gz
+man/man1/FvwmWinList.1.gz
+man/man1/fvwm2.1.gz
+man/man1/xpmroot.1.gz
+include/X11/pixmaps/Mosaic.xpm
+include/X11/pixmaps/arrdown2.xpm
+include/X11/pixmaps/arrows2.xpm
+include/X11/pixmaps/arrup2.xpm
+include/X11/pixmaps/bomb.xpm
+include/X11/pixmaps/clamp.xpm
+include/X11/pixmaps/colormap.xpm
+include/X11/pixmaps/datebook.xpm
+include/X11/pixmaps/desk.xpm
+include/X11/pixmaps/dialog_box.xpm
+include/X11/pixmaps/doombig.xpm
+include/X11/pixmaps/doomface.xpm
+include/X11/pixmaps/editres.xpm
+include/X11/pixmaps/eps.xpm
+include/X11/pixmaps/exit.xpm
+include/X11/pixmaps/flow_chart.xpm
+include/X11/pixmaps/folder2.xpm
+include/X11/pixmaps/folders.xpm
+include/X11/pixmaps/fvwm.xpm
+include/X11/pixmaps/fvwm2.xpm
+include/X11/pixmaps/fvwm2_big.xpm
+include/X11/pixmaps/fvwm3.xpm
+include/X11/pixmaps/graphs.xpm
+include/X11/pixmaps/jewelbig.xpm
+include/X11/pixmaps/k.xpm
+include/X11/pixmaps/k2.xpm
+include/X11/pixmaps/lemacs.xpm
+include/X11/pixmaps/mag_glass.xpm
+include/X11/pixmaps/mail1.xpm
+include/X11/pixmaps/mail2.xpm
+include/X11/pixmaps/map.xpm
+include/X11/pixmaps/math4.xpm
+include/X11/pixmaps/mini.audiovol.xpm
+include/X11/pixmaps/mini.checkmark.xpm
+include/X11/pixmaps/mini.cut.xpm
+include/X11/pixmaps/mini.destroy.xpm
+include/X11/pixmaps/mini.excl.xpm
+include/X11/pixmaps/mini.exit.xpm
+include/X11/pixmaps/mini.fvwm.xpm
+include/X11/pixmaps/mini.letter.xpm
+include/X11/pixmaps/mini.lower.xpm
+include/X11/pixmaps/mini.move.xpm
+include/X11/pixmaps/mini.netscape.xpm
+include/X11/pixmaps/mini.raise.xpm
+include/X11/pixmaps/mini.resize.xpm
+include/X11/pixmaps/mini.xarchie.xpm
+include/X11/pixmaps/mini.xboing.xpm
+include/X11/pixmaps/mini.xlock.xpm
+include/X11/pixmaps/mini.xpm
+include/X11/pixmaps/mini.xterm.xpm
+include/X11/pixmaps/mini.zircon.xpm
+include/X11/pixmaps/page.xpm
+include/X11/pixmaps/page2.xpm
+include/X11/pixmaps/ps.xpm
+include/X11/pixmaps/question.xpm
+include/X11/pixmaps/rbomb.xpm
+include/X11/pixmaps/rcalc.xpm
+include/X11/pixmaps/rterm.xpm
+include/X11/pixmaps/term.xpm
+include/X11/pixmaps/tiff2.xpm
+include/X11/pixmaps/toolbox.xpm
+include/X11/pixmaps/unknown1.xpm
+include/X11/pixmaps/wierd_page3.xpm
+include/X11/pixmaps/word_processor.xpm
+include/X11/pixmaps/world.xpm
+include/X11/pixmaps/xboingbig.xpm
+include/X11/pixmaps/xcalc.xpm
+include/X11/pixmaps/xemacs.xpm
+include/X11/pixmaps/xlock.xpm
+include/X11/pixmaps/xman.xpm
+include/X11/pixmaps/xpaint.xpm
+include/X11/pixmaps/xterm-axp.xpm
+include/X11/pixmaps/xterm-blank.xpm
+include/X11/pixmaps/xterm-dec.xpm
+include/X11/pixmaps/xterm-sgi.xpm
+include/X11/pixmaps/xterm-sol.xpm
+include/X11/pixmaps/xterm-sun.xpm
+include/X11/pixmaps/xterm.xpm
+include/X11/pixmaps/xv.xpm
diff --git a/x11-wm/fvwm2/Makefile b/x11-wm/fvwm2/Makefile
new file mode 100644
index 000000000000..24330e910874
--- /dev/null
+++ b/x11-wm/fvwm2/Makefile
@@ -0,0 +1,29 @@
+# New ports collection makefile for:	fvwm2
+# Version required:	2.0.39
+# Date created:		20 Jan 1996
+# Whom:			peter
+#
+# $Id$
+#
+
+DISTNAME=	fvwm-2.0.40
+CATEGORIES+=	x11
+MASTER_SITES=	ftp://ftp.hpc.uh.edu/pub/fvwm/version-2/
+
+MAINTAINER=	peter@FreeBSD.org
+
+LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+
+USE_IMAKE=	yes
+XMKMF=		xmkmf
+ALL_TARGET=	Makefiles all
+WRKSRC=		${WRKDIR}/fvwm
+
+post-configure:
+	cd ${WRKSRC}/modules/FvwmConfig; xmkmf
+
+post-install:
+	@mkdir -p ${PREFIX}/include/X11/pixmaps
+	cp ${WRKSRC}/fvwm_icons/*.xpm ${PREFIX}/include/X11/pixmaps
+
+.include <bsd.port.mk>
diff --git a/x11-wm/fvwm2/distinfo b/x11-wm/fvwm2/distinfo
new file mode 100644
index 000000000000..c63a27605234
--- /dev/null
+++ b/x11-wm/fvwm2/distinfo
@@ -0,0 +1 @@
+MD5 (fvwm-2.0.40.tar.gz) = 2c31901e46240f0b65f60ee1bfe7a980
diff --git a/x11-wm/fvwm2/pkg-comment b/x11-wm/fvwm2/pkg-comment
new file mode 100644
index 000000000000..ad787c80f735
--- /dev/null
+++ b/x11-wm/fvwm2/pkg-comment
@@ -0,0 +1 @@
+beta of the fvwm window manager - requires XPM
diff --git a/x11-wm/fvwm2/pkg-descr b/x11-wm/fvwm2/pkg-descr
new file mode 100644
index 000000000000..7115ae6ae14c
--- /dev/null
+++ b/x11-wm/fvwm2/pkg-descr
@@ -0,0 +1,5 @@
+Fvwm is a another window manager for X11, which provides a simple virtual
+desktop, a 3-D look for windows decorations, and shaped, color icons. 
+It can be configured to use far less memory than twm, or to give a very 
+good emulation of mwm. A nice button-bar can be used to provide convenient 
+access to frequently used functions or programs.
diff --git a/x11-wm/fvwm2/pkg-plist b/x11-wm/fvwm2/pkg-plist
new file mode 100644
index 000000000000..d1b20282b4a4
--- /dev/null
+++ b/x11-wm/fvwm2/pkg-plist
@@ -0,0 +1,124 @@
+bin/fvwm2
+bin/xpmroot
+lib/X11/fvwm2/.fvwm2rc
+lib/X11/fvwm2/FvwmAudio
+lib/X11/fvwm2/FvwmAuto
+lib/X11/fvwm2/FvwmBacker
+lib/X11/fvwm2/FvwmBanner
+lib/X11/fvwm2/FvwmButtons
+lib/X11/fvwm2/FvwmConfig
+lib/X11/fvwm2/FvwmCpp
+lib/X11/fvwm2/FvwmDebug
+lib/X11/fvwm2/FvwmForm
+lib/X11/fvwm2/FvwmIconBox
+lib/X11/fvwm2/FvwmIdent
+lib/X11/fvwm2/FvwmM4
+lib/X11/fvwm2/FvwmPager
+lib/X11/fvwm2/FvwmPrompt
+lib/X11/fvwm2/FvwmSave
+lib/X11/fvwm2/FvwmSaveDesk
+lib/X11/fvwm2/FvwmScroll
+lib/X11/fvwm2/FvwmTalk
+lib/X11/fvwm2/FvwmWinList
+lib/X11/fvwm2/fvwmrc_convert
+lib/X11/fvwm2/quantize_pixmaps
+man/man1/FvwmAudio.1.gz
+man/man1/FvwmAuto.1.gz
+man/man1/FvwmBacker.1.gz
+man/man1/FvwmBanner.1.gz
+man/man1/FvwmButtons.1.gz
+man/man1/FvwmConfig.1.gz
+man/man1/FvwmCpp.1.gz
+man/man1/FvwmDebug.1.gz
+man/man1/FvwmForm.1.gz
+man/man1/FvwmIconBox.1.gz
+man/man1/FvwmIdent.1.gz
+man/man1/FvwmM4.1.gz
+man/man1/FvwmPager.1.gz
+man/man1/FvwmPrompt.1.gz
+man/man1/FvwmSave.1.gz
+man/man1/FvwmSaveDesk.1.gz
+man/man1/FvwmScroll.1.gz
+man/man1/FvwmTalk.1.gz
+man/man1/FvwmWinList.1.gz
+man/man1/fvwm2.1.gz
+man/man1/xpmroot.1.gz
+include/X11/pixmaps/Mosaic.xpm
+include/X11/pixmaps/arrdown2.xpm
+include/X11/pixmaps/arrows2.xpm
+include/X11/pixmaps/arrup2.xpm
+include/X11/pixmaps/bomb.xpm
+include/X11/pixmaps/clamp.xpm
+include/X11/pixmaps/colormap.xpm
+include/X11/pixmaps/datebook.xpm
+include/X11/pixmaps/desk.xpm
+include/X11/pixmaps/dialog_box.xpm
+include/X11/pixmaps/doombig.xpm
+include/X11/pixmaps/doomface.xpm
+include/X11/pixmaps/editres.xpm
+include/X11/pixmaps/eps.xpm
+include/X11/pixmaps/exit.xpm
+include/X11/pixmaps/flow_chart.xpm
+include/X11/pixmaps/folder2.xpm
+include/X11/pixmaps/folders.xpm
+include/X11/pixmaps/fvwm.xpm
+include/X11/pixmaps/fvwm2.xpm
+include/X11/pixmaps/fvwm2_big.xpm
+include/X11/pixmaps/fvwm3.xpm
+include/X11/pixmaps/graphs.xpm
+include/X11/pixmaps/jewelbig.xpm
+include/X11/pixmaps/k.xpm
+include/X11/pixmaps/k2.xpm
+include/X11/pixmaps/lemacs.xpm
+include/X11/pixmaps/mag_glass.xpm
+include/X11/pixmaps/mail1.xpm
+include/X11/pixmaps/mail2.xpm
+include/X11/pixmaps/map.xpm
+include/X11/pixmaps/math4.xpm
+include/X11/pixmaps/mini.audiovol.xpm
+include/X11/pixmaps/mini.checkmark.xpm
+include/X11/pixmaps/mini.cut.xpm
+include/X11/pixmaps/mini.destroy.xpm
+include/X11/pixmaps/mini.excl.xpm
+include/X11/pixmaps/mini.exit.xpm
+include/X11/pixmaps/mini.fvwm.xpm
+include/X11/pixmaps/mini.letter.xpm
+include/X11/pixmaps/mini.lower.xpm
+include/X11/pixmaps/mini.move.xpm
+include/X11/pixmaps/mini.netscape.xpm
+include/X11/pixmaps/mini.raise.xpm
+include/X11/pixmaps/mini.resize.xpm
+include/X11/pixmaps/mini.xarchie.xpm
+include/X11/pixmaps/mini.xboing.xpm
+include/X11/pixmaps/mini.xlock.xpm
+include/X11/pixmaps/mini.xpm
+include/X11/pixmaps/mini.xterm.xpm
+include/X11/pixmaps/mini.zircon.xpm
+include/X11/pixmaps/page.xpm
+include/X11/pixmaps/page2.xpm
+include/X11/pixmaps/ps.xpm
+include/X11/pixmaps/question.xpm
+include/X11/pixmaps/rbomb.xpm
+include/X11/pixmaps/rcalc.xpm
+include/X11/pixmaps/rterm.xpm
+include/X11/pixmaps/term.xpm
+include/X11/pixmaps/tiff2.xpm
+include/X11/pixmaps/toolbox.xpm
+include/X11/pixmaps/unknown1.xpm
+include/X11/pixmaps/wierd_page3.xpm
+include/X11/pixmaps/word_processor.xpm
+include/X11/pixmaps/world.xpm
+include/X11/pixmaps/xboingbig.xpm
+include/X11/pixmaps/xcalc.xpm
+include/X11/pixmaps/xemacs.xpm
+include/X11/pixmaps/xlock.xpm
+include/X11/pixmaps/xman.xpm
+include/X11/pixmaps/xpaint.xpm
+include/X11/pixmaps/xterm-axp.xpm
+include/X11/pixmaps/xterm-blank.xpm
+include/X11/pixmaps/xterm-dec.xpm
+include/X11/pixmaps/xterm-sgi.xpm
+include/X11/pixmaps/xterm-sol.xpm
+include/X11/pixmaps/xterm-sun.xpm
+include/X11/pixmaps/xterm.xpm
+include/X11/pixmaps/xv.xpm
diff --git a/x11-wm/fvwm24/Makefile b/x11-wm/fvwm24/Makefile
new file mode 100644
index 000000000000..24330e910874
--- /dev/null
+++ b/x11-wm/fvwm24/Makefile
@@ -0,0 +1,29 @@
+# New ports collection makefile for:	fvwm2
+# Version required:	2.0.39
+# Date created:		20 Jan 1996
+# Whom:			peter
+#
+# $Id$
+#
+
+DISTNAME=	fvwm-2.0.40
+CATEGORIES+=	x11
+MASTER_SITES=	ftp://ftp.hpc.uh.edu/pub/fvwm/version-2/
+
+MAINTAINER=	peter@FreeBSD.org
+
+LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+
+USE_IMAKE=	yes
+XMKMF=		xmkmf
+ALL_TARGET=	Makefiles all
+WRKSRC=		${WRKDIR}/fvwm
+
+post-configure:
+	cd ${WRKSRC}/modules/FvwmConfig; xmkmf
+
+post-install:
+	@mkdir -p ${PREFIX}/include/X11/pixmaps
+	cp ${WRKSRC}/fvwm_icons/*.xpm ${PREFIX}/include/X11/pixmaps
+
+.include <bsd.port.mk>
diff --git a/x11-wm/fvwm24/distinfo b/x11-wm/fvwm24/distinfo
new file mode 100644
index 000000000000..c63a27605234
--- /dev/null
+++ b/x11-wm/fvwm24/distinfo
@@ -0,0 +1 @@
+MD5 (fvwm-2.0.40.tar.gz) = 2c31901e46240f0b65f60ee1bfe7a980
diff --git a/x11-wm/fvwm24/pkg-comment b/x11-wm/fvwm24/pkg-comment
new file mode 100644
index 000000000000..ad787c80f735
--- /dev/null
+++ b/x11-wm/fvwm24/pkg-comment
@@ -0,0 +1 @@
+beta of the fvwm window manager - requires XPM
diff --git a/x11-wm/fvwm24/pkg-descr b/x11-wm/fvwm24/pkg-descr
new file mode 100644
index 000000000000..7115ae6ae14c
--- /dev/null
+++ b/x11-wm/fvwm24/pkg-descr
@@ -0,0 +1,5 @@
+Fvwm is a another window manager for X11, which provides a simple virtual
+desktop, a 3-D look for windows decorations, and shaped, color icons. 
+It can be configured to use far less memory than twm, or to give a very 
+good emulation of mwm. A nice button-bar can be used to provide convenient 
+access to frequently used functions or programs.
diff --git a/x11-wm/fvwm24/pkg-plist b/x11-wm/fvwm24/pkg-plist
new file mode 100644
index 000000000000..d1b20282b4a4
--- /dev/null
+++ b/x11-wm/fvwm24/pkg-plist
@@ -0,0 +1,124 @@
+bin/fvwm2
+bin/xpmroot
+lib/X11/fvwm2/.fvwm2rc
+lib/X11/fvwm2/FvwmAudio
+lib/X11/fvwm2/FvwmAuto
+lib/X11/fvwm2/FvwmBacker
+lib/X11/fvwm2/FvwmBanner
+lib/X11/fvwm2/FvwmButtons
+lib/X11/fvwm2/FvwmConfig
+lib/X11/fvwm2/FvwmCpp
+lib/X11/fvwm2/FvwmDebug
+lib/X11/fvwm2/FvwmForm
+lib/X11/fvwm2/FvwmIconBox
+lib/X11/fvwm2/FvwmIdent
+lib/X11/fvwm2/FvwmM4
+lib/X11/fvwm2/FvwmPager
+lib/X11/fvwm2/FvwmPrompt
+lib/X11/fvwm2/FvwmSave
+lib/X11/fvwm2/FvwmSaveDesk
+lib/X11/fvwm2/FvwmScroll
+lib/X11/fvwm2/FvwmTalk
+lib/X11/fvwm2/FvwmWinList
+lib/X11/fvwm2/fvwmrc_convert
+lib/X11/fvwm2/quantize_pixmaps
+man/man1/FvwmAudio.1.gz
+man/man1/FvwmAuto.1.gz
+man/man1/FvwmBacker.1.gz
+man/man1/FvwmBanner.1.gz
+man/man1/FvwmButtons.1.gz
+man/man1/FvwmConfig.1.gz
+man/man1/FvwmCpp.1.gz
+man/man1/FvwmDebug.1.gz
+man/man1/FvwmForm.1.gz
+man/man1/FvwmIconBox.1.gz
+man/man1/FvwmIdent.1.gz
+man/man1/FvwmM4.1.gz
+man/man1/FvwmPager.1.gz
+man/man1/FvwmPrompt.1.gz
+man/man1/FvwmSave.1.gz
+man/man1/FvwmSaveDesk.1.gz
+man/man1/FvwmScroll.1.gz
+man/man1/FvwmTalk.1.gz
+man/man1/FvwmWinList.1.gz
+man/man1/fvwm2.1.gz
+man/man1/xpmroot.1.gz
+include/X11/pixmaps/Mosaic.xpm
+include/X11/pixmaps/arrdown2.xpm
+include/X11/pixmaps/arrows2.xpm
+include/X11/pixmaps/arrup2.xpm
+include/X11/pixmaps/bomb.xpm
+include/X11/pixmaps/clamp.xpm
+include/X11/pixmaps/colormap.xpm
+include/X11/pixmaps/datebook.xpm
+include/X11/pixmaps/desk.xpm
+include/X11/pixmaps/dialog_box.xpm
+include/X11/pixmaps/doombig.xpm
+include/X11/pixmaps/doomface.xpm
+include/X11/pixmaps/editres.xpm
+include/X11/pixmaps/eps.xpm
+include/X11/pixmaps/exit.xpm
+include/X11/pixmaps/flow_chart.xpm
+include/X11/pixmaps/folder2.xpm
+include/X11/pixmaps/folders.xpm
+include/X11/pixmaps/fvwm.xpm
+include/X11/pixmaps/fvwm2.xpm
+include/X11/pixmaps/fvwm2_big.xpm
+include/X11/pixmaps/fvwm3.xpm
+include/X11/pixmaps/graphs.xpm
+include/X11/pixmaps/jewelbig.xpm
+include/X11/pixmaps/k.xpm
+include/X11/pixmaps/k2.xpm
+include/X11/pixmaps/lemacs.xpm
+include/X11/pixmaps/mag_glass.xpm
+include/X11/pixmaps/mail1.xpm
+include/X11/pixmaps/mail2.xpm
+include/X11/pixmaps/map.xpm
+include/X11/pixmaps/math4.xpm
+include/X11/pixmaps/mini.audiovol.xpm
+include/X11/pixmaps/mini.checkmark.xpm
+include/X11/pixmaps/mini.cut.xpm
+include/X11/pixmaps/mini.destroy.xpm
+include/X11/pixmaps/mini.excl.xpm
+include/X11/pixmaps/mini.exit.xpm
+include/X11/pixmaps/mini.fvwm.xpm
+include/X11/pixmaps/mini.letter.xpm
+include/X11/pixmaps/mini.lower.xpm
+include/X11/pixmaps/mini.move.xpm
+include/X11/pixmaps/mini.netscape.xpm
+include/X11/pixmaps/mini.raise.xpm
+include/X11/pixmaps/mini.resize.xpm
+include/X11/pixmaps/mini.xarchie.xpm
+include/X11/pixmaps/mini.xboing.xpm
+include/X11/pixmaps/mini.xlock.xpm
+include/X11/pixmaps/mini.xpm
+include/X11/pixmaps/mini.xterm.xpm
+include/X11/pixmaps/mini.zircon.xpm
+include/X11/pixmaps/page.xpm
+include/X11/pixmaps/page2.xpm
+include/X11/pixmaps/ps.xpm
+include/X11/pixmaps/question.xpm
+include/X11/pixmaps/rbomb.xpm
+include/X11/pixmaps/rcalc.xpm
+include/X11/pixmaps/rterm.xpm
+include/X11/pixmaps/term.xpm
+include/X11/pixmaps/tiff2.xpm
+include/X11/pixmaps/toolbox.xpm
+include/X11/pixmaps/unknown1.xpm
+include/X11/pixmaps/wierd_page3.xpm
+include/X11/pixmaps/word_processor.xpm
+include/X11/pixmaps/world.xpm
+include/X11/pixmaps/xboingbig.xpm
+include/X11/pixmaps/xcalc.xpm
+include/X11/pixmaps/xemacs.xpm
+include/X11/pixmaps/xlock.xpm
+include/X11/pixmaps/xman.xpm
+include/X11/pixmaps/xpaint.xpm
+include/X11/pixmaps/xterm-axp.xpm
+include/X11/pixmaps/xterm-blank.xpm
+include/X11/pixmaps/xterm-dec.xpm
+include/X11/pixmaps/xterm-sgi.xpm
+include/X11/pixmaps/xterm-sol.xpm
+include/X11/pixmaps/xterm-sun.xpm
+include/X11/pixmaps/xterm.xpm
+include/X11/pixmaps/xv.xpm