From ba6ad37ffea77176a91d038ac299c25730201a0a Mon Sep 17 00:00:00 2001
From: jasper <jasper@openbsd.org>
Date: Tue, 16 Dec 2008 10:41:56 +0000
Subject: [PATCH] - there's always a bigger fish, so make scrollkeeper conflict
 with that.

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

diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile
index 09356516783..2a1ea8b7389 100644
--- a/textproc/scrollkeeper/Makefile
+++ b/textproc/scrollkeeper/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.25 2008/06/03 13:56:56 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.26 2008/12/16 10:41:56 jasper Exp $
 
 COMMENT=		Scrollkeeper Open Documentation Cataloging System
 
 DISTNAME=		scrollkeeper-0.3.14
-PKGNAME=		${DISTNAME}p5
+PKGNAME=		${DISTNAME}p6
 SHARED_LIBS=		scrollkeeper	1.0
 CATEGORIES=		textproc
 
diff --git a/textproc/scrollkeeper/pkg/PLIST b/textproc/scrollkeeper/pkg/PLIST
index 31330151279..f086b06d048 100644
--- a/textproc/scrollkeeper/pkg/PLIST
+++ b/textproc/scrollkeeper/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.15 2007/12/17 20:33:43 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.16 2008/12/16 10:41:56 jasper Exp $
+@conflict rarian-*
 %%SHARED%%
 bin/scrollkeeper-config
 bin/scrollkeeper-extract