[pkgsrc/trunk]: pkgsrc/wm pwm and ion conflict with each other -- both instal...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2fc77acc185a
branches:  trunk
changeset: 488573:2fc77acc185a
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri Feb 04 13:58:32 2005 +0000

description:
pwm and ion conflict with each other -- both install bin/pwm and its man page.
Noted by Leonard Schmidt on tech-pkg.

diffstat:

 wm/ion/Makefile |  4 +++-
 wm/pwm/Makefile |  4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diffs (36 lines):

diff -r 92a20611d92a -r 2fc77acc185a wm/ion/Makefile
--- a/wm/ion/Makefile   Fri Feb 04 13:00:09 2005 +0000
+++ b/wm/ion/Makefile   Fri Feb 04 13:58:32 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2004/10/15 12:06:05 tv Exp $
+# $NetBSD: Makefile,v 1.19 2005/02/04 13:58:32 wiz Exp $
 #
 
 DISTNAME=      ion-2-20040729
@@ -13,6 +13,8 @@
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 
+CONFLICTS+=    pwm-[0-9]*
+
 USE_BUILDLINK3=        YES
 USE_PKGINSTALL=        YES
 USE_X11=       YES
diff -r 92a20611d92a -r 2fc77acc185a wm/pwm/Makefile
--- a/wm/pwm/Makefile   Fri Feb 04 13:00:09 2005 +0000
+++ b/wm/pwm/Makefile   Fri Feb 04 13:58:32 2005 +0000
@@ -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 @@
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 
+CONFLICTS+=    ion-[0-9]*
+
 USE_BUILDLINK3=        YES
 USE_PKGINSTALL=        YES
 USE_X11=       YES