summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2006-11-18 20:40:14 +0000
committerwiz <wiz@pkgsrc.org>2006-11-18 20:40:14 +0000
commitdbaf9086f3a4f8a579d9d138bd161342a1bd281b (patch)
tree4975f75e7c2a4fb752c5b60b7bd2839824a26734 /misc
parentcf82bcc704356c555a301a0dfe522d60acf9ffe1 (diff)
downloadpkgsrc-dbaf9086f3a4f8a579d9d138bd161342a1bd281b.tar.gz
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 (limited to 'misc')
-rw-r--r--misc/kchm/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/misc/kchm/Makefile b/misc/kchm/Makefile
index c2a2768a2f3..e63d22b4b58 100644
--- a/misc/kchm/Makefile
+++ b/misc/kchm/Makefile
@@ -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_LANGUAGES= c c++
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"