Index: head/www/mahara/Makefile
===================================================================
--- head/www/mahara/Makefile	(revision 386915)
+++ head/www/mahara/Makefile	(revision 386916)
@@ -1,45 +1,42 @@
 # Created by: Wen Heping <wenheping@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	mahara
 PORTVERSION=	15.04.0
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	https://launchpad.net/${PORTNAME}/${PORTVERSION:R}/${PORTVERSION}/+download/
 
 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
 MYSQL_USE=	PHP=mysql
 PGSQL_USE=	PHP=pgsql
 
 NO_BUILD=	yes
 PLIST=		${WRKDIR}/plist
 SUB_FILES=	pkg-message
 SUB_LIST=	MAHARADIR=${MAHARADIR} \
 		MAHARADATADIR=${MAHARADATADIR}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/htdocs
 
 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 <bsd.port.mk>
Index: head/www/mahara/files/pkg-message.in
===================================================================
--- head/www/mahara/files/pkg-message.in	(revision 386915)
+++ head/www/mahara/files/pkg-message.in	(revision 386916)
@@ -1,41 +1,45 @@
 POST-INSTALL CONFIGURATION FOR MAHARA
 =====================================
 
 1) Create a user and a database for MAHARA to store all
    its tables in (or choose an existing database).
 
 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
    <Directory %%PREFIX%%/%%MAHARADIR%%>
       AllowOverride None
       Order Allow,Deny
       Allow from all 
    </Directory>
-   <Directory %%PREFIX%%/%%MAHARADATADIR%%>
+
+   For Apache version 2.4.x or above:
+
+   Alias /mahara %%PREFIX%%/%%MAHARADIR%%/
+   AcceptPathInfo On
+   <Directory %%PREFIX%%/%%MAHARADIR%%/>
       AllowOverride None
-      Order Allow,Deny
-      Deny from all 
+      Require all granted
    </Directory>
 
 3) Make sure that magic_quotes_gpc is off and register_globals is off 
 in your PHP.ini file.
 
 4) Change into the directory %%PREFIX%%/%%MAHARADIR%% and copy the 
 file config-dist.php to config.php, then go through the file and make 
 changes where appropriate.
 
 5) Now you can navigate to the Mahara website using your web browser.
 Log into the system with user "admin", password "mahara". 
 
    Congratulations!
 
 
 For more information, see the INSTALL DOCUMENTATION:
 
 http://wiki.mahara.org/System_Administrator%27s_Guide/Installing_Mahara
 
 =======================================================================