summaryrefslogtreecommitdiff
path: root/misc/openoffice-bin
diff options
context:
space:
mode:
authorhira <hira@pkgsrc.org>2007-02-27 13:52:04 +0000
committerhira <hira@pkgsrc.org>2007-02-27 13:52:04 +0000
commit128df77a7b2b28435f66566ffecea33681f3fcfc (patch)
treeff292b452be2557a12b396d6ba6ec01fdabc6625 /misc/openoffice-bin
parent1a9ae5b387f5b922c27e5100fa0b31858b7f6dfa (diff)
downloadpkgsrc-128df77a7b2b28435f66566ffecea33681f3fcfc.tar.gz
Conflict with openoffice2. Bump PKGREVISION.
Pointed out by ghen@.
Diffstat (limited to 'misc/openoffice-bin')
-rw-r--r--misc/openoffice-bin/Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/misc/openoffice-bin/Makefile b/misc/openoffice-bin/Makefile
index d60b1ecd3b8..602e4039e06 100644
--- a/misc/openoffice-bin/Makefile
+++ b/misc/openoffice-bin/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2007/02/22 19:26:50 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2007/02/27 13:52:04 hira Exp $
PKGNAME= openoffice-bin-${OO_VER}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_OPENOFFICE:=stable/${OO_VER}/}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
@@ -24,6 +24,7 @@ NO_CONFIGURE= yes
CONFLICTS+= staroffice-[0-9]*
CONFLICTS+= openoffice-[0-9]*
+CONFLICTS+= openoffice2-[0-9]*
CONFLICTS+= openoffice-linux-[0-9]*
ONLY_FOR_PLATFORM= NetBSD-1.6*-i386 NetBSD-[2-9]*-i386