svn commit: r375152 - in head/www/claroline: . files

[Wen Heping]

Author: wen
Date: Sun Dec 21 03:45:31 2014
New Revision: 375152
URL: https://svnweb.freebsd.org/changeset/ports/375152
QAT: https://qat.redports.org/buildarchive/r375152/

Log:
  - Update to 1.11.10.1
  - Update pkg-message.in

Deleted:
  head/www/claroline/pkg-plist
Modified:
  head/www/claroline/Makefile
  head/www/claroline/distinfo
  head/www/claroline/files/pkg-message.in

Modified: head/www/claroline/Makefile
==============================================================================
--- head/www/claroline/Makefile	Sun Dec 21 01:45:36 2014	(r375151)
+++ head/www/claroline/Makefile	Sun Dec 21 03:45:31 2014	(r375152)
@@ -2,9 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	claroline
-PORTVERSION=	1.11.10
+PORTVERSION=	1.11.10.1
 CATEGORIES=	www
-MASTER_SITES=	SF/${PORTNAME}/Claroline/Claroline_${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME}/Claroline/Claroline_1.11.10
+DISTNAME=	${PORTNAME}-1.11.10-1
 
 MAINTAINER=	wen at FreeBSD.org
 COMMENT=	Open Source eLearning and eWorking platform
@@ -15,6 +16,8 @@ NO_BUILD=	yes
 USE_PHP=	mysql
 WRKSRC=		${WRKDIR}/${DISTNAME}
 SUB_FILES=	pkg-message
+PLIST=		${WRKDIR}/plist
+CLARODIR=	www/claroline
 
 OPTIONS_DEFINE=		LDAP GD SSL
 OPTIONS_DEFAULT=	GD
@@ -33,15 +36,19 @@ USE_PHP+=	openssl
 USE_PHP+=	ldap
 .endif
 
+pre-install:
+	@${ECHO_CMD} "@owner ${WWWOWN}" >> ${PLIST}
+	@${ECHO_CMD} "@group ${WWWGRP}" >> ${PLIST}
+	@${ECHO_CMD} "@mode 755" >> ${PLIST}
+	@${FIND} -s -d ${WRKSRC} -type f | ${SED} "s?${WRKSRC}?${CLARODIR}?g" >>${PLIST}
+	@${FIND} -s -d ${WRKSRC} -type d  | ${SED} "s?${WRKSRC}?@dir ${CLARODIR}?g" >> ${PLIST}
+	@${ECHO_CMD} "@mode" >> ${PLIST}
+	@${ECHO_CMD} "@group" >> ${PLIST}
+	@${ECHO_CMD} "@owner" >> ${PLIST}
+
 do-install:
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}
-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR}
 	@${CHMOD} -R 755 ${STAGEDIR}${WWWDIR}
-	@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR}' \
-		>> ${TMPPLIST}
-	@${ECHO_CMD} '@exec ${CHMOD} -R 755 ${STAGEDIR}${WWWDIR}' >>${TMPPLIST}
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
+	@${ECHO_CMD} '@exec ${CHMOD} -R 755 ${STAGEDIR}${WWWDIR}' >>${PLIST}
 
 .include <bsd.port.mk>

Modified: head/www/claroline/distinfo
==============================================================================
--- head/www/claroline/distinfo	Sun Dec 21 01:45:36 2014	(r375151)
+++ head/www/claroline/distinfo	Sun Dec 21 03:45:31 2014	(r375152)
@@ -1,2 +1,2 @@
-SHA256 (claroline-1.11.10.tar.gz) = 666b63e3b4cf0d188a7f618c0c65493812f0ba2283e606d8f1ea8236072d9dd6
-SIZE (claroline-1.11.10.tar.gz) = 5855725
+SHA256 (claroline-1.11.10-1.tar.gz) = 9e887be39f6de9306ad7c197b723554484eb96d5a1e7aca0abc7d63d8b1d007e
+SIZE (claroline-1.11.10-1.tar.gz) = 5855704

Modified: head/www/claroline/files/pkg-message.in
==============================================================================
--- head/www/claroline/files/pkg-message.in	Sun Dec 21 01:45:36 2014	(r375151)
+++ head/www/claroline/files/pkg-message.in	Sun Dec 21 03:45:31 2014	(r375152)
@@ -5,7 +5,16 @@ POST-INSTALL CONFIGURATION FOR Claroline
 1) 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 version 2.4.x or above:
+   Alias /claroline %%WWWDIR%%/
+   AcceptPathInfo On
+   <Directory %%WWWDIR%%>
+     Options Indexes
+     AllowOverride None
+     Require all granted
+   </Directory>
+
+   For Apache versions earlier than 2.4:
    Alias /claroline %%WWWDIR%%/
    AcceptPathInfo On
    <Directory %%WWWDIR%%>