Attachment #209490 for bug #241312

Lines 3-12 Link Here

(-)Makefile (-5 / +50 lines)
3		3
4	PORTNAME= logstash	4	PORTNAME= logstash
5	PORTVERSION= 6.8.5	5	PORTVERSION= 6.8.5
6	PORTREVISION= 0
7	CATEGORIES= sysutils java	6	CATEGORIES= sysutils java
8	MASTER_SITES= http://artifacts.elastic.co/downloads/logstash/	7	MASTER_SITES= http://artifacts.elastic.co/downloads/logstash/:logstash \
		8	https://github.com/netty/netty-tcnative/archive/:nettytcnative
9	PKGNAMESUFFIX= 6	9	PKGNAMESUFFIX= 6
		10	DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:logstash \
		11	netty-tcnative-parent-${NETTY_VERSION}.Final.tar.gz:nettytcnative
10		12
11	MAINTAINER= elastic@FreeBSD.org	13	MAINTAINER= elastic@FreeBSD.org
12	COMMENT= Server-side data ingest and transfomation tool	14	COMMENT= Server-side data ingest and transfomation tool
Lines 14-29 Link Here
14	LICENSE= APACHE20	16	LICENSE= APACHE20
15		17
16	RUN_DEPENDS= ${LOCALBASE}/bin/bash:shells/bash	18	RUN_DEPENDS= ${LOCALBASE}/bin/bash:shells/bash
		19	LIB_DEPENDS= libapr-1.so:devel/apr1
17		20
		21	USES= cpe shebangfix
		22
