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

Collapse All | Expand All

(-)Makefile (-3 / +44 lines)
Lines 5-11 Link Here
5
PORTVERSION=	6.8.4
5
PORTVERSION=	6.8.4
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 14-19 Link Here
14
LICENSE=	APACHE20
17
LICENSE=	APACHE20
15
18
16
RUN_DEPENDS=	${LOCALBASE}/bin/bash:shells/bash
19
RUN_DEPENDS=	${LOCALBASE}/bin/bash:shells/bash
20
LIB_DEPENDS=	libapr-1.so:devel/apr1
17
21
18
CONFLICTS=	logstash-[0-9]* logstash5-[0-9]*
22
CONFLICTS=	logstash-[0-9]* logstash5-[0-9]*
19
23
Lines 23-29 Link Here
23
USE_JAVA=	yes
27
USE_JAVA=	yes
24
JAVA_VERSION=	1.8+
28
JAVA_VERSION=	1.8+
25
JAVA_RUN=	yes
29
JAVA_RUN=	yes
26
NO_BUILD=	yes
30
JAVA_BUILD=	yes
31
BUILD_WRKSRC=	${WRKDIR}/netty-tcnative-netty-tcnative-parent-2.0.12.Final/openssl-dynamic/src/main/c
27
32
28
USERS=	logstash
33
USERS=	logstash
29
GROUPS=	logstash
34
GROUPS=	logstash
Lines 43-52 Link Here
43
LOGSTASH_JRUBY_BIN_FILES=	ast gem irb jgem jirb jirb_swing jruby \
48
LOGSTASH_JRUBY_BIN_FILES=	ast gem irb jgem jirb jirb_swing jruby \
44
				jruby.bash jruby.sh jrubyc rake rdoc ri testrb
49
				jruby.bash jruby.sh jrubyc rake rdoc ri testrb
45
50
51
.include <bsd.port.pre.mk>
52
53
.if ${ARCH} == "aarch64"
54
NETTY_ARCH=	aarch_64
55
.elif ${ARCH} == "amd64"
56
NETTY_ARCH=	x86_64
57
.elif ${ARCH} == "arm6"
58
NETTY_ARCH=	arm_32
59
.elif ${ARCH} == "arm7"
60
NETTY_ARCH=	arm_32
61
.elif ${ARCH} == "i386"
62
NETTY_ARCH=	x86_32
63
.elif ${ARCH} == "powerpc"
64
NETTY_ARCH=	ppc_32
65
.elif ${ARCH} == "powerpc64"
66
NETTY_ARCH=	ppc_64
67
.elif ${ARCH} == "sparc64"
68
NETTY_ARCH=	sparc_64
69
.else
70
# Default to ${ARCH}
71
NETTY_ARCH=	${ARCH}
72
.endif
73
74
SUB_LIST+=	NETTY_ARCH=${NETTY_ARCH}
75
46
post-patch:
76
post-patch:
47
	${REINPLACE_CMD} 's|%%ETCDIR%%|${ETCDIR}|g' ${WRKSRC}/config/logstash.yml
77
	${REINPLACE_CMD} 's|%%ETCDIR%%|${ETCDIR}|g' ${WRKSRC}/config/logstash.yml
48
	${FIND} ${WRKSRC} -name '*.orig' -delete
78
	${FIND} ${WRKSRC} -name '*.orig' -delete
49
79
80
post-configure:
81
	${SED} ${_SUB_LIST_TEMP} -e '/^@comment /d' ${FILESDIR}/Makefile.in > ${BUILD_WRKSRC}/Makefile
82
	${SED} ${_SUB_LIST_TEMP} -e '/^@comment /d' ${FILESDIR}/config.h.in > ${BUILD_WRKSRC}/config.h
83
84
post-build:
85
	${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
86
	${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
87
	(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)
88
	${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
89
	${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
90
50
do-install:
91
do-install:
51
	${FIND} ${WRKSRC} -name '*.bat' -delete
92
	${FIND} ${WRKSRC} -name '*.bat' -delete
52
	${MKDIR} ${STAGEDIR}${ETCDIR}
93
	${MKDIR} ${STAGEDIR}${ETCDIR}
Lines 71-74 Link Here
71
		${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
112
		${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
72
	${ECHO} "@dir(logstash,logstash,) logstash/data" >> ${TMPPLIST}
113
	${ECHO} "@dir(logstash,logstash,) logstash/data" >> ${TMPPLIST}
73
114
74
.include <bsd.port.mk>
115
.include <bsd.port.post.mk>
(-)distinfo (+2 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1574468347
1
TIMESTAMP = 1574468347
2
SHA256 (logstash-6.8.4.tar.gz) = da077fdc38d59b0de56de8bd76243f3ea215e95d8ce5880569be46ba715844a8
2
SHA256 (logstash-6.8.4.tar.gz) = da077fdc38d59b0de56de8bd76243f3ea215e95d8ce5880569be46ba715844a8
3
SIZE (logstash-6.8.4.tar.gz) = 172186036
3
SIZE (logstash-6.8.4.tar.gz) = 172186036
4
SHA256 (netty-tcnative-parent-2.0.12.Final.tar.gz) = a2ac433be51308b07e6b0b9fdcb65b15ac323b9c1d8a306d614ee79ec1efec10
5
SIZE (netty-tcnative-parent-2.0.12.Final.tar.gz) = 146650

Return to bug 241312