summaryrefslogtreecommitdiff
path: root/textproc
diff options
context:
space:
mode:
authorjmmv <jmmv>2007-11-05 15:56:13 +0000
committerjmmv <jmmv>2007-11-05 15:56:13 +0000
commit76966a64556173c73840a3a8391d356860b6bd93 (patch)
tree78e82686384f2f446c9c5fa0319066fab2cad9e1 /textproc
parentfcfdcbf05ca9bf8ee8fbe96210292dba28459ffe (diff)
downloadpkgsrc-76966a64556173c73840a3a8391d356860b6bd93.tar.gz
rarian conflicts with scrollkeeper, so the reverse is also true. Then,
add a conflicts line with rarian.
Diffstat (limited to 'textproc')
-rw-r--r--textproc/scrollkeeper/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile
index dafafa29b8b..c02b0764795 100644
--- a/textproc/scrollkeeper/Makefile
+++ b/textproc/scrollkeeper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2007/02/22 19:27:17 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2007/11/05 15:56:13 jmmv Exp $
#
DISTNAME= scrollkeeper-0.3.14
@@ -14,6 +14,8 @@ COMMENT= Open Document Cataloging Project
PKG_INSTALLATION_TYPES= overwrite pkgviews
PKG_DESTDIR_SUPPORT= user-destdir
+CONFLICTS= rarian-[0-9]*
+
DEPENDS+= docbook-xml>=4.4nb4:../../textproc/docbook-xml
GNU_CONFIGURE= yes