summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2005-02-26 15:52:52 +0000
committerwiz <wiz@pkgsrc.org>2005-02-26 15:52:52 +0000
commit50ec47b83aa9a8401a58321cd7d8ce6ca1d6e299 (patch)
tree8fe69106840f8ad6a98d64f69578fcbe82413639 /misc
parent99bed9126079b208f4fd280f5f5f9db75c3206dc (diff)
downloadpkgsrc-50ec47b83aa9a8401a58321cd7d8ce6ca1d6e299.tar.gz
We also need to conflict with the old package name
of openoffice-bin (openoffice-linux) since people might still have it installed or binary packages lying around.
Diffstat (limited to 'misc')
-rw-r--r--misc/openoffice/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/misc/openoffice/Makefile b/misc/openoffice/Makefile
index 6bcd8eb7607..7655c33329d 100644
--- a/misc/openoffice/Makefile
+++ b/misc/openoffice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2005/02/26 15:46:15 mrauch Exp $
+# $NetBSD: Makefile,v 1.60 2005/02/26 15:52:52 wiz Exp $
DISTNAME= openoffice-1.1.4
CATEGORIES= misc
@@ -35,6 +35,7 @@ PTHREAD_AUTO_VARS= yes
CONFLICTS+= staroffice-[0-9]*
CONFLICTS+= openoffice-bin-[0-9]*
+CONFLICTS+= openoffice-linux-[0-9]*
ONLY_FOR_PLATFORM= NetBSD-1.6Z[G-Z]*-i386 NetBSD-[2-9]*-i386