3 files changed, 19 insertions, 37 deletions

diff --git a/www/atutor/Makefile b/www/atutor/Makefile
index 2f31bb1b8580..87b3a7c0af4d 100644
--- a/www/atutor/Makefile
+++ b/www/atutor/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	atutor
-DISTVERSION=	1.6.0.1
+DISTVERSION=	1.6.1
 CATEGORIES=	www
 MASTER_SITES=	SF
-DISTNAME=	ATutor-1.6-pl1
+DISTNAME=	ATutor-${PORTVERSION}
 
 MAINTAINER=	wenheping@gmail.com
 COMMENT=	An Open Source Web-based Learning Content Management System (LCMS)
@@ -20,41 +20,23 @@ WRKSRC=		${WRKDIR}/ATutor
 .include <bsd.port.pre.mk>
 
 NO_BUILD=	yes
-PLIST=		${WRKDIR}/plist
 SUB_FILES=	pkg-message
-SUB_LIST=	ATUTDIR=${ATUTDIR} \
-		ATUTDATDIR=${ATUTDATDIR}
 
-ATUTDIR?=	www/atutor
-ATUTDATDIR?=	${ATUTDIR}/content
-ATUTCONFIG?=	include/config.inc.php
-
-pre-install:
-	@${FIND} -s -d ${WRKSRC} -type f | ${SED} "s?${WRKSRC}?${ATUTDIR}?g" >${PLIST}
-	@${ECHO_CMD} @dirrm ${ATUTDATDIR} >> ${PLIST}
-	@${FIND} -s -d ${WRKSRC} -type d  | ${SED} "s?${WRKSRC}?@dirrm ${ATUTDIR}?g" >> ${PLIST}
+ATUTDATDIR=	${WWWDIR}/content
+ATUTCONFIG=	include/config.inc.php
 
 do-install:
-	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${PREFIX}/${ATUTDIR}
-	@${CHOWN} ${WWWOWN}:${WWWGRP} ${PREFIX}/${ATUTDIR}
-	@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} \
-		${PREFIX}/${ATUTDIR}' >> ${TMPPLIST}
-	@${FIND} ${PREFIX}/${ATUTDIR} -type d -exec ${CHMOD} a+x {} \;
-	@${INSTALL} -d ${PREFIX}/${ATUTDATDIR}
-	@${CHOWN} ${WWWOWN}:${WWWGRP} ${PREFIX}/${ATUTDATDIR}
-	@${ECHO_CMD} '@exec ${INSTALL} -d \
-		${PREFIX}/${ATUTDATDIR}' >> ${TMPPLIST}
+	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${WWWDIR}
+	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
 	@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} \
-		${PREFIX}/${ATUTDATDIR}' >> ${TMPPLIST}
-	@${CHMOD} 755 ${PREFIX}/${ATUTDATDIR}
-	@${ECHO_CMD} '@exec ${CHMOD} 755 ${PREFIX}/${ATUTDATDIR}' >> ${TMPPLIST}
-	@${CHMOD} 666 ${PREFIX}/${ATUTDIR}/${ATUTCONFIG}
+		${WWWDIR}' >> ${TMPPLIST}
+	@${FIND} ${WWWDIR} -type d -exec ${CHMOD} a+x {} \;
+	@${INSTALL_DATA} -d ${ATUTDATDIR}
+	@${CHMOD} 777 ${ATUTDATDIR}
+	@${ECHO_CMD} '@exec ${CHMOD} 777 ${ATUTDATDIR}' >> ${TMPPLIST}
+	@${CHMOD} 666 ${WWWDIR}/${ATUTCONFIG}
 	@${ECHO_CMD} '@exec ${CHMOD} 666 \
-		${PREFIX}/${ATUTDIR}/${ATUTCONFIG}' >> ${TMPPLIST}
-	@${ECHO_CMD} '@exec ${INSTALL} -d \
-		${PREFIX}/${ATUTDIR}/themes/blumin/users' >> ${TMPPLIST}
-	@${ECHO_CMD} '@exec ${INSTALL} -d \
-		${PREFIX}/${ATUTDIR}/themes/greenmin/users' >> ${TMPPLIST}
+		${WWWDIR}/${ATUTCONFIG}' >> ${TMPPLIST}
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/www/atutor/distinfo b/www/atutor/distinfo
index dde611c79f49..26e758c3eb30 100644
--- a/www/atutor/distinfo
+++ b/www/atutor/distinfo
@@ -1,3 +1,3 @@
-MD5 (ATutor-1.6-pl1.tar.gz) = ef967186f6400fb8c2c9f29fe853a695
-SHA256 (ATutor-1.6-pl1.tar.gz) = 07898f7f88c84230a4c698ba87a50ade9844b1bf31c281338024186808cce638
-SIZE (ATutor-1.6-pl1.tar.gz) = 2695227
+MD5 (ATutor-1.6.1.tar.gz) = de1090f2d3b9a2c99bc5082581571bad
+SHA256 (ATutor-1.6.1.tar.gz) = 731ba8c0e1ef44f4622ebaf7d550a425a6b791b89423e8d5cfd92c435a18d949
+SIZE (ATutor-1.6.1.tar.gz) = 2171403
diff --git a/www/atutor/files/pkg-message.in b/www/atutor/files/pkg-message.in
index bde82ba2f977..78a315d0077f 100644
--- a/www/atutor/files/pkg-message.in
+++ b/www/atutor/files/pkg-message.in
@@ -6,14 +6,14 @@ POST-INSTALL CONFIGURATION FOR ATutor
    restart the server:
 
    ### Add the AcceptPathInfo directive only for Apache 2.0.30 or later.
-   Alias /ATutor %%PREFIX%%/%%ATUTDIR%%/
+   Alias /atutor %%WWWDIR%%
    AcceptPathInfo On
-   <Directory %%PREFIX%%/%%ATUTDIR%%>
+   <Directory %%WWWDIR%%>
       AllowOverride None
       Order Allow,Deny
       Allow from all
    </Directory>
-   <Directory %%PREFIX%%/%%ATUTDATDIR%%>
+   <Directory %%WWWDIR%%/content/>
       AllowOverride None
       Order Allow,Deny
       Deny from all