summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorMartin Matuska <mm@FreeBSD.org>2012-09-22 12:31:09 +0000
committerMartin Matuska <mm@FreeBSD.org>2012-09-22 12:31:09 +0000
commitf69bbaebf90d27b9b589e4ec65f707327dead10a (patch)
tree43ae67fb852344bbd56d243aee1b73e7dffa7377 /www
parent- update to 2.8.3 (diff)
Fix CONFLICTS with horde4
Reported by: Andrea Venturoli
Notes
Notes: svn path=/head/; revision=304671
Diffstat (limited to 'www')
-rw-r--r--www/horde-base/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/www/horde-base/Makefile b/www/horde-base/Makefile
index 3f70b1b51074..dc56bd006a7e 100644
--- a/www/horde-base/Makefile
+++ b/www/horde-base/Makefile
@@ -78,7 +78,7 @@ RUN_DEPENDS+= ${PEARDIR}/Date.php:${PORTSDIR}/devel/pear-Date \
${PEARDIR}/Net/SMTP.php:${PORTSDIR}/net/pear-Net_SMTP \
${PEARDIR}/MDB2/Schema/Validate.php:${PORTSDIR}/databases/pear-MDB2_Schema
-CONFLICTS= horde-2.*
+CONFLICTS= horde-4*
USE_GETTEXT= yes
USE_PHP= ctype gettext session