diff options
author | antoine <antoine@FreeBSD.org> | 2013-12-01 15:29:17 +0800 |
---|---|---|
committer | antoine <antoine@FreeBSD.org> | 2013-12-01 15:29:17 +0800 |
commit | 81699a8185c1a7a91834849da4f6e5e13c85d5c9 (patch) | |
tree | a0c136813f6bf328a766d4425fc64c1f3673ed7a /security | |
parent | 82c96f9677dfc6581846cea161aa3bc74f7581e4 (diff) | |
download | freebsd-ports-gnome-81699a8185c1a7a91834849da4f6e5e13c85d5c9.tar.gz freebsd-ports-gnome-81699a8185c1a7a91834849da4f6e5e13c85d5c9.tar.zst freebsd-ports-gnome-81699a8185c1a7a91834849da4f6e5e13c85d5c9.zip |
- 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
Diffstat (limited to 'security')
-rw-r--r-- | security/bro/Makefile | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/security/bro/Makefile b/security/bro/Makefile index 4be72df3db7c..fd55486f0138 100644 --- a/security/bro/Makefile +++ b/security/bro/Makefile @@ -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/ipsumdump .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 |