summaryrefslogtreecommitdiff
path: root/misc/openoffice2
diff options
context:
space:
mode:
authorhira <hira@pkgsrc.org>2008-10-14 19:20:43 +0000
committerhira <hira@pkgsrc.org>2008-10-14 19:20:43 +0000
commita0187f3e5bcb3ff451c8ccc948b1260846ae58c0 (patch)
treedc8e3c8ab6936f428074899f3bb3aa9f6dd1ac61 /misc/openoffice2
parent53eba2b00ab18815bfd04515f3e8026d851e6471 (diff)
downloadpkgsrc-a0187f3e5bcb3ff451c8ccc948b1260846ae58c0.tar.gz
Add conflict with openoffice3. Bump PKGREVISION.
Pointed out by wiz@.
Diffstat (limited to 'misc/openoffice2')
-rw-r--r--misc/openoffice2/Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/misc/openoffice2/Makefile b/misc/openoffice2/Makefile
index c05b1f5e707..e1f50e39c95 100644
--- a/misc/openoffice2/Makefile
+++ b/misc/openoffice2/Makefile
@@ -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 @@ PTHREAD_AUTO_VARS= yes
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]*