From 8ae20db5cf9f566ef048cf2659eb74c81d9e5f21 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Tue, 8 Oct 2002 14:39:30 +0000
Subject: Note conflicts with older koffice3 package.

---
 misc/koffice11/Makefile | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'misc')

diff --git a/misc/koffice11/Makefile b/misc/koffice11/Makefile
index 3f3021eaa0e..846c866267f 100644
--- a/misc/koffice11/Makefile
+++ b/misc/koffice11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/10/08 14:38:48 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2002/10/08 14:39:30 jlam Exp $
 
 DISTNAME=	koffice-1.1.1
 PKGREVISION=	1
@@ -7,12 +7,14 @@ MASTER_SITES=	ftp://ftp.kde.org/pub/kde/stable/koffice-1.1.1/src/ \
 		ftp://ftp.us.kde.org/pub/kde/stable/koffice-1.1.1/src/ \
 		ftp://ftp.de.kde.org/pub/kde/stable/koffice-1.1.1/src/
 
+BUILD_DEPENDS+=	qt2-designer-kde>=2.3.1nb2:../../x11/qt2-designer-kde
+
+CONFLICTS=	koffice3-[0-9]*
+
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.koffice.org/
 COMMENT=	KDE Office Suite with text processor, spreadsheet, etc.
 
-BUILD_DEPENDS+=	qt2-designer-kde>=2.3.1nb2:../../x11/qt2-designer-kde
-
 .include "../../mk/bsd.prefs.mk"
 .include "../../x11/kde2/Makefile.kde2"
 
-- 
cgit v1.2.3