svn commit: r338391 - in head/www: moodle24 moodle25

[Jason Helfman]

Author: jgh
Date: Wed Jan  1 19:46:14 2014
New Revision: 338391
URL: http://svnweb.freebsd.org/changeset/ports/338391

Log:
  - update conflicts
  
  Reported by:	mat@
  Approved by:	wen@ (implicit )

Modified:
  head/www/moodle24/Makefile
  head/www/moodle25/Makefile

Modified: head/www/moodle24/Makefile
==============================================================================
--- head/www/moodle24/Makefile	Wed Jan  1 19:45:41 2014	(r338390)
+++ head/www/moodle24/Makefile	Wed Jan  1 19:46:14 2014	(r338391)
@@ -13,7 +13,7 @@ COMMENT=	Course management system based 
 BUILD_DEPENDS=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/intl.so:${PORTSDIR}/devel/pecl-intl
 RUN_DEPENDS=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/intl.so:${PORTSDIR}/devel/pecl-intl
 
-CONFLICTS=	moodle-1.*.* moodle-2.5.*
+CONFLICTS=	moodle-1.*.* moodle25-2.5.*
 PKGNAMESUFFIX=	${PKGORIGIN:T:S/moodle//}
 
 USE_PHP=	session gd pcre mbstring iconv tokenizer curl xml xmlrpc ctype \

Modified: head/www/moodle25/Makefile
==============================================================================
--- head/www/moodle25/Makefile	Wed Jan  1 19:45:41 2014	(r338390)
+++ head/www/moodle25/Makefile	Wed Jan  1 19:46:14 2014	(r338391)
@@ -13,7 +13,7 @@ COMMENT=	Course management system based 
 BUILD_DEPENDS=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/intl.so:${PORTSDIR}/devel/pecl-intl
 RUN_DEPENDS=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/intl.so:${PORTSDIR}/devel/pecl-intl
 
-CONFLICTS=	moodle-1.*.* moodle-2.4.*
+CONFLICTS=	moodle-1.*.* moodle24-2.4.*
 PKGNAMESUFFIX=	${PKGORIGIN:T:S/moodle//}
 
 USE_PHP=	session gd pcre mbstring iconv tokenizer curl xml xmlrpc ctype \