ports/110782: [maintainer update] www/lightsquid: respect WWWDIR

[Alexander Logvinov]

>Number:         110782
>Category:       ports
>Synopsis:       [maintainer update] www/lightsquid: respect WWWDIR
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Mar 25 02:40:05 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Alexander Logvinov
>Release:        FreeBSD 6.2-RELEASE-p3 i386
>Organization:
>Environment:

>Description:

  Respect WWWDIR

>How-To-Repeat:
  
>Fix:

Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/www/lightsquid/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- Makefile	15 Jan 2007 01:18:55 -0000	1.5
+++ Makefile	24 Mar 2007 19:29:02 -0000
@@ -40,7 +40,7 @@
 	@${REINPLACE_CMD} -e 's|/var/www/html/${PORTNAME}/lang|${DATADIR}/lang|' \
 		-e 's|/var/www/html/${PORTNAME}\"|${PREFIX}/etc/${PORTNAME}\"|' \
 		-e 's|/var/www/html/${PORTNAME}/ip2name|${PREFIX}/libexec/${PORTNAME}|' \
-		-e 's|/var/www/html/${PORTNAME}|${PREFIX}/www/${PORTNAME}|' \
+		-e 's|/var/www/html/${PORTNAME}|${WWWDIR}|' \
 		${WRKSRC}/lightsquid.cfg
 	@${FIND} -E ${WRKSRC} -maxdepth 1 -regex '.*\.(cgi|pl)' | \
 		${XARGS} ${REINPLACE_CMD} \
@@ -63,18 +63,18 @@
 	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/etc/${PORTNAME}/
 .endif
 .endfor
-	${MKDIR} ${PREFIX}/www/${PORTNAME}/report
-	${MKDIR} ${PREFIX}/www/${PORTNAME}/tpl
+	${MKDIR} ${WWWDIR}/report
+	${MKDIR} ${WWWDIR}/tpl
 	cd ${WRKSRC}/tpl && \
 	${FIND} . -type d ! -empty -exec \
-		${MKDIR} "${PREFIX}/www/${PORTNAME}/tpl/{}" \; && \
+		${MKDIR} "${WWWDIR}/tpl/{}" \; && \
 	${FIND} . -type f -exec \
-		${INSTALL_DATA} "{}" "${PREFIX}/www/${PORTNAME}/tpl/{}" \;
+		${INSTALL_DATA} "{}" "${WWWDIR}/tpl/{}" \;
 	cd ${WRKSRC} && \
 	${FIND} -E . -maxdepth 1 -regex '.*\.(cgi|pl)' -exec \
-		${INSTALL_SCRIPT} "{}" "${PREFIX}/www/${PORTNAME}/{}" \; && \
-		${INSTALL_DATA} .htaccess ${PREFIX}/www/${PORTNAME}/
-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/www/${PORTNAME}
+		${INSTALL_SCRIPT} "{}" "${WWWDIR}/{}" \; && \
+		${INSTALL_DATA} .htaccess ${WWWDIR}/
+	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for i in ${PORTDOCS}
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/www/lightsquid/pkg-plist,v
retrieving revision 1.3
diff -u -r1.3 pkg-plist
--- pkg-plist	15 Jan 2007 01:18:55 -0000	1.3
+++ pkg-plist	24 Mar 2007 19:29:02 -0000
@@ -32,54 +32,54 @@
 %%DATADIR%%/lang/ru.lng
 %%DATADIR%%/lang/sp.lng
 %%DATADIR%%/lang/ua.lng
