svn commit: r568700 - in branches/2021Q1/www: moodle310 moodle39

[Wen Heping]

Author: wen
Date: Wed Mar 17 23:47:53 2021
New Revision: 568700
URL: https://svnweb.freebsd.org/changeset/ports/568700

Log:
  MFH: r568699
  
  - Update moodle to 3.10.2 and 3.9.5
    (include security fix)
  - Adjust CONFLICTS

Modified:
  branches/2021Q1/www/moodle310/Makefile
  branches/2021Q1/www/moodle310/distinfo
  branches/2021Q1/www/moodle39/Makefile
  branches/2021Q1/www/moodle39/distinfo
Directory Properties:
  branches/2021Q1/   (props changed)

Modified: branches/2021Q1/www/moodle310/Makefile
==============================================================================
--- branches/2021Q1/www/moodle310/Makefile	Wed Mar 17 23:40:19 2021	(r568699)
+++ branches/2021Q1/www/moodle310/Makefile	Wed Mar 17 23:47:53 2021	(r568700)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	moodle
-PORTVERSION=	3.10.1
+PORTVERSION=	3.10.2
 CATEGORIES=	www education
 MASTER_SITES=	SF/moodle/Moodle/stable310/
 PKGNAMESUFFIX=	${PKGORIGIN:T:S/moodle//}${PHP_PKGNAMESUFFIX}
@@ -12,8 +12,7 @@ COMMENT=	Course management system based on social cons
 
 LICENSE=	GPLv3
 
-CONFLICTS=	moodle35-3.5.[0-9]* moodle37-3.7.[0-9]* moodle38-3.8.[0-9]* \
-		moodle39-3.9.[0-9]*
+CONFLICTS=	moodle39-3.9.[0-9]*
 
 USES=		cpe php:flavors tar:tgz
 USE_PHP=	ctype curl dom fileinfo filter gd hash iconv intl json mbstring \

Modified: branches/2021Q1/www/moodle310/distinfo
==============================================================================
--- branches/2021Q1/www/moodle310/distinfo	Wed Mar 17 23:40:19 2021	(r568699)
+++ branches/2021Q1/www/moodle310/distinfo	Wed Mar 17 23:47:53 2021	(r568700)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1611053836
-SHA256 (moodle-3.10.1.tgz) = 547973f2dc2ca7b992c193dab4991c88768338fd2bd04b9d786e62de08cf513f
-SIZE (moodle-3.10.1.tgz) = 57464025
+TIMESTAMP = 1615946124
+SHA256 (moodle-3.10.2.tgz) = b36d06b70a95d41015af6abe0f11ba86a2a70ea3347559ba4dba2498f0bc1ebb
+SIZE (moodle-3.10.2.tgz) = 57476423

Modified: branches/2021Q1/www/moodle39/Makefile
==============================================================================
--- branches/2021Q1/www/moodle39/Makefile	Wed Mar 17 23:40:19 2021	(r568699)
+++ branches/2021Q1/www/moodle39/Makefile	Wed Mar 17 23:47:53 2021	(r568700)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	moodle
-PORTVERSION=	3.9.4
+PORTVERSION=	3.9.5
 CATEGORIES=	www education
 MASTER_SITES=	SF/moodle/Moodle/stable39/
 PKGNAMESUFFIX=	${PKGORIGIN:T:S/moodle//}${PHP_PKGNAMESUFFIX}
@@ -12,8 +12,7 @@ COMMENT=	Course management system based on social cons
 
 LICENSE=	GPLv3
 
-CONFLICTS=	moodle35-3.5.[0-9]* moodle37-3.7.[0-9]* moodle38-3.8.[0-9]* \
-		moodle310-3.10
+CONFLICTS=	moodle310-3.10.[0-9]*
 
 USES=		cpe php:flavors tar:tgz
 USE_PHP=	ctype curl dom fileinfo filter gd hash iconv intl json mbstring \

Modified: branches/2021Q1/www/moodle39/distinfo
==============================================================================
--- branches/2021Q1/www/moodle39/distinfo	Wed Mar 17 23:40:19 2021	(r568699)
+++ branches/2021Q1/www/moodle39/distinfo	Wed Mar 17 23:47:53 2021	(r568700)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1611049944
-SHA256 (moodle-3.9.4.tgz) = 613e5acd2274b90bb824fc25a61bb272d87ffa30266ac2ced35c7f658dbba3af
-SIZE (moodle-3.9.4.tgz) = 57068491
+TIMESTAMP = 1615947290
+SHA256 (moodle-3.9.5.tgz) = 0886f979a31070662c06c0c9e89c665e4599761f5c1ab6f9c7da4cfad77f6ace
+SIZE (moodle-3.9.5.tgz) = 57104678