Updated fvwm2 to -2.4.12

* Fixed drawing problems with TiledPixmap and Solid MenuFaces which
  appeared in 2.4.10, replacing the same problem with ?Gradient
  MenuFaces in 2.4.9.

* Fixed accidental menu animation with certain menu position hints.

* Fixed starting "Move" at random position when pointer is on a
  different screen.

* Transient windows do not appear in FvwmWinList after they have
  been moved on the desktop.

* Increased maximum allowed key symbol name length to 200
  characters.

* Allow quotes in conditional command conditions.

4 files changed, 23 insertions, 34 deletions

diff --git a/wm/fvwm2/Makefile b/wm/fvwm2/Makefile
index 32c7ebc6756..b01b2a442f9 100644
--- a/wm/fvwm2/Makefile
+++ b/wm/fvwm2/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.24 2002/10/09 08:34:15 martti Exp $
+# $NetBSD: Makefile,v 1.25 2002/10/11 06:16:49 martti Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/10/11 10:42:43 jkh Exp
 #
 
 DISTNAME=	fvwm-${FVWM_VER}
 PKGNAME=	fvwm2-${FVWM_VER}
-PKGREVISION=	1
 CATEGORIES=	x11 wm
 MASTER_SITES=	ftp://ftp.fvwm.org/pub/fvwm/version-2/ \
 		http://www.fvwm.org/generated/icon_download/ \
@@ -19,7 +18,7 @@ DEPENDS+=	xpmroot-2.*:../../x11/xpmroot
 
 CONFLICTS=	fvwm1-* fvwm>=1
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
-FVWM_VER=	2.4.11
+FVWM_VER=	2.4.12
 
 USE_X11BASE=		YES
 USE_BUILDLINK2=		YES
diff --git a/wm/fvwm2/distinfo b/wm/fvwm2/distinfo
index 56a193997a3..dad7708d589 100644
--- a/wm/fvwm2/distinfo
+++ b/wm/fvwm2/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.14 2002/09/21 08:27:14 martti Exp $
+$NetBSD: distinfo,v 1.15 2002/10/11 06:16:49 martti Exp $
 
-SHA1 (fvwm-2.4.11.tar.gz) = b50bb74d5e7ef5442c82f41b5ee8f993c4e802f5
-Size (fvwm-2.4.11.tar.gz) = 1779404 bytes
+SHA1 (fvwm-2.4.12.tar.gz) = af0ec9a461a7f308ed10418141cfada1d2aa4333
+Size (fvwm-2.4.12.tar.gz) = 1722921 bytes
 SHA1 (fvwm_icons.tgz) = d6ee1e52f1a84c4edd722ccee0f7e9cc79cc2a4b
 Size (fvwm_icons.tgz) = 363406 bytes
-SHA1 (patch-aa) = dcc33ec3329ffb11cbb0b6b460f04dd183d630db
-SHA1 (patch-ab) = 2583a735dd828016791c9e5faf3e5c48e769e282
+SHA1 (patch-aa) = 66028f69eff2edf721859e06f3a3357231949d2d
+SHA1 (patch-ab) = 73d605597d13be44f1ad8355dd602c43cc7d7fd7
diff --git a/wm/fvwm2/patches/patch-aa b/wm/fvwm2/patches/patch-aa
index e7c7c0c8ee1..a890cc0e08a 100644
--- a/wm/fvwm2/patches/patch-aa
+++ b/wm/fvwm2/patches/patch-aa
@@ -1,31 +1,21 @@
-$NetBSD: patch-aa,v 1.7 2002/09/21 08:27:15 martti Exp $
+$NetBSD: patch-aa,v 1.8 2002/10/11 06:16:50 martti Exp $
 
---- 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 @@
+--- utils/Makefile.in.orig	Thu Oct 10 16:23:37 2002
++++ utils/Makefile.in	Fri Oct 11 07:58:47 2002
+@@ -113,13 +113,13 @@
  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 \
-+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 	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
  
-@@ -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)
+ EXTRA_DIST = fvwmrc_convert quantize_pixmaps $(man_MANS)
  
- xpmroot_SOURCES = xpmroot.c
diff --git a/wm/fvwm2/patches/patch-ab b/wm/fvwm2/patches/patch-ab
index bcd880f4697..56453a94d36 100644
--- a/wm/fvwm2/patches/patch-ab
+++ b/wm/fvwm2/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.14 2002/09/21 08:27:15 martti Exp $
+$NetBSD: patch-ab,v 1.15 2002/10/11 06:16:50 martti Exp $
 
---- configure.orig	Fri Sep 20 11:07:02 2002
-+++ configure	Sat Sep 21 09:26:44 2002
-@@ -1486,7 +1486,7 @@
+--- configure.orig	Thu Oct 10 16:20:15 2002
++++ configure	Fri Oct 11 07:59:36 2002
+@@ -761,7 +761,7 @@
  fi
  
- # Define the identity of the package.
-- PACKAGE=fvwm
-+ PACKAGE=fvwm2
-  VERSION=2.4.11
  
+-PACKAGE=fvwm
++PACKAGE=fvwm2
+ 
+ VERSION=2.4.12