[pkgsrc/trunk]: pkgsrc Make chmlib and kchm conflict, both install:

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/09ebd48af1ee
branches:  trunk
changeset: 521703:09ebd48af1ee
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sat Nov 18 20:40:14 2006 +0000

description:
Make chmlib and kchm conflict, both install:
include/chm_lib.h
include/lzx.h

XXX: Perhaps kchm should be made to depend on chmlib instead?

diffstat:

 devel/chmlib/Makefile |  4 +++-
 misc/kchm/Makefile    |  4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diffs (36 lines):

diff -r 7363e8ade169 -r 09ebd48af1ee devel/chmlib/Makefile
--- a/devel/chmlib/Makefile     Sat Nov 18 19:08:23 2006 +0000
+++ b/devel/chmlib/Makefile     Sat Nov 18 20:40:14 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/07/20 19:57:06 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2006/11/18 20:40:14 wiz Exp $
 #
 
 DISTNAME=      chmlib-0.38
@@ -10,6 +10,8 @@
 HOMEPAGE=      http://morte.jedrea.com/~jedwin/projects/chmlib/
 COMMENT=       Library for dealing with Microsoft ITSS/CHM format files
 
+CONFLICTS=     kchm-[0-9]*
+
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 
 GNU_CONFIGURE= yes
diff -r 7363e8ade169 -r 09ebd48af1ee misc/kchm/Makefile
--- a/misc/kchm/Makefile        Sat Nov 18 19:08:23 2006 +0000
+++ b/misc/kchm/Makefile        Sat Nov 18 20:40:14 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/05/24 18:54:18 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2006/11/18 20:40:14 wiz Exp $
 #
 
 DISTNAME=      kchm-0.6.5
@@ -16,6 +16,8 @@
 USE_LIBTOOL=   YES
 USE_TOOLS+=    gmake
 
+CONFLICTS=     chmlib-[0-9]*
+
 .include "../../meta-pkgs/kde3/kde3.mk"
 .include "../../x11/kdelibs3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"