From a7b833f71d5b1142c2d48ec937d642f1d67d4dcb Mon Sep 17 00:00:00 2001 From: Wen Heping Date: Sun, 8 Jun 2014 05:09:44 +0000 Subject: - Adjust CONFLICTS to welcome moodle-2.7 --- www/moodle25/Makefile | 2 +- www/moodle26/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'www') diff --git a/www/moodle25/Makefile b/www/moodle25/Makefile index 45c6c9a2aa12..16674f445a71 100644 --- a/www/moodle25/Makefile +++ b/www/moodle25/Makefile @@ -15,7 +15,7 @@ LICENSE= GPLv3 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.*.* moodle24-2.4.* moodle26-2.6.[0-9]* +CONFLICTS= moodle-1.*.* moodle24-2.4.* moodle26-2.6.[0-9]* moodle27-2.7 PKGNAMESUFFIX= ${PKGORIGIN:T:S/moodle//} USE_PHP= session gd pcre mbstring iconv tokenizer curl xml xmlrpc ctype \ diff --git a/www/moodle26/Makefile b/www/moodle26/Makefile index 17172632debb..966e6a24ab92 100644 --- a/www/moodle26/Makefile +++ b/www/moodle26/Makefile @@ -16,7 +16,7 @@ LICENSE= GPLv3 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.*.* moodle24-2.4.* moodle25-2.5.[0-9]* +CONFLICTS= moodle-1.*.* moodle24-2.4.* moodle25-2.5.[0-9]* moodle27-2.7 USE_PHP= session gd pcre mbstring iconv tokenizer curl xml xmlrpc ctype \ soap openssl simplexml spl dom json zip zlib hash -- cgit v1.2.3