Update to fvwm-2.4.0. Sync with fvwm2 package. Addresses PR #13373.

Highlights:
-----------

 ** A new "Theme" module called FvwmTheme and "colour sets"
    including 8 kinds of gradients and pixmap support controlling
    the appearance of borders, title bars, frames, 3D shadows,
    menus and modules.

 ** GNOME compliance.
    GNOME hints can be turned on and off for individual windows.

 ** Mouse stroke support.
    You will need the libstroke library, found at

      http://www.etla.net/~willey/projects/libstroke/

 ** Much more flexibility and control in menu definition and menu
    styles including dynamically generated menus and some menu
    generating scripts.

 ** Almost all commands, including Key, Mouse and Style, take
    effect immediately.  The Recapture command is no longer needed
    to activate most changes.

 ** The old StaysOnTop style option has been generalised into the
    concept of layers.  See the fvwm2 man page for details.

 ** Using Alt-Tab now works exactly like the other one.

 ** A derived package fvwm-themes standardises FVWM Themes issues.
    More info is available at

      http://fvwm-themes.sourceforge.net/

 ** Improved multi head support.

4 files changed, 114 insertions, 91 deletions

diff --git a/wm/fvwm2-current/Makefile b/wm/fvwm2-current/Makefile
index 9a04c6057ec..7c146ad23c6 100644
--- a/wm/fvwm2-current/Makefile
+++ b/wm/fvwm2-current/Makefile
@@ -1,48 +1,63 @@
-# $NetBSD: Makefile,v 1.5 2001/06/25 09:49:49 zuntum Exp $
+# $NetBSD: Makefile,v 1.6 2001/07/10 20:15:48 nra Exp $
+# FreeBSD Id: Makefile,v 1.12 1997/10/11 10:42:43 jkh Exp
 #
 
-DISTNAME=	fvwm-${FVWM_VERSION}
-PKGNAME=	fvwm2-${FVWM_VERSION}
-CATEGORIES=	wm
+DISTNAME=	fvwm-${FVWM_VER}
+PKGNAME=	fvwm2-${FVWM_VER}
+CATEGORIES=	x11 wm
 MASTER_SITES=	ftp://ftp.fvwm.org/pub/fvwm/version-2/ \
-		http://www.fvwm.org/generated/icon_download/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} fvwm_icons.tgz
+		http://www.fvwm.org/generated/icon_download/ \
+		ftp://ftp.hpc.uh.edu/pub/fvwm/version-2/
+DISTFILES+=	fvwm-${FVWM_VER}.tar.gz fvwm_icons.tgz
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.fvwm.org/
-COMMENT=	Popular virtual window manager for X
+COMMENT=	Newer version of X11 Virtual window manager
 
 DEPENDS+=	xpmroot-2.*:../../x11/xpmroot
-DEPENDS+=	readline-*:../../devel/readline
-DEPENDS+=	rplay-3.*:../../audio/rplay
-DEPENDS+=	gtk+>=1.2.0:../../x11/gtk
-
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 CONFLICTS=	fvwm-2.*
+EXTRACT_ONLY=	${DISTNAME}.tar.gz
+FVWM_VER=	2.4.0
 
-FVWM_VERSION=	2.3.33
+USE_X11BASE=		YES
+GNU_CONFIGURE=		YES
+USE_GNU_READLINE=	YES
 
-USE_X11BASE=	yes
-GNU_CONFIGURE=	yes
-PLIST_SUBST+=	VERSION=${FVWM_VERSION}
+PLIST_SUBST+=	FVWM_VER=${FVWM_VER}
 
 EVAL_PREFIX+=		XPMDIR=xpm
-CONFIGURE_ARGS+=	--enable-extras
+CONFIGURE_ARGS+=	--enable-extras --without-gnome
+CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/lib/X11/fvwm2
+CONFIGURE_ARGS+=	--libexecdir=${PREFIX}/lib/X11
 CONFIGURE_ARGS+=	--with-xpm-includes=${XPMDIR}/include
-CONFIGURE_ARGS+=	--with-readline-includes=${LOCALBASE}/include
-CONFIGURE_ARGS+=	--with-rplay-includes=${LOCALBASE}/include
 CONFIGURE_ARGS+=	--with-iconpath=${PREFIX}/lib/X11/fvwm2/pixmaps:${X11BASE}/include/X11/bitmaps:${X11BASE}/include/X11/pixmaps
