[pkgsrc/trunk]: pkgsrc/wm fvwm and metisse CONFLICT mutually

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/932d35154a7f
branches:  trunk
changeset: 398718:932d35154a7f
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Mon Sep 07 16:39:28 2009 +0000

description:
fvwm and metisse CONFLICT mutually

diffstat:

 wm/fvwm/Makefile    |  4 ++--
 wm/metisse/Makefile |  4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diffs (36 lines):

diff -r efbea2b3e5c4 -r 932d35154a7f wm/fvwm/Makefile
--- a/wm/fvwm/Makefile  Mon Sep 07 16:04:21 2009 +0000
+++ b/wm/fvwm/Makefile  Mon Sep 07 16:39:28 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2009/05/20 00:58:29 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2009/09/07 16:39:28 drochner Exp $
 
 DISTNAME=      fvwm-${FVWM_VER}
 PKGREVISION=   3
@@ -14,7 +14,7 @@
 
 DEPENDS+=      xpmroot-2.*:../../x11/xpmroot
 
-CONFLICTS=     fvwm1-[0-9]* fvwm2-[0-9]*
+CONFLICTS=     fvwm1-[0-9]* fvwm2-[0-9]* metisse-[0-9]*
 EXTRACT_ONLY=  ${DISTNAME}.tar.gz
 FVWM_VER=      2.4.20
 
diff -r efbea2b3e5c4 -r 932d35154a7f wm/metisse/Makefile
--- a/wm/metisse/Makefile       Mon Sep 07 16:04:21 2009 +0000
+++ b/wm/metisse/Makefile       Mon Sep 07 16:39:28 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2009/08/26 19:58:24 sno Exp $
+# $NetBSD: Makefile,v 1.11 2009/09/07 16:39:28 drochner Exp $
 #
 
 DISTNAME=      metisse-0.4.1
@@ -12,6 +12,8 @@
 COMMENT=       Window manager with novel features
 LICENSE=       gnu-gpl-v3
 
+CONFLICTS+=    fvwm-[0-9]*
+
 PKG_DESTDIR_SUPPORT=   user-destdir
 
 GNU_CONFIGURE=         yes