From 128df77a7b2b28435f66566ffecea33681f3fcfc Mon Sep 17 00:00:00 2001
From: hira <hira@pkgsrc.org>
Date: Tue, 27 Feb 2007 13:52:04 +0000
Subject: Conflict with openoffice2.  Bump PKGREVISION. Pointed out by ghen@.

---
 misc/openoffice2-bin/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'misc/openoffice2-bin')

diff --git a/misc/openoffice2-bin/Makefile b/misc/openoffice2-bin/Makefile
index 7be6f62a708..7dc0ca56822 100644
--- a/misc/openoffice2-bin/Makefile
+++ b/misc/openoffice2-bin/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2007/02/22 19:26:50 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2007/02/27 13:52:05 hira Exp $
 
 PKGNAME=		openoffice-bin-${OO_RELEASE}
+PKGREVISION=		1
 CATEGORIES=		misc
 MASTER_SITES=		${MASTER_SITE_OPENOFFICE:=stable/${OO_RELEASE}/}
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX}
@@ -25,6 +26,7 @@ NO_BUILD=		yes
 
 CONFLICTS+=		staroffice-[0-9]*
 CONFLICTS+=		openoffice-[0-9]*
+CONFLICTS+=		openoffice2-[0-9]*
 CONFLICTS+=		openoffice2-bin-[0-9]*
 CONFLICTS+=		openoffice-linux-[0-9]*
 
-- 
cgit v1.2.3