View | Details | Raw Unified | Return to bug 241312 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-3 / +43 lines)
Lines 5-11 Link Here
5
PORTVERSION=	6.8.3
5
PORTVERSION=	6.8.3
6
PORTREVISION=	0
6
PORTREVISION=	0
7
CATEGORIES=	sysutils java
7
CATEGORIES=	sysutils java
8
MASTER_SITES=	http://artifacts.elastic.co/downloads/logstash/
8
MASTER_SITES=	http://artifacts.elastic.co/downloads/logstash/:logstash \
9
		https://github.com/netty/netty-tcnative/archive/:nettytcnative
10
DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:logstash \
11
		netty-tcnative-parent-2.0.12.Final.tar.gz:nettytcnative
9
PKGNAMESUFFIX=	6
12
PKGNAMESUFFIX=	6
10
13
11
MAINTAINER=	elastic@FreeBSD.org
14
MAINTAINER=	elastic@FreeBSD.org
Lines 23-29 Link Here
23
USE_JAVA=	yes
26
USE_JAVA=	yes
24
JAVA_VERSION=	1.8+
27
JAVA_VERSION=	1.8+
25
JAVA_RUN=	yes
28
JAVA_RUN=	yes
26
NO_BUILD=	yes
29
#NO_BUILD=	yes
30
BUILD_WRKSRC=	${WRKDIR}/netty-tcnative-netty-tcnative-parent-2.0.12.Final/openssl-dynamic/src/main/c
27
31
28
USERS=	logstash
32
USERS=	logstash
29
GROUPS=	logstash
33
GROUPS=	logstash
Lines 43-52 Link Here
43
LOGSTASH_JRUBY_BIN_FILES=	ast gem irb jgem jirb jirb_swing jruby \
47
LOGSTASH_JRUBY_BIN_FILES=	ast gem irb jgem jirb jirb_swing jruby \
44
				jruby.bash jruby.sh jrubyc rake rdoc ri testrb
48
				jruby.bash jruby.sh jrubyc rake rdoc ri testrb
45
49
50
.include <bsd.port.pre.mk>
51
52
.if ${ARCH} == "aarch64"
53
NETTY_ARCH=	aarch_64
54
.elif ${ARCH} == "amd64"
55
NETTY_ARCH=	x86_64
56
.elif ${ARCH} == "arm6"
57
NETTY_ARCH=	arm_32
58
.elif ${ARCH} == "arm7"
59
NETTY_ARCH=	arm_32
60
.elif ${ARCH} == "i386"
61
NETTY_ARCH=	x86_32
62
.elif ${ARCH} == "powerpc"
63
NETTY_ARCH=	ppc_32
64
.elif ${ARCH} == "powerpc64"
65
NETTY_ARCH=	ppc_64
66
.elif ${ARCH} == "sparc64"
67
NETTY_ARCH=	sparc_64
68
.else
69
# Default to ${ARCH}
70
NETTY_ARCH=	${ARCH}
71
.endif
72
73
SUB_LIST+=	NETTY_ARCH=${NETTY_ARCH}
74
46
post-patch:
75
post-patch:
47
	${REINPLACE_CMD} 's|%%ETCDIR%%|${ETCDIR}|g' ${WRKSRC}/config/logstash.yml
76
	${REINPLACE_CMD} 's|%%ETCDIR%%|${ETCDIR}|g' ${WRKSRC}/config/logstash.yml
48
	${FIND} ${WRKSRC} -name '*.orig' -delete
77
	${FIND} ${WRKSRC} -name '*.orig' -delete
49
78
79
post-configure:
80
	${SED} ${_SUB_LIST_TEMP} -e '/^@comment /d' ${FILESDIR}/Makefile.in > ${BUILD_WRKSRC}/Makefile
81
	${SED} ${_SUB_LIST_TEMP} -e '/^@comment /d' ${FILESDIR}/config.h.in > ${BUILD_WRKSRC}/config.h
82
83
post-build:
84
	${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
85
	${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
86
	(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)
87
	${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
88
	${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
89
50
do-install:
90
do-install:
51
	${FIND} ${WRKSRC} -name '*.bat' -delete
91
	${FIND} ${WRKSRC} -name '*.bat' -delete
52
	${MKDIR} ${STAGEDIR}${ETCDIR}
92
	${MKDIR} ${STAGEDIR}${ETCDIR}
Lines 71-74 Link Here
71
		${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
111
		${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
72
	${ECHO} "@dir(logstash,logstash,) logstash/data" >> ${TMPPLIST}
112
	${ECHO} "@dir(logstash,logstash,) logstash/data" >> ${TMPPLIST}
73
113
74
.include <bsd.port.mk>
114
.include <bsd.port.post.mk>
(-)distinfo (-1 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1568827839
1
TIMESTAMP = 1573185203
2
SHA256 (logstash-6.8.3.tar.gz) = a300840ff110f6c3b94388ba728fdf7bc6ffc0f003ae12deffd4b547d989fc02
2
SHA256 (logstash-6.8.3.tar.gz) = a300840ff110f6c3b94388ba728fdf7bc6ffc0f003ae12deffd4b547d989fc02
3
SIZE (logstash-6.8.3.tar.gz) = 172067513
3
SIZE (logstash-6.8.3.tar.gz) = 172067513
4
SHA256 (netty-tcnative-parent-2.0.12.Final.tar.gz) = a2ac433be51308b07e6b0b9fdcb65b15ac323b9c1d8a306d614ee79ec1efec10
5
SIZE (netty-tcnative-parent-2.0.12.Final.tar.gz) = 146650
(-)files/Makefile.in (+13 lines)
Line 0 Link Here
1
# $FreeBSD$
2
3
APR_INCLUDES = `%%LOCALBASE%%/bin/apr-1-config --includes`
4
APR_CFLAGS = `%%LOCALBASE%%/bin/apr-1-config --cflags`
5
APR_LIBS = `%%LOCALBASE%%/bin/apr-1-config --libs`
6
APR_LDFLAGS = `%%LOCALBASE%%/bin/apr-1-config --link-ld`
7
SHLIB_NAME=	libnetty_tcnative_freebsd_%%NETTY_ARCH%%.so
8
SRCS!=	ls *.c
9
INCS!=	ls *.h
10
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
11
LDFLAGS+=  -L/usr/lib -lssl -lcrypto  $(APR_LDFLAGS) $(APR_LIBS)
12
13
.include <bsd.lib.mk>
(-)files/config.h.in (+65 lines)
Line 0 Link Here
1
/* src/config.h.  Generated from config.h.in by configure.  */
2
/* src/config.h.in.  Generated from configure.ac by autoheader.  */
3
4
/* Define to 1 if you have the <dlfcn.h> header file. */
5
#define HAVE_DLFCN_H 1
6
7
/* Define to 1 if you have the <inttypes.h> header file. */
8
#define HAVE_INTTYPES_H 1
9
10
/* Define to 1 if you have the <memory.h> header file. */
11
#define HAVE_MEMORY_H 1
12
13
/* Define HAVE_OPENSSL_DSA */
14
/* #undef HAVE_OPENSSL_DSA */
15
16
/* Define to 1 if you have the <stdint.h> header file. */
17
#define HAVE_STDINT_H 1
18
19
/* Define to 1 if you have the <stdlib.h> header file. */
20
#define HAVE_STDLIB_H 1
21
22
/* Define to 1 if you have the <strings.h> header file. */
23
#define HAVE_STRINGS_H 1
24
25
/* Define to 1 if you have the <string.h> header file. */
26
#define HAVE_STRING_H 1
27
28
/* Define to 1 if you have the <sys/stat.h> header file. */
29
#define HAVE_SYS_STAT_H 1
30
31
/* Define to 1 if you have the <sys/types.h> header file. */
32
#define HAVE_SYS_TYPES_H 1
33
34
/* Define to 1 if you have the <unistd.h> header file. */
35
#define HAVE_UNISTD_H 1
36
37
/* Define to the sub-directory where libtool stores uninstalled libraries. */
38
#define LT_OBJDIR ".libs/"
39
40
/* Name of package */
41
#define PACKAGE "-project_name-"
42
43
/* Define to the address where bug reports for this package should be sent. */
44
#define PACKAGE_BUGREPORT ""
45
46
/* Define to the full name of this package. */
47
#define PACKAGE_NAME "@PROJECT_NAME@"
48
49
/* Define to the full name and version of this package. */
50
#define PACKAGE_STRING "@PROJECT_NAME@ @VERSION@"
51
52
/* Define to the one symbol short name of this package. */
53
#define PACKAGE_TARNAME "-project_name-"
54
55
/* Define to the home page for this package. */
56
#define PACKAGE_URL ""
57
58
/* Define to the version of this package. */
59
#define PACKAGE_VERSION "@VERSION@"
60
61
/* Define to 1 if you have the ANSI C header files. */
62
#define STDC_HEADERS 1
63
64
/* Version number of package */
65
#define VERSION "freebsd_%%NETTY_ARCH%%"

Return to bug 241312