From 0841d45cda5cec6099d961ab9265c562434d9b1f Mon Sep 17 00:00:00 2001
From: pvalchev <pvalchev@openbsd.org>
Date: Mon, 17 Sep 2001 04:32:56 +0000
Subject: [PATCH] Update to fvwm-2.4.2

Make sure gnome support is properly disabled.  gnome wm hints
are built, but gnome support in FvwmGtk will have to be looked at.
Add imlib support in FvwmGtk by default.

2.4.2 contains a lot of fixes and new features as opposed to 2.4.0,
see http://www.fvwm.org/generated/NEWS.html
---
 x11/fvwm2/Makefile        | 11 ++++++-----
 x11/fvwm2/files/md5       |  6 +++---
 x11/fvwm2/pkg/PLIST       |  3 ++-
 x11/fvwm2/pkg/PLIST-fvwm2 |  3 ++-
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/x11/fvwm2/Makefile b/x11/fvwm2/Makefile
index 83bbc1a5026..9992676562c 100644
--- a/x11/fvwm2/Makefile
+++ b/x11/fvwm2/Makefile
@@ -1,16 +1,16 @@
-# $OpenBSD: Makefile,v 1.15 2001/08/13 06:34:26 pvalchev Exp $
+# $OpenBSD: Makefile,v 1.16 2001/09/17 04:32:56 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.0
+VERSION=	2.4.2
 DISTNAME=	fvwm-${VERSION}
 PKGNAME=	fvwm2+fvicons-${VERSION}
 FULLPKGNAME-fvicons=fvicons-${VERSION}
 PKGNAME-fvwm2=	fvwm2-${VERSION}
 CATEGORIES=     x11
-NEED_VERSION=	1.435
+NEED_VERSION=	1.457
 
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} fvwm_icons.tgz:0
 
@@ -26,7 +26,8 @@ PERMIT_DISTFILES_FTP=	Yes
 MASTER_SITES=	ftp://ftp.fvwm.org/pub/fvwm/version-2/
 MASTER_SITES0=	http://www.fvwm.org/generated/icon_download/
 
-LIB_DEPENDS=	gtk.1.2:gtk+-*:x11/gtk+
+LIB_DEPENDS=	gtk.1.2:gtk+-*:x11/gtk+ \
+		gdk_imlib.19.:imlib-*:graphics/imlib
 
 MULTI_PACKAGES=	-fvwm2 -fvicons
 SUBPACKAGE?=
@@ -60,7 +61,7 @@ USE_X11=	Yes
 SEPARATE_BUILD= concurrent
 CONFIGURE_STYLE= gnu
 CONFIGURE_ARGS+= --enable-extras \
-		 --disable-gnome
+		 --without-gnome
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/fvicons
diff --git a/x11/fvwm2/files/md5 b/x11/fvwm2/files/md5
index 85f955239c1..7b2570f48b2 100644
--- a/x11/fvwm2/files/md5
+++ b/x11/fvwm2/files/md5
@@ -1,6 +1,6 @@
-MD5 (fvwm-2.4.0.tar.gz) = b2fe8edec50cfbd46fdc2a5acd6c3139
+MD5 (fvwm-2.4.2.tar.gz) = be4e0d8c0d633e4ac9f1633ec201bd6d
 MD5 (fvwm_icons.tgz) = 7b254da269a236d77c790581701442cb
-RMD160 (fvwm-2.4.0.tar.gz) = 7d782612b92440a57275bbf3caefe76ed2e64d81
+RMD160 (fvwm-2.4.2.tar.gz) = af27936a1adc59b61b46fb6f25d1f6a6a5b31cf5
 RMD160 (fvwm_icons.tgz) = de1ae2b472ee555d4006fa4ebb4e4dbbc9fabd04
-SHA1 (fvwm-2.4.0.tar.gz) = b7c4c74a7bfad13f0e0a08f0a5d84e45b43fd129
+SHA1 (fvwm-2.4.2.tar.gz) = 249e6fa64d35d7baa762e29584a019fa960da524
 SHA1 (fvwm_icons.tgz) = 418356862ab564ac0b771300b53004aea7c7c1ec
diff --git a/x11/fvwm2/pkg/PLIST b/x11/fvwm2/pkg/PLIST
index 436a0810c3e..aaa488bbd98 100644
--- a/x11/fvwm2/pkg/PLIST
+++ b/x11/fvwm2/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.4 2001/07/05 18:38:38 pvalchev Exp $
+@comment $OpenBSD: PLIST,v 1.5 2001/09/17 04:32:56 pvalchev Exp $
 @pkgcfl fvwm2-*
 @pkgcfl fvicons-*
 bin/FvwmCommand
@@ -390,6 +390,7 @@ man/man1/FvwmTaskBar.1
 man/man1/FvwmTheme.1
 man/man1/FvwmWharf.1
 man/man1/FvwmWinList.1
+man/man1/fvwm-config.1
 man/man1/fvwm-menu-desktop.1
 man/man1/fvwm-menu-directory.1
 man/man1/fvwm-menu-headlines.1
diff --git a/x11/fvwm2/pkg/PLIST-fvwm2 b/x11/fvwm2/pkg/PLIST-fvwm2
index f2912212108..cadac9021d6 100644
--- a/x11/fvwm2/pkg/PLIST-fvwm2
+++ b/x11/fvwm2/pkg/PLIST-fvwm2
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-fvwm2,v 1.2 2001/07/05 18:38:38 pvalchev Exp $
+@comment $OpenBSD: PLIST-fvwm2,v 1.3 2001/09/17 04:32:56 pvalchev Exp $
 @pkgcfl fvwm2+fvicons-*
 bin/FvwmCommand
 bin/fvwm-config
@@ -73,6 +73,7 @@ man/man1/FvwmTaskBar.1
 man/man1/FvwmTheme.1
 man/man1/FvwmWharf.1
 man/man1/FvwmWinList.1
+man/man1/fvwm-config.1
 man/man1/fvwm-menu-desktop.1
 man/man1/fvwm-menu-directory.1
 man/man1/fvwm-menu-headlines.1