From infofarmer@gmail.com  Mon Feb  6 22:12:39 2006
Return-Path: <infofarmer@gmail.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 3FF7716A420
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  6 Feb 2006 22:12:39 +0000 (GMT)
	(envelope-from infofarmer@gmail.com)
Received: from uproxy.gmail.com (uproxy.gmail.com [66.249.92.199])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7945843D48
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  6 Feb 2006 22:12:38 +0000 (GMT)
	(envelope-from infofarmer@gmail.com)
Received: by uproxy.gmail.com with SMTP id j3so51171ugf
        for <FreeBSD-gnats-submit@freebsd.org>; Mon, 06 Feb 2006 14:12:34 -0800 (PST)
Received: by 10.66.252.11 with SMTP id z11mr2197306ugh;
        Mon, 06 Feb 2006 14:12:34 -0800 (PST)
Received: from localhost ( [83.237.228.230])
        by mx.gmail.com with ESMTP id k1sm27974ugf.2006.02.06.14.12.32;
        Mon, 06 Feb 2006 14:12:33 -0800 (PST)
Message-Id: <43e7c9d1.29f583ef.4709.05ed@mx.gmail.com>
Date: Mon, 06 Feb 2006 14:12:33 -0800 (PST)
From: infofarmer@gmail.com
To: FreeBSD-gnats-submit@freebsd.org
Subject: update sysutils/durep
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         92924
>Category:       ports
>Synopsis:       update sysutils/durep
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Feb 06 22:20:10 GMT 2006
>Closed-Date:    Tue Feb 07 21:09:23 GMT 2006
>Last-Modified:  Tue Feb 07 21:09:23 GMT 2006
>Originator:     Andrew Pantyukhin
>Release:        FreeBSD 6.0-STABLE i386
>Organization:
>Environment:
System: FreeBSD sat64.net17 6.0-STABLE FreeBSD 6.0-STABLE #9: Wed Feb 1 17:33:01 MSK 2006 sat@sat64.net17:/usr/obj/usr/src/sys/SATCUR32 i386


	
>Description:
Install into www instead of www/{data,cgi-bin}

Reported by: pointyhat via kris
	
>How-To-Repeat:
	
>Fix:

	

--- durep.diff begins here ---
diff -urN /usr/ports/sysutils/durep/Makefile durep/Makefile
--- /usr/ports/sysutils/durep/Makefile	Sat Nov 26 17:49:34 2005
+++ durep/Makefile	Tue Feb  7 01:05:37 2006
@@ -17,32 +17,29 @@
 RUN_DEPENDS=	${SITE_PERL}/MLDBM.pm:${PORTSDIR}/databases/p5-MLDBM
 
 USE_PERL5=	yes
-NO_BUILD=	yes
-WWWDOCROOT?=	www/data
-WWWCGIROOT?=	www/cgi-bin
-DUREPCGI?=	${WWWCGIROOT}/durep
-DUREPFILES?=	${WWWDOCROOT}/durep
-DCGI=		${PREFIX}/${DUREPCGI}
-DFILES=		${PREFIX}/${DUREPFILES}
+WWWDOCROOT?=	www
+WWWSUBDIR?=	${PORTNAME}
+WWWDIR?=	${WWWDOCROOT}/${WWWSUBDIR}
+DIR?=		${PREFIX}/${WWWDIR}
 
 MAN1=		durep.1
-PLIST_FILES=	bin/durep ${DUREPCGI}/durep.cgi ${DUREPFILES}/style.css \
-		${DUREPFILES}/bar.png
-PLIST_DIRS=	${DUREPCGI} ${DUREPFILES}
+WWW_FILES=	durep.cgi style.css bar.png
+PLIST_FILES=	bin/durep ${WWW_FILES:S/^/${WWWDIR}\//}
+PLIST_DIRS=	${WWWDIR}
 PORTDOCS=	Artistic BUGS CHANGES README THANKS
 
-doc:
+do-build:
 	pod2man --center="Disk Usage Report Generator" --release="durep version ${PORTVERSION}" ${WRKSRC}/durep.pod > ${WRKSRC}/durep.1
 
-do-install:	doc
-	${INSTALL} -d ${DFILES} ${DCGI}
-	${INSTALL_SCRIPT} ${WRKSRC}/durep ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/durep.1 ${MAN1PREFIX}/man/man1
-	${INSTALL_SCRIPT} ${WRKSRC}/durep.cgi ${DCGI}
-	${INSTALL_DATA} ${WRKSRC}/style.css ${WRKSRC}/bar.png ${DFILES}
+do-install:
+	${INSTALL} -d ${DIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/durep ${PREFIX}/bin/
+	${INSTALL_MAN} ${WRKSRC}/durep.1 ${MAN1PREFIX}/man/man1/
+	${INSTALL_SCRIPT} ${WRKSRC}/durep.cgi ${DIR}/
+	${INSTALL_DATA} ${WRKSRC}/style.css ${WRKSRC}/bar.png ${DIR}/
 .if !defined(NOPORTDOCS)
 	${INSTALL} -d ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S#^#${WRKSRC}/#} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S/^/${WRKSRC}\//} ${DOCSDIR}/
 .endif
 
 .include <bsd.port.mk>
--- durep.diff ends here ---


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Tue Feb 7 21:09:13 UTC 2006 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=92924 
>Unformatted:
