pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/textproc/scrollkeeper rarian conflicts with scrollkeep...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/405e5a847443
branches:  trunk
changeset: 535000:405e5a847443
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Mon Nov 05 15:56:13 2007 +0000

description:
rarian conflicts with scrollkeeper, so the reverse is also true.  Then,
add a conflicts line with rarian.

diffstat:

 textproc/scrollkeeper/Makefile |  4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diffs (18 lines):

diff -r 9bd904024879 -r 405e5a847443 textproc/scrollkeeper/Makefile
--- a/textproc/scrollkeeper/Makefile    Mon Nov 05 15:49:45 2007 +0000
+++ b/textproc/scrollkeeper/Makefile    Mon Nov 05 15:56:13 2007 +0000
@@ -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 @@
 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



Home | Main Index | Thread Index | Old Index