summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorrh <rh>2003-01-22 22:43:40 +0000
committerrh <rh>2003-01-22 22:43:40 +0000
commitcce2141c8fcb7016036d7be80196d7c88ed82f45 (patch)
treedcb319bfea91177166d93ce695e5d7fb2773d04e /misc
parent61eb8d994c32ca5af9d6a96fdc4d6fbac527bfb2 (diff)
downloadpkgsrc-cce2141c8fcb7016036d7be80196d7c88ed82f45.tar.gz
This conflicts with openoffice-linux.
Diffstat (limited to 'misc')
-rw-r--r--misc/openoffice/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/misc/openoffice/Makefile b/misc/openoffice/Makefile
index f7e3662e14b..4978045ee1e 100644
--- a/misc/openoffice/Makefile
+++ b/misc/openoffice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2003/01/19 08:48:50 tron Exp $
+# $NetBSD: Makefile,v 1.32 2003/01/22 22:43:40 rh Exp $
DISTNAME= openoffice-0.0.0.641
PKGREVISION= 1
@@ -48,7 +48,7 @@ USE_X11= # defined
USE_GMAKE= # defined
PKG_JVMS_ACCEPTED= sun-jdk13
-CONFLICTS= staroffice-[0-9]*
+CONFLICTS= staroffice-[0-9]* openoffice-linux-[0-9]*
ONLY_FOR_PLATFORM= NetBSD-1.5.3*-i386 NetBSD-1.5Z?-i386 \
NetBSD-1.[6-9]*-i386 NetBSD-[2-9]*-i386