summaryrefslogtreecommitdiffstats
path: root/devel
diff options
context:
space:
mode:
Diffstat (limited to 'devel')
-rw-r--r--devel/devhelp/Makefile4
-rw-r--r--devel/devhelp3/Makefile4
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