Update to 2.2.5, provided by Martti Kuparinen in pkg/12377.

Changes: Remote startup sped up, security fix regarding .fvwm2rc being
searched in . if $HOME was not set, and some minor fixes.

5 files changed, 48 insertions, 45 deletions

diff --git a/wm/fvwm2/Makefile b/wm/fvwm2/Makefile
index d14d3cf997d..ec9c3efaefd 100644
--- a/wm/fvwm2/Makefile
+++ b/wm/fvwm2/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2001/02/17 17:21:37 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/03/13 20:59:14 wiz Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/10/11 10:42:43 jkh Exp
 #
 
-DISTNAME=	fvwm-2.2.4
-PKGNAME=	${DISTNAME:S/fvwm/fvwm2/}
+FVWM_VER=	2.2.5
+DISTNAME=	fvwm-${FVWM_VER}
+PKGNAME=	fvwm2-${FVWM_VER}
 CATEGORIES=	x11 wm
 MASTER_SITES=	ftp://ftp.hpc.uh.edu/pub/fvwm/version-2/ \
 		ftp://ftp.ics.es.osaka-u.ac.jp/pub/CFAN/sources/2.0.x/ \
@@ -24,6 +25,8 @@ CONFLICTS=	fvwm-2.*
 USE_X11BASE=	yes
 GNU_CONFIGURE=	yes
 
+PLIST_SUBST+=	FVWM_VER=${FVWM_VER}
+
 EVAL_PREFIX+=		XPMDIR=xpm
 CONFIGURE_ARGS+=	--enable-extras
 CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/lib/X11/fvwm2
diff --git a/wm/fvwm2/files/md5 b/wm/fvwm2/files/md5
index bfd49f4eac9..7db7ea33958 100644
--- a/wm/fvwm2/files/md5
+++ b/wm/fvwm2/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 2001/01/01 23:42:05 veego Exp $
+$NetBSD: md5,v 1.3 2001/03/13 20:59:14 wiz Exp $
 
-MD5 (fvwm-2.2.4.tar.gz) = 14ec1ca8ba305345078b7ed4c9cfdcfb
+SHA1 (fvwm-2.2.5.tar.gz) = 2cb0c6dbd1a361987a301956315d9f3b9a68f78b
diff --git a/wm/fvwm2/files/patch-sum b/wm/fvwm2/files/patch-sum
index f1b0b9f9ecd..d45c3d85e2d 100644
--- a/wm/fvwm2/files/patch-sum
+++ b/wm/fvwm2/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.2 2001/01/01 23:42:05 veego Exp $
+$NetBSD: patch-sum,v 1.3 2001/03/13 20:59:15 wiz Exp $
 
-MD5 (patch-aa) = 601bb4f219e3edb6bbefb9fa2c48a325
-MD5 (patch-ab) = 750926d14a0da562872ad0f84cc2f0c7
+SHA1 (patch-aa) = ac1eb7da79fcc06bedc20994beb6accea5f75b4e
+SHA1 (patch-ab) = a6f4e367cad784c8f126a9498795b0c88a71fcbb
diff --git a/wm/fvwm2/patches/patch-ab b/wm/fvwm2/patches/patch-ab
index c6522bebef7..37033cf0644 100644
--- a/wm/fvwm2/patches/patch-ab
+++ b/wm/fvwm2/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 2001/01/01 23:42:05 veego Exp $
+$NetBSD: patch-ab,v 1.3 2001/03/13 20:59:15 wiz Exp $
 
 --- configure.orig	Mon Nov 29 10:07:03 1999
 +++ configure	Mon Jan  1 22:23:09 2001
@@ -18,7 +18,7 @@ $NetBSD: patch-ab,v 1.2 2001/01/01 23:42:05 veego Exp $
 -PACKAGE=fvwm
 +PACKAGE=fvwm2
  
- VERSION=2.2.4
+ VERSION=2.2.5
  
 @@ -2984,7 +2984,7 @@
  # It thinks the first close brace ends the variable substitution.
diff --git a/wm/fvwm2/pkg/PLIST b/wm/fvwm2/pkg/PLIST
index f7d04ee2a22..ead5adc2d93 100644
--- a/wm/fvwm2/pkg/PLIST
+++ b/wm/fvwm2/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2001/01/01 23:42:05 veego Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/03/13 20:59:15 wiz Exp $
 bin/fvwm2
 bin/FvwmCommand
 lib/X11/fvwm2/decor_examples
@@ -145,40 +145,40 @@ lib/X11/fvwm2/pixmaps/mini.dirlink.xpm
 lib/X11/fvwm2/pixmaps/mini.file.xpm
 lib/X11/fvwm2/pixmaps/mini.filelink.xpm
 lib/X11/fvwm2/pixmaps/xterm-bsd.xpm
-lib/X11/fvwm2/2.2.4/FvwmAnimate
-lib/X11/fvwm2/2.2.4/FvwmAudio
-lib/X11/fvwm2/2.2.4/FvwmAuto
-lib/X11/fvwm2/2.2.4/FvwmBacker
-lib/X11/fvwm2/2.2.4/FvwmBanner
-lib/X11/fvwm2/2.2.4/FvwmButtons
-lib/X11/fvwm2/2.2.4/FvwmCpp
-lib/X11/fvwm2/2.2.4/FvwmEvent
-lib/X11/fvwm2/2.2.4/FvwmForm
-lib/X11/fvwm2/2.2.4/FvwmIconBox
-lib/X11/fvwm2/2.2.4/FvwmIconMan
-lib/X11/fvwm2/2.2.4/FvwmIdent
-lib/X11/fvwm2/2.2.4/FvwmM4
-lib/X11/fvwm2/2.2.4/FvwmPager
-lib/X11/fvwm2/2.2.4/FvwmRearrange
-lib/X11/fvwm2/2.2.4/FvwmCascade
-lib/X11/fvwm2/2.2.4/FvwmTile
-lib/X11/fvwm2/2.2.4/FvwmSave
-lib/X11/fvwm2/2.2.4/FvwmSaveDesk
-lib/X11/fvwm2/2.2.4/FvwmScroll
-lib/X11/fvwm2/2.2.4/FvwmTalk
-lib/X11/fvwm2/2.2.4/FvwmWinList
-lib/X11/fvwm2/2.2.4/FvwmCommandS
-lib/X11/fvwm2/2.2.4/FvwmConfig
-lib/X11/fvwm2/2.2.4/FvwmConsole
-lib/X11/fvwm2/2.2.4/FvwmConsoleC
-lib/X11/fvwm2/2.2.4/FvwmConsoleC.pl
-lib/X11/fvwm2/2.2.4/FvwmDebug
-lib/X11/fvwm2/2.2.4/FvwmGoodStuff
-lib/X11/fvwm2/2.2.4/FvwmPipe
-lib/X11/fvwm2/2.2.4/FvwmScript
-lib/X11/fvwm2/2.2.4/FvwmTaskBar
-lib/X11/fvwm2/2.2.4/FvwmWharf
-@dirrm lib/X11/fvwm2/2.2.4
+lib/X11/fvwm2/${FVWM_VER}/FvwmAnimate
+lib/X11/fvwm2/${FVWM_VER}/FvwmAudio
+lib/X11/fvwm2/${FVWM_VER}/FvwmAuto
+lib/X11/fvwm2/${FVWM_VER}/FvwmBacker
+lib/X11/fvwm2/${FVWM_VER}/FvwmBanner
+lib/X11/fvwm2/${FVWM_VER}/FvwmButtons
+lib/X11/fvwm2/${FVWM_VER}/FvwmCpp
+lib/X11/fvwm2/${FVWM_VER}/FvwmEvent
+lib/X11/fvwm2/${FVWM_VER}/FvwmForm
+lib/X11/fvwm2/${FVWM_VER}/FvwmIconBox
+lib/X11/fvwm2/${FVWM_VER}/FvwmIconMan
+lib/X11/fvwm2/${FVWM_VER}/FvwmIdent
+lib/X11/fvwm2/${FVWM_VER}/FvwmM4
+lib/X11/fvwm2/${FVWM_VER}/FvwmPager
+lib/X11/fvwm2/${FVWM_VER}/FvwmRearrange
+lib/X11/fvwm2/${FVWM_VER}/FvwmCascade
+lib/X11/fvwm2/${FVWM_VER}/FvwmTile
+lib/X11/fvwm2/${FVWM_VER}/FvwmSave
+lib/X11/fvwm2/${FVWM_VER}/FvwmSaveDesk
+lib/X11/fvwm2/${FVWM_VER}/FvwmScroll
+lib/X11/fvwm2/${FVWM_VER}/FvwmTalk
+lib/X11/fvwm2/${FVWM_VER}/FvwmWinList
+lib/X11/fvwm2/${FVWM_VER}/FvwmCommandS
+lib/X11/fvwm2/${FVWM_VER}/FvwmConfig
+lib/X11/fvwm2/${FVWM_VER}/FvwmConsole
+lib/X11/fvwm2/${FVWM_VER}/FvwmConsoleC
+lib/X11/fvwm2/${FVWM_VER}/FvwmConsoleC.pl
+lib/X11/fvwm2/${FVWM_VER}/FvwmDebug
+lib/X11/fvwm2/${FVWM_VER}/FvwmGoodStuff
+lib/X11/fvwm2/${FVWM_VER}/FvwmPipe
+lib/X11/fvwm2/${FVWM_VER}/FvwmScript
+lib/X11/fvwm2/${FVWM_VER}/FvwmTaskBar
+lib/X11/fvwm2/${FVWM_VER}/FvwmWharf
+@dirrm lib/X11/fvwm2/${FVWM_VER}
 @dirrm lib/X11/fvwm2/pixmaps
 @dirrm lib/X11/fvwm2
 man/man1/fvwm2.1