From 3628f05c3f5b2d77f66c10a024f48f22df358c3e Mon Sep 17 00:00:00 2001
From: martti <martti@pkgsrc.org>
Date: Mon, 17 Jun 2002 08:12:36 +0000
Subject: This conflicts with fvwm1

---
 wm/fvwm2/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wm/fvwm2/Makefile b/wm/fvwm2/Makefile
index 85574bfe08a..20c3157415f 100644
--- a/wm/fvwm2/Makefile
+++ b/wm/fvwm2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2002/06/13 08:41:45 martti Exp $
+# $NetBSD: Makefile,v 1.18 2002/06/17 08:12:36 martti Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/10/11 10:42:43 jkh Exp
 #
 
@@ -16,7 +16,7 @@ COMMENT=	Newer version of X11 Virtual window manager
 
 DEPENDS+=	xpmroot-2.*:../../x11/xpmroot
 
-CONFLICTS=	fvwm-2.*
+CONFLICTS=	fvwm1-*
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
 FVWM_VER=	2.4.8
 
-- 
cgit v1.2.3