-CONFIGURE_ARGS+=	--without-gnome
 
 post-extract:
-	cd ${WRKDIR} && ${MKDIR} icons && cd icons && \
-		${GTAR} xfz ${_DISTDIR}/fvwm_icons.tgz
+	${MKDIR} ${WRKDIR}/icons
+	${GTAR} -xzf ${DISTDIR}/fvwm_icons.tgz -C ${WRKDIR}/icons
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/fvwm2/pixmaps
+	@${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/fvwm2/pixmaps
 	${INSTALL_DATA} \
 		${WRKDIR}/icons/*.xpm \
 		${PREFIX}/lib/X11/fvwm2/pixmaps
-
+	${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/fvwm2
+	${INSTALL_DATA} \
+		${WRKSRC}/sample.fvwmrc/decor_examples \
+		${WRKSRC}/sample.fvwmrc/system.fvwm2rc-sample-* \
+		${PREFIX}/lib/X11/fvwm2
+	${INSTALL_DATA} \
+		${WRKSRC}/sample.fvwmrc/system.fvwm2rc \
+		${PREFIX}/lib/X11/fvwm2/system.fvwm2rc.example
+	if [ ! -f ${PREFIX}/lib/X11/fvwm2/system.fvwm2rc ]; then \
+		${INSTALL_DATA} \
+			${PREFIX}/lib/X11/fvwm2/system.fvwm2rc.example \
+			${PREFIX}/lib/X11/fvwm2/system.fvwm2rc ; \
+	fi
+
+.include "../../audio/rplay/buildlink.mk"
+.include "../../devel/readline/buildlink.mk"
+.include "../../graphics/imlib/buildlink.mk"
+.include "../../x11/gtk/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/fvwm2-current/distinfo b/wm/fvwm2-current/distinfo
index 568f09d5eb7..42e9f60c999 100644
--- a/wm/fvwm2-current/distinfo
+++ b/wm/fvwm2-current/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.5 2001/06/25 09:49:49 zuntum Exp $
+$NetBSD: distinfo,v 1.6 2001/07/10 20:15:48 nra Exp $
 
-SHA1 (fvwm-2.3.33.tar.gz) = 2c01d78a3a0b930cb936f785c2dfcfb77d2b12e3
-Size (fvwm-2.3.33.tar.gz) = 1642761 bytes
+SHA1 (fvwm-2.4.0.tar.gz) = b7c4c74a7bfad13f0e0a08f0a5d84e45b43fd129
+Size (fvwm-2.4.0.tar.gz) = 1636066 bytes
 SHA1 (fvwm_icons.tgz) = 418356862ab564ac0b771300b53004aea7c7c1ec
 Size (fvwm_icons.tgz) = 368640 bytes
-SHA1 (patch-aa) = fffa99f080c706c26c381c1bde4ce838e8beea34
+SHA1 (patch-aa) = eb9012612496251a3bd52f139b5cbab7a6ada531
+SHA1 (patch-ab) = f49788d4c5af55ef296bb37a9a856aa51717f964
diff --git a/wm/fvwm2-current/patches/patch-aa b/wm/fvwm2-current/patches/patch-aa
index dcde6b6c3d5..f5462d2b252 100644
--- a/wm/fvwm2-current/patches/patch-aa
+++ b/wm/fvwm2-current/patches/patch-aa
@@ -1,17 +1,18 @@
-$NetBSD: patch-aa,v 1.2 2001/04/27 15:14:59 zuntum Exp $
+$NetBSD: patch-aa,v 1.3 2001/07/10 20:15:49 nra Exp $
 
---- utils/Makefile.in.orig	Fri Mar  2 19:38:46 2001
-+++ utils/Makefile.in
-@@ -108,13 +108,13 @@
+--- utils/Makefile.in.orig	Tue Jul 10 14:44:32 2001
++++ utils/Makefile.in	Tue Jul 10 14:44:50 2001
+@@ -109,13 +109,13 @@
  xpm_CFLAGS = @xpm_CFLAGS@
  xpm_LIBS = @xpm_LIBS@
  
 -bin_PROGRAMS = @XPMROOT@
-+bin_PROGRAMS =
++#bin_PROGRAMS = @XPMROOT@
  bin_SCRIPTS = fvwm-config fvwmbug fvwm-menu-xlock fvwm-menu-directory 	fvwm-menu-desktop fvwm-menu-headlines fvwm24_convert
  
  
- EXTRA_PROGRAMS = xpmroot xselection
+-EXTRA_PROGRAMS = xpmroot xselection
++EXTRA_PROGRAMS = xselection
  
 -man_MANS = xpmroot.1 fvwmbug.1 fvwmrc_convert.1 fvwm24_convert.1 	fvwm-menu-xlock.1 fvwm-menu-directory.1 	fvwm-menu-desktop.1 fvwm-menu-headlines.1
 +man_MANS = fvwmbug.1 fvwmrc_convert.1 fvwm24_convert.1 	fvwm-menu-xlock.1 fvwm-menu-directory.1 	fvwm-menu-desktop.1 fvwm-menu-headlines.1
diff --git a/wm/fvwm2-current/pkg/PLIST b/wm/fvwm2-current/pkg/PLIST
index a666b1757cb..fb295e6f758 100644
--- a/wm/fvwm2-current/pkg/PLIST
+++ b/wm/fvwm2-current/pkg/PLIST
@@ -1,13 +1,49 @@
-@comment $NetBSD: PLIST,v 1.3 2001/04/27 15:14:59 zuntum Exp $
-bin/fvwm2
+@comment $NetBSD: PLIST,v 1.4 2001/07/10 20:15:49 nra Exp $
 bin/FvwmCommand
 bin/fvwm-config
-bin/fvwmbug
-bin/fvwm-menu-xlock
-bin/fvwm-menu-directory
 bin/fvwm-menu-desktop
+bin/fvwm-menu-directory
 bin/fvwm-menu-headlines
+bin/fvwm-menu-xlock
+bin/fvwm2
 bin/fvwm24_convert
+bin/fvwmbug
+lib/X11/fvwm/2.4.0/FvwmAnimate
+lib/X11/fvwm/2.4.0/FvwmAudio
+lib/X11/fvwm/2.4.0/FvwmAuto
+lib/X11/fvwm/2.4.0/FvwmBacker
+lib/X11/fvwm/2.4.0/FvwmBanner
+lib/X11/fvwm/2.4.0/FvwmButtons
+lib/X11/fvwm/2.4.0/FvwmCascade
+lib/X11/fvwm/2.4.0/FvwmCommand.pm
+lib/X11/fvwm/2.4.0/FvwmCommand.sh
+lib/X11/fvwm/2.4.0/FvwmCommandS
+lib/X11/fvwm/2.4.0/FvwmConsole
+lib/X11/fvwm/2.4.0/FvwmConsoleC
+lib/X11/fvwm/2.4.0/FvwmConsoleC.pl
+lib/X11/fvwm/2.4.0/FvwmCpp
+lib/X11/fvwm/2.4.0/FvwmDebug
+lib/X11/fvwm/2.4.0/FvwmDragWell
+lib/X11/fvwm/2.4.0/FvwmEvent
+lib/X11/fvwm/2.4.0/FvwmForm
+lib/X11/fvwm/2.4.0/FvwmGtk
+lib/X11/fvwm/2.4.0/FvwmIconBox
+lib/X11/fvwm/2.4.0/FvwmIconMan
+lib/X11/fvwm/2.4.0/FvwmIdent
+lib/X11/fvwm/2.4.0/FvwmM4
+lib/X11/fvwm/2.4.0/FvwmPager
+lib/X11/fvwm/2.4.0/FvwmRearrange
+lib/X11/fvwm/2.4.0/FvwmSave
+lib/X11/fvwm/2.4.0/FvwmSaveDesk
+lib/X11/fvwm/2.4.0/FvwmScript
+lib/X11/fvwm/2.4.0/FvwmScroll
+lib/X11/fvwm/2.4.0/FvwmTalk
+lib/X11/fvwm/2.4.0/FvwmTaskBar
+lib/X11/fvwm/2.4.0/FvwmTheme
+lib/X11/fvwm/2.4.0/FvwmTile
+lib/X11/fvwm/2.4.0/FvwmWharf
+lib/X11/fvwm/2.4.0/FvwmWinList
+lib/X11/fvwm2/decor_examples
 lib/X11/fvwm2/pixmaps/Jlock.xpm
 lib/X11/fvwm2/pixmaps/Jnews.xpm
 lib/X11/fvwm2/pixmaps/Jrecycle.xpm
@@ -235,7 +271,6 @@ lib/X11/fvwm2/pixmaps/mini.term.xpm
 lib/X11/fvwm2/pixmaps/mini.term2.xpm
 lib/X11/fvwm2/pixmaps/mini.tetris.xpm
 lib/X11/fvwm2/pixmaps/mini.trebol.xpm
-lib/X11/fvwm2/pixmaps/mini.x.xpm
 lib/X11/fvwm2/pixmaps/mini.turn.xpm
 lib/X11/fvwm2/pixmaps/mini.twm.xpm
 lib/X11/fvwm2/pixmaps/mini.winXX-close.xpm
@@ -247,6 +282,7 @@ lib/X11/fvwm2/pixmaps/mini.window.xpm
 lib/X11/fvwm2/pixmaps/mini.window2.xpm
 lib/X11/fvwm2/pixmaps/mini.windows.xpm
 lib/X11/fvwm2/pixmaps/mini.windowshade.xpm
+lib/X11/fvwm2/pixmaps/mini.x.xpm
 lib/X11/fvwm2/pixmaps/mini.x2.xpm
 lib/X11/fvwm2/pixmaps/mini.xaniroc.xpm
 lib/X11/fvwm2/pixmaps/mini.xarchie.xpm
@@ -254,7 +290,6 @@ lib/X11/fvwm2/pixmaps/mini.xbiff.xpm
 lib/X11/fvwm2/pixmaps/mini.xboing.xpm
 lib/X11/fvwm2/pixmaps/mini.xfig.xpm
 lib/X11/fvwm2/pixmaps/mini.xjewel.xpm
-lib/X11/fvwm2/pixmaps/ps.xpm
 lib/X11/fvwm2/pixmaps/mini.xkeycaps.xpm
 lib/X11/fvwm2/pixmaps/mini.xlander.xpm
 lib/X11/fvwm2/pixmaps/mini.xlock.xpm
@@ -273,6 +308,7 @@ lib/X11/fvwm2/pixmaps/page.xpm
 lib/X11/fvwm2/pixmaps/page2.xpm
 lib/X11/fvwm2/pixmaps/pointer.xpm
 lib/X11/fvwm2/pixmaps/programs.xpm
+lib/X11/fvwm2/pixmaps/ps.xpm
 lib/X11/fvwm2/pixmaps/question.xpm
 lib/X11/fvwm2/pixmaps/rbomb.xpm
 lib/X11/fvwm2/pixmaps/rbomb2.xpm
@@ -324,43 +360,11 @@ lib/X11/fvwm2/pixmaps/xterm.xpm
 lib/X11/fvwm2/pixmaps/xv.xpm
 lib/X11/fvwm2/pixmaps/xv2.xpm
 lib/X11/fvwm2/pixmaps/xview.xpm
-@dirrm lib/X11/fvwm2/pixmaps
-@dirrm lib/X11/fvwm2
-libexec/fvwm/${VERSION}/FvwmAnimate
-libexec/fvwm/${VERSION}/FvwmAuto
-libexec/fvwm/${VERSION}/FvwmBacker
-libexec/fvwm/${VERSION}/FvwmBanner
-libexec/fvwm/${VERSION}/FvwmButtons
-libexec/fvwm/${VERSION}/FvwmCommandS
-libexec/fvwm/${VERSION}/FvwmCommand.sh
-libexec/fvwm/${VERSION}/FvwmCommand.pm
-libexec/fvwm/${VERSION}/FvwmConsole
-libexec/fvwm/${VERSION}/FvwmConsoleC
-libexec/fvwm/${VERSION}/FvwmConsoleC.pl
-libexec/fvwm/${VERSION}/FvwmCpp
-libexec/fvwm/${VERSION}/FvwmDebug
-libexec/fvwm/${VERSION}/FvwmDragWell
-libexec/fvwm/${VERSION}/FvwmEvent
-libexec/fvwm/${VERSION}/FvwmForm
-libexec/fvwm/${VERSION}/FvwmGtk
-libexec/fvwm/${VERSION}/FvwmTalk
-libexec/fvwm/${VERSION}/FvwmIconBox
-libexec/fvwm/${VERSION}/FvwmIconMan
-libexec/fvwm/${VERSION}/FvwmIdent
-libexec/fvwm/${VERSION}/FvwmM4
-libexec/fvwm/${VERSION}/FvwmPager
-libexec/fvwm/${VERSION}/FvwmRearrange
-libexec/fvwm/${VERSION}/FvwmCascade
-libexec/fvwm/${VERSION}/FvwmTile
-libexec/fvwm/${VERSION}/FvwmSave
-libexec/fvwm/${VERSION}/FvwmSaveDesk
-libexec/fvwm/${VERSION}/FvwmScript
-libexec/fvwm/${VERSION}/FvwmScroll
-libexec/fvwm/${VERSION}/FvwmTaskBar
-libexec/fvwm/${VERSION}/FvwmTheme
-libexec/fvwm/${VERSION}/FvwmWharf
-libexec/fvwm/${VERSION}/FvwmWinList
-@unexec rm %B/FvwmAudio
+lib/X11/fvwm2/system.fvwm2rc
+lib/X11/fvwm2/system.fvwm2rc-sample-1
+lib/X11/fvwm2/system.fvwm2rc-sample-2
+lib/X11/fvwm2/system.fvwm2rc-sample-95
+lib/X11/fvwm2/system.fvwm2rc.example
 man/man1/FvwmAnimate.1
 man/man1/FvwmAuto.1
 man/man1/FvwmBacker.1
@@ -397,24 +401,25 @@ man/man1/fvwm2.1
 man/man1/fvwm24_convert.1
 man/man1/fvwmbug.1
 man/man1/fvwmrc_convert.1
-@dirrm libexec/fvwm/${VERSION}
-@dirrm libexec/fvwm
-share/fvwm/ConfigFvwmDefaults
-share/fvwm/ConfigFvwmSetup
 share/fvwm/ConfigFvwmBacker
 share/fvwm/ConfigFvwmButtons
-share/fvwm/FvwmForm-Setup
-share/fvwm/FvwmForm-Form
+share/fvwm/ConfigFvwmDefaults
+share/fvwm/ConfigFvwmIconBox
+share/fvwm/ConfigFvwmIconMan
+share/fvwm/ConfigFvwmIdent
+share/fvwm/ConfigFvwmPager
+share/fvwm/ConfigFvwmScroll
+share/fvwm/ConfigFvwmSetup
+share/fvwm/ConfigFvwmTaskBar
+share/fvwm/ConfigFvwmWinList
 share/fvwm/FvwmForm-Capture
+share/fvwm/FvwmForm-Form
 share/fvwm/FvwmForm-QuitVerify
 share/fvwm/FvwmForm-Rlogin
 share/fvwm/FvwmForm-RootCursor
+share/fvwm/FvwmForm-Setup
 share/fvwm/FvwmForm-Talk
 share/fvwm/FvwmForm-TalkHelp
-share/fvwm/ConfigFvwmIconBox
-share/fvwm/ConfigFvwmIconMan
-share/fvwm/ConfigFvwmIdent
-share/fvwm/ConfigFvwmPager
 share/fvwm/FvwmScript-BaseConfig
 share/fvwm/FvwmScript-BellSetup
 share/fvwm/FvwmScript-Buttons
@@ -430,8 +435,9 @@ share/fvwm/FvwmScript-ScreenSetup
 share/fvwm/FvwmScript-Setup95
 share/fvwm/FvwmScript-WidgetDemo
 share/fvwm/fvwm-script-setup95.pl
-share/fvwm/ConfigFvwmScroll
-share/fvwm/ConfigFvwmTaskBar
-share/fvwm/ConfigFvwmWinList
 share/fvwm/system.fvwm2rc-sample-95
 @dirrm share/fvwm
+@dirrm lib/X11/fvwm2/pixmaps
+@dirrm lib/X11/fvwm2
+@dirrm lib/X11/fvwm/2.4.0
+@dirrm lib/X11/fvwm