Update fvwm-2.0.40 -> fvwm-2.0.41.

16 files changed, 161 insertions, 188 deletions

diff --git a/x11-wm/fvwm2-beta/Makefile b/x11-wm/fvwm2-beta/Makefile
index 24330e910874..3d563977313d 100644
--- a/x11-wm/fvwm2-beta/Makefile
+++ b/x11-wm/fvwm2-beta/Makefile
@@ -3,10 +3,10 @@
 # Date created:		20 Jan 1996
 # Whom:			peter
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1996/03/09 14:42:56 asami Exp $
 #
 
-DISTNAME=	fvwm-2.0.40
+DISTNAME=	fvwm-2.0.41
 CATEGORIES+=	x11
 MASTER_SITES=	ftp://ftp.hpc.uh.edu/pub/fvwm/version-2/
 
@@ -17,13 +17,12 @@ 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
+	${INSTALL} -c -m 444 ${WRKSRC}/icons/*.xpm ${PREFIX}/include/X11/pixmaps
 
 .include <bsd.port.mk>
diff --git a/x11-wm/fvwm2-beta/distinfo b/x11-wm/fvwm2-beta/distinfo
index c63a27605234..4f258781fc95 100644
--- a/x11-wm/fvwm2-beta/distinfo
+++ b/x11-wm/fvwm2-beta/distinfo
@@ -1 +1 @@
-MD5 (fvwm-2.0.40.tar.gz) = 2c31901e46240f0b65f60ee1bfe7a980
+MD5 (fvwm-2.0.41.tar.gz) = cd21e4a80b1e5ad02320564efb4e909f
diff --git a/x11-wm/fvwm2-beta/pkg-plist b/x11-wm/fvwm2-beta/pkg-plist
index d1b20282b4a4..8001e18a9bc0 100644
--- a/x11-wm/fvwm2-beta/pkg-plist
+++ b/x11-wm/fvwm2-beta/pkg-plist
@@ -1,27 +1,26 @@
-bin/fvwm2
+bin/fvwm
 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
+lib/X11/fvwm/system.fvwmrc
+lib/X11/fvwm/FvwmAudio
+lib/X11/fvwm/FvwmAuto
+lib/X11/fvwm/FvwmBacker
+lib/X11/fvwm/FvwmBanner
+lib/X11/fvwm/FvwmButtons
+lib/X11/fvwm/FvwmConfig
+lib/X11/fvwm/FvwmCpp
+lib/X11/fvwm/FvwmDebug
+lib/X11/fvwm/FvwmForm
+lib/X11/fvwm/FvwmIconBox
+lib/X11/fvwm/FvwmIdent
+lib/X11/fvwm/FvwmM4
+lib/X11/fvwm/FvwmPager
+lib/X11/fvwm/FvwmSave
+lib/X11/fvwm/FvwmSaveDesk
+lib/X11/fvwm/FvwmScroll
+lib/X11/fvwm/FvwmTalk
+lib/X11/fvwm/FvwmWinList
+lib/X11/fvwm/fvwmrc_convert
+lib/X11/fvwm/quantize_pixmaps
 man/man1/FvwmAudio.1.gz
 man/man1/FvwmAuto.1.gz
 man/man1/FvwmBacker.1.gz
@@ -35,13 +34,12 @@ 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/fvwm.1.gz
 man/man1/xpmroot.1.gz
 include/X11/pixmaps/Mosaic.xpm
 include/X11/pixmaps/arrdown2.xpm
@@ -65,6 +63,7 @@ include/X11/pixmaps/fvwm.xpm
 include/X11/pixmaps/fvwm2.xpm
 include/X11/pixmaps/fvwm2_big.xpm
 include/X11/pixmaps/fvwm3.xpm
+include/X11/pixmaps/gnu-animal.xpm
 include/X11/pixmaps/graphs.xpm
 include/X11/pixmaps/jewelbig.xpm
 include/X11/pixmaps/k.xpm
diff --git a/x11-wm/fvwm2-devel/Makefile b/x11-wm/fvwm2-devel/Makefile
index 24330e910874..3d563977313d 100644
--- a/x11-wm/fvwm2-devel/Makefile
+++ b/x11-wm/fvwm2-devel/Makefile
@@ -3,10 +3,10 @@
 # Date created:		20 Jan 1996
 # Whom:			peter
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1996/03/09 14:42:56 asami Exp $
 #
 
-DISTNAME=	fvwm-2.0.40
+DISTNAME=	fvwm-2.0.41
 CATEGORIES+=	x11
 MASTER_SITES=	ftp://ftp.hpc.uh.edu/pub/fvwm/version-2/
 
@@ -17,13 +17,12 @@ 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
+	${INSTALL} -c -m 444 ${WRKSRC}/icons/*.xpm ${PREFIX}/include/X11/pixmaps
 
 .include <bsd.port.mk>
diff --git a/x11-wm/fvwm2-devel/distinfo b/x11-wm/fvwm2-devel/distinfo
index c63a27605234..4f258781fc95 100644
--- a/x11-wm/fvwm2-devel/distinfo
+++ b/x11-wm/fvwm2-devel/distinfo
@@ -1 +1 @@
-MD5 (fvwm-2.0.40.tar.gz) = 2c31901e46240f0b65f60ee1bfe7a980
+MD5 (fvwm-2.0.41.tar.gz) = cd21e4a80b1e5ad02320564efb4e909f
diff --git a/x11-wm/fvwm2-devel/pkg-plist b/x11-wm/fvwm2-devel/pkg-plist
index d1b20282b4a4..8001e18a9bc0 100644
--- a/x11-wm/fvwm2-devel/pkg-plist
+++ b/x11-wm/fvwm2-devel/pkg-plist
@@ -1,27 +1,26 @@
-bin/fvwm2
+bin/fvwm
 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
+lib/X11/fvwm/system.fvwmrc
+lib/X11/fvwm/FvwmAudio
+lib/X11/fvwm/FvwmAuto
+lib/X11/fvwm/FvwmBacker
+lib/X11/fvwm/FvwmBanner
+lib/X11/fvwm/FvwmButtons
+lib/X11/fvwm/FvwmConfig
+lib/X11/fvwm/FvwmCpp
+lib/X11/fvwm/FvwmDebug
+lib/X11/fvwm/FvwmForm
+lib/X11/fvwm/FvwmIconBox
+lib/X11/fvwm/FvwmIdent
+lib/X11/fvwm/FvwmM4
+lib/X11/fvwm/FvwmPager
+lib/X11/fvwm/FvwmSave
+lib/X11/fvwm/FvwmSaveDesk
+lib/X11/fvwm/FvwmScroll
+lib/X11/fvwm/FvwmTalk
+lib/X11/fvwm/FvwmWinList
+lib/X11/fvwm/fvwmrc_convert
+lib/X11/fvwm/quantize_pixmaps
 man/man1/FvwmAudio.1.gz
 man/man1/FvwmAuto.1.gz
 man/man1/FvwmBacker.1.gz
@@ -35,13 +34,12 @@ 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/fvwm.1.gz
 man/man1/xpmroot.1.gz
 include/X11/pixmaps/Mosaic.xpm
 include/X11/pixmaps/arrdown2.xpm
@@ -65,6 +63,7 @@ include/X11/pixmaps/fvwm.xpm
 include/X11/pixmaps/fvwm2.xpm
 include/X11/pixmaps/fvwm2_big.xpm
 include/X11/pixmaps/fvwm3.xpm
+include/X11/pixmaps/gnu-animal.xpm
 include/X11/pixmaps/graphs.xpm
 include/X11/pixmaps/jewelbig.xpm
 include/X11/pixmaps/k.xpm
diff --git a/x11-wm/fvwm2-i18n/Makefile b/x11-wm/fvwm2-i18n/Makefile
index 24330e910874..3d563977313d 100644
--- a/x11-wm/fvwm2-i18n/Makefile
+++ b/x11-wm/fvwm2-i18n/Makefile
@@ -3,10 +3,10 @@
 # Date created:		20 Jan 1996
 # Whom:			peter
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1996/03/09 14:42:56 asami Exp $
 #
 
-DISTNAME=	fvwm-2.0.40
+DISTNAME=	fvwm-2.0.41
 CATEGORIES+=	x11
 MASTER_SITES=	ftp://ftp.hpc.uh.edu/pub/fvwm/version-2/
 
@@ -17,13 +17,12 @@ 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
+	${INSTALL} -c -m 444 ${WRKSRC}/icons/*.xpm ${PREFIX}/include/X11/pixmaps
 
 .include <bsd.port.mk>
diff --git a/x11-wm/fvwm2-i18n/distinfo b/x11-wm/fvwm2-i18n/distinfo
index c63a27605234..4f258781fc95 100644
--- a/x11-wm/fvwm2-i18n/distinfo
+++ b/x11-wm/fvwm2-i18n/distinfo
@@ -1 +1 @@
-MD5 (fvwm-2.0.40.tar.gz) = 2c31901e46240f0b65f60ee1bfe7a980
+MD5 (fvwm-2.0.41.tar.gz) = cd21e4a80b1e5ad02320564efb4e909f
diff --git a/x11-wm/fvwm2-i18n/files/patch-aa b/x11-wm/fvwm2-i18n/files/patch-aa
index 7937e33145a1..75ccecea8f26 100644
--- a/x11-wm/fvwm2-i18n/files/patch-aa
+++ b/x11-wm/fvwm2-i18n/files/patch-aa
@@ -1,38 +1,21 @@
---- 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 */
- 
+*** configure.h.dist	Sat Feb 17 09:13:18 1996
+--- configure.h	Mon Mar 11 18:50:57 1996
+***************
+*** 47,54 ****
+  /***************************************************************************
+   * Define if you have uname. Otherwise, define gethostname
+   ***************************************************************************/
+! #define HAVE_UNAME 1
+! /* #define HAVE_GETHOSTNAME 1 */
+  
+  #endif /* End of do-it-yourself OS support section */
+  
+--- 47,54 ----
+  /***************************************************************************
+   * Define if you have uname. Otherwise, define gethostname
+   ***************************************************************************/
+! /* #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-plist b/x11-wm/fvwm2-i18n/pkg-plist
index d1b20282b4a4..8001e18a9bc0 100644
--- a/x11-wm/fvwm2-i18n/pkg-plist
+++ b/x11-wm/fvwm2-i18n/pkg-plist
@@ -1,27 +1,26 @@
-bin/fvwm2
+bin/fvwm
 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
+lib/X11/fvwm/system.fvwmrc
+lib/X11/fvwm/FvwmAudio
+lib/X11/fvwm/FvwmAuto
+lib/X11/fvwm/FvwmBacker
+lib/X11/fvwm/FvwmBanner
+lib/X11/fvwm/FvwmButtons
+lib/X11/fvwm/FvwmConfig
+lib/X11/fvwm/FvwmCpp
+lib/X11/fvwm/FvwmDebug
+lib/X11/fvwm/FvwmForm
+lib/X11/fvwm/FvwmIconBox
+lib/X11/fvwm/FvwmIdent
+lib/X11/fvwm/FvwmM4
+lib/X11/fvwm/FvwmPager
+lib/X11/fvwm/FvwmSave
+lib/X11/fvwm/FvwmSaveDesk
+lib/X11/fvwm/FvwmScroll
+lib/X11/fvwm/FvwmTalk
+lib/X11/fvwm/FvwmWinList
+lib/X11/fvwm/fvwmrc_convert
+lib/X11/fvwm/quantize_pixmaps
 man/man1/FvwmAudio.1.gz
 man/man1/FvwmAuto.1.gz
 man/man1/FvwmBacker.1.gz
@@ -35,13 +34,12 @@ 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/fvwm.1.gz
 man/man1/xpmroot.1.gz
 include/X11/pixmaps/Mosaic.xpm
 include/X11/pixmaps/arrdown2.xpm
@@ -65,6 +63,7 @@ include/X11/pixmaps/fvwm.xpm
 include/X11/pixmaps/fvwm2.xpm
 include/X11/pixmaps/fvwm2_big.xpm
 include/X11/pixmaps/fvwm3.xpm
+include/X11/pixmaps/gnu-animal.xpm
 include/X11/pixmaps/graphs.xpm
 include/X11/pixmaps/jewelbig.xpm
 include/X11/pixmaps/k.xpm
diff --git a/x11-wm/fvwm2/Makefile b/x11-wm/fvwm2/Makefile
index 24330e910874..3d563977313d 100644
--- a/x11-wm/fvwm2/Makefile
+++ b/x11-wm/fvwm2/Makefile
@@ -3,10 +3,10 @@
 # Date created:		20 Jan 1996
 # Whom:			peter
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1996/03/09 14:42:56 asami Exp $
 #
 
-DISTNAME=	fvwm-2.0.40
+DISTNAME=	fvwm-2.0.41
 CATEGORIES+=	x11
 MASTER_SITES=	ftp://ftp.hpc.uh.edu/pub/fvwm/version-2/
 
@@ -17,13 +17,12 @@ 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
+	${INSTALL} -c -m 444 ${WRKSRC}/icons/*.xpm ${PREFIX}/include/X11/pixmaps
 
 .include <bsd.port.mk>
diff --git a/x11-wm/fvwm2/distinfo b/x11-wm/fvwm2/distinfo
index c63a27605234..4f258781fc95 100644
--- a/x11-wm/fvwm2/distinfo
+++ b/x11-wm/fvwm2/distinfo
@@ -1 +1 @@
-MD5 (fvwm-2.0.40.tar.gz) = 2c31901e46240f0b65f60ee1bfe7a980
+MD5 (fvwm-2.0.41.tar.gz) = cd21e4a80b1e5ad02320564efb4e909f
diff --git a/x11-wm/fvwm2/pkg-plist b/x11-wm/fvwm2/pkg-plist
index d1b20282b4a4..8001e18a9bc0 100644
--- a/x11-wm/fvwm2/pkg-plist
+++ b/x11-wm/fvwm2/pkg-plist
@@ -1,27 +1,26 @@
-bin/fvwm2
+bin/fvwm
 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
+lib/X11/fvwm/system.fvwmrc
+lib/X11/fvwm/FvwmAudio
+lib/X11/fvwm/FvwmAuto
+lib/X11/fvwm/FvwmBacker
+lib/X11/fvwm/FvwmBanner
+lib/X11/fvwm/FvwmButtons
+lib/X11/fvwm/FvwmConfig
+lib/X11/fvwm/FvwmCpp
+lib/X11/fvwm/FvwmDebug
+lib/X11/fvwm/FvwmForm
+lib/X11/fvwm/FvwmIconBox
+lib/X11/fvwm/FvwmIdent
+lib/X11/fvwm/FvwmM4
+lib/X11/fvwm/FvwmPager
+lib/X11/fvwm/FvwmSave
+lib/X11/fvwm/FvwmSaveDesk
+lib/X11/fvwm/FvwmScroll
+lib/X11/fvwm/FvwmTalk
+lib/X11/fvwm/FvwmWinList
+lib/X11/fvwm/fvwmrc_convert
+lib/X11/fvwm/quantize_pixmaps
 man/man1/FvwmAudio.1.gz
 man/man1/FvwmAuto.1.gz
 man/man1/FvwmBacker.1.gz
@@ -35,13 +34,12 @@ 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/fvwm.1.gz
 man/man1/xpmroot.1.gz
 include/X11/pixmaps/Mosaic.xpm
 include/X11/pixmaps/arrdown2.xpm
@@ -65,6 +63,7 @@ include/X11/pixmaps/fvwm.xpm
 include/X11/pixmaps/fvwm2.xpm
 include/X11/pixmaps/fvwm2_big.xpm
 include/X11/pixmaps/fvwm3.xpm
+include/X11/pixmaps/gnu-animal.xpm
 include/X11/pixmaps/graphs.xpm
 include/X11/pixmaps/jewelbig.xpm
 include/X11/pixmaps/k.xpm
diff --git a/x11-wm/fvwm24/Makefile b/x11-wm/fvwm24/Makefile
index 24330e910874..3d563977313d 100644
--- a/x11-wm/fvwm24/Makefile
+++ b/x11-wm/fvwm24/Makefile
@@ -3,10 +3,10 @@
 # Date created:		20 Jan 1996
 # Whom:			peter
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1996/03/09 14:42:56 asami Exp $
 #
 
-DISTNAME=	fvwm-2.0.40
+DISTNAME=	fvwm-2.0.41
 CATEGORIES+=	x11
 MASTER_SITES=	ftp://ftp.hpc.uh.edu/pub/fvwm/version-2/
 
@@ -17,13 +17,12 @@ 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
+	${INSTALL} -c -m 444 ${WRKSRC}/icons/*.xpm ${PREFIX}/include/X11/pixmaps
 
 .include <bsd.port.mk>
diff --git a/x11-wm/fvwm24/distinfo b/x11-wm/fvwm24/distinfo
index c63a27605234..4f258781fc95 100644
--- a/x11-wm/fvwm24/distinfo
+++ b/x11-wm/fvwm24/distinfo
@@ -1 +1 @@
-MD5 (fvwm-2.0.40.tar.gz) = 2c31901e46240f0b65f60ee1bfe7a980
+MD5 (fvwm-2.0.41.tar.gz) = cd21e4a80b1e5ad02320564efb4e909f
diff --git a/x11-wm/fvwm24/pkg-plist b/x11-wm/fvwm24/pkg-plist
index d1b20282b4a4..8001e18a9bc0 100644
--- a/x11-wm/fvwm24/pkg-plist
+++ b/x11-wm/fvwm24/pkg-plist
@@ -1,27 +1,26 @@
-bin/fvwm2
+bin/fvwm
 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
+lib/X11/fvwm/system.fvwmrc
+lib/X11/fvwm/FvwmAudio
+lib/X11/fvwm/FvwmAuto
+lib/X11/fvwm/FvwmBacker
+lib/X11/fvwm/FvwmBanner
+lib/X11/fvwm/FvwmButtons
+lib/X11/fvwm/FvwmConfig
+lib/X11/fvwm/FvwmCpp
+lib/X11/fvwm/FvwmDebug
+lib/X11/fvwm/FvwmForm
+lib/X11/fvwm/FvwmIconBox
+lib/X11/fvwm/FvwmIdent
+lib/X11/fvwm/FvwmM4
+lib/X11/fvwm/FvwmPager
+lib/X11/fvwm/FvwmSave
+lib/X11/fvwm/FvwmSaveDesk
+lib/X11/fvwm/FvwmScroll
+lib/X11/fvwm/FvwmTalk
+lib/X11/fvwm/FvwmWinList
+lib/X11/fvwm/fvwmrc_convert
+lib/X11/fvwm/quantize_pixmaps
 man/man1/FvwmAudio.1.gz
 man/man1/FvwmAuto.1.gz
 man/man1/FvwmBacker.1.gz
@@ -35,13 +34,12 @@ 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/fvwm.1.gz
 man/man1/xpmroot.1.gz
 include/X11/pixmaps/Mosaic.xpm
 include/X11/pixmaps/arrdown2.xpm
@@ -65,6 +63,7 @@ include/X11/pixmaps/fvwm.xpm
 include/X11/pixmaps/fvwm2.xpm
 include/X11/pixmaps/fvwm2_big.xpm
 include/X11/pixmaps/fvwm3.xpm
+include/X11/pixmaps/gnu-animal.xpm
 include/X11/pixmaps/graphs.xpm
 include/X11/pixmaps/jewelbig.xpm
 include/X11/pixmaps/k.xpm