From 4093a7b15f42ba1a231e5ed499c6071513055a56 Mon Sep 17 00:00:00 2001 From: Wen Heping Date: Tue, 24 May 2016 08:41:11 +0000 Subject: [PATCH] - Adjust CONFLICTS to welcome moodle-3.1 --- www/moodle28/Makefile | 2 +- www/moodle29/Makefile | 2 +- www/moodle30/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/www/moodle28/Makefile b/www/moodle28/Makefile index aea939e4a8ae..acfbb40c4fa6 100644 --- a/www/moodle28/Makefile +++ b/www/moodle28/Makefile @@ -12,7 +12,7 @@ COMMENT= Course management system based on social constructionism LICENSE= GPLv3 -CONFLICTS= moodle30-3.0.[0-9]* moodle29-2.9.[0-9]* +CONFLICTS= moodle30-3.0.[0-9]* moodle29-2.9.[0-9]* moodle31-3.1 USES= cpe tar:tgz USE_PHP= session gd pcre mbstring iconv tokenizer curl xml xmlrpc ctype \ diff --git a/www/moodle29/Makefile b/www/moodle29/Makefile index 2efedfaf92b9..54220fe3dff2 100644 --- a/www/moodle29/Makefile +++ b/www/moodle29/Makefile @@ -12,7 +12,7 @@ COMMENT= Course management system based on social constructionism LICENSE= GPLv3 -CONFLICTS= moodle30-3.0.[0-9]* moodle28-2.8.[0-9]* +CONFLICTS= moodle31-3.1 moodle30-3.0.[0-9]* moodle28-2.8.[0-9]* USES= cpe tar:tgz USE_PHP= session gd pcre mbstring iconv tokenizer curl xml xmlrpc ctype \ diff --git a/www/moodle30/Makefile b/www/moodle30/Makefile index 8198ccd51c4b..0e6727ae6aea 100644 --- a/www/moodle30/Makefile +++ b/www/moodle30/Makefile @@ -12,7 +12,7 @@ COMMENT= Course management system based on social constructionism LICENSE= GPLv3 -CONFLICTS= moodle28-2.8.[0-9]* moodle29-2.9.[0-9]* +CONFLICTS= moodle28-2.8.[0-9]* moodle29-2.9.[0-9]* moodle31-3.1 USES= cpe tar:tgz USE_PHP= ctype curl dom gd hash iconv intl json mbstring opcache \