18	CONFLICTS= logstash-[0-9]* logstash5-[0-9]*	23	CONFLICTS= logstash-[0-9]* logstash5-[0-9]*
19		24
20	USES= cpe shebangfix
21	SHEBANG_FILES= bin/*	25	SHEBANG_FILES= bin/*
22	CPE_VENDOR= elasticsearch	26	CPE_VENDOR= elasticsearch
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-${NETTY_VERSION}.Final/openssl-dynamic/src/main/c
27		32
28	USERS= logstash	33	USERS= logstash
29	GROUPS= logstash	34	GROUPS= logstash
Lines 34-39 Link Here
34		39
35	LOGSTASH_HOME?= ${PREFIX}/${PORTNAME}	40	LOGSTASH_HOME?= ${PREFIX}/${PORTNAME}
36		41
		42	NETTY_VERSION= 2.0.12
		43	BEATS_VERSION= 5.1.9
		44	JRUBY_VERSION= 2.5.0
		45
37	SUB_LIST= JAVA_HOME=${JAVA_HOME} \	46	SUB_LIST= JAVA_HOME=${JAVA_HOME} \
38	LOGSTASH_HOME=${LOGSTASH_HOME}	47	LOGSTASH_HOME=${LOGSTASH_HOME}
39		48
Lines 43-52 Link Here
43	LOGSTASH_JRUBY_BIN_FILES= ast gem irb jgem jirb jirb_swing jruby \	52	LOGSTASH_JRUBY_BIN_FILES= ast gem irb jgem jirb jirb_swing jruby \
44	jruby.bash jruby.sh jrubyc rake rdoc ri testrb	53	jruby.bash jruby.sh jrubyc rake rdoc ri testrb
45		54
		55	.include <bsd.port.pre.mk>
		56
		57	.if ${ARCH} == "aarch64"
		58	NETTY_ARCH= aarch_64
		59	.elif ${ARCH} == "amd64"
		60	NETTY_ARCH= x86_64
		61	.elif ${ARCH} == "arm6"
		62	NETTY_ARCH= arm_32
		63	.elif ${ARCH} == "arm7"
		64	NETTY_ARCH= arm_32
		65	.elif ${ARCH} == "i386"
		66	NETTY_ARCH= x86_32
		67	.elif ${ARCH} == "powerpc"
		68	NETTY_ARCH= ppc_32
		69	.elif ${ARCH} == "powerpc64"
		70	NETTY_ARCH= ppc_64
		71	.elif ${ARCH} == "sparc64"
		72	NETTY_ARCH= sparc_64
		73	.else
		74	# Default to ${ARCH}
		75	NETTY_ARCH= ${ARCH}
		76	.endif
		77
		78	SUB_LIST+= NETTY_ARCH=${NETTY_ARCH}
		79
46	post-patch:	80	post-patch:
47	${REINPLACE_CMD} 's\|%%ETCDIR%%\|${ETCDIR}\|g' ${WRKSRC}/config/logstash.yml	81	${REINPLACE_CMD} 's\|%%ETCDIR%%\|${ETCDIR}\|g' ${WRKSRC}/config/logstash.yml
48	${FIND} ${WRKSRC} -name '*.orig' -delete	82	${FIND} ${WRKSRC} -name '*.orig' -delete
49		83
		84	post-configure:
		85	${SED} ${_SUB_LIST_TEMP} -e '/^@comment /d' ${FILESDIR}/Makefile.in > ${BUILD_WRKSRC}/Makefile
		86	${SED} ${_SUB_LIST_TEMP} -e '/^@comment /d' ${FILESDIR}/config.h.in > ${BUILD_WRKSRC}/config.h
		87
		88	post-build:
		89	${MKDIR} ${WRKSRC}/vendor/bundle/jruby/${JRUBY_VERSION}/gems/logstash-input-beats-${BEATS_VERSION}-java/vendor/jar-dependencies/io/netty/netty-tcnative-boringssl-static/${NETTY_VERSION}.Final/META-INF/native
		90	${CP} ${BUILD_WRKSRC}/libnetty*.so ${WRKSRC}/vendor/bundle/jruby/${JRUBY_VERSION}/gems/logstash-input-beats-${BEATS_VERSION}-java/vendor/jar-dependencies/io/netty/netty-tcnative-boringssl-static/${NETTY_VERSION}.Final/META-INF/native
		91	(cd ${WRKSRC}/vendor/bundle/jruby/${JRUBY_VERSION}/gems/logstash-input-beats-${BEATS_VERSION}-java/vendor/jar-dependencies/io/netty/netty-tcnative-boringssl-static/${NETTY_VERSION}.Final && ${JAR} uvf netty-tcnative-boringssl-static-${NETTY_VERSION}.Final.jar META-INF/native/libnetty*.so)
		92	${CP} ${WRKSRC}/vendor/bundle/jruby/${JRUBY_VERSION}/gems/logstash-input-beats-${BEATS_VERSION}-java/vendor/jar-dependencies/io/netty/netty-tcnative-boringssl-static/${NETTY_VERSION}.Final/netty-tcnative-boringssl-static-${NETTY_VERSION}.Final.jar ${WRKSRC}/vendor/bundle/jruby/${JRUBY_VERSION}/gems/logstash-input-http-3.3.0-java/vendor/jar-dependencies/io/netty/netty-tcnative-boringssl-static/${NETTY_VERSION}.Final/netty-tcnative-boringssl-static-${NETTY_VERSION}.Final.jar
		93	${RM} -rf ${WRKSRC}/vendor/bundle/jruby/${JRUBY_VERSION}/gems/logstash-input-beats-${BEATS_VERSION}-java/vendor/jar-dependencies/io/netty/netty-tcnative-boringssl-static/${NETTY_VERSION}.Final/META-INF
		94
50	do-install:	95	do-install:
51	${FIND} ${WRKSRC} -name '*.bat' -delete	96	${FIND} ${WRKSRC} -name '*.bat' -delete
52	${MKDIR} ${STAGEDIR}${ETCDIR}	97	${MKDIR} ${STAGEDIR}${ETCDIR}
Lines 71-74 Link Here
71	${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}	116	${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
72	${ECHO} "@dir(logstash,logstash,) logstash/data" >> ${TMPPLIST}	117	${ECHO} "@dir(logstash,logstash,) logstash/data" >> ${TMPPLIST}
73		118
74	.include <bsd.port.mk>	119	.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)distinfo (+2 lines)
1	TIMESTAMP = 1574583674	1	TIMESTAMP = 1574583674
2	SHA256 (logstash-6.8.5.tar.gz) = c67b4cbf4dd28ecf6580a2e31769855b56a38f9f4db507341e6ca27edd27656d	2	SHA256 (logstash-6.8.5.tar.gz) = c67b4cbf4dd28ecf6580a2e31769855b56a38f9f4db507341e6ca27edd27656d
3	SIZE (logstash-6.8.5.tar.gz) = 172214102	3	SIZE (logstash-6.8.5.tar.gz) = 172214102
		4	SHA256 (netty-tcnative-parent-2.0.12.Final.tar.gz) = a2ac433be51308b07e6b0b9fdcb65b15ac323b9c1d8a306d614ee79ec1efec10
		5	SIZE (netty-tcnative-parent-2.0.12.Final.tar.gz) = 146650




# $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 <bsd.lib.mk>
# $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 <bsd.lib.mk>




/* 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 <dlfcn.h> header file. */
#define HAVE_DLFCN_H 1

/* Define to 1 if you have the <inttypes.h> header file. */
#define HAVE_INTTYPES_H 1

/* Define to 1 if you have the <memory.h> header file. */
#define HAVE_MEMORY_H 1

/* Define HAVE_OPENSSL_DSA */
/* #undef HAVE_OPENSSL_DSA */

/* Define to 1 if you have the <stdint.h> header file. */
#define HAVE_STDINT_H 1

/* Define to 1 if you have the <stdlib.h> header file. */
#define HAVE_STDLIB_H 1

/* Define to 1 if you have the <strings.h> header file. */
#define HAVE_STRINGS_H 1

/* Define to 1 if you have the <string.h> header file. */
#define HAVE_STRING_H 1

