[pkgsrc/trunk]: pkgsrc/misc Add conflict with openoffice3. Bump PKGREVISION.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/987e61f6e235
branches:  trunk
changeset: 548415:987e61f6e235
user:      hira <hira%pkgsrc.org@localhost>
date:      Tue Oct 14 19:20:43 2008 +0000

description:
Add conflict with openoffice3.  Bump PKGREVISION.
Pointed out by wiz@.

diffstat:

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

diffs (43 lines):

diff -r 725f9f00f05c -r 987e61f6e235 misc/openoffice2-bin/Makefile
--- a/misc/openoffice2-bin/Makefile     Tue Oct 14 18:24:11 2008 +0000
+++ b/misc/openoffice2-bin/Makefile     Tue Oct 14 19:20:43 2008 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2008/06/15 12:22:52 tron Exp $
+# $NetBSD: Makefile,v 1.37 2008/10/14 19:20:43 hira Exp $
 
 DISTNAME=              openoffice2-bin # overridden below
 PKGNAME=               openoffice2-bin-${OO_RELEASE}
+PKGREVISION=           1
 CATEGORIES=            misc
 MASTER_SITES=          ${MASTER_SITE_OPENOFFICE:=stable/${OO_RELEASE}/}
 
@@ -13,6 +14,7 @@
 CONFLICTS+=            openoffice-[0-9]*
 CONFLICTS+=            openoffice-bin-[0-9]*
 CONFLICTS+=            openoffice2-[0-9]*
+CONFLICTS+=            openoffice3-[0-9]*
 CONFLICTS+=            openoffice-linux-[0-9]*
 
 OO_VER=                        2.4
diff -r 725f9f00f05c -r 987e61f6e235 misc/openoffice2/Makefile
--- a/misc/openoffice2/Makefile Tue Oct 14 18:24:11 2008 +0000
+++ b/misc/openoffice2/Makefile Tue Oct 14 19:20:43 2008 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.51 2008/10/02 17:57:45 joerg Exp $
+# $NetBSD: Makefile,v 1.52 2008/10/14 19:20:43 hira Exp $
 #
 
 OO_VER=                        2.4.1
-PKGREVISION=           3
+PKGREVISION=           4
 DISTNAME=              openoffice-${OO_VER}
 PKGNAME=               openoffice2-${OO_VER}
 CATEGORIES=            misc
@@ -44,6 +44,7 @@
 
 CONFLICTS+=            staroffice-[0-9]*
 CONFLICTS+=            openoffice-[0-9]*
+CONFLICTS+=            openoffice3-[0-9]*
 CONFLICTS+=            openoffice-bin-[0-9]*
 CONFLICTS+=            openoffice2-bin-[0-9]*
 CONFLICTS+=            openoffice-linux-[0-9]*