From 9fa1fe643ee3bdb9645e86a1042a45ce920aabe5 Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Fri, 4 Feb 2005 13:58:32 +0000
Subject: pwm and ion conflict with each other -- both install bin/pwm and its
 man page. Noted by Leonard Schmidt on tech-pkg.

---
 wm/pwm/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'wm/pwm')

diff --git a/wm/pwm/Makefile b/wm/pwm/Makefile
index 6ff4d4d3e26..77c666a0740 100644
--- a/wm/pwm/Makefile
+++ b/wm/pwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/01/24 15:18:32 grant Exp $
+# $NetBSD: Makefile,v 1.14 2005/02/04 13:58:32 wiz Exp $
 #
 
 DISTNAME=	pwm-20030617
@@ -12,6 +12,8 @@ COMMENT=	Window manager that frames multiple client windows in a single frame
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
+CONFLICTS+=	ion-[0-9]*
+
 USE_BUILDLINK3=	YES
 USE_PKGINSTALL=	YES
 USE_X11=	YES
-- 
cgit v1.2.3