summaryrefslogtreecommitdiff
path: root/misc/openoffice
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
commit4a87b4257242dc2e73c9092b79d596aec8bc67b4 (patch)
treeff292b452be2557a12b396d6ba6ec01fdabc6625 /misc/openoffice
parentac2ba29e8f5ab868c25b420c8547824c31a14fec (diff)
downloadpkgsrc-4a87b4257242dc2e73c9092b79d596aec8bc67b4.tar.gz
Conflict with openoffice2. Bump PKGREVISION.
Pointed out by ghen@.
Diffstat (limited to 'misc/openoffice')
-rw-r--r--misc/openoffice/Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/misc/openoffice/Makefile b/misc/openoffice/Makefile
index cae350032f3..39c149ef19d 100644
--- a/misc/openoffice/Makefile
+++ b/misc/openoffice/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.76 2007/02/22 19:30:05 wiz Exp $
+# $NetBSD: Makefile,v 1.77 2007/02/27 13:52:04 hira Exp $
DISTNAME= openoffice-1.1.5
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_OPENOFFICE:=stable/1.1.5/}
DISTFILES= OOo_1.1.5_src.tar.gz
@@ -32,6 +32,7 @@ PTHREAD_OPTS+= require
PTHREAD_AUTO_VARS= yes
CONFLICTS+= staroffice-[0-9]*
+CONFLICTS+= openoffice2-[0-9]*
CONFLICTS+= openoffice-bin-[0-9]*
CONFLICTS+= openoffice-linux-[0-9]*