Updated fvwm2 to 2.4.16

* Bug fixes

* All single letter variables are deprecated now; new variables:

    $[w.id], $[w.name], $[w.iconname], $[w.class], $[w.resource],
    $[desk.n], $[version.num], $[version.info], $[version.line],
    $[desk.pagesx], $[desk.pagesy]

* The NoWarp menu position hint option works with root menus too.

* WindowListFunc is executed now within a window context, so
  a prefix "WindowId $0" is not needed in its definition anymore
  and it is advised to remove it in user configs.

* FvwmEvent now executes all window related events within a window
  context, so PassId is not needed anymore, and all prefixes
  "WindowId $0" may be removed in user event handlers.

4 files changed, 11 insertions, 40 deletions

diff --git a/wm/fvwm2/Makefile b/wm/fvwm2/Makefile
index 75cbf577701..38ed3f47e66 100644
--- a/wm/fvwm2/Makefile
+++ b/wm/fvwm2/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.32 2003/05/02 11:56:35 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2003/06/01 06:53:30 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=	3
 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.15
+FVWM_VER=	2.4.16
 
 USE_X11BASE=		YES
 USE_BUILDLINK2=		YES
diff --git a/wm/fvwm2/distinfo b/wm/fvwm2/distinfo
index 6186fdd1105..48d8de38fdd 100644
--- a/wm/fvwm2/distinfo
+++ b/wm/fvwm2/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.19 2003/02/12 00:47:52 atatat Exp $
+$NetBSD: distinfo,v 1.20 2003/06/01 06:53:30 martti Exp $
 
-SHA1 (fvwm-2.4.15.tar.gz) = 1b022b8c199ba4f3596aa1866b1181e6fc8f1f38
-Size (fvwm-2.4.15.tar.gz) = 1778746 bytes
+SHA1 (fvwm-2.4.16.tar.gz) = 7cb65dcfa55392ac18e53ff46595d9b0b3eccd1c
+Size (fvwm-2.4.16.tar.gz) = 1787645 bytes
 SHA1 (fvwm_icons.tgz) = d6ee1e52f1a84c4edd722ccee0f7e9cc79cc2a4b
 Size (fvwm_icons.tgz) = 363406 bytes
 SHA1 (patch-aa) = 31533662f175f9958eed78b8d181c0b71296c6de
-SHA1 (patch-ab) = abbd63336b9aaf67a9fa9bbe4f49c1d7234c23d9
-SHA1 (patch-ac) = 714a3311683ce472cfbd60a052a02ec957ecfadb
+SHA1 (patch-ab) = 56c1048d42d18b15923fa6a278bccfee4f961be4
diff --git a/wm/fvwm2/patches/patch-ab b/wm/fvwm2/patches/patch-ab
index 79fd9670342..581861a2549 100644
--- a/wm/fvwm2/patches/patch-ab
+++ b/wm/fvwm2/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.17 2003/01/26 13:13:54 martti Exp $
+$NetBSD: patch-ab,v 1.18 2003/06/01 06:53:30 martti Exp $
 
---- configure.orig	Fri Jan 24 14:29:02 2003
-+++ configure	Sun Jan 26 12:55:04 2003
-@@ -1486,7 +1486,7 @@
+--- configure.orig	Fri May 30 20:06:22 2003
++++ configure	Sun Jun  1 09:41:41 2003
+@@ -1561,7 +1561,7 @@
  fi
  
  # Define the identity of the package.
 - PACKAGE=fvwm
 + PACKAGE=fvwm2
-  VERSION=2.4.15
+  VERSION=2.4.16
  
  
diff --git a/wm/fvwm2/patches/patch-ac b/wm/fvwm2/patches/patch-ac
deleted file mode 100644
index 87d9159adeb..00000000000
--- a/wm/fvwm2/patches/patch-ac
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2003/02/12 00:47:53 atatat Exp $
-
-Re-open /dev/null on the (now) closed stdin file descriptor.  The
-fvwm2 changelog says they did this to make gmplayer realize it was
-not running interactively (ie, its stdin was not a tty), but that
-means that all things get executed with stdin closed.  That's not a
-very good security posture.  Some things can get confused or do
-wrong things if stdin is closed when they start.
-
---- fvwm/builtins.c.orig	2003-01-16 07:58:58.000000000 -0500
-+++ fvwm/builtins.c
-@@ -23,6 +23,7 @@
- 
- #include "config.h"
- 
-+#include <fcntl.h>
- #include <stdio.h>
- #include <signal.h>
- #include <errno.h>
-@@ -784,6 +785,7 @@ void CMD_Exec(F_CMD_ARGS)
-   {
-     /* close stdin so the exec'd process knows its not interactive */
-     close(0);
-+    open("/dev/null", O_RDWR);
-     if (execl(exec_shell_name, exec_shell_name, "-c", cmd, NULL)==-1)
-     {
-       fvwm_msg(ERR,"exec_function","execl failed (%s)",strerror(errno));