From owner-svn-ports-head@FreeBSD.ORG Thu May 21 07:48:58 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5A1B43E4; Thu, 21 May 2015 07:48:58 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3AFA81FE1; Thu, 21 May 2015 07:48:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4L7mwqo026720; Thu, 21 May 2015 07:48:58 GMT (envelope-from wen@FreeBSD.org) Received: (from wen@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4L7mv88026718; Thu, 21 May 2015 07:48:57 GMT (envelope-from wen@FreeBSD.org) Message-Id: <201505210748.t4L7mv88026718@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: wen set sender to wen@FreeBSD.org using -f From: Wen Heping Date: Thu, 21 May 2015 07:48:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r386916 - in head/www/mahara: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 May 2015 07:48:58 -0000 Author: wen Date: Thu May 21 07:48:57 2015 New Revision: 386916 URL: https://svnweb.freebsd.org/changeset/ports/386916 Log: - Fix permissions [1] - Add LICENSE file [1] - Add missing PHP module - Update pkg-message PR: 200351 [1] Submitted by: amdmi3@ Modified: head/www/mahara/Makefile head/www/mahara/files/pkg-message.in Modified: head/www/mahara/Makefile ============================================================================== --- head/www/mahara/Makefile Thu May 21 07:06:01 2015 (r386915) +++ head/www/mahara/Makefile Thu May 21 07:48:57 2015 (r386916) @@ -3,6 +3,7 @@ PORTNAME= mahara PORTVERSION= 15.04.0 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= https://launchpad.net/${PORTNAME}/${PORTVERSION:R}/${PORTVERSION}/+download/ @@ -10,9 +11,10 @@ MAINTAINER= wen@FreeBSD.org COMMENT= Open source ePortfolio system LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/../COPYING USES= cpe tar:bzip2 -USE_PHP= session json curl xml xmlrpc openssl simplexml +USE_PHP= dom gd session json curl xml xmlrpc openssl simplexml OPTIONS_DEFINE= MYSQL PGSQL OPTIONS_DEFAULT= MYSQL @@ -30,16 +32,11 @@ MAHARADIR?= www/mahara MAHARADATADIR?= www/maharadata pre-install: - @${ECHO_CMD} -e '@owner ${WWWOWN}\n@group ${WWWGRP}' > ${PLIST} @${FIND} -s -d ${WRKSRC} -type f | ${SED} "s?${WRKSRC}?${MAHARADIR}?g" >> ${PLIST} - @${FIND} -s -d ${WRKSRC} -type d | ${SED} "s?${WRKSRC}?@dir ${MAHARADIR}?g" >> ${PLIST} - @${ECHO} @dir ${MAHARADATADIR} >> ${PLIST} - @${ECHO_CMD} -e '@owner root\n@group wheel' >> ${PLIST} + @${ECHO_CMD} "@dir(${WWWOWN},${WWWGRP},755) ${MAHARADATADIR}" >> ${PLIST} do-install: @cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR} - @${INSTALL} -d ${STAGEDIR}${PREFIX}/${MAHARADATADIR} - @${CHMOD} -R 755 ${STAGEDIR}${WWWDIR} - @${CHMOD} -R a+w ${STAGEDIR}${PREFIX}/${MAHARADATADIR} + @${MKDIR} ${STAGEDIR}${PREFIX}/${MAHARADATADIR} .include Modified: head/www/mahara/files/pkg-message.in ============================================================================== --- head/www/mahara/files/pkg-message.in Thu May 21 07:06:01 2015 (r386915) +++ head/www/mahara/files/pkg-message.in Thu May 21 07:48:57 2015 (r386916) @@ -7,7 +7,7 @@ POST-INSTALL CONFIGURATION FOR MAHARA 2) Add the following to your Apache configuration, and restart the server: - ### Add the AcceptPathInfo directive only for Apache 2.0.30 or later. + ### For Apache earlier than 2.4. Alias /mahara %%PREFIX%%/%%MAHARADIR%%/ AcceptPathInfo On @@ -15,10 +15,14 @@ POST-INSTALL CONFIGURATION FOR MAHARA Order Allow,Deny Allow from all - + + For Apache version 2.4.x or above: + + Alias /mahara %%PREFIX%%/%%MAHARADIR%%/ + AcceptPathInfo On + AllowOverride None - Order Allow,Deny - Deny from all + Require all granted 3) Make sure that magic_quotes_gpc is off and register_globals is off