From a766f70aae46ca6727f001fc32a7ee05316d40fa Mon Sep 17 00:00:00 2001
From: martti <martti>
Date: Thu, 13 Jun 2002 08:41:45 +0000
Subject: Updated fvwm2 to 2.4.8

Improvements and compatibility issues:
--------------------------------------
* Setup "fvwm" and "fvwm-root" name symlinks for the executable and
  the man page when installing, see INSTALL.fvwm.
* New FvwmIconMan configuration syntax now conforms to the syntax of
  other modules, see the man page.
* New WindowList option CurrentAtEnd.
* Always display the current desk number in the FvwmPager window title.
* A small security patch regarding TMPDIR.
* fvwm-menu-headlines: updated the site data, added a configurable timeout on
  socket reading (20 sec) to avoid fvwm hanging, new --icon-error option.
* Fonts in double quotes now should work in module configurations.
---
 wm/fvwm2/Makefile         |  4 ++--
 wm/fvwm2/PLIST            |  6 +++++-
 wm/fvwm2/distinfo         | 10 +++++-----
 wm/fvwm2/patches/patch-aa |  8 ++++----
 wm/fvwm2/patches/patch-ab | 10 +++++-----
 5 files changed, 21 insertions(+), 17 deletions(-)

(limited to 'wm')

diff --git a/wm/fvwm2/Makefile b/wm/fvwm2/Makefile
index d29230ce464..85574bfe08a 100644
--- a/wm/fvwm2/Makefile
+++ b/wm/fvwm2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2002/04/14 13:59:42 veego Exp $
+# $NetBSD: Makefile,v 1.17 2002/06/13 08:41:45 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=	fvwm-2.*
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
-FVWM_VER=	2.4.7
+FVWM_VER=	2.4.8
 
 USE_X11BASE=		YES
 GNU_CONFIGURE=		YES
diff --git a/wm/fvwm2/PLIST b/wm/fvwm2/PLIST
index 49072a8d87f..185e7f059cd 100644
--- a/wm/fvwm2/PLIST
+++ b/wm/fvwm2/PLIST
@@ -1,10 +1,12 @@
-@comment $NetBSD: PLIST,v 1.2 2001/12/17 07:30:07 martti Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/06/13 08:41:46 martti Exp $
 bin/FvwmCommand
+bin/fvwm
 bin/fvwm-config
 bin/fvwm-menu-desktop
 bin/fvwm-menu-directory
 bin/fvwm-menu-headlines
 bin/fvwm-menu-xlock
+bin/fvwm-root
 bin/fvwm2
 bin/fvwm24_convert
 bin/fvwmbug
@@ -398,6 +400,8 @@ man/man1/fvwm-menu-desktop.1
 man/man1/fvwm-menu-directory.1
 man/man1/fvwm-menu-headlines.1
 man/man1/fvwm-menu-xlock.1
+man/man1/fvwm-root.1
+man/man1/fvwm.1
 man/man1/fvwm2.1
 man/man1/fvwm24_convert.1
 man/man1/fvwmbug.1
diff --git a/wm/fvwm2/distinfo b/wm/fvwm2/distinfo
index be3f2f35906..408a165ebe4 100644
--- a/wm/fvwm2/distinfo
+++ b/wm/fvwm2/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.10 2002/04/12 09:09:08 martti Exp $
+$NetBSD: distinfo,v 1.11 2002/06/13 08:41:46 martti Exp $
 
-SHA1 (fvwm-2.4.7.tar.gz) = ee658ba10c43642370a414948bee250cd81f3f25
-Size (fvwm-2.4.7.tar.gz) = 1710230 bytes
+SHA1 (fvwm-2.4.8.tar.gz) = 42e1b90ceab2414536af4ee5de47e90b08b0ce6f
+Size (fvwm-2.4.8.tar.gz) = 1716147 bytes
 SHA1 (fvwm_icons.tgz) = d6ee1e52f1a84c4edd722ccee0f7e9cc79cc2a4b
 Size (fvwm_icons.tgz) = 363406 bytes
-SHA1 (patch-aa) = a4b7554381c0035d16d6804bf9f9eac57a5d2f72
-SHA1 (patch-ab) = 8ea0ea5fda7340d112007b2a2ccefe97f0c7398e
+SHA1 (patch-aa) = 59ff96ccb952a4b8bb0dc3da5758d13078e12500
+SHA1 (patch-ab) = 5df5d4ea27344f46a87d96934117bfc92027e364
diff --git a/wm/fvwm2/patches/patch-aa b/wm/fvwm2/patches/patch-aa
index ae3d537b2a9..8f71edac491 100644
--- a/wm/fvwm2/patches/patch-aa
+++ b/wm/fvwm2/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2002/03/11 07:20:55 martti Exp $
+$NetBSD: patch-aa,v 1.5 2002/06/13 08:41:47 martti Exp $
 
---- utils/Makefile.in.orig	Sun Mar 10 10:47:13 2002
-+++ utils/Makefile.in	Mon Mar 11 07:44:16 2002
-@@ -113,13 +113,13 @@
+--- utils/Makefile.in.orig	Wed Jun 12 00:38:08 2002
++++ utils/Makefile.in	Wed Jun 12 19:16:37 2002
+@@ -114,13 +114,13 @@
  xpm_CFLAGS = @xpm_CFLAGS@
  xpm_LIBS = @xpm_LIBS@
  
diff --git a/wm/fvwm2/patches/patch-ab b/wm/fvwm2/patches/patch-ab
index c251f0c2da7..c7ff4043524 100644
--- a/wm/fvwm2/patches/patch-ab
+++ b/wm/fvwm2/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.10 2002/04/12 09:09:09 martti Exp $
+$NetBSD: patch-ab,v 1.11 2002/06/13 08:41:47 martti Exp $
 
---- configure.orig	Thu Apr 11 14:21:34 2002
-+++ configure	Fri Apr 12 07:48:42 2002
+--- configure.orig	Wed Jun 12 00:06:22 2002
++++ configure	Wed Jun 12 19:17:09 2002
 @@ -672,7 +672,7 @@
  # It thinks the first close brace ends the variable substitution.
  test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
@@ -18,9 +18,9 @@ $NetBSD: patch-ab,v 1.10 2002/04/12 09:09:09 martti Exp $
 -PACKAGE=fvwm
 +PACKAGE=fvwm2
  
- VERSION=2.4.7
+ VERSION=2.4.8
  
-@@ -3929,7 +3929,7 @@
+@@ -3933,7 +3933,7 @@
  # It thinks the first close brace ends the variable substitution.
  test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
  
-- 
cgit v1.2.3