- Update to 2.0

3 files changed, 26 insertions, 40 deletions

diff --git a/www/moodle2/Makefile b/www/moodle2/Makefile
index d7c07b8e65a5..f1be8ed91241 100644
--- a/www/moodle2/Makefile
+++ b/www/moodle2/Makefile
@@ -6,46 +6,37 @@
 #
 
 PORTNAME=	moodle
-PORTVERSION=	1.9.10
+PORTVERSION=	2.0
 CATEGORIES=	www
-MASTER_SITES=	http://download.moodle.org/stable19/ \
-		http://download2.moodle.org/stable19/ \
-		http://download3.moodle.org/stable19/ \
-		http://download4.moodle.org/stable19/
+MASTER_SITES=	http://download.moodle.org/stable20/ \
+		http://download2.moodle.org/stable20/ \
+		http://download3.moodle.org/stable20/ \
+		http://download4.moodle.org/stable20/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	jmrueda@diatel.upm.es
+MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Course management system based on social constructionism
 
-USE_PHP=	session gd pcre mbstring iconv tokenizer curl xml xmlrpc ctype
+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.*.*
+LATEST_LINK=	moodle20
+
+USE_PHP=	session gd pcre mbstring iconv tokenizer curl xml xmlrpc ctype \
+		soap openssl simplexml spl dom json zip zlib
 WRKSRC=		${WRKDIR}/moodle
 
-OPTIONS=	MYSQL   "Add support for a MySQL database server" Off \
+OPTIONS=	MYSQL   "Add support for a MySQL database server" On \
 		PGSQL   "Add support for a PostgreSQL database server" Off \
 		MSSQL   "Add support for a MS SQL Server" Off \
-		ZLIB    "Add zip/unzip functionality" On \
-		NETWORK "Add Moodle Network functionality" Off \
 		LDAP    "Add LDAP authentication functionality" Off \
 		MIMETEX "Add mimeTeX filter functionality" On
 
 .include <bsd.port.pre.mk>
 
-.if !defined(WITH_MYSQL) && !defined(WITH_PGSQL) && !defined(WITH_MSSQL)
-pre-fetch:
-	@${ECHO_MSG} "
-	@${ECHO_MSG} "You didn't activate support for any database server!"
-	@${ECHO_MSG} "
-	@${ECHO_MSG} "If you want to reconsider, press Ctrl-C now to cancel"
-	@${ECHO_MSG} "the installation and run 'make config'"
-	@${ECHO_MSG} "
-	@${ECHO_MSG} "You can also add the required PHP module later, if that's"
-	@${ECHO_MSG} "what you prefer."
-	@${ECHO_MSG} "
-	@sleep 5
-.endif
-
-.if defined(WITH_MYSQL)
-USE_PHP+=	mysql
+.if !defined(WITHOUT_MYSQL)
+USE_PHP+=	mysqli
 .endif
 
 .if defined(WITH_PGSQL)
@@ -56,14 +47,6 @@ USE_PHP+=	pgsql
 USE_PHP+=	mssql
 .endif
 
-.if !defined(WITHOUT_ZLIB)
-USE_PHP+=	zlib
-.endif
-
-.if defined(WITH_NETWORK)
-USE_PHP+=	openssl
-.endif
-
 .if defined(WITH_LDAP)
 USE_PHP+=	ldap
 .endif
@@ -79,7 +62,7 @@ SUB_LIST=	MOODLEDIR=${MOODLEDIR} \
 		MOODLEDATADIR=${MOODLEDATADIR}
 
 MOODLEDIR?=	www/moodle
-MOODLEDATADIR?=	www/moodledata
+MOODLEDATADIR?=	moodledata
 
 pre-install:
 	@${FIND} -s -d ${WRKSRC} -type f | ${SED} "s?${WRKSRC}?${MOODLEDIR}?g" >${PLIST}
@@ -88,9 +71,12 @@ pre-install:
 
 do-install:
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${PREFIX}/${MOODLEDIR}
-	@${FIND} ${PREFIX}/${MOODLEDIR} -type d -exec ${CHMOD} a+x {} \;
-	@${ECHO_CMD} '@exec ${FIND} ${PREFIX}/${MOODLEDIR} -type d -exec ${CHMOD} a+x {} \;' \
+	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${MOODLEDIR}
+	@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${MOODLEDIR}' \
 		>> ${TMPPLIST}
+	${CHMOD} -R 755 ${PREFIX}/${MOODLEDIR}
+	@${ECHO_CMD} '@exec ${CHMOD} -R 755 ${PREFIX}/${MOODLEDIR}' >> ${TMPPLIST}
+
 	@${INSTALL} -d ${PREFIX}/${MOODLEDATADIR}
 	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${MOODLEDATADIR}
 	@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${MOODLEDATADIR}' \
diff --git a/www/moodle2/distinfo b/www/moodle2/distinfo
index 5a5761a5b9e3..a7d24a32b9d0 100644
--- a/www/moodle2/distinfo
+++ b/www/moodle2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (moodle-1.9.10.tgz) = 6bcba3babafc345b057e1fbe2634ef645a0b3227bef0221a2aec3dce2dd78ce4
-SIZE (moodle-1.9.10.tgz) = 14037302
+SHA256 (moodle-2.0.tgz) = 856f4aae83ac7521a46ea84deaa2117a6ce99277811c0b99ea8e46fd74865fad
+SIZE (moodle-2.0.tgz) = 24497921
diff --git a/www/moodle2/files/pkg-message.in b/www/moodle2/files/pkg-message.in
index 9fc6317594c0..9380c51f6361 100644
--- a/www/moodle2/files/pkg-message.in
+++ b/www/moodle2/files/pkg-message.in
@@ -55,7 +55,7 @@ If you are upgrading from an earlier version of Moodle, check out
 possible additional steps at:
 
    http://docs.moodle.org/en/Upgrading
-   http://docs.moodle.org/en/Upgrading_to_Moodle_1.9
+   http://docs.moodle.org/en/Upgrading_to_Moodle_2.0
 
 If you have real trouble, please visit the Moodle course
 "Using Moodle" on moodle.org.