Index: head/www/tomcat-native/files/patch-src_ssl.c =================================================================== --- head/www/tomcat-native/files/patch-src_ssl.c (revision 534040) +++ head/www/tomcat-native/files/patch-src_ssl.c (nonexistent) @@ -1,22 +0,0 @@ ---- src/ssl.c.orig 2019-06-26 11:12:00 UTC -+++ src/ssl.c -@@ -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; -+#elif defined(__FreeBSD__) -+ return (unsigned long)pthread_getthreadid_np(); - #elif defined(__linux__) - return (unsigned long)syscall(SYS_gettid); - #else Property changes on: head/www/tomcat-native/files/patch-src_ssl.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/tomcat-native/files/patch-Makefile.in =================================================================== --- head/www/tomcat-native/files/patch-Makefile.in (revision 534040) +++ head/www/tomcat-native/files/patch-Makefile.in (nonexistent) @@ -1,33 +0,0 @@ ---- 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) $(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) Property changes on: head/www/tomcat-native/files/patch-Makefile.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/tomcat-native/Makefile =================================================================== --- head/www/tomcat-native/Makefile (revision 534040) +++ head/www/tomcat-native/Makefile (revision 534041) @@ -1,36 +1,36 @@ # Created by: Alex Dupre # $FreeBSD$ PORTNAME= tomcat-native -PORTVERSION= 1.2.23 +PORTVERSION= 1.2.24 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 Index: head/www/tomcat-native/distinfo =================================================================== --- head/www/tomcat-native/distinfo (revision 534040) +++ head/www/tomcat-native/distinfo (revision 534041) @@ -1,3 +1,3 @@ -TIMESTAMP = 1583516376 -SHA256 (tomcat-native-1.2.23-src.tar.gz) = 5ae5940f759cfdd68384ecf61f2c4fd9b01eb430ab0d349c0b197df0b0c0c3c7 -SIZE (tomcat-native-1.2.23-src.tar.gz) = 419428 +TIMESTAMP = 1588667024 +SHA256 (tomcat-native-1.2.24-src.tar.gz) = 037f52f9a345e766a7dde8361c55b3b69045928f9a8068a406612b603819e76c +SIZE (tomcat-native-1.2.24-src.tar.gz) = 419572