Updated fvwm2 to 2.4.17

* The "Visible" condition does no longer select windows on
  different desks.

* Fixed sending M_NEW_PAGE packets to the modules if the page did
  not change.

* With the styles StartsOnPage, SkipMapping and UsePPosition,
  windows that request a specific position are still placed on the
  given page.

* It is now possible to suppress title action or title completely
  in menus created by fvwm-menu-directory.

* Added support for new BBC headlines in fvwm-menu-headlines, this
  replaces the old BBC-Worlds and BBC-SciTech headlines.

5 files changed, 19 insertions, 20 deletions

diff --git a/wm/fvwm2/Makefile b/wm/fvwm2/Makefile
index e18711b77fa..ab66cf122fd 100644
--- a/wm/fvwm2/Makefile
+++ b/wm/fvwm2/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.35 2003/07/17 22:55:12 grant Exp $
+# $NetBSD: Makefile,v 1.36 2003/10/13 15:21:19 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.16
+FVWM_VER=	2.4.17
 
 USE_X11BASE=		YES
 USE_BUILDLINK2=		YES
diff --git a/wm/fvwm2/PLIST b/wm/fvwm2/PLIST
index c639e21a487..e11458e5b67 100644
--- a/wm/fvwm2/PLIST
+++ b/wm/fvwm2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2003/04/10 07:22:35 bouyer Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/10/13 15:21:19 martti Exp $
 bin/FvwmCommand
 bin/fvwm
 bin/fvwm-config
@@ -381,7 +381,7 @@ man/man1/FvwmDebug.1
 man/man1/FvwmDragWell.1
 man/man1/FvwmEvent.1
 man/man1/FvwmForm.1
-man/man1/FvwmGtk.1
+${GTK}man/man1/FvwmGtk.1
 man/man1/FvwmIconBox.1
 man/man1/FvwmIconMan.1
 man/man1/FvwmIdent.1
diff --git a/wm/fvwm2/distinfo b/wm/fvwm2/distinfo
index 48d8de38fdd..fd48962a140 100644
--- a/wm/fvwm2/distinfo
+++ b/wm/fvwm2/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.20 2003/06/01 06:53:30 martti Exp $
+$NetBSD: distinfo,v 1.21 2003/10/13 15:21:19 martti Exp $
 
-SHA1 (fvwm-2.4.16.tar.gz) = 7cb65dcfa55392ac18e53ff46595d9b0b3eccd1c
-Size (fvwm-2.4.16.tar.gz) = 1787645 bytes
+SHA1 (fvwm-2.4.17.tar.gz) = 44bc8d8d739092e29cacf2829481bd322839fb46
+Size (fvwm-2.4.17.tar.gz) = 1795326 bytes
 SHA1 (fvwm_icons.tgz) = d6ee1e52f1a84c4edd722ccee0f7e9cc79cc2a4b
 Size (fvwm_icons.tgz) = 363406 bytes
-SHA1 (patch-aa) = 31533662f175f9958eed78b8d181c0b71296c6de
-SHA1 (patch-ab) = 56c1048d42d18b15923fa6a278bccfee4f961be4
+SHA1 (patch-aa) = 6721d48d720a242ec80dd7b50aa934f13ff26ddf
+SHA1 (patch-ab) = 42052984c5b359fc19c117940ea30963d0b22944
diff --git a/wm/fvwm2/patches/patch-aa b/wm/fvwm2/patches/patch-aa
index 62857e7f93b..0cb9aea8e15 100644
--- a/wm/fvwm2/patches/patch-aa
+++ b/wm/fvwm2/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.9 2003/01/26 13:13:54 martti Exp $
+$NetBSD: patch-aa,v 1.10 2003/10/13 15:21:19 martti Exp $
 
---- 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 @@
+--- utils/Makefile.in.orig	Fri Oct 10 23:12:36 2003
++++ utils/Makefile.in	Mon Oct 13 18:09:55 2003
+@@ -133,14 +133,14 @@
  xpm_CFLAGS = @xpm_CFLAGS@
  xpm_LIBS = @xpm_LIBS@
  
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.9 2003/01/26 13:13:54 martti Exp $
  	fvwm-menu-xlock.1 fvwm-menu-directory.1 \
  	fvwm-menu-desktop.1 fvwm-menu-headlines.1
  
-@@ -156,8 +156,8 @@
+@@ -159,8 +159,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
diff --git a/wm/fvwm2/patches/patch-ab b/wm/fvwm2/patches/patch-ab
index 581861a2549..2a24f14b8f7 100644
--- a/wm/fvwm2/patches/patch-ab
+++ b/wm/fvwm2/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.18 2003/06/01 06:53:30 martti Exp $
+$NetBSD: patch-ab,v 1.19 2003/10/13 15:21:19 martti Exp $
 
---- configure.orig	Fri May 30 20:06:22 2003
-+++ configure	Sun Jun  1 09:41:41 2003
-@@ -1561,7 +1561,7 @@
+--- configure.orig	Fri Oct 10 23:12:43 2003
++++ configure	Mon Oct 13 18:10:33 2003
+@@ -1562,7 +1562,7 @@
  fi
  
  # Define the identity of the package.
 - PACKAGE=fvwm
 + PACKAGE=fvwm2
-  VERSION=2.4.16
+  VERSION=2.4.17