svn commit: r482654 - branches/2018Q4/security/bro

[Antoine Brodin]

Author: antoine
Date: Sun Oct 21 08:10:20 2018
New Revision: 482654
URL: https://svnweb.freebsd.org/changeset/ports/482654

Log:
  MFH: r482313
  
  Bro 2.5.5 does not build under 12.0-ALPHA10 due to openssl 1.1.1
  in the base. Unbreak build by statically linking against
  security/openssl. This is a stopgap until Bro 2.6 which supports
  openssl 1.1 is released. It is currently in beta and due in a
  few weeks.
  
  Add missing NETMAP_DESC while we're here.
  
  Reviewed by:	ler (mentor)
  Approved by:	ler (mentor)
  Differential Revision:	https://reviews.freebsd.org/D17602

Modified:
  branches/2018Q4/security/bro/Makefile
Directory Properties:
  branches/2018Q4/   (props changed)

Modified: branches/2018Q4/security/bro/Makefile
==============================================================================
--- branches/2018Q4/security/bro/Makefile	Sun Oct 21 08:07:14 2018	(r482653)
+++ branches/2018Q4/security/bro/Makefile	Sun Oct 21 08:10:20 2018	(r482654)
@@ -63,6 +63,7 @@ BROKER_DESC=	Enable the Broker communication library
 IPSUMDUMP_DESC=	Enables traffic summaries
 LBL_CF_DESC=	Unix time to formated time/date filter support
 LBL_HF_DESC=	Address to hostname filter support
+NETMAP_DESC=	Native Netmap Packet IOSource for Bro 
 PERFTOOLS_DESC=	Use Perftools to improve memory & CPU usage
 
 BROCTL_IMPLIES=		BROCCOLI IPSUMDUMP
@@ -139,5 +140,19 @@ post-build-NETMAP-on:
 	(cd ${WRKSRC_bro_netmap} && ./configure --bro-dist=${WRKSRC} \
 	    --install-root=${STAGEDIR}${PREFIX}/lib/bro/plugins && \
 	    make && make install)
+
+.include <bsd.port.options.mk>
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200000
+BUILD_DEPENDS+=		${NONEXISTENT}:security/openssl:stage
+CXXFLAGS+=		-I${WRKDIR}/openssl/include
+OPENSSL_LDFLAGS+=	-L${WRKDIR}/openssl/lib
+
+# Don't use COPYTREE_SHARE here as it hard links files, and the original files
+# are owned by root, which creates problems of its own.
+pre-configure:
+	@cd `${MAKE} -V STAGEDIR -C ${PORTSDIR}/security/openssl`${PREFIX} \
+	    && ${FIND} -E . ! -name *.so* | ${CPIO} -dump ${WRKDIR}/openssl >/dev/null 2>&1
+.endif
 
 .include <bsd.port.mk>