diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2010-04-01 00:41:36 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2010-04-01 00:41:36 +0000 |
| commit | e09a56a8b0fec8e9d1d125e04154c579dc9966f6 (patch) | |
| tree | 87f256f17c8bf5935761d4678d2130a7a2842d5a | |
| parent | Make 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
| -rw-r--r-- | editors/openoffice-3-devel/Makefile | 2 | ||||
| -rw-r--r-- | editors/openoffice-3/Makefile | 2 | ||||
| -rw-r--r-- | editors/openoffice.org-2/Makefile | 2 | ||||
| -rw-r--r-- | editors/openoffice.org-3-RC/Makefile | 2 | ||||
| -rw-r--r-- | editors/openoffice.org-3-devel/Makefile | 2 | ||||
| -rw-r--r-- | editors/openoffice.org-3/Makefile | 2 | ||||
| -rw-r--r-- | editors/openoffice.org-vcltesttool/Makefile | 2 |
7 files changed, 14 insertions, 0 deletions
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile index 9766e9988f0a..32d7babf3ff8 100644 --- a/editors/openoffice-3-devel/Makefile +++ b/editors/openoffice-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) diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile index 6fc548560542..d8b06b28948b 100644 --- a/editors/openoffice-3/Makefile +++ b/editors/openoffice-3/Makefile @@ -22,6 +22,8 @@ EXTRACT_ONLY= ${OOOSRC} MAINTAINER= openoffice@FreeBSD.org COMMENT= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(release branch) +CONFLICTS= cppunit* + OOOVERSION= 3.2.0 NO_LATEST_LINK= yes diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile index 91de0ba00957..4170cdc6ffa5 100644 --- a/editors/openoffice.org-2/Makefile +++ b/editors/openoffice.org-2/Makefile @@ -25,6 +25,8 @@ EXTRACT_ONLY= ${OOOSRC} MAINTAINER= openoffice@FreeBSD.org COMMENT?= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser +CONFLICTS= cppunit* + OOOVERSION= 2.4.3 NO_LATEST_LINK= yes USE_GNOME= desktopfileutils gtk20 diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile index 1fea7ede16d0..e08d45f43fff 100644 --- a/editors/openoffice.org-3-RC/Makefile +++ b/editors/openoffice.org-3-RC/Makefile @@ -22,6 +22,8 @@ EXTRACT_ONLY= ${OOOSRC} MAINTAINER= openoffice@FreeBSD.org COMMENT= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(release branch) +CONFLICTS= cppunit* + NO_LATEST_LINK= yes .if !defined(WITHOUT_MOZILLA) 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) diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile index 6fc548560542..d8b06b28948b 100644 --- a/editors/openoffice.org-3/Makefile +++ b/editors/openoffice.org-3/Makefile @@ -22,6 +22,8 @@ EXTRACT_ONLY= ${OOOSRC} MAINTAINER= openoffice@FreeBSD.org COMMENT= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(release branch) +CONFLICTS= cppunit* + OOOVERSION= 3.2.0 NO_LATEST_LINK= yes diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile index 01d71eb4a2bb..fa58db267105 100644 --- a/editors/openoffice.org-vcltesttool/Makefile +++ b/editors/openoffice.org-vcltesttool/Makefile @@ -19,6 +19,8 @@ EXTRACT_ONLY= ${OOOSRC} MAINTAINER= openoffice@FreeBSD.org COMMENT= Automated testtool for the openoffice.org +CONFLICTS= cppunit* + USE_GNOME= desktopfileutils gtk20 gnomevfs2 USE_XORG= x11 ice xaw xau xext xrender xrandr \ xi xt xcursor xdamage xcomposite xfixes |