[pkgsrc/trunk]: pkgsrc/misc/openoffice We also need to conflict with the old ...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/93ecbe78c6f1
branches:  trunk
changeset: 489772:93ecbe78c6f1
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sat Feb 26 15:52:52 2005 +0000

description:
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:

 misc/openoffice/Makefile |  3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diffs (17 lines):

diff -r 2b475eaaf3df -r 93ecbe78c6f1 misc/openoffice/Makefile
--- a/misc/openoffice/Makefile  Sat Feb 26 15:46:15 2005 +0000
+++ b/misc/openoffice/Makefile  Sat Feb 26 15:52:52 2005 +0000
@@ -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 @@
 
 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