/* Define to 1 if you have the <sys/stat.h> header file. */
#define HAVE_SYS_STAT_H 1

/* Define to 1 if you have the <sys/types.h> header file. */
#define HAVE_SYS_TYPES_H 1

/* Define to 1 if you have the <unistd.h> 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%%"
/* 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 <dlfcn.h> header file. */
#define HAVE_DLFCN_H 1

/* Define to 1 if you have the <inttypes.h> header file. */
#define HAVE_INTTYPES_H 1

/* Define to 1 if you have the <memory.h> header file. */
#define HAVE_MEMORY_H 1

/* Define HAVE_OPENSSL_DSA */
/* #undef HAVE_OPENSSL_DSA */

/* Define to 1 if you have the <stdint.h> header file. */
#define HAVE_STDINT_H 1

/* Define to 1 if you have the <stdlib.h> header file. */
#define HAVE_STDLIB_H 1

/* Define to 1 if you have the <strings.h> header file. */
#define HAVE_STRINGS_H 1

/* Define to 1 if you have the <string.h> header file. */
#define HAVE_STRING_H 1

/* Define to 1 if you have the <sys/stat.h> header file. */
#define HAVE_SYS_STAT_H 1

/* Define to 1 if you have the <sys/types.h> header file. */
#define HAVE_SYS_TYPES_H 1

/* Define to 1 if you have the <unistd.h> 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%%"

Return to bug 241312

Line 0 Link Here

(-)files/Makefile.in (+26 lines)
	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>
	14	# $FreeBSD$
	15
	16	APR_INCLUDES = `%%LOCALBASE%%/bin/apr-1-config --includes`
	17	APR_CFLAGS = `%%LOCALBASE%%/bin/apr-1-config --cflags`
	18	APR_LIBS = `%%LOCALBASE%%/bin/apr-1-config --libs`
	19	APR_LDFLAGS = `%%LOCALBASE%%/bin/apr-1-config --link-ld`
	20	SHLIB_NAME= libnetty_tcnative_freebsd_%%NETTY_ARCH%%.so
	21	SRCS!= ls *.c
	22	INCS!= ls *.h
	23	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
	24	LDFLAGS+= -L/usr/lib -lssl -lcrypto $(APR_LDFLAGS) $(APR_LIBS)
	25
	26	.include <bsd.lib.mk>

Line 0 Link Here

(-)files/config.h.in (+130 lines)
		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%%"
66	/* src/config.h. Generated from config.h.in by configure. */
67	/* src/config.h.in. Generated from configure.ac by autoheader. */
68
69	/* Define to 1 if you have the <dlfcn.h> header file. */
70	#define HAVE_DLFCN_H 1
71
72	/* Define to 1 if you have the <inttypes.h> header file. */
73	#define HAVE_INTTYPES_H 1
74
75	/* Define to 1 if you have the <memory.h> header file. */
76	#define HAVE_MEMORY_H 1
77
78	/* Define HAVE_OPENSSL_DSA */
79	/* #undef HAVE_OPENSSL_DSA */
80
81	/* Define to 1 if you have the <stdint.h> header file. */
82	#define HAVE_STDINT_H 1
83
84	/* Define to 1 if you have the <stdlib.h> header file. */
85	#define HAVE_STDLIB_H 1
86
87	/* Define to 1 if you have the <strings.h> header file. */
88	#define HAVE_STRINGS_H 1
89
90	/* Define to 1 if you have the <string.h> header file. */
91	#define HAVE_STRING_H 1
92
93	/* Define to 1 if you have the <sys/stat.h> header file. */
94	#define HAVE_SYS_STAT_H 1
95
96	/* Define to 1 if you have the <sys/types.h> header file. */
97	#define HAVE_SYS_TYPES_H 1
98
99	/* Define to 1 if you have the <unistd.h> header file. */
100	#define HAVE_UNISTD_H 1
101
102	/* Define to the sub-directory where libtool stores uninstalled libraries. */
103	#define LT_OBJDIR ".libs/"
104
105	/* Name of package */
106	#define PACKAGE "-project_name-"
107
108	/* Define to the address where bug reports for this package should be sent. */
109	#define PACKAGE_BUGREPORT ""
110
111	/* Define to the full name of this package. */
112	#define PACKAGE_NAME "@PROJECT_NAME@"
113
114	/* Define to the full name and version of this package. */
115	#define PACKAGE_STRING "@PROJECT_NAME@ @VERSION@"
116
117	/* Define to the one symbol short name of this package. */
118	#define PACKAGE_TARNAME "-project_name-"
119
120	/* Define to the home page for this package. */
121	#define PACKAGE_URL ""
122
123	/* Define to the version of this package. */
124	#define PACKAGE_VERSION "@VERSION@"
125
126	/* Define to 1 if you have the ANSI C header files. */
127	#define STDC_HEADERS 1
128
129	/* Version number of package */
130	#define VERSION "freebsd_%%NETTY_ARCH%%"