Index: www/tomcat-native/Makefile =================================================================== --- www/tomcat-native/Makefile (Revision 527748) +++ www/tomcat-native/Makefile (Arbeitskopie) @@ -2,7 +2,7 @@ # $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 @@ -14,8 +14,6 @@ LIB_DEPENDS= libapr-1.so:devel/apr1 -WRKSRC= ${WRKDIR}/${DISTNAME}/native - USES= libtool ssl USE_JAVA= yes USE_LDCONFIG= yes @@ -24,12 +22,15 @@ --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 Index: www/tomcat-native/distinfo =================================================================== --- www/tomcat-native/distinfo (Revision 527748) +++ www/tomcat-native/distinfo (Arbeitskopie) @@ -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: www/tomcat-native/files/patch-Makefile.in =================================================================== --- www/tomcat-native/files/patch-Makefile.in (Revision 527748) +++ www/tomcat-native/files/patch-Makefile.in (Arbeitskopie) @@ -23,7 +23,7 @@ - $(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 Index: www/tomcat-native/files/patch-src_ssl.c =================================================================== --- www/tomcat-native/files/patch-src_ssl.c (Revision 527748) +++ www/tomcat-native/files/patch-src_ssl.c (Arbeitskopie) @@ -1,6 +1,17 @@ ---- 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 + #endif + ++#ifdef __FreeBSD__ ++#include ++#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;