summaryrefslogtreecommitdiff
path: root/misc/openoffice3
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
commit3ff28477b626d2ee7806084c72423028cec1e24f (patch)
treeab518dd0efae7f584fd34532bd0b8fbdd8d0df77 /misc/openoffice3
parente9e40337758a2fb0d3ea600fc4d38df43867e58e (diff)
downloadpkgsrc-3ff28477b626d2ee7806084c72423028cec1e24f.tar.gz
Conflict with openoffice3-bin.
Diffstat (limited to 'misc/openoffice3')
-rw-r--r--misc/openoffice3/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/misc/openoffice3/Makefile b/misc/openoffice3/Makefile
index 475e8de253e..2f0c6fd66be 100644
--- a/misc/openoffice3/Makefile
+++ b/misc/openoffice3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2009/01/31 16:54:30 hira Exp $
+# $NetBSD: Makefile,v 1.23 2009/01/31 22:10:37 bad Exp $
#
OO_VER= 3.0.1
@@ -42,6 +42,7 @@ CONFLICTS+= openoffice-[0-9]*
CONFLICTS+= openoffice2-[0-9]*
CONFLICTS+= openoffice-bin-[0-9]*
CONFLICTS+= openoffice2-bin-[0-9]*
+CONFLICTS+= openoffice3-bin-[0-9]*
CONFLICTS+= openoffice-linux-[0-9]*
USE_DIRS+= xdg-1.1