Updated fvwm2 to 2.4.15

* Fix for gmplayer launched by fvwm.  Close stdin on Exec so the
  exec'd process knows its not running interactively.

* Windows using the WindowListSkip style do not appear in the
  FvwmTaskBar at random.

* Fixed a memory leak in ChangeIcon, ChangeForeColor and
  ChangeBackColor FvwmScript options.

* Fixed a core dump in the parsing of FvwmAuto arguments.

* Fixed screwed calculation of icon picture size when application
  specifies it explicitly.

* The option ShowOnlyIcons now works as described in the
  FvwmIconMan man page.  It was accidentally named ShowOnlyIconic
  before.

4 files changed, 38 insertions, 22 deletions

diff --git a/wm/fvwm2/Makefile b/wm/fvwm2/Makefile
index 0b0a8b6fbc2..34e1800c1db 100644
--- a/wm/fvwm2/Makefile
+++ b/wm/fvwm2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2002/12/02 08:53:01 martti Exp $
+# $NetBSD: Makefile,v 1.29 2003/01/26 13:13:54 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.14
+FVWM_VER=	2.4.15
 
 USE_X11BASE=		YES
 USE_BUILDLINK2=		YES
@@ -28,7 +28,7 @@ USE_GNU_READLINE=	YES
 PLIST_SUBST+=		FVWM_VER=${FVWM_VER}
 
 EVAL_PREFIX+=		XPMDIR=xpm
-CONFIGURE_ARGS+=	--enable-extras --without-gnome
+CONFIGURE_ARGS+=	--without-gnome
 CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/lib/X11/fvwm2
 CONFIGURE_ARGS+=	--libexecdir=${PREFIX}/lib/X11
 CONFIGURE_ARGS+=	--with-xpm-includes=${XPMDIR}/include
diff --git a/wm/fvwm2/distinfo b/wm/fvwm2/distinfo
index 8985f49e381..f0127c0cd7a 100644
--- a/wm/fvwm2/distinfo
+++ b/wm/fvwm2/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.17 2002/12/02 08:53:01 martti Exp $
+$NetBSD: distinfo,v 1.18 2003/01/26 13:13:54 martti Exp $
 
-SHA1 (fvwm-2.4.14.tar.gz) = 5a4a476013d919ab2c801b59c8194efb5d8c7976
-Size (fvwm-2.4.14.tar.gz) = 1725527 bytes
+SHA1 (fvwm-2.4.15.tar.gz) = 1b022b8c199ba4f3596aa1866b1181e6fc8f1f38
+Size (fvwm-2.4.15.tar.gz) = 1778746 bytes
 SHA1 (fvwm_icons.tgz) = d6ee1e52f1a84c4edd722ccee0f7e9cc79cc2a4b
 Size (fvwm_icons.tgz) = 363406 bytes
-SHA1 (patch-aa) = 66028f69eff2edf721859e06f3a3357231949d2d
-SHA1 (patch-ab) = 5405bb80eaecb50038299425e3c22e530fca4549
+SHA1 (patch-aa) = 31533662f175f9958eed78b8d181c0b71296c6de
+SHA1 (patch-ab) = abbd63336b9aaf67a9fa9bbe4f49c1d7234c23d9
diff --git a/wm/fvwm2/patches/patch-aa b/wm/fvwm2/patches/patch-aa
index a890cc0e08a..62857e7f93b 100644
--- a/wm/fvwm2/patches/patch-aa
+++ b/wm/fvwm2/patches/patch-aa
@@ -1,21 +1,33 @@
-$NetBSD: patch-aa,v 1.8 2002/10/11 06:16:50 martti Exp $
+$NetBSD: patch-aa,v 1.9 2003/01/26 13:13:54 martti Exp $
 
---- 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 @@
+--- utils/Makefile.in.orig	Fri Jan 24 14:29:01 2003
++++ utils/Makefile.in	Sun Jan 26 14:11:10 2003
+@@ -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)
+@@ -156,8 +156,8 @@
+ CONFIG_HEADER = $(top_builddir)/config.h
+ 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@
++EXTRA_PROGRAMS = xselection$(EXEEXT)
++bin_PROGRAMS =
+ PROGRAMS = $(bin_PROGRAMS)
  
+ xpmroot_SOURCES = xpmroot.c
diff --git a/wm/fvwm2/patches/patch-ab b/wm/fvwm2/patches/patch-ab
index 31723277c79..79fd9670342 100644
--- a/wm/fvwm2/patches/patch-ab
+++ b/wm/fvwm2/patches/patch-ab
@@ -1,9 +1,13 @@
-$NetBSD: patch-ab,v 1.16 2002/11/03 09:01:03 martti Exp $
+$NetBSD: patch-ab,v 1.17 2003/01/26 13:13:54 martti Exp $
 
---- configure.orig	Fri Nov  1 18:21:37 2002
-+++ configure	Sat Nov  2 18:55:29 2002
-@@ -763,3 +763,3 @@
+--- configure.orig	Fri Jan 24 14:29:02 2003
++++ configure	Sun Jan 26 12:55:04 2003
+@@ -1486,7 +1486,7 @@
+ fi
+ 
+ # Define the identity of the package.
+- PACKAGE=fvwm
++ PACKAGE=fvwm2
+  VERSION=2.4.15
  
--PACKAGE=fvwm
-+PACKAGE=fvwm2