Index: head/www/tomcat-native/Makefile
===================================================================
--- head/www/tomcat-native/Makefile	(revision 535087)
+++ head/www/tomcat-native/Makefile	(revision 535088)
@@ -1,36 +1,37 @@
 # Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	tomcat-native
 PORTVERSION=	1.2.24
+PORTREVISION=	1
 CATEGORIES=	www java
 MASTER_SITES=	APACHE/tomcat/tomcat-connectors/native/${PORTVERSION}/source
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	Tomcat native library
 
 LICENSE=	APACHE20
 
 LIB_DEPENDS=	libapr-1.so:devel/apr1
 
 USES=		libtool ssl
 USE_JAVA=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-apr=${LOCALBASE} \
 		--with-java-home=${JAVA_HOME} \
 		--with-ssl=${OPENSSLBASE}
 
 WRKSRC=	${WRKDIR}/${DISTNAME}/native
 
 SOVERSION=	${PORTVERSION:S/^1.//1}
 PLIST_FILES=	lib/libtcnative-1.a \
 		lib/libtcnative-1.so \
 		lib/libtcnative-1.so.0 \
 		lib/libtcnative-1.so.0.${SOVERSION}
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtcnative-1.so.0.${SOVERSION}
 
 .include <bsd.port.mk>
Index: head/www/tomcat-native/files/patch-include_ssl__private.h
===================================================================
--- head/www/tomcat-native/files/patch-include_ssl__private.h	(nonexistent)
+++ head/www/tomcat-native/files/patch-include_ssl__private.h	(revision 535088)
@@ -0,0 +1,11 @@
+--- include/ssl_private.h.orig	2020-04-24 19:24:44 UTC
++++ include/ssl_private.h
+@@ -241,7 +241,7 @@
+ #define TLS_server_method                SSLv23_server_method
+ #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) */
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x10101000L
++#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER)
+ #define HAVE_KEYLOG_CALLBACK
+ #endif
+ 

Property changes on: head/www/tomcat-native/files/patch-include_ssl__private.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/www/tomcat-native/files/patch-src_ssl.c
===================================================================
--- head/www/tomcat-native/files/patch-src_ssl.c	(nonexistent)
+++ head/www/tomcat-native/files/patch-src_ssl.c	(revision 535088)
@@ -0,0 +1,46 @@
+--- src/ssl.c.orig	2020-04-24 19:24:44 UTC
++++ src/ssl.c
+@@ -367,11 +367,6 @@ static apr_status_t ssl_init_cleanup(void *data)
+ #endif
+     free_dh_params();
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+-    /* Openssl v1.1+ handles all termination automatically. Do
+-     * nothing in this case.
+-     */
+-#else
+     /*
+      * Try to kill the internals of the SSL library.
+      */
+@@ -394,7 +389,6 @@ static apr_status_t ssl_init_cleanup(void *data)
+ #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+     ERR_remove_thread_state(NULL);
+ #endif
+-#endif
+ 
+ #ifdef HAVE_KEYLOG_CALLBACK
+     if (key_log_file) {
+@@ -764,14 +758,7 @@ TCN_IMPLEMENT_CALL(jint, SSL, initialize)(TCN_STDARGS,
+         TCN_FREE_CSTRING(engine);
+         return (jint)APR_SUCCESS;
+     }
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+-    /* Openssl v1.1+ handles all initialisation automatically, apart
+-     * from hints as to how we want to use the library.
+-     *
+-     * We tell openssl we want to include engine support.
+-     */
+-    OPENSSL_init_ssl(OPENSSL_INIT_ENGINE_ALL_BUILTIN, NULL);
+-#else
++
+     /* We must register the library in full, to ensure our configuration
+      * code can successfully test the SSL environment.
+      */
+@@ -785,6 +772,7 @@ TCN_IMPLEMENT_CALL(jint, SSL, initialize)(TCN_STDARGS,
+ #endif
+     OPENSSL_load_builtin_modules();
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ #if ! (defined(WIN32) || defined(WIN64))
+     err = apr_threadkey_private_create(&thread_exit_key, _ssl_thread_exit,
+                                        tcn_global_pool);

Property changes on: head/www/tomcat-native/files/patch-src_ssl.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property