From user@blg.akavia.ru  Sun Mar 25 02:31:29 2007
Return-Path: <user@blg.akavia.ru>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 5553616A401
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 25 Mar 2007 02:31:29 +0000 (UTC)
	(envelope-from user@blg.akavia.ru)
Received: from blg.akavia.ru (blg.akavia.ru [62.33.174.250])
	by mx1.freebsd.org (Postfix) with ESMTP id 0958C13C46C
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 25 Mar 2007 02:31:27 +0000 (UTC)
	(envelope-from user@blg.akavia.ru)
Received: from blg.akavia.ru (localhost [127.0.0.1])
	by blg.akavia.ru (8.13.8/8.13.8) with ESMTP id l2P2VPib002087;
	Sun, 25 Mar 2007 12:31:25 +1000 (YAKST)
	(envelope-from user@blg.akavia.ru)
Received: (from root@localhost)
	by blg.akavia.ru (8.13.8/8.13.8/Submit) id l2P2VPfp002086;
	Sun, 25 Mar 2007 12:31:25 +1000 (YAKST)
	(envelope-from user)
Message-Id: <200703250231.l2P2VPfp002086@blg.akavia.ru>
Date: Sun, 25 Mar 2007 12:31:25 +1000 (YAKST)
From: Alexander Logvinov <ports@logvinov.com>
Reply-To: Alexander Logvinov <ports@logvinov.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc: Alexander Logvinov <ports@logvinov.com>
Subject: [maintainer update] www/lightsquid: respect WWWDIR
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         110782
>Category:       ports
>Synopsis:       [maintainer update] www/lightsquid: respect WWWDIR
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    jmelo
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Mar 25 02:40:05 GMT 2007
>Closed-Date:    Thu Apr 05 19:50:24 GMT 2007
>Last-Modified:  Thu Apr  5 20:00:11 GMT 2007
>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%%
-@dirrmtry www/lightsquid/tpl/base/images
-@dirrmtry www/lightsquid/tpl/base
-@dirrmtry www/lightsquid/tpl/text
-@dirrmtry www/lightsquid/tpl
-@dirrmtry www/lightsquid/report
-@dirrmtry www/lightsquid
+@dirrmtry %%WWWDIR%%/tpl/base/images
+@dirrmtry %%WWWDIR%%/tpl/base
+@dirrmtry %%WWWDIR%%/tpl/text
+@dirrmtry %%WWWDIR%%/tpl
+@dirrmtry %%WWWDIR%%/report
+@dirrmtry %%WWWDIR%%
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->jmelo 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sun Mar 25 02:40:12 UTC 2007 
Responsible-Changed-Why:  
jmelo@ wants to have WWW and MASTER_SITES PRs 

http://www.freebsd.org/cgi/query-pr.cgi?pr=110782 
State-Changed-From-To: open->closed 
State-Changed-By: jmelo 
State-Changed-When: Thu Apr 5 19:50:17 UTC 2007 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=110782 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/110782: commit references a PR
Date: Thu,  5 Apr 2007 19:50:09 +0000 (UTC)

 jmelo       2007-04-05 19:49:58 UTC
 
   FreeBSD ports repository
 
   Modified files:
     www/lightsquid       Makefile pkg-plist 
   Log:
   - Respect WWWDIR.
   
   PR:             ports/110782
   Submitted by:   Alexander Logvinov <ports@logvinov.com> (maintainer)
   
   Revision  Changes    Path
   1.6       +8 -8      ports/www/lightsquid/Makefile
   1.4       +47 -47    ports/www/lightsquid/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
