[pkgsrc/trunk]: pkgsrc/misc Conflict with openoffice3-bin.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d0822f8dbb27
branches:  trunk
changeset: 553845:d0822f8dbb27
user:      bad <bad%pkgsrc.org@localhost>
date:      Sat Jan 31 22:10:36 2009 +0000

description:
Conflict with openoffice3-bin.

diffstat:

 misc/openoffice2-bin/Makefile |  3 ++-
 misc/openoffice2/Makefile     |  3 ++-
 misc/openoffice3/Makefile     |  3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diffs (51 lines):

diff -r 0eff43de945f -r d0822f8dbb27 misc/openoffice2-bin/Makefile
--- a/misc/openoffice2-bin/Makefile     Sat Jan 31 22:05:53 2009 +0000
+++ b/misc/openoffice2-bin/Makefile     Sat Jan 31 22:10:36 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2009/01/31 21:56:32 bad Exp $
+# $NetBSD: Makefile,v 1.39 2009/01/31 22:10:36 bad Exp $
 
 DISTNAME=              openoffice2-bin # overridden below
 PKGNAME=               openoffice2-bin-${OO_RELEASE}
@@ -12,6 +12,7 @@
 CONFLICTS+=            staroffice-[0-9]*
 CONFLICTS+=            openoffice-[0-9]*
 CONFLICTS+=            openoffice-bin-[0-9]*
+CONFLICTS+=            openoffice3-bin-[0-9]*
 CONFLICTS+=            openoffice2-[0-9]*
 CONFLICTS+=            openoffice3-[0-9]*
 CONFLICTS+=            openoffice-linux-[0-9]*
diff -r 0eff43de945f -r d0822f8dbb27 misc/openoffice2/Makefile
--- a/misc/openoffice2/Makefile Sat Jan 31 22:05:53 2009 +0000
+++ b/misc/openoffice2/Makefile Sat Jan 31 22:10:36 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2009/01/26 15:39:05 hira Exp $
+# $NetBSD: Makefile,v 1.62 2009/01/31 22:10:36 bad Exp $
 #
 
 OO_VER=                        2.4.2
@@ -47,6 +47,7 @@
 CONFLICTS+=            openoffice3-[0-9]*
 CONFLICTS+=            openoffice-bin-[0-9]*
 CONFLICTS+=            openoffice2-bin-[0-9]*
+CONFLICTS+=            openoffice3-bin-[0-9]*
 CONFLICTS+=            openoffice-linux-[0-9]*
 
 ONLY_FOR_PLATFORM=     FreeBSD-*-i386 FreeBSD-*-x86_64
diff -r 0eff43de945f -r d0822f8dbb27 misc/openoffice3/Makefile
--- a/misc/openoffice3/Makefile Sat Jan 31 22:05:53 2009 +0000
+++ b/misc/openoffice3/Makefile Sat Jan 31 22:10:36 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2009/01/31 16:54:30 hira Exp $
+# $NetBSD: Makefile,v 1.23 2009/01/31 22:10:37 bad Exp $
 #
 
 OO_VER=                        3.0.1
@@ -42,6 +42,7 @@
 CONFLICTS+=            openoffice2-[0-9]*
 CONFLICTS+=            openoffice-bin-[0-9]*
 CONFLICTS+=            openoffice2-bin-[0-9]*
+CONFLICTS+=            openoffice3-bin-[0-9]*
 CONFLICTS+=            openoffice-linux-[0-9]*
 
 USE_DIRS+=             xdg-1.1