Index: head/www/tomcat-native/Makefile
===================================================================
--- head/www/tomcat-native/Makefile	(revision 528003)
+++ head/www/tomcat-native/Makefile	(revision 528004)
@@ -1,35 +1,36 @@
 # Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	tomcat-native
-PORTVERSION=	1.2.21
+PORTVERSION=	1.2.23
 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
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/native
-
 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.2.21
+		lib/libtcnative-1.so.0.${SOVERSION}
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtcnative-1.so.0.2.21
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtcnative-1.so.0.${SOVERSION}
 
 .include <bsd.port.mk>
Index: head/www/tomcat-native/distinfo
===================================================================
--- head/www/tomcat-native/distinfo	(revision 528003)
+++ head/www/tomcat-native/distinfo	(revision 528004)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1553515413
-SHA256 (tomcat-native-1.2.21-src.tar.gz) = 05bba41671cc91c531c366a9ccd930b38a107a0212c73181961f3cda508d5007
-SIZE (tomcat-native-1.2.21-src.tar.gz) = 418909
+TIMESTAMP = 1583516376
+SHA256 (tomcat-native-1.2.23-src.tar.gz) = 5ae5940f759cfdd68384ecf61f2c4fd9b01eb430ab0d349c0b197df0b0c0c3c7
+SIZE (tomcat-native-1.2.23-src.tar.gz) = 419428
Index: head/www/tomcat-native/files/patch-Makefile.in
===================================================================
--- head/www/tomcat-native/files/patch-Makefile.in	(revision 528003)
+++ head/www/tomcat-native/files/patch-Makefile.in	(revision 528004)
@@ -1,33 +1,33 @@
 --- Makefile.in.orig	2018-12-20 18:48:22 UTC
 +++ Makefile.in
 @@ -49,13 +49,9 @@ TARGETS = $(TARGET_LIB)
  @INCLUDE_RULES@
  @INCLUDE_OUTPUTS@
  
 -ifneq ($(CC_OLD),$(CC))
 -    CC=$(CC_OLD)
 -endif
 +CC=$(CC_OLD)
  
 -ifneq ($(LIBTOOL_OLD),$(LIBTOOL))
 -    LIBTOOL=$(LIBTOOL_OLD)
 -endif
 +LIBTOOL=$(LIBTOOL_OLD)
  
  LINK          = $(LIBTOOL) $(LTFLAGS) --mode=link --tag=CC $(LT_LDFLAGS) $(COMPILE) -version-info $(TCNATIVE_LIBTOOL_VERSION) $(ALL_LDFLAGS) -o $@
  CLEAN_SUBDIRS = test
 @@ -77,13 +73,7 @@ top_blddir=@abs_builddir@
  
  
  install: $(TARGET_LIB)
 -	$(APR_MKDIR) $(DESTDIR)$(includedir) $(DESTDIR)$(libdir)/pkgconfig \
 -		     $(DESTDIR)$(libdir) $(DESTDIR)$(bindir)
 -	$(INSTALL_DATA) tcnative.pc $(DESTDIR)$(libdir)/pkgconfig/$(TCNATIVE_PCFILE)
--	$(INSTALL_DATA) include/*.h $(DESTDIR)$(includedir)
+-	$(INSTALL_DATA) $(srcdir)/include/*.h $(DESTDIR)$(includedir)
 -	list='$(INSTALL_SUBDIRS)'; for i in $$list; do \
 -		( cd $$i ; $(MAKE) DESTDIR=$(DESTDIR) install ); \
 -	done
 +	$(APR_MKDIR) $(DESTDIR)$(libdir)
  	$(LIBTOOL) --mode=install $(INSTALL) -m 755 $(TARGET_LIB) $(DESTDIR)$(libdir)
  
  $(TARGET_LIB): $(OBJECTS)
Index: head/www/tomcat-native/files/patch-src_ssl.c
===================================================================
--- head/www/tomcat-native/files/patch-src_ssl.c	(revision 528003)
+++ head/www/tomcat-native/files/patch-src_ssl.c	(revision 528004)
@@ -1,11 +1,22 @@
---- src/ssl.c.orig	2017-01-23 08:26:47 UTC
+--- src/ssl.c.orig	2019-06-26 11:12:00 UTC
 +++ src/ssl.c
-@@ -428,6 +428,8 @@ static unsigned long ssl_thread_id(void)
+@@ -24,6 +24,10 @@
+ #include <sys/syscall.h>
+ #endif
+ 
++#ifdef __FreeBSD__
++#include <pthread_np.h>
++#endif
++
+ #ifdef HAVE_OPENSSL
+ #include "ssl_private.h"
+ 
+@@ -472,6 +476,8 @@ static unsigned long ssl_thread_id(void)
      uint64_t tid;
      pthread_threadid_np(NULL, &tid);
      return (unsigned long)tid;
 +#elif defined(__FreeBSD__)
 +    return (unsigned long)pthread_getthreadid_np();
  #elif defined(__linux__)
      return (unsigned long)syscall(SYS_gettid);
  #else