summaryrefslogtreecommitdiff
path: root/misc/openoffice2-bin/Makefile
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/openoffice2-bin/Makefile
parent1a9ae5b387f5b922c27e5100fa0b31858b7f6dfa (diff)
downloadpkgsrc-128df77a7b2b28435f66566ffecea33681f3fcfc.tar.gz
Conflict with openoffice2. Bump PKGREVISION.
Pointed out by ghen@.
Diffstat (limited to 'misc/openoffice2-bin/Makefile')
-rw-r--r--misc/openoffice2-bin/Makefile4
1 files changed, 3 insertions, 1 deletions
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]*