Date: Sun, 1 Dec 2013 07:29:17 +0000 (UTC) From: Antoine Brodin <antoine@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r335367 - head/security/bro Message-ID: <201312010729.rB17THeY025538@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: antoine Date: Sun Dec 1 07:29:17 2013 New Revision: 335367 URL: http://svnweb.freebsd.org/changeset/ports/335367 Log: - Fix packaging with pkgng: create empty dirs to be packed in STAGEDIR - Fix build on FreeBSD 8: depend on libmagic ABI version from ports - While here, use new LIB_DEPENDS syntax PR: ports/184194 PR: ports/184381 Submitted by: Craig Leres (maintainer) Reported by: Mark Martinec and pkg-fallout Modified: head/security/bro/Makefile Modified: head/security/bro/Makefile ============================================================================== --- head/security/bro/Makefile Sun Dec 1 07:15:49 2013 (r335366) +++ head/security/bro/Makefile Sun Dec 1 07:29:17 2013 (r335367) @@ -13,7 +13,7 @@ LICENSE= BSD BUILD_DEPENDS= bison:${PORTSDIR}/devel/bison \ swig:${PORTSDIR}/devel/swig13 -LIB_DEPENDS= GeoIP:${PORTSDIR}/net/GeoIP +LIB_DEPENDS= libGeoIP.so:${PORTSDIR}/net/GeoIP USES= cmake:outsource perl5 USE_PYTHON= yes @@ -56,13 +56,13 @@ OPTIONS_EXCLUDE=NLS DOCS # Bro 2.2 requires libmagic >= 5.04 .if ${OSVERSION} < 901000 -LIB_DEPENDS+= magic:${PORTSDIR}/sysutils/file +LIB_DEPENDS+= libmagic.so.1:${PORTSDIR}/sysutils/file .endif .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MBROCCOLI} -LIB_DEPENDS+= broccoli:${PORTSDIR}/security/broccoli +LIB_DEPENDS+= libbroccoli.so:${PORTSDIR}/security/broccoli .endif .if ${PORT_OPTIONS:MBROCTL} @@ -111,8 +111,10 @@ RUN_DEPENDS+= ipsumdump:${PORTSDIR}/net/ .if ${PORT_OPTIONS:MBROCTL} post-stage:: .if defined(BRO_PREFIX) - @${MKDIR} ${PREFIX} + @${MKDIR} ${STAGEDIR}${PREFIX} .endif + @${MKDIR} ${STAGEDIR}${PREFIX}/spool/installed-scripts-do-not-touch/auto + @${MKDIR} ${STAGEDIR}${PREFIX}/spool/installed-scripts-do-not-touch/site .for F in broctl.cfg @${INSTALL_SCRIPT} ${INSTALL_WRKSRC}/aux/broctl/etc/${F} ${STAGEDIR}${PREFIX}/etc/${F}.example .endfor
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312010729.rB17THeY025538>