Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 22 Oct 2013 17:38:46 +0000 (UTC)
From:      Paul Schmehl <pauls@utdallas.edu>
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/183209: update port to implement STAGE
Message-ID:  <20131022173846.7C16610376D34@buttercup4.utdallas.edu>
Resent-Message-ID: <201310221740.r9MHe03f049801@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         183209
>Category:       ports
>Synopsis:       update port to implement STAGE
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Oct 22 17:40:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Paul Schmehl
>Release:        FreeBSD 9.1-RELEASE amd64
>Organization:
The University of Texas at Dallas
>Environment:
System: FreeBSD hostname.utdallas.edu 9.1-RELEASE FreeBSD 9.1-RELEASE #0 r243825: Tue Dec 4 09:23:10 UTC 2012 root@farrell.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC amd64


	
>Description:
	security/sguil-sensor, update port to implement STAGE
>How-To-Repeat:
	
>Fix:

	

--- sguil-sensor.diff begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 331301)
+++ Makefile	(working copy)
@@ -41,7 +41,6 @@
 PORTDOCS3=	CHANGES FAQ INSTALL INSTALL.openbsd OPENSSL.README \
 		TODO UPGRADE USAGE sguildb.dia
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSANCP}
@@ -66,53 +65,50 @@
 
 post-patch:
 .for f in ${AGENTS}
-	@${REINPLACE_CMD} 's|/bin/sh|${PREFIX}/bin/${TCLSH}|' \
+	@${REINPLACE_CMD} 's|/bin/sh|${STAGEDIR}${PREFIX}/bin/${TCLSH}|' \
 		${WRKSRC}/sensor/${f}
 .endfor
 
 do-install:
-	@${MKDIR} ${PREFIX}/bin/${SGUILDIR}
-	@${MKDIR} ${PREFIX}/etc/${SGUILDIR}
-	@${MKDIR} ${PREFIX}/share/${SGUILDIR}
-	@${MKDIR} ${PREFIX}/share/${SGUILDIR}/contrib
-	@${MKDIR} ${PREFIX}/share/${SGUILDIR}/init
-	(cd ${WRKSRC}/sensor/contrib && ${COPYTREE_SHARE} \* ${PREFIX}/share/${SGUILDIR}/contrib "! -name ossec_agent.tcl.orig")
-	(cd ${WRKSRC}/sensor/init && ${COPYTREE_SHARE} \* ${PREFIX}/share/${SGUILDIR}/init)
+	@${MKDIR} ${STAGEDIR}${PREFIX}/bin/${SGUILDIR}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/${SGUILDIR}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/${SGUILDIR}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/${SGUILDIR}/contrib
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/${SGUILDIR}/init
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC}/sensor/contrib && ${COPYTREE_SHARE} \* ${STAGEDIR}${PREFIX}/share/${SGUILDIR}/contrib "! -name ossec_agent.tcl.orig")
+	(cd ${WRKSRC}/sensor/init && ${COPYTREE_SHARE} \* ${STAGEDIR}${PREFIX}/share/${SGUILDIR}/init)
+	${INSTALL_DATA} ${PORTDOCS1:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS2:S|^|${WRKSRC}/sensor/|} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS3:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR}
 .for f in ${AGENTS}
 	${INSTALL_SCRIPT} -m 751 ${WRKSRC}/sensor/${f} \
-		${PREFIX}/bin/${SGUILDIR}/${f}
+		${STAGEDIR}${PREFIX}/bin/${SGUILDIR}/${f}
 .endfor
 .for f in ${LOG_SCRIPTS}
 	${INSTALL_SCRIPT} -m 751 ${WRKSRC}/sensor/${f} \
-		${PREFIX}/bin/${SGUILDIR}/${f}
+		${STAGEDIR}${PREFIX}/bin/${SGUILDIR}/${f}
 .endfor
 .for f in ${CONFS}
 	${INSTALL_DATA} ${WRKSRC}/sensor/${f} \
-		${PREFIX}/etc/${SGUILDIR}/${f}-sample
+		${STAGEDIR}${PREFIX}/etc/${SGUILDIR}/${f}-sample
 .endfor
 .if ${PORT_OPTIONS:MSANCP}
 .for f in log_packets-sancp.sh
 	${INSTALL_SCRIPT} -m 751 ${WRKSRC}/sensor/${f} \
-		${PREFIX}/bin/${SGUILDIR}/${f}
+		${STAGEDIR}${PREFIX}/bin/${SGUILDIR}/${f}
 .endfor
 .for f in sancp.conf
 	${INSTALL_DATA} ${WRKSRC}/sensor/sancp/${f} \
-		${PREFIX}/etc/${SGUILDIR}/${f}-sample
+		${STAGEDIR}${PREFIX}/etc/${SGUILDIR}/${f}-sample
 .endfor
 .endif
 post-install:
 
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS1} ${DOCSDIR}
-	cd ${WRKSRC}/sensor && ${INSTALL_DATA} ${PORTDOCS2} ${DOCSDIR}
-	cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS3} ${DOCSDIR}
 .if ${PORT_OPTIONS:MSANCP}
 .for f in README.sancp_indexed_pcap
-	cd ${WRKSRC}/sensor && ${INSTALL_DATA} ${f} ${DOCSDIR}
+	cd ${WRKSRC}/sensor && ${INSTALL_DATA} ${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 .endif
-.endif
-	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
--- sguil-sensor.diff ends here ---


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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20131022173846.7C16610376D34>