summaryrefslogtreecommitdiff
path: root/editors/openoffice.org-3-devel
diff options
context:
space:
mode:
authorMaho Nakata <maho@FreeBSD.org>2010-04-01 00:41:36 +0000
committerMaho Nakata <maho@FreeBSD.org>2010-04-01 00:41:36 +0000
commite09a56a8b0fec8e9d1d125e04154c579dc9966f6 (patch)
tree87f256f17c8bf5935761d4678d2130a7a2842d5a /editors/openoffice.org-3-devel
parentMake the python and libfixbuf dependencies mandatory -- they're pretty (diff)
Add CONFLICTS against devel/cppunit.
Submitted by: jhell <jhell@dataix.net> and many others Feature safe: yes
Notes
Notes: svn path=/head/; revision=251911
Diffstat (limited to 'editors/openoffice.org-3-devel')
-rw-r--r--editors/openoffice.org-3-devel/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index 9766e9988f0a..32d7babf3ff8 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -22,6 +22,8 @@ DISTFILES+= ${OOOSRC} unowinreg.dll:unowinreg
MAINTAINER= openoffice@FreeBSD.org
COMMENT?= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
+CONFLICTS= cppunit*
+
EXTRATC_ONLY?= ${OOOSRC}
.if defined(CWS)