From 82887f8426ed0ad20a208f49da21695d3a212dbb Mon Sep 17 00:00:00 2001
From: pvalchev <pvalchev@openbsd.org>
Date: Mon, 16 Jun 2003 04:58:16 +0000
Subject: [PATCH] Update to fvwm-2.4.16; from Peter Hessler
 <phessler@theapt.org>

---
 x11/fvwm2/Makefile                        |  4 ++--
 x11/fvwm2/distinfo                        |  6 ++---
 x11/fvwm2/patches/patch-fvwm_Makefile_in  | 23 +++++++++----------
 x11/fvwm2/patches/patch-utils_Makefile_in | 27 +++++++++++------------
 4 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/x11/fvwm2/Makefile b/x11/fvwm2/Makefile
index 31330f62f3a..c9270907584 100644
--- a/x11/fvwm2/Makefile
+++ b/x11/fvwm2/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.28 2003/01/18 19:49:16 pvalchev Exp $
+# $OpenBSD: Makefile,v 1.29 2003/06/16 04:58:16 pvalchev Exp $
 
 COMMENT=	"multiple virtual desktop window manager, with icons"
 COMMENT-fvicons="multiple virtual desktop window manager icons"
 COMMENT-fvwm2=	"multiple virtual desktop window manager, without icons"
 
-VERSION=	2.4.14
+VERSION=	2.4.16
 DISTNAME=	fvwm-${VERSION}
 PKGNAME=	fvwm2+fvicons-${VERSION}
 FULLPKGNAME-fvicons=fvicons-${VERSION}
diff --git a/x11/fvwm2/distinfo b/x11/fvwm2/distinfo
index 72f602fb824..38f3bd2ed51 100644
--- a/x11/fvwm2/distinfo
+++ b/x11/fvwm2/distinfo
@@ -1,6 +1,6 @@
-MD5 (fvwm-2.4.14.tar.gz) = 169e64dc41df7f1f146ad12b1b36dcfa
+MD5 (fvwm-2.4.16.tar.gz) = 6a5bc94c69d6d18c50d813ac42a4f80f
 MD5 (fvwm_icons.tgz) = de6c2822f1f6d43a0e1daddd0c7a8665
-RMD160 (fvwm-2.4.14.tar.gz) = aa78f1a799b8ef3f367df033f522ac0052e9cc4b
+RMD160 (fvwm-2.4.16.tar.gz) = 8e54fa7a0e4b60cf69853003d252c3279c43bceb
 RMD160 (fvwm_icons.tgz) = a5aa60994e64aab939f94b4620d79ea4fcb156f3
-SHA1 (fvwm-2.4.14.tar.gz) = 5a4a476013d919ab2c801b59c8194efb5d8c7976
+SHA1 (fvwm-2.4.16.tar.gz) = 7cb65dcfa55392ac18e53ff46595d9b0b3eccd1c
 SHA1 (fvwm_icons.tgz) = d6ee1e52f1a84c4edd722ccee0f7e9cc79cc2a4b
diff --git a/x11/fvwm2/patches/patch-fvwm_Makefile_in b/x11/fvwm2/patches/patch-fvwm_Makefile_in
index 9d259962678..fc8d4a9cb2a 100644
--- a/x11/fvwm2/patches/patch-fvwm_Makefile_in
+++ b/x11/fvwm2/patches/patch-fvwm_Makefile_in
@@ -1,16 +1,15 @@
-$OpenBSD: patch-fvwm_Makefile_in,v 1.2 2003/01/18 19:49:16 pvalchev Exp $
---- fvwm/Makefile.in.orig	Fri Nov 29 13:10:56 2002
-+++ fvwm/Makefile.in	Sat Jan 18 12:12:12 2003
-@@ -581,10 +581,10 @@ check-am: all-am
- check: check-am
- installcheck-am:
- installcheck: installcheck-am
+$OpenBSD: patch-fvwm_Makefile_in,v 1.3 2003/06/16 04:58:16 pvalchev Exp $
+--- fvwm/Makefile.in.orig	Fri May 30 10:05:44 2003
++++ fvwm/Makefile.in	Sun Jun 15 16:50:46 2003
+@@ -495,9 +495,9 @@ info: info-am
+ 
+ info-am:
+ 
+-install-data-am: install-configDATA install-data-local install-man
++install-data-am: install-configDATA install-man
+ 
 -install-exec-am: install-binPROGRAMS install-exec-local
 +install-exec-am: install-binPROGRAMS
- install-exec: install-exec-am
  
--install-data-am: install-man install-configDATA install-data-local
-+install-data-am: install-man install-configDATA
- install-data: install-data-am
+ install-info: install-info-am
  
- install-am: all-am
diff --git a/x11/fvwm2/patches/patch-utils_Makefile_in b/x11/fvwm2/patches/patch-utils_Makefile_in
index 08f1a3f99f6..a57f360ec4e 100644
--- a/x11/fvwm2/patches/patch-utils_Makefile_in
+++ b/x11/fvwm2/patches/patch-utils_Makefile_in
@@ -1,17 +1,16 @@
-$OpenBSD: patch-utils_Makefile_in,v 1.2 2003/01/18 19:49:16 pvalchev Exp $
---- utils/Makefile.in.orig	Fri Nov 29 13:11:26 2002
-+++ utils/Makefile.in	Sat Jan 18 12:12:12 2003
-@@ -369,11 +369,10 @@ check-am: all-am
- check: check-am
- installcheck-am:
- installcheck: installcheck-am
--install-exec-am: install-binPROGRAMS install-binSCRIPTS \
--		install-exec-local
-+install-exec-am: install-binPROGRAMS install-binSCRIPTS
- install-exec: install-exec-am
+$OpenBSD: patch-utils_Makefile_in,v 1.3 2003/06/16 04:58:16 pvalchev Exp $
+--- utils/Makefile.in.orig	Fri May 30 10:06:16 2003
++++ utils/Makefile.in	Sun Jun 15 16:52:10 2003
+@@ -449,10 +449,9 @@ info: info-am
  
--install-data-am: install-man install-data-local
+ info-am:
+ 
+-install-data-am: install-data-local install-man
 +install-data-am: install-man
- install-data: install-data-am
  
- install-am: all-am
+-install-exec-am: install-binPROGRAMS install-binSCRIPTS \
+-	install-exec-local
++install-exec-am: install-binPROGRAMS install-binSCRIPTS
+ 
+ install-info: install-info-am
+