-www/lightsquid/tpl/base/bigfiles.html
-www/lightsquid/tpl/base/day_detail.html
-www/lightsquid/tpl/base/graph.html
-www/lightsquid/tpl/base/group_detail.html
-www/lightsquid/tpl/base/index.html
-www/lightsquid/tpl/base/month_detail.html
-www/lightsquid/tpl/base/topsites.html
-www/lightsquid/tpl/base/user_detail.html
-www/lightsquid/tpl/base/user_month.html
-www/lightsquid/tpl/base/user_time.html
-www/lightsquid/tpl/base/whousesite.html
-www/lightsquid/tpl/base/images/datetime.png
-www/lightsquid/tpl/base/images/flag_red.png
-www/lightsquid/tpl/base/images/graph.png
-www/lightsquid/tpl/base/images/printer.png
-www/lightsquid/tpl/text/bigfiles.html
-www/lightsquid/tpl/text/user_detail.html
-www/lightsquid/tpl/text/index.html
-www/lightsquid/tpl/text/group_detail.html
-www/lightsquid/tpl/text/user_month.html
-www/lightsquid/tpl/text/whousesite.html
-www/lightsquid/tpl/text/topsites.html
-www/lightsquid/tpl/text/month_detail.html
-www/lightsquid/tpl/text/day_detail.html
-www/lightsquid/bigfiles.cgi
-www/lightsquid/day_detail.cgi
-www/lightsquid/fixreport.pl
-www/lightsquid/get.cgi
-www/lightsquid/graph.cgi
-www/lightsquid/group_detail.cgi
-www/lightsquid/index.cgi
-www/lightsquid/month_detail.cgi
-www/lightsquid/topsites.cgi
-www/lightsquid/user_detail.cgi
-www/lightsquid/user_month.cgi
-www/lightsquid/user_time.cgi
-www/lightsquid/whousesite.cgi
-www/lightsquid/.htaccess
-www/lightsquid/check-setup.pl
-www/lightsquid/common.pl
-www/lightsquid/lightparser.pl
+%%WWWDIR%%/tpl/base/bigfiles.html
+%%WWWDIR%%/tpl/base/day_detail.html
+%%WWWDIR%%/tpl/base/graph.html
+%%WWWDIR%%/tpl/base/group_detail.html
+%%WWWDIR%%/tpl/base/index.html
+%%WWWDIR%%/tpl/base/month_detail.html
+%%WWWDIR%%/tpl/base/topsites.html
+%%WWWDIR%%/tpl/base/user_detail.html
+%%WWWDIR%%/tpl/base/user_month.html
+%%WWWDIR%%/tpl/base/user_time.html
+%%WWWDIR%%/tpl/base/whousesite.html
+%%WWWDIR%%/tpl/base/images/datetime.png
+%%WWWDIR%%/tpl/base/images/flag_red.png
+%%WWWDIR%%/tpl/base/images/graph.png
+%%WWWDIR%%/tpl/base/images/printer.png
+%%WWWDIR%%/tpl/text/bigfiles.html
+%%WWWDIR%%/tpl/text/user_detail.html
+%%WWWDIR%%/tpl/text/index.html
+%%WWWDIR%%/tpl/text/group_detail.html
+%%WWWDIR%%/tpl/text/user_month.html
+%%WWWDIR%%/tpl/text/whousesite.html
+%%WWWDIR%%/tpl/text/topsites.html
+%%WWWDIR%%/tpl/text/month_detail.html
+%%WWWDIR%%/tpl/text/day_detail.html
+%%WWWDIR%%/bigfiles.cgi
+%%WWWDIR%%/day_detail.cgi
+%%WWWDIR%%/fixreport.pl
+%%WWWDIR%%/get.cgi
+%%WWWDIR%%/graph.cgi
+%%WWWDIR%%/group_detail.cgi
+%%WWWDIR%%/index.cgi
+%%WWWDIR%%/month_detail.cgi
+%%WWWDIR%%/topsites.cgi
+%%WWWDIR%%/user_detail.cgi
+%%WWWDIR%%/user_month.cgi
+%%WWWDIR%%/user_time.cgi
+%%WWWDIR%%/whousesite.cgi
+%%WWWDIR%%/.htaccess
+%%WWWDIR%%/check-setup.pl
+%%WWWDIR%%/common.pl
+%%WWWDIR%%/lightparser.pl
 @dirrmtry etc/lightsquid
 @dirrmtry libexec/lightsquid
 @dirrmtry %%DATADIR%%/lang
 @dirrmtry %%DATADIR%%
- at dirrmtry www/lightsquid/tpl/base/images
- at dirrmtry www/lightsquid/tpl/base
- at dirrmtry www/lightsquid/tpl/text
- at dirrmtry www/lightsquid/tpl
- at dirrmtry www/lightsquid/report
- at dirrmtry www/lightsquid
+ at dirrmtry %%WWWDIR%%/tpl/base/images
+ at dirrmtry %%WWWDIR%%/tpl/base
+ at dirrmtry %%WWWDIR%%/tpl/text
+ at dirrmtry %%WWWDIR%%/tpl
+ at dirrmtry %%WWWDIR%%/report
+ at dirrmtry %%WWWDIR%%
>Release-Note:
>Audit-Trail:
>Unformatted: