summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2002-10-06 03:42:13 +0000
committerjlam <jlam@pkgsrc.org>2002-10-06 03:42:13 +0000
commit8e27c618562ee91699199808356b6f4b77191941 (patch)
tree329df798d0642ee05864754f15f63772240af7c0 /misc
parentb95098f7ee2af12e7141b46244ebdcda3e36d37d (diff)
downloadpkgsrc-8e27c618562ee91699199808356b6f4b77191941.tar.gz
There is no conflict with kdelibs3...all of the fixes were in koffice3.
Diffstat (limited to 'misc')
-rw-r--r--misc/koffice3/Makefile4
1 files changed, 1 insertions, 3 deletions
diff --git a/misc/koffice3/Makefile b/misc/koffice3/Makefile
index 7cc55b0cc80..64feb546575 100644
--- a/misc/koffice3/Makefile
+++ b/misc/koffice3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2002/10/06 03:38:58 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2002/10/06 03:42:13 jlam Exp $
.include "../koffice/Makefile.common"
@@ -12,8 +12,6 @@ DISTFILES= ${DISTNAME}-kde3.tar.bz2
.include "../../x11/kde3/Makefile.kde3"
-CONFLICTS+= kdelibs<=3.0.3nb1
-
MAINTAINER= jschauma@netbsd.org
USE_BUILDLINK2= # defined