From mat@aragorn.in.absolight.net  Mon Oct 21 13:45:17 2013
Return-Path: <mat@aragorn.in.absolight.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTP id 6537CBA5
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 21 Oct 2013 13:45:17 +0000 (UTC)
	(envelope-from mat@aragorn.in.absolight.net)
Received: from prod2.absolight.net (mx3.absolight.net [IPv6:2a01:678:2:100::25])
	(using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id 277FE293F
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 21 Oct 2013 13:45:13 +0000 (UTC)
Received: from prod2.absolight.net (localhost [127.0.0.1])
	by prod2.absolight.net (Postfix) with ESMTP id A1B38BDC25;
	Mon, 21 Oct 2013 15:45:10 +0200 (CEST)
Received: from gw.in.absolight.net (gw-ecl.in.absolight.net [79.143.241.69])
	(using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits))
	(Client CN "gw.in.absolight.net", Issuer "CA Cert Signing Authority" (not verified))
	by prod2.absolight.net (Postfix) with ESMTPSA id 7CD30BDC1D;
	Mon, 21 Oct 2013 15:45:10 +0200 (CEST)
Received: from aragorn.in.absolight.net (aragorn.in.absolight.net [79.143.241.225])
	by gw.in.absolight.net (Postfix) with ESMTP id C2A0560E8;
	Mon, 21 Oct 2013 15:45:09 +0200 (CEST)
Received: by aragorn.in.absolight.net (Postfix, from userid 1000)
	id 8440A14269C; Mon, 21 Oct 2013 15:45:08 +0200 (CEST)
Message-Id: <20131021134508.8440A14269C@aragorn.in.absolight.net>
Date: Mon, 21 Oct 2013 15:45:08 +0200 (CEST)
From: Mathieu Arnold <mat@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: avg@icyb.net.ua
Subject: [PATCH] www/drraw: support staging.
X-Send-Pr-Version: 3.113
X-GNATS-Notify: avg@icyb.net.ua

>Number:         183158
>Category:       ports
>Synopsis:       [PATCH] www/drraw: support staging.
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    mat
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Oct 21 13:50:00 UTC 2013
>Closed-Date:    Mon Oct 21 14:07:35 UTC 2013
>Last-Modified:  Mon Oct 21 14:10:00 UTC 2013
>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@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@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:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Mon Oct 21 13:50:09 UTC 2013 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=183158 
Responsible-Changed-From-To: freebsd-ports-bugs->mat 
Responsible-Changed-By: mat 
Responsible-Changed-When: Mon Oct 21 13:51:48 UTC 2013 
Responsible-Changed-Why:  
Take 

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

From: Edwin Groothuis <edwin@FreeBSD.org>
To: avg@icyb.net.ua
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/183158: [PATCH] www/drraw: support staging.
Date: Mon, 21 Oct 2013 13:50:09 UT

 Maintainer of www/drraw,
 
 Please note that PR ports/183158 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/183158
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: Andriy Gapon <avg@icyb.net.ua>
To: bug-followup@FreeBSD.ORG
Cc:  
Subject: Re: ports/183158: [PATCH] www/drraw: support staging.
Date: Mon, 21 Oct 2013 16:54:43 +0300

 on 21/10/2013 16:50 Edwin Groothuis said the following:
 > Maintainer of www/drraw,
 > 
 > Please note that PR ports/183158 has just been submitted.
 > 
 > If it contains a patch for an upgrade, an enhancement or a bug fix
 > you agree on, reply to this email stating that you approve the patch
 > and a committer will take care of it.
 > 
 > The full text of the PR can be found at:
 >     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/183158
 > 
 
 I do approve.
 Thank you very much!
 
 -- 
 Andriy Gapon
State-Changed-From-To: feedback->closed 
State-Changed-By: mat 
State-Changed-When: Mon Oct 21 14:07:34 UTC 2013 
State-Changed-Why:  
Committed, thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/183158: commit references a PR
Date: Mon, 21 Oct 2013 14:07:37 +0000 (UTC)

 Author: mat
 Date: Mon Oct 21 14:07:30 2013
 New Revision: 331141
 URL: http://svnweb.freebsd.org/changeset/ports/331141
 
 Log:
   - Support staging.
   - Add the DOCS option as it is used.
   
   PR:		ports/183158
   Submitted by:	mat
   Approved by:	maintainer
 
 Modified:
   head/www/drraw/Makefile
 
 Modified: head/www/drraw/Makefile
 ==============================================================================
 --- head/www/drraw/Makefile	Mon Oct 21 14:02:55 2013	(r331140)
 +++ head/www/drraw/Makefile	Mon Oct 21 14:07:30 2013	(r331141)
 @@ -13,12 +13,13 @@ COMMENT=	A simple web-based presentation
  
  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 @@ TMPDIR?=	/var/db/${PORTNAME}/tmp
  
  PLIST_SUB+=	CONFDIR=${CONFDIR}
  
 -NO_STAGE=	yes
  .include <bsd.port.options.mk>
  
  .if ${PORT_OPTIONS:MZOOM_PATCH}
 @@ -48,27 +48,16 @@ post-patch:
  		${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>
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
