summaryrefslogtreecommitdiff
path: root/misc/openoffice2
diff options
context:
space:
mode:
authorbad <bad@pkgsrc.org>2009-01-31 22:10:36 +0000
committerbad <bad@pkgsrc.org>2009-01-31 22:10:36 +0000
commitd82b7e4e9ca0a5d1ae8166097d00f23efb7a8ce9 (patch)
treeab518dd0efae7f584fd34532bd0b8fbdd8d0df77 /misc/openoffice2
parentfad663194f32424ad40686679ad529ed5434b3f0 (diff)
downloadpkgsrc-d82b7e4e9ca0a5d1ae8166097d00f23efb7a8ce9.tar.gz
Conflict with openoffice3-bin.
Diffstat (limited to 'misc/openoffice2')
-rw-r--r--misc/openoffice2/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/misc/openoffice2/Makefile b/misc/openoffice2/Makefile
index 9f62a1bffc4..a1563ebbc69 100644
--- a/misc/openoffice2/Makefile
+++ b/misc/openoffice2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2009/01/26 15:39:05 hira Exp $
+# $NetBSD: Makefile,v 1.62 2009/01/31 22:10:36 bad Exp $
#
OO_VER= 2.4.2
@@ -47,6 +47,7 @@ CONFLICTS+= openoffice-[0-9]*
CONFLICTS+= openoffice3-[0-9]*
CONFLICTS+= openoffice-bin-[0-9]*
CONFLICTS+= openoffice2-bin-[0-9]*
+CONFLICTS+= openoffice3-bin-[0-9]*
CONFLICTS+= openoffice-linux-[0-9]*
ONLY_FOR_PLATFORM= FreeBSD-*-i386 FreeBSD-*-x86_64