--- Makefile (revision 516731) +++ Makefile (working copy) @@ -5,7 +5,10 @@ PORTVERSION= 6.8.3 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 @@ -23,7 +26,8 @@ USE_JAVA= yes JAVA_VERSION= 1.8+ JAVA_RUN= yes -NO_BUILD= yes +#NO_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 +47,46 @@ LOGSTASH_JRUBY_BIN_FILES= ast gem irb jgem jirb jirb_swing jruby \ jruby.bash jruby.sh jrubyc rake rdoc ri testrb +.include + +.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.8-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.8-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.8-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.8-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.8-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 +111,4 @@ ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST} ${ECHO} "@dir(logstash,logstash,) logstash/data" >> ${TMPPLIST} -.include +.include --- distinfo (revision 516731) +++ distinfo (working copy) @@ -1,3 +1,5 @@ -TIMESTAMP = 1568827839 +TIMESTAMP = 1573185203 SHA256 (logstash-6.8.3.tar.gz) = a300840ff110f6c3b94388ba728fdf7bc6ffc0f003ae12deffd4b547d989fc02 SIZE (logstash-6.8.3.tar.gz) = 172067513 +SHA256 (netty-tcnative-parent-2.0.12.Final.tar.gz) = a2ac433be51308b07e6b0b9fdcb65b15ac323b9c1d8a306d614ee79ec1efec10 +SIZE (netty-tcnative-parent-2.0.12.Final.tar.gz) = 146650 --- files/Makefile.in (nonexistent) +++ files/Makefile.in (working copy) @@ -0,0 +1,13 @@ +# $FreeBSD$ + +APR_INCLUDES = `%%LOCALBASE%%/bin/apr-1-config --includes` +APR_CFLAGS = `%%LOCALBASE%%/bin/apr-1-config --cflags` +APR_LIBS = `%%LOCALBASE%%/bin/apr-1-config --libs` +APR_LDFLAGS = `%%LOCALBASE%%/bin/apr-1-config --link-ld` +SHLIB_NAME= libnetty_tcnative_freebsd_%%NETTY_ARCH%%.so +SRCS!= ls *.c +INCS!= ls *.h +CFLAGS+= -DHAVE_OPENSSL -I/usr/include/openssl $(APR_INCLUDES) -I%%JAVA_HOME%%/include -I%%JAVA_HOME%%/include/freebsd -D_LARGEFILE64_SOURCE $(APR_CFLAGS) -fvisibility=hidden +LDFLAGS+= -L/usr/lib -lssl -lcrypto $(APR_LDFLAGS) $(APR_LIBS) + +.include --- files/config.h.in (nonexistent) +++ files/config.h.in (working copy) @@ -0,0 +1,65 @@ +/* src/config.h. Generated from config.h.in by configure. */ +/* src/config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define HAVE_OPENSSL_DSA */ +/* #undef HAVE_OPENSSL_DSA */ + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to the sub-directory where libtool stores uninstalled libraries. */ +#define LT_OBJDIR ".libs/" + +/* Name of package */ +#define PACKAGE "-project_name-" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "@PROJECT_NAME@" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "@PROJECT_NAME@ @VERSION@" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "-project_name-" + +/* Define to the home page for this package. */ +#define PACKAGE_URL "" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "@VERSION@" + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Version number of package */ +#define VERSION "freebsd_%%NETTY_ARCH%%"