Bug 183208 - security/sguil-client port update to implement STAGE
Summary: security/sguil-client port update to implement STAGE
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: Mark Felder
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-10-22 18:30 UTC by pauls
Modified: 2013-11-02 16:50 UTC (History)
0 users

See Also:

Attachments
sguil-client.diff (1.85 KB, patch)
2013-10-22 18:30 UTC, pauls 		no flags Details | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description pauls 2013-10-22 18:30:00 UTC 
	security/sguil-client, update port to implement STAGE
Comment 1 Mark Felder freebsd_committer freebsd_triage 2013-11-02 16:44:04 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->feld

I'll take it.
Comment 2 dfilter service freebsd_committer freebsd_triage 2013-11-02 16:45:51 UTC 
Author: feld
Date: Sat Nov  2 16:45:44 2013
New Revision: 332502
URL: http://svnweb.freebsd.org/changeset/ports/332502

Log:
  Support STAGE
  
  PR:		ports/183208
  Approved by:	swills (mentor, implicit)

Modified:
  head/security/sguil-client/Makefile

Modified: head/security/sguil-client/Makefile
==============================================================================
--- head/security/sguil-client/Makefile	Sat Nov  2 15:52:27 2013	(r332501)
+++ head/security/sguil-client/Makefile	Sat Nov  2 16:45:44 2013	(r332502)
@@ -29,7 +29,6 @@ SANCP_DESC=	Use sancp
 WIRESHARK_DESC=	Install wireshark
 
 NO_BUILD=	yes
-NO_STAGE=	yes
 USES=		tk:wrapper
 WRKSRC=		${WRKDIR}/sguil-${PORTVERSION}
 SUB_LIST=	SGUILDIR=${SGUILDIR}
@@ -58,31 +57,27 @@ RUN_DEPENDS+=	wireshark:${PORTSDIR}/net/
 .endif
 
 do-install:
-	@${MKDIR} ${PREFIX}/bin/${SGUILDIR}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/bin/${SGUILDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_SCRIPT} -m 751 ${WRKSRC}/client/sguil.tk \
-		${PREFIX}/bin/${SGUILDIR}/sguil.tk
+		${STAGEDIR}${PREFIX}/bin/${SGUILDIR}/sguil.tk
+	${INSTALL_DATA} ${PORTDOCS1:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS2:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR}
 .for f in sguil.conf
 	${INSTALL_DATA} ${WRKSRC}/client/${f} \
-		${PREFIX}/etc/${f}-sample
+		${STAGEDIR}${PREFIX}/etc/${f}-sample
 .endfor
 .for f in ${LIBFILES}
-	@${MKDIR} ${PREFIX}/bin/${SGUILDIR}/lib
-	${INSTALL_DATA} ${WRKSRC}/client/lib/${f} ${PREFIX}/bin/${SGUILDIR}/lib/${f}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/bin/${SGUILDIR}/lib
+	${INSTALL_DATA} ${WRKSRC}/client/lib/${f} ${STAGEDIR}${PREFIX}/bin/${SGUILDIR}/lib/${f}
 .endfor
 .for f in sguil_logo_h.gif
-	@${MKDIR} ${PREFIX}/bin/${SGUILDIR}/images
+	@${MKDIR} ${STAGEDIR}${PREFIX}/bin/${SGUILDIR}/images
 	${INSTALL_DATA} ${WRKSRC}/client/lib/images/${f} \
-		${PREFIX}/bin/${SGUILDIR}/images/${f}
+		${STAGEDIR}${PREFIX}/bin/${SGUILDIR}/images/${f}
 .endfor
 
 	(cd ${WRKSRC}/client/lib/tablelist4.1 && ${COPYTREE_SHARE} \* \
-		${PREFIX}/bin/${SGUILDIR}/lib/tablelist4.1/)
-
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS1} ${DOCSDIR}
-	cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS2} ${DOCSDIR}
-.endif
-	@${CAT} ${PKGMESSAGE}
+		${STAGEDIR}${PREFIX}/bin/${SGUILDIR}/lib/tablelist4.1/)
 
 .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"
Comment 3 Mark Felder freebsd_committer freebsd_triage 2013-11-02 16:46:01 UTC 
State Changed
From-To: open->closed

Committed. Thanks!