summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--www/epiphany/Makefile4
-rw-r--r--www/epiphany3/Makefile4
2 files changed, 6 insertions, 2 deletions
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index f2620db92..474673fa6 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD: ports/www/epiphany/Makefile,v 1.148 2010/11/20 15:36:57 kwm Exp $
-# $MCom: ports/www/epiphany/Makefile,v 1.243 2011/03/07 07:56:29 kwm Exp $
+# $MCom: ports/www/epiphany/Makefile,v 1.244 2011/04/10 19:41:37 mezz Exp $
#
PORTNAME= epiphany
@@ -27,6 +27,8 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-co
${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \
${LOCALBASE}/share/icons/HighContrastLargePrint/index.theme:${PORTSDIR}/x11-themes/gnome-themes
+CONFLICTS= epiphany-3.[0-9]*
+
USE_LDCONFIG= yes
INSTALLS_ICONS= yes
USE_GETTEXT= yes
diff --git a/www/epiphany3/Makefile b/www/epiphany3/Makefile
index 3e752ba47..ceb3bdc5e 100644
--- a/www/epiphany3/Makefile
+++ b/www/epiphany3/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/epiphany3/Makefile,v 1.11 2011/04/05 21:44:40 kwm Exp $
+# $MCom: ports/www/epiphany3/Makefile,v 1.12 2011/04/10 19:41:38 mezz Exp $
#
PORTNAME= epiphany
@@ -30,6 +30,8 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-co
gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas \
${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
+CONFLICTS= epiphany-2.[0-9]*
+
USE_LDCONFIG= yes
INSTALLS_ICONS= yes
USE_GETTEXT= yes