summaryrefslogtreecommitdiff
path: root/wm
diff options
context:
space:
mode:
authordrochner <drochner@pkgsrc.org>2009-09-07 16:39:28 +0000
committerdrochner <drochner@pkgsrc.org>2009-09-07 16:39:28 +0000
commite26eff9ffcfc5481322960517b2a8df662ce2ee0 (patch)
tree8ad4370f5e7a20b484091dee34c23ead2066fa62 /wm
parentf748bc568fc30c05fbcf702b2918d5c724e6926d (diff)
downloadpkgsrc-e26eff9ffcfc5481322960517b2a8df662ce2ee0.tar.gz
fvwm and metisse CONFLICT mutually
Diffstat (limited to 'wm')
-rw-r--r--wm/fvwm/Makefile4
-rw-r--r--wm/metisse/Makefile4
2 files changed, 5 insertions, 3 deletions
diff --git a/wm/fvwm/Makefile b/wm/fvwm/Makefile
index 5fe1925ab3d..a9abbb33b45 100644
--- a/wm/fvwm/Makefile
+++ b/wm/fvwm/Makefile
@@ -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 @@ LICENSE= gnu-gpl-v2
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 --git a/wm/metisse/Makefile b/wm/metisse/Makefile
index 22dee7b0efa..1a1a4dde526 100644
--- a/wm/metisse/Makefile
+++ b/wm/metisse/Makefile
@@ -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 @@ HOMEPAGE= http://insitu.lri.fr/metisse/
COMMENT= Window manager with novel features
LICENSE= gnu-gpl-v3
+CONFLICTS+= fvwm-[0-9]*
+
PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= yes