--- Makefile	(revision 518335)
+++ Makefile	(working copy)
@@ -5,7 +5,10 @@ 
 PORTVERSION=	6.8.4
 PORTREVISION=	0
 CATEGORIES=	sysutils java
-MASTER_SITES=	http://artifacts.elastic.co/downloads/logstash/
+MASTER_SITES=	http://artifacts.elastic.co/downloads/logstash/:logstash \
+		https://github.com/netty/netty-tcnative/archive/:nettytcnative
+DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:logstash \
+		netty-tcnative-parent-2.0.12.Final.tar.gz:nettytcnative
 PKGNAMESUFFIX=	6
 
 MAINTAINER=	elastic@FreeBSD.org
@@ -14,6 +17,7 @@ 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	${LOCALBASE}/bin/bash:shells/bash
+LIB_DEPENDS=	libapr-1.so:devel/apr1
 
 CONFLICTS=	logstash-[0-9]* logstash5-[0-9]*
 
@@ -23,7 +27,8 @@ 
 USE_JAVA=	yes
 JAVA_VERSION=	1.8+
 JAVA_RUN=	yes
-NO_BUILD=	yes
+JAVA_BUILD=	yes
+BUILD_WRKSRC=	${WRKDIR}/netty-tcnative-netty-tcnative-parent-2.0.12.Final/openssl-dynamic/src/main/c
 
 USERS=	logstash
 GROUPS=	logstash
@@ -43,10 +48,46 @@ 
 LOGSTASH_JRUBY_BIN_FILES=	ast gem irb jgem jirb jirb_swing jruby \
 				jruby.bash jruby.sh jrubyc rake rdoc ri testrb
 
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == "aarch64"
+NETTY_ARCH=	aarch_64
+.elif ${ARCH} == "amd64"
+NETTY_ARCH=	x86_64
+.elif ${ARCH} == "arm6"
+NETTY_ARCH=	arm_32
+.elif ${ARCH} == "arm7"
+NETTY_ARCH=	arm_32
+.elif ${ARCH} == "i386"
+NETTY_ARCH=	x86_32
+.elif ${ARCH} == "powerpc"
+NETTY_ARCH=	ppc_32
+.elif ${ARCH} == "powerpc64"
+NETTY_ARCH=	ppc_64
+.elif ${ARCH} == "sparc64"
+NETTY_ARCH=	sparc_64
+.else
+# Default to ${ARCH}
+NETTY_ARCH=	${ARCH}
+.endif
+
+SUB_LIST+=	NETTY_ARCH=${NETTY_ARCH}
+
 post-patch:
 	${REINPLACE_CMD} 's|%%ETCDIR%%|${ETCDIR}|g' ${WRKSRC}/config/logstash.yml
 	${FIND} ${WRKSRC} -name '*.orig' -delete
 
+post-configure:
+	${SED} ${_SUB_LIST_TEMP} -e '/^@comment /d' ${FILESDIR}/Makefile.in > ${BUILD_WRKSRC}/Makefile
+	${SED} ${_SUB_LIST_TEMP} -e '/^@comment /d' ${FILESDIR}/config.h.in > ${BUILD_WRKSRC}/config.h
+
+post-build:
+	${MKDIR} ${WRKSRC}/vendor/bundle/jruby/2.5.0/gems/logstash-input-beats-5.1.9-java/vendor/jar-dependencies/io/netty/netty-tcnative-boringssl-static/2.0.12.Final/META-INF/native
+	${CP} ${BUILD_WRKSRC}/libnetty*.so ${WRKSRC}/vendor/bundle/jruby/2.5.0/gems/logstash-input-beats-5.1.9-java/vendor/jar-dependencies/io/netty/netty-tcnative-boringssl-static/2.0.12.Final/META-INF/native
+	(cd ${WRKSRC}/vendor/bundle/jruby/2.5.0/gems/logstash-input-beats-5.1.9-java/vendor/jar-dependencies/io/netty/netty-tcnative-boringssl-static/2.0.12.Final && ${JAR} uvf netty-tcnative-boringssl-static-2.0.12.Final.jar META-INF/native/libnetty*.so)
+	${CP} ${WRKSRC}/vendor/bundle/jruby/2.5.0/gems/logstash-input-beats-5.1.9-java/vendor/jar-dependencies/io/netty/netty-tcnative-boringssl-static/2.0.12.Final/netty-tcnative-boringssl-static-2.0.12.Final.jar ${WRKSRC}/vendor/bundle/jruby/2.5.0/gems/logstash-input-http-3.3.0-java/vendor/jar-dependencies/io/netty/netty-tcnative-boringssl-static/2.0.12.Final/netty-tcnative-boringssl-static-2.0.12.Final.jar
+	${RM} -rf ${WRKSRC}/vendor/bundle/jruby/2.5.0/gems/logstash-input-beats-5.1.9-java/vendor/jar-dependencies/io/netty/netty-tcnative-boringssl-static/2.0.12.Final/META-INF
+
 do-install:
 	${FIND} ${WRKSRC} -name '*.bat' -delete
 	${MKDIR} ${STAGEDIR}${ETCDIR}
@@ -71,4 +112,4 @@ 
 		${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
 	${ECHO} "@dir(logstash,logstash,) logstash/data" >> ${TMPPLIST}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
--- distinfo	(revision 518335)
+++ distinfo	(working copy)
@@ -1,3 +1,5 @@ 
 TIMESTAMP = 1574468347
 SHA256 (logstash-6.8.4.tar.gz) = da077fdc38d59b0de56de8bd76243f3ea215e95d8ce5880569be46ba715844a8
 SIZE (logstash-6.8.4.tar.gz) = 172186036
+SHA256 (netty-tcnative-parent-2.0.12.Final.tar.gz) = a2ac433be51308b07e6b0b9fdcb65b15ac323b9c1d8a306d614ee79ec1efec10
+SIZE (netty-tcnative-parent-2.0.12.Final.tar.gz) = 146650