svn commit: r386916 - in head/www/mahara: . files

[Wen Heping]

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 at 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 at 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 at 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>

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
    <Directory %%PREFIX%%/%%MAHARADIR%%>
@@ -15,10 +15,14 @@ POST-INSTALL CONFIGURATION FOR MAHARA
       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