From 9ccbf6cec6b34e1fc931d5c19fbe72fcb1447a62 Mon Sep 17 00:00:00 2001 From: beech Date: Mon, 25 Feb 2008 18:58:10 +0000 Subject: - Update to 1.8.4 - Fix pkg permissions PR: ports/121042 Submitted by: Wen heping Approved by: Javier Martin Rueda (maintainer) --- www/moodle/Makefile | 19 +++++++++++++------ www/moodle/distinfo | 6 +++--- www/moodle2/Makefile | 19 +++++++++++++------ www/moodle2/distinfo | 6 +++--- 4 files changed, 32 insertions(+), 18 deletions(-) diff --git a/www/moodle/Makefile b/www/moodle/Makefile index 4162de66bf41..ed1f36c3dafb 100644 --- a/www/moodle/Makefile +++ b/www/moodle/Makefile @@ -6,7 +6,7 @@ # PORTNAME= moodle -PORTVERSION= 1.8.3 +PORTVERSION= 1.8.4 CATEGORIES= www MASTER_SITES= http://download.moodle.org/stable18/ EXTRACT_SUFX= .tgz @@ -79,12 +79,19 @@ pre-install: @${ECHO} @dirrm ${MOODLEDATADIR} >> ${PLIST} do-install: - ${INSTALL_DATA} -d ${PREFIX}/${MOODLEDIR} - ${CP} -Rn ${WRKSRC}/* ${PREFIX}/${MOODLEDIR} - ${FIND} ${PREFIX}/${MOODLEDIR} -type d -exec ${CHMOD} a+x {} \; - ${MKDIR} ${PREFIX}/${MOODLEDATADIR} - ${CHOWN} www ${PREFIX}/${MOODLEDATADIR} + @cd ${WRKSRC} && ${COPYTREE_SHARE} . ${PREFIX}/${MOODLEDIR} + @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${MOODLEDIR} + @${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${MOODLEDIR}' \ + >> ${TMPPLIST} + @${FIND} ${PREFIX}/${MOODLEDIR} -type d -exec ${CHMOD} a+x {} \; + @${ECHO_CMD} '@exec ${FIND} ${PREFIX}/${MOODLEDIR} -type d -exec ${CHMOD} a+x {} \;' \ + >> ${TMPPLIST} + @${INSTALL} -d ${PREFIX}/${MOODLEDATADIR} + @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${MOODLEDATADIR} + @${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${MOODLEDATADIR}' \ + >> ${TMPPLIST} ${CHMOD} 755 ${PREFIX}/${MOODLEDATADIR} + @${ECHO_CMD} '@exec ${CHMOD} 755 ${PREFIX}/${MOODLEDATADIR}' >> ${TMPPLIST} post-install: @${CAT} ${PKGMESSAGE} diff --git a/www/moodle/distinfo b/www/moodle/distinfo index 492e433da7d3..ec3aa3f170aa 100644 --- a/www/moodle/distinfo +++ b/www/moodle/distinfo @@ -1,3 +1,3 @@ -MD5 (moodle-1.8.3.tgz) = fda7add896d864beb075b4a1eae40817 -SHA256 (moodle-1.8.3.tgz) = 0458457ae6f9cd47cd86ea4a4aab1075ac980fc3c4e81a8e1afb76c28bc6fc31 -SIZE (moodle-1.8.3.tgz) = 10109152 +MD5 (moodle-1.8.4.tgz) = a84715a8094b7a85b68c5034b5b734d1 +SHA256 (moodle-1.8.4.tgz) = 3b708a0c11257c1d55e0ea6f5e8983062ca22aca0c52c966f0c33cf7b5e7dd3e +SIZE (moodle-1.8.4.tgz) = 10276123 diff --git a/www/moodle2/Makefile b/www/moodle2/Makefile index 4162de66bf41..ed1f36c3dafb 100644 --- a/www/moodle2/Makefile +++ b/www/moodle2/Makefile @@ -6,7 +6,7 @@ # PORTNAME= moodle -PORTVERSION= 1.8.3 +PORTVERSION= 1.8.4 CATEGORIES= www MASTER_SITES= http://download.moodle.org/stable18/ EXTRACT_SUFX= .tgz @@ -79,12 +79,19 @@ pre-install: @${ECHO} @dirrm ${MOODLEDATADIR} >> ${PLIST} do-install: - ${INSTALL_DATA} -d ${PREFIX}/${MOODLEDIR} - ${CP} -Rn ${WRKSRC}/* ${PREFIX}/${MOODLEDIR} - ${FIND} ${PREFIX}/${MOODLEDIR} -type d -exec ${CHMOD} a+x {} \; - ${MKDIR} ${PREFIX}/${MOODLEDATADIR} - ${CHOWN} www ${PREFIX}/${MOODLEDATADIR} + @cd ${WRKSRC} && ${COPYTREE_SHARE} . ${PREFIX}/${MOODLEDIR} + @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${MOODLEDIR} + @${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${MOODLEDIR}' \ + >> ${TMPPLIST} + @${FIND} ${PREFIX}/${MOODLEDIR} -type d -exec ${CHMOD} a+x {} \; + @${ECHO_CMD} '@exec ${FIND} ${PREFIX}/${MOODLEDIR} -type d -exec ${CHMOD} a+x {} \;' \ + >> ${TMPPLIST} + @${INSTALL} -d ${PREFIX}/${MOODLEDATADIR} + @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${MOODLEDATADIR} + @${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${MOODLEDATADIR}' \ + >> ${TMPPLIST} ${CHMOD} 755 ${PREFIX}/${MOODLEDATADIR} + @${ECHO_CMD} '@exec ${CHMOD} 755 ${PREFIX}/${MOODLEDATADIR}' >> ${TMPPLIST} post-install: @${CAT} ${PKGMESSAGE} diff --git a/www/moodle2/distinfo b/www/moodle2/distinfo index 492e433da7d3..ec3aa3f170aa 100644 --- a/www/moodle2/distinfo +++ b/www/moodle2/distinfo @@ -1,3 +1,3 @@ -MD5 (moodle-1.8.3.tgz) = fda7add896d864beb075b4a1eae40817 -SHA256 (moodle-1.8.3.tgz) = 0458457ae6f9cd47cd86ea4a4aab1075ac980fc3c4e81a8e1afb76c28bc6fc31 -SIZE (moodle-1.8.3.tgz) = 10109152 +MD5 (moodle-1.8.4.tgz) = a84715a8094b7a85b68c5034b5b734d1 +SHA256 (moodle-1.8.4.tgz) = 3b708a0c11257c1d55e0ea6f5e8983062ca22aca0c52c966f0c33cf7b5e7dd3e +SIZE (moodle-1.8.4.tgz) = 10276123 -- cgit