Updated fvwm2 to 2.4.6

* New conditional command ThisWindow.
* Better support of non ISO-8859-1 window and icon titles.
* Bug fixes

Apart from fixing a number of minor or rare problems, it addresses
slow opaque window movement and resizing that was not encountered in
the 2.2.x releases. If you do not use opaque window movement or resizing
and did not encounter any of the bugs described below you do not need
to upgrade. System administrators are strongly encouraged to move to
2.4.6 from any earlier 2.4.x release.

4 files changed, 19 insertions, 19 deletions

diff --git a/wm/fvwm2/Makefile b/wm/fvwm2/Makefile
index 5707ddaf7eb..3af7317a0b6 100644
--- a/wm/fvwm2/Makefile
+++ b/wm/fvwm2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2002/01/28 08:14:34 martti Exp $
+# $NetBSD: Makefile,v 1.14 2002/03/11 07:20:55 martti Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/10/11 10:42:43 jkh Exp
 #
 
@@ -10,7 +10,7 @@ MASTER_SITES=	ftp://ftp.fvwm.org/pub/fvwm/version-2/ \
 		ftp://ftp.hpc.uh.edu/pub/fvwm/version-2/
 DISTFILES+=	fvwm-${FVWM_VER}.tar.gz fvwm_icons.tgz
 
-MAINTAINER=	packages@netbsd.org
+MAINTAINER=	martti@netbsd.org
 HOMEPAGE=	http://www.fvwm.org/
 COMMENT=	Newer version of X11 Virtual window manager
 
@@ -18,7 +18,7 @@ DEPENDS+=	xpmroot-2.*:../../x11/xpmroot
 
 CONFLICTS=	fvwm-2.*
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
-FVWM_VER=	2.4.5
+FVWM_VER=	2.4.6
 
 USE_X11BASE=		YES
 GNU_CONFIGURE=		YES
diff --git a/wm/fvwm2/distinfo b/wm/fvwm2/distinfo
index 693bdb9b6fa..5a666c4de95 100644
--- a/wm/fvwm2/distinfo
+++ b/wm/fvwm2/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.8 2002/01/28 08:14:34 martti Exp $
+$NetBSD: distinfo,v 1.9 2002/03/11 07:20:55 martti Exp $
 
-SHA1 (fvwm-2.4.5.tar.gz) = f7cc13f0bb5919f7f6fad45f1b3b621ab0f41c64
-Size (fvwm-2.4.5.tar.gz) = 1712522 bytes
+SHA1 (fvwm-2.4.6.tar.gz) = a08b945353b654ed4e93f875e7aba49f67b310be
+Size (fvwm-2.4.6.tar.gz) = 1709543 bytes
 SHA1 (fvwm_icons.tgz) = d6ee1e52f1a84c4edd722ccee0f7e9cc79cc2a4b
 Size (fvwm_icons.tgz) = 363406 bytes
-SHA1 (patch-aa) = a2b2f7f6aca946bc3c18929f59ff43d8da945553
-SHA1 (patch-ab) = 38f6851123237528a0cdd285c008910964cda8a0
+SHA1 (patch-aa) = a4b7554381c0035d16d6804bf9f9eac57a5d2f72
+SHA1 (patch-ab) = dfe951fa1b794941f3d0f502a7f17e3b28b5e5b3
diff --git a/wm/fvwm2/patches/patch-aa b/wm/fvwm2/patches/patch-aa
index d867f704f6a..ae3d537b2a9 100644
--- a/wm/fvwm2/patches/patch-aa
+++ b/wm/fvwm2/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.3 2001/10/01 11:14:42 martti Exp $
+$NetBSD: patch-aa,v 1.4 2002/03/11 07:20:55 martti Exp $
 
---- utils/Makefile.in.orig	Tue Sep 18 09:20:20 2001
-+++ utils/Makefile.in	Tue Sep 18 09:21:28 2001
+--- utils/Makefile.in.orig	Sun Mar 10 10:47:13 2002
++++ utils/Makefile.in	Mon Mar 11 07:44:16 2002
 @@ -113,13 +113,13 @@
  xpm_CFLAGS = @xpm_CFLAGS@
  xpm_LIBS = @xpm_LIBS@
@@ -17,5 +17,5 @@ $NetBSD: patch-aa,v 1.3 2001/10/01 11:14:42 martti Exp $
 -man_MANS = xpmroot.1 fvwm-config.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 = fvwm-config.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
  
- EXTRA_DIST = fvwmrc_convert fvwm24_convert.in quantize_pixmaps $(man_MANS)
+ EXTRA_DIST = fvwmrc_convert quantize_pixmaps $(man_MANS)
  
diff --git a/wm/fvwm2/patches/patch-ab b/wm/fvwm2/patches/patch-ab
index b2456924f75..a56a3123d35 100644
--- a/wm/fvwm2/patches/patch-ab
+++ b/wm/fvwm2/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.8 2002/01/28 08:14:34 martti Exp $
+$NetBSD: patch-ab,v 1.9 2002/03/11 07:20:55 martti Exp $
 
---- configure.orig	Wed Jan 16 23:06:17 2002
-+++ configure	Mon Jan 28 08:49:43 2002
-@@ -670,7 +670,7 @@
+--- configure.orig	Sun Mar 10 10:38:10 2002
++++ configure	Mon Mar 11 07:44:38 2002
+@@ -672,7 +672,7 @@
  # It thinks the first close brace ends the variable substitution.
  test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
  
@@ -11,16 +11,16 @@ $NetBSD: patch-ab,v 1.8 2002/01/28 08:14:34 martti Exp $
  
  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  
-@@ -759,7 +759,7 @@
+@@ -761,7 +761,7 @@
  fi
  
  
 -PACKAGE=fvwm
 +PACKAGE=fvwm2
  
- VERSION=2.4.5
+ VERSION=2.4.6
  
-@@ -3879,7 +3879,7 @@
+@@ -3907,7 +3907,7 @@
  # It thinks the first close brace ends the variable substitution.
  test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'