Updated wm/fvwm-devel to 2.5.19

Upgrading from earlier 2.5.x versions is strongly recommended.

This release is available at the home page: http://www.fvwm.org/.

* Bug Fixes:

   - FvwmCommand now reports "end windowlist" and "end configinfo".
   - FvwmCommand now prints config info split on lines.
   - FvwmTaskBar no longer gets lost with trailing whitespace after
     geometry specification.
   - Fixed a window size problem if the aspect ratio is set (e.g.
     mplayer).
   - Decorations now update when unmanaged windows take focus, and
     not FlickeringQtDialogsWorkaround is enabled.
   - FvwmPager again allows movement of windows added before a
     page change.
   - fvwm no longer crashes on 1 and 4 bit displays. (#1677)
   - EWMH desktops now correctly handles FPClickToFocus. (#1492)
   - Security fix in fvwm-menu-directory. (CVE-2006-5969)

4 files changed, 12 insertions, 26 deletions

diff --git a/wm/fvwm-devel/Makefile b/wm/fvwm-devel/Makefile
index 0859fc18ec8..839f53d2dc7 100644
--- a/wm/fvwm-devel/Makefile
+++ b/wm/fvwm-devel/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2006/11/26 13:32:22 adrianp Exp $
+# $NetBSD: Makefile,v 1.18 2006/12/12 07:05:01 martti Exp $
 
 DISTNAME=	fvwm-${FVWM_VER}
-PKGREVISION=	1
+#PKGREVISION=	1
 CATEGORIES=	x11 wm
 MASTER_SITES=	ftp://ftp.fvwm.org/pub/fvwm/version-2/
 EXTRACT_SUFX=	.tar.bz2
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.fvwm.org/
 COMMENT=	Development version of X11 Virtual window manager
 
 CONFLICTS=	fvwm1-[0-9]* fvwm2-[0-9]*
-FVWM_VER=	2.5.18
+FVWM_VER=	2.5.19
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
diff --git a/wm/fvwm-devel/distinfo b/wm/fvwm-devel/distinfo
index 724acb03d6e..f2c5fda2c9f 100644
--- a/wm/fvwm-devel/distinfo
+++ b/wm/fvwm-devel/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.10 2006/11/26 13:32:22 adrianp Exp $
+$NetBSD: distinfo,v 1.11 2006/12/12 07:05:01 martti Exp $
 
-SHA1 (fvwm-2.5.18.tar.bz2) = b7ef45dfe3975deab38dd9ae306c5fd280f307c6
-RMD160 (fvwm-2.5.18.tar.bz2) = 68bd7a5d3e1c5fb3776de0fbda75414d9e7ad54b
-Size (fvwm-2.5.18.tar.bz2) = 2034340 bytes
-SHA1 (patch-aa) = 2f9c40c201fb041e71c7553118595f6af1c05030
+SHA1 (fvwm-2.5.19.tar.bz2) = b35da6ba6acb2f7bccd84da2ca95e49af2d7dd75
+RMD160 (fvwm-2.5.19.tar.bz2) = 75aabb54a9a66db21a16a339bbc4359b484b58de
+Size (fvwm-2.5.19.tar.bz2) = 1990433 bytes
+SHA1 (patch-aa) = a3661d015c2e11db244084f7d2025f6cd2efe8ed
 SHA1 (patch-ab) = 71282c66036746dcb4a3905a56f7bf1a75fbd497
-SHA1 (patch-ac) = e1c9450bc83510f2ae0dec98ff62ffc350dbbf4e
diff --git a/wm/fvwm-devel/patches/patch-aa b/wm/fvwm-devel/patches/patch-aa
index 123450f611d..c144a4417d8 100644
--- a/wm/fvwm-devel/patches/patch-aa
+++ b/wm/fvwm-devel/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2006/07/02 09:32:55 martti Exp $
+$NetBSD: patch-aa,v 1.4 2006/12/12 07:05:01 martti Exp $
 
---- bin/Makefile.in.orig	2006-01-20 11:22:45.000000000 +0200
-+++ bin/Makefile.in	2006-07-01 07:10:20.000000000 +0300
-@@ -697,14 +697,8 @@
+--- bin/Makefile.in.orig	2006-12-09 12:44:04.000000000 +0000
++++ bin/Makefile.in	2006-12-12 08:59:49.000000000 +0000
+@@ -703,14 +703,8 @@
  	_fvwm-perllib.1
  
  install-exec-local:
diff --git a/wm/fvwm-devel/patches/patch-ac b/wm/fvwm-devel/patches/patch-ac
deleted file mode 100644
index 8978424acb2..00000000000
--- a/wm/fvwm-devel/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2006/11/26 13:32:22 adrianp Exp $
-
---- bin/fvwm-menu-directory.in.orig	2005-07-08 21:59:00.000000000 +0100
-+++ bin/fvwm-menu-directory.in
-@@ -279,7 +279,7 @@ sub evalFolderLine ($$) {
- 	my $itemStr = $dir && $itemF_eval? &evalItem($_name, $dir): $_name;
- 	$itemStr = escapeItemName($itemStr);
- 	my $act = !$dir || $checkSubdirs && !-x $dir? "Nop": !$reuse?
--		qq(Popup ") . escapeFvwmName($dir) . qq("$submenuPos):
-+		qq(Popup ") . escapeFileName($dir) . qq("$submenuPos):
- 		qq(PipeRead 'echo ") . escapeFileName($dir) . qq(" >$dirFile; )
- 		. qq(echo Menu ") . escapeFvwmName($name) . qq(" WarpTitle');
- 	return qq(+ "$iconDStr$itemStr" $act\n);