diff options
| author | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2011-04-18 03:18:07 +0800 |
|---|---|---|
| committer | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2011-04-18 03:18:07 +0800 |
| commit | 8eb09aec882f3c994f4769a433aa95e89e9d4d8f (patch) | |
| tree | 1fed3b768e2f9a21c4781012e15dead88cacb5c6 /devel | |
| parent | 682ab3ad9fda30a1e471dee7901d2f656c078ba4 (diff) | |
| download | marcuscom-ports-8eb09aec882f3c994f4769a433aa95e89e9d4d8f.tar.gz marcuscom-ports-8eb09aec882f3c994f4769a433aa95e89e9d4d8f.tar.zst marcuscom-ports-8eb09aec882f3c994f4769a433aa95e89e9d4d8f.zip | |
Add CONFLICTS with the each others.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@15837 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/devhelp/Makefile | 4 | ||||
| -rw-r--r-- | devel/devhelp3/Makefile | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile index ec86cedb9..16b7188d3 100644 --- a/devel/devhelp/Makefile +++ b/devel/devhelp/Makefile @@ -3,7 +3,7 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD: ports/devel/devhelp/Makefile,v 1.48 2010/12/04 07:31:03 ade Exp $ -# $MCom: ports/devel/devhelp/Makefile,v 1.38 2010/09/28 09:09:20 kwm Exp $ +# $MCom: ports/devel/devhelp/Makefile,v 1.40 2011/03/06 23:12:37 kwm Exp $ PORTNAME= devhelp PORTVERSION= 2.32.0 @@ -19,6 +19,8 @@ COMMENT= Developer help browser for GNOME 2 LIB_DEPENDS= webkitgtk-1.0.0:${PORTSDIR}/www/webkit-gtk2 \ unique-1.0.2:${PORTSDIR}/x11-toolkits/unique +CONFLICTS= devhelp-3.[0-9]* + USE_BZIP2= yes USE_XORG= x11 USE_GETTEXT= yes diff --git a/devel/devhelp3/Makefile b/devel/devhelp3/Makefile index 3c80da742..40fe3eec5 100644 --- a/devel/devhelp3/Makefile +++ b/devel/devhelp3/Makefile @@ -3,7 +3,7 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/devhelp3/Makefile,v 1.5 2011/03/23 15:38:01 kwm Exp $ +# $MCom: ports/devel/devhelp3/Makefile,v 1.6 2011/04/05 09:35:08 kwm Exp $ PORTNAME= devhelp PORTVERSION= 3.0.0 @@ -16,6 +16,8 @@ COMMENT= Developer help browser for GNOME 3 LIB_DEPENDS= webkitgtk-3.0.0:${PORTSDIR}/www/webkit-gtk3 +CONFLICTS= devhelp-2.[0-9]* + USE_BZIP2= yes USE_XORG= x11 USE_GETTEXT= yes |