git: aa12e327e832 - main - www/moodle*: Update CONFLICTS

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Wen Heping <wen_at_FreeBSD.org>
Date: Sun, 23 Apr 2023 12:15:03 UTC
The branch main has been updated by wen:

URL: https://cgit.FreeBSD.org/ports/commit/?id=aa12e327e832e3fbaffa249d5703e6708f1c3abe

commit aa12e327e832e3fbaffa249d5703e6708f1c3abe
Author:     Wen Heping <wen@FreeBSD.org>
AuthorDate: 2023-04-23 12:13:06 +0000
Commit:     Wen Heping <wen@FreeBSD.org>
CommitDate: 2023-04-23 12:14:35 +0000

    www/moodle*: Update CONFLICTS
    
    Update EXPIRATION_DATE
---
 www/moodle311/Makefile | 5 +++--
 www/moodle39/Makefile  | 3 ++-
 www/moodle40/Makefile  | 5 +++--
 www/moodle41/Makefile  | 3 ++-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/www/moodle311/Makefile b/www/moodle311/Makefile
index 885e4036007c..ae886f970521 100644
--- a/www/moodle311/Makefile
+++ b/www/moodle311/Makefile
@@ -12,9 +12,10 @@ WWW=		https://www.moodle.org/
 LICENSE=	GPLv3
 
 DEPRECATED=	Requires php80 which is set to expire on 2023-11-26
-EXPIRATION_DATE=	2023-12-31
+EXPIRATION_DATE=	2023-06-30
 
-CONFLICTS=	moodle39-3.9.[0-9]* moodle40-4.0.[0-9]* moodle41-4.1.[0-9]*
+CONFLICTS=	moodle39-3.9.[0-9]* moodle40-4.0.[0-9]* moodle41-4.1.[0-9]* \
+		moodle42-4.2
 
 USES=		cpe php:flavors tar:tgz
 USE_PHP=	ctype curl dom fileinfo filter gd iconv intl mbstring \
diff --git a/www/moodle39/Makefile b/www/moodle39/Makefile
index 036d432b8fce..51f2d88e8b2c 100644
--- a/www/moodle39/Makefile
+++ b/www/moodle39/Makefile
@@ -13,7 +13,8 @@ LICENSE=	GPLv3
 DEPRECATED=	Requires php74 which has been removed from the tree
 EXPIRATION_DATE=	2023-04-30
 
-CONFLICTS=	moodle311-3.11.[0-9]* moodle40-4.0.[0-9]* moodle41-4.1.[0-9]*
+CONFLICTS=	moodle311-3.11.[0-9]* moodle40-4.0.[0-9]* moodle41-4.1.[0-9]* \
+		moodle42-4.2
 
 USES=		cpe php:flavors tar:tgz
 USE_PHP=	ctype curl dom fileinfo filter gd iconv intl mbstring \
diff --git a/www/moodle40/Makefile b/www/moodle40/Makefile
index f2ac0a2e5938..f9166db762de 100644
--- a/www/moodle40/Makefile
+++ b/www/moodle40/Makefile
@@ -12,9 +12,10 @@ WWW=		https://www.moodle.org/
 LICENSE=	GPLv3
 
 DEPRECATED=	Requires php80 which is set to expire on 2023-11-26
-EXPIRATION_DATE=	2023-12-31
+EXPIRATION_DATE=	2023-06-30
 
-CONFLICTS=	moodle39-3.9.[0-9]* moodle311-3.11.[0-9]* moodle41-4.1.[0-9]*
+CONFLICTS=	moodle39-3.9.[0-9]* moodle311-3.11.[0-9]* moodle41-4.1.[0-9]* \
+		moodle42-4.2
 
 USES=		cpe php:flavors tar:tgz
 USE_PHP=	ctype curl dom exif fileinfo filter gd \
diff --git a/www/moodle41/Makefile b/www/moodle41/Makefile
index 3df9e51d8107..568ece636b65 100644
--- a/www/moodle41/Makefile
+++ b/www/moodle41/Makefile
@@ -10,7 +10,8 @@ WWW=		https://www.moodle.org/
 
 LICENSE=	GPLv3
 
-CONFLICTS=	moodle39-3.9.[0-9]* moodle311-3.11.[0-9]* moodle40-4.0.[0-9]*
+CONFLICTS=	moodle39-3.9.[0-9]* moodle311-3.11.[0-9]* moodle40-4.0.[0-9]* \
+		moodle42-4.2
 
 USES=		cpe php:flavors tar:tgz
 USE_PHP=	ctype curl dom exif fileinfo filter gd \