7 files changed, 18 insertions, 15 deletions

diff --git a/www/moodle29/Makefile b/www/moodle29/Makefile
index 17e53f497aac..1685c7c4d95c 100644
--- a/www/moodle29/Makefile
+++ b/www/moodle29/Makefile
@@ -12,7 +12,10 @@ COMMENT=	Course management system based on social constructionism
 
 LICENSE=	GPLv3
 
-CONFLICTS=	moodle32-3.2 moodle31-3.1.[0-9]* moodle30-3.0.[0-9]*
+DEPRECATED=	Upstream support EoL, please migrate to moodle32
+EXPIRATION_DATE=	2017-04-10
+
+CONFLICTS=	moodle32-3.2.[0-9]* moodle31-3.1.[0-9]* moodle30-3.0.[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 d559bbabd9e0..ce569216582c 100644
--- a/www/moodle30/Makefile
+++ b/www/moodle30/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	moodle
-PORTVERSION=	3.0.7
+PORTVERSION=	3.0.9
 CATEGORIES=	www
 MASTER_SITES=	SF/moodle/Moodle/stable30/
 PKGNAMESUFFIX=	${PKGORIGIN:T:S/moodle//}
@@ -12,7 +12,7 @@ COMMENT=	Course management system based on social constructionism
 
 LICENSE=	GPLv3
 
-CONFLICTS=	moodle29-2.9.[0-9]* moodle31-3.1.[0-9]* moodle32-3.2
+CONFLICTS=	moodle29-2.9.[0-9]* moodle31-3.1.[0-9]* moodle32-3.2.[0-9]*
 
 USES=		cpe tar:tgz
 USE_PHP=	ctype curl dom gd hash iconv intl json mbstring opcache \
diff --git a/www/moodle30/distinfo b/www/moodle30/distinfo
index 4b319a207a28..18cb8e3cbeb5 100644
--- a/www/moodle30/distinfo
+++ b/www/moodle30/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1479194501
-SHA256 (moodle-3.0.7.tgz) = 6d4f97fd6f8431a8a79eb8d49bdaf54b197c667d7b6d6185c4d7e568d69092b0
-SIZE (moodle-3.0.7.tgz) = 38213543
+TIMESTAMP = 1489368895
+SHA256 (moodle-3.0.9.tgz) = 48786ee7bba47603843c405be91e4bcb269b3864e532425620c15d216d2c311b
+SIZE (moodle-3.0.9.tgz) = 38216116
diff --git a/www/moodle31/Makefile b/www/moodle31/Makefile
index 0654cb9ead18..16bebed2eecd 100644
--- a/www/moodle31/Makefile
+++ b/www/moodle31/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	moodle
-PORTVERSION=	3.1.3
+PORTVERSION=	3.1.5
 CATEGORIES=	www
 MASTER_SITES=	SF/moodle/Moodle/stable31/
 PKGNAMESUFFIX=	${PKGORIGIN:T:S/moodle//}
@@ -12,7 +12,7 @@ COMMENT=	Course management system based on social constructionism
 
 LICENSE=	GPLv3
 
-CONFLICTS=	moodle29-2.9.[0-9]* moodle30-3.0.[0-9]* moodle32-3.2
+CONFLICTS=	moodle29-2.9.[0-9]* moodle30-3.0.[0-9]* moodle32-3.2.[0-9]*
 
 USES=		cpe tar:tgz
 USE_PHP=	ctype curl dom gd hash iconv intl json mbstring opcache \
diff --git a/www/moodle31/distinfo b/www/moodle31/distinfo
index d62c66282959..99e8ae46eafc 100644
--- a/www/moodle31/distinfo
+++ b/www/moodle31/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1479193633
-SHA256 (moodle-3.1.3.tgz) = c0a4924ef66000fc1ac203276260789a43aab6a88283a45f1ce01002370a8ab2
-SIZE (moodle-3.1.3.tgz) = 37558330
+TIMESTAMP = 1489368316
+SHA256 (moodle-3.1.5.tgz) = 48b685e52bc65b3cb78930cb1331abff2a0153f2ac6606ac2969ff6011315f7f
+SIZE (moodle-3.1.5.tgz) = 37952408
diff --git a/www/moodle32/Makefile b/www/moodle32/Makefile
index 36f61a0e468c..e2b6e5eb62a3 100644
--- a/www/moodle32/Makefile
+++ b/www/moodle32/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	moodle
-PORTVERSION=	3.2
+PORTVERSION=	3.2.2
 CATEGORIES=	www
 MASTER_SITES=	SF/moodle/Moodle/stable32/
 PKGNAMESUFFIX=	${PKGORIGIN:T:S/moodle//}
diff --git a/www/moodle32/distinfo b/www/moodle32/distinfo
index f417619749f2..4d872dc79efe 100644
--- a/www/moodle32/distinfo
+++ b/www/moodle32/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1480905982
-SHA256 (moodle-3.2.tgz) = ae6dcfdc0d300bcba518f10be7978049f0c4e400b4f2e4420f3b31c011cbeb41
-SIZE (moodle-3.2.tgz) = 38923254
+TIMESTAMP = 1489367309
+SHA256 (moodle-3.2.2.tgz) = 7d520e781756a020314d913521a612e4a1b188b074eec043dc29e897f66585cb
+SIZE (moodle-3.2.2.tgz) = 39465439