ports/183158: [PATCH] www/drraw: support staging.

[Mathieu Arnold]

>Number:         183158
>Category:       ports
>Synopsis:       [PATCH] www/drraw: support staging.
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Oct 21 13:50:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Mathieu Arnold
>Release:        FreeBSD 9.2-RELEASE i386
>Organization:
Absolight
>Environment:
System: FreeBSD aragorn.in.absolight.net 9.2-RELEASE FreeBSD 9.2-RELEASE #0 r255898: Fri Sep 27 03:52:52 UTC
>Description:
Support staging, add the DOCS option as it is used.

Port maintainer (avg at icyb.net.ua) is cc'd.

Generated with FreeBSD Port Tools 0.99_8 (mode: change, diff: ports)
>How-To-Repeat:
>Fix:

--- drraw-2.2.b2_1.patch begins here ---
diff -ruN /usr/ports/www/drraw/Makefile ./Makefile
--- /usr/ports/www/drraw/Makefile	2013-09-21 01:36:50.000000000 +0200
+++ ./Makefile	2013-10-21 14:49:06.000000000 +0200
@@ -1,5 +1,5 @@
 # Created by: Jim Riggs <ports at christianserving.org>
-# $FreeBSD: www/drraw/Makefile 327776 2013-09-20 23:36:50Z bapt $
+# $FreeBSD: head/www/drraw/Makefile 327776 2013-09-20 23:36:50Z bapt $
 
 PORTNAME=	drraw
 DISTVERSION=	2.2b2
@@ -13,12 +13,13 @@
 
 RUN_DEPENDS+=	rrdtool>=0:${PORTSDIR}/databases/rrdtool
 
-OPTIONS_DEFINE=	ZOOM_PATCH
+OPTIONS_DEFINE=	ZOOM_PATCH DOCS
 ZOOM_PATCH_DESC=	Zoom support using jQuery via external patch
 
-USES=		perl5
+USES=		perl5 shebangfix
 USE_PERL5=	run
 NO_BUILD=	yes
+SHEBANG_FILES=	drraw.cgi
 
 PORTDOCS=	CHANGES INSTALL LICENSE README.EVENTS
 
@@ -29,7 +30,6 @@
 
 PLIST_SUB+=	CONFDIR=${CONFDIR}
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MZOOM_PATCH}
@@ -48,27 +48,16 @@
 		${WRKSRC}/drraw.conf-dist
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/drraw.conf-dist ${PREFIX}/${CONFDIR}
+	${INSTALL_DATA} ${WRKSRC}/drraw.conf-dist ${STAGEDIR}${PREFIX}/${CONFDIR}
 
-	${MKDIR} ${WWWDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/drraw.cgi ${WWWDIR}
-
-	${MKDIR} ${WWWDIR}/icons
-.for theFile in bomb.gif folder.gif folder.open.gif generic.gif link.gif text.gif unknown.gif
-	${INSTALL_DATA} ${WRKSRC}/icons/${theFile} ${WWWDIR}/icons
-.endfor
+	${MKDIR} ${STAGEDIR}${WWWDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/drraw.cgi ${STAGEDIR}${WWWDIR}
 
+	${MKDIR} ${STAGEDIR}${WWWDIR}/icons
+	cd ${WRKSRC}/icons/${theFile} && ${INSTALL_DATA} bomb.gif folder.gif folder.open.gif generic.gif link.gif text.gif unknown.gif ${STAGEDIR}${WWWDIR}/icons
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-. for theFile in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${theFile} ${DOCSDIR}
-. endfor
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 .endif
 
-post-install:
-	@if [ ! -f ${PREFIX}/etc/drraw.conf ];\
-	then \
-		${CP} -p ${PREFIX}/etc/drraw.conf-dist ${PREFIX}/etc/drraw.conf; \
-	fi
-
 .include <bsd.port.mk>
--- drraw-2.2.b2_1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: