Updated fvwm2 to 2.4.11

* Fixed a crash with ssh-askpass introduced in 2.4.10.

* Allow the use of mouse buttons other than the first in
  FvwmWinList when invoked transient.

4 files changed, 33 insertions, 41 deletions

diff --git a/wm/fvwm2/Makefile b/wm/fvwm2/Makefile
index 9d9144564e3..9239333c708 100644
--- a/wm/fvwm2/Makefile
+++ b/wm/fvwm2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2002/09/16 09:31:48 martti Exp $
+# $NetBSD: Makefile,v 1.23 2002/09/21 08:27:13 martti Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/10/11 10:42:43 jkh Exp
 #
 
@@ -18,7 +18,7 @@ DEPENDS+=	xpmroot-2.*:../../x11/xpmroot
 
 CONFLICTS=	fvwm1-* fvwm>=1
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
-FVWM_VER=	2.4.10
+FVWM_VER=	2.4.11
 
 USE_X11BASE=		YES
 USE_BUILDLINK2=		YES
diff --git a/wm/fvwm2/distinfo b/wm/fvwm2/distinfo
index 9aa7ade546b..56a193997a3 100644
--- a/wm/fvwm2/distinfo
+++ b/wm/fvwm2/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.13 2002/09/16 09:31:48 martti Exp $
+$NetBSD: distinfo,v 1.14 2002/09/21 08:27:14 martti Exp $
 
-SHA1 (fvwm-2.4.10.tar.gz) = 032753947fb07cd8b75f1965d2c10451b7acb754
-Size (fvwm-2.4.10.tar.gz) = 1722410 bytes
+SHA1 (fvwm-2.4.11.tar.gz) = b50bb74d5e7ef5442c82f41b5ee8f993c4e802f5
+Size (fvwm-2.4.11.tar.gz) = 1779404 bytes
 SHA1 (fvwm_icons.tgz) = d6ee1e52f1a84c4edd722ccee0f7e9cc79cc2a4b
 Size (fvwm_icons.tgz) = 363406 bytes
-SHA1 (patch-aa) = 7987468961ec6d3c5d8eac9da03ce6f9ba308d71
-SHA1 (patch-ab) = 6cac01086e47542113148d816d8e5439b0047003
+SHA1 (patch-aa) = dcc33ec3329ffb11cbb0b6b460f04dd183d630db
+SHA1 (patch-ab) = 2583a735dd828016791c9e5faf3e5c48e769e282
diff --git a/wm/fvwm2/patches/patch-aa b/wm/fvwm2/patches/patch-aa
index 734b0c6029e..e7c7c0c8ee1 100644
--- a/wm/fvwm2/patches/patch-aa
+++ b/wm/fvwm2/patches/patch-aa
@@ -1,21 +1,31 @@
-$NetBSD: patch-aa,v 1.6 2002/09/16 09:31:48 martti Exp $
+$NetBSD: patch-aa,v 1.7 2002/09/21 08:27:15 martti Exp $
 
---- utils/Makefile.in.orig	Sun Sep 15 22:19:50 2002
-+++ utils/Makefile.in	Mon Sep 16 10:53:07 2002
-@@ -113,13 +113,13 @@
+--- utils/Makefile.in.orig	Fri Sep 20 11:06:52 2002
++++ utils/Makefile.in	Sat Sep 21 10:11:12 2002
+@@ -130,14 +130,14 @@
  xpm_CFLAGS = @xpm_CFLAGS@
  xpm_LIBS = @xpm_LIBS@
  
 -bin_PROGRAMS = @XPMROOT@
 +bin_PROGRAMS =
- bin_SCRIPTS = fvwm-config fvwmbug fvwm-menu-xlock fvwm-menu-directory 	fvwm-menu-desktop fvwm-menu-headlines fvwm24_convert
+ 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 = xselection
  
--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
+-man_MANS = xpmroot.1 fvwm-config.1 fvwmbug.1 fvwmrc_convert.1 fvwm24_convert.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 quantize_pixmaps $(man_MANS)
+@@ -157,7 +157,7 @@
+ CONFIG_CLEAN_FILES = fvwm-config fvwm-menu-xlock fvwm-menu-directory \
+ 	fvwm-menu-desktop fvwm-menu-headlines fvwm24_convert fvwmbug.sh
+ EXTRA_PROGRAMS = xpmroot$(EXEEXT) xselection$(EXEEXT)
+-bin_PROGRAMS = @XPMROOT@
++bin_PROGRAMS =
+ PROGRAMS = $(bin_PROGRAMS)
  
+ xpmroot_SOURCES = xpmroot.c
diff --git a/wm/fvwm2/patches/patch-ab b/wm/fvwm2/patches/patch-ab
index f284186ac36..bcd880f4697 100644
--- a/wm/fvwm2/patches/patch-ab
+++ b/wm/fvwm2/patches/patch-ab
@@ -1,31 +1,13 @@
-$NetBSD: patch-ab,v 1.13 2002/09/16 09:31:48 martti Exp $
+$NetBSD: patch-ab,v 1.14 2002/09/21 08:27:15 martti Exp $
 
---- configure.orig	Sun Sep 15 22:06:39 2002
-+++ configure	Mon Sep 16 10:53:32 2002
-@@ -672,7 +672,7 @@
- # It thinks the first close brace ends the variable substitution.
- test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
- 
--test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM:S/-s//g}'
- 
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
- 
-@@ -761,7 +761,7 @@
+--- configure.orig	Fri Sep 20 11:07:02 2002
++++ configure	Sat Sep 21 09:26:44 2002
+@@ -1486,7 +1486,7 @@
  fi
  
+ # Define the identity of the package.
+- PACKAGE=fvwm
++ PACKAGE=fvwm2
+  VERSION=2.4.11
  
--PACKAGE=fvwm
-+PACKAGE=fvwm2
- 
- VERSION=2.4.10
- 
-@@ -3911,7 +3911,7 @@
- # It thinks the first close brace ends the variable substitution.
- test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
- 
--test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM:S/-s//g}'
- 
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'