From owner-svn-ports-head@FreeBSD.ORG Sat Nov 2 16:45:44 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id D497147D; Sat, 2 Nov 2013 16:45:44 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A63742D6E; Sat, 2 Nov 2013 16:45:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA2Gjit8054622; Sat, 2 Nov 2013 16:45:44 GMT (envelope-from feld@svn.freebsd.org) Received: (from feld@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA2GjigR054621; Sat, 2 Nov 2013 16:45:44 GMT (envelope-from feld@svn.freebsd.org) Message-Id: <201311021645.rA2GjigR054621@svn.freebsd.org> From: Mark Felder Date: Sat, 2 Nov 2013 16:45:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r332502 - head/security/sguil-client X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Nov 2013 16:45:44 -0000 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