Bug 183158 - [PATCH] www/drraw: support staging.
Summary: [PATCH] www/drraw: support staging.
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Mathieu Arnold
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-10-21 14:50 UTC by Mathieu Arnold
Modified: 2013-10-21 15:10 UTC (History)
1 user (show)

See Also:


Attachments
drraw-2.2.b2_1.patch (2.04 KB, patch)
2013-10-21 14:50 UTC, Mathieu Arnold
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Mathieu Arnold freebsd_committer freebsd_triage 2013-10-21 14:50:00 UTC
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)
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-10-21 14:50:09 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 2 Edwin Groothuis freebsd_committer freebsd_triage 2013-10-21 14:50:09 UTC
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
Comment 3 Mathieu Arnold freebsd_committer freebsd_triage 2013-10-21 14:51:48 UTC
Responsible Changed
From-To: freebsd-ports-bugs->mat

Take
Comment 4 Andriy Gapon 2013-10-21 14:54:43 UTC
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
Comment 5 Mathieu Arnold freebsd_committer freebsd_triage 2013-10-21 15:07:34 UTC
State Changed
From-To: feedback->closed

Committed, thanks!
Comment 6 dfilter service freebsd_committer freebsd_triage 2013-10-21 15:07:37 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"