Index: head/www/tomcat-native/Makefile =================================================================== --- head/www/tomcat-native/Makefile (revision 432319) +++ head/www/tomcat-native/Makefile (revision 432320) @@ -1,47 +1,48 @@ # Created by: Alex Dupre # $FreeBSD$ PORTNAME= tomcat-native PORTVERSION= 1.2.10 +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 WRKSRC= ${WRKDIR}/${DISTNAME}/native USES= libtool ssl USE_JAVA= yes USE_LDCONFIG= yes JAVA_VERSION= 1.6+ GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-apr=${LOCALBASE} \ --with-java-home=${JAVA_HOME} \ --with-ssl=${OPENSSLBASE} PLIST_FILES= lib/libtcnative-1.a \ lib/libtcnative-1.so \ lib/libtcnative-1.so.0 \ lib/libtcnative-1.so.0.2.10 post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtcnative-1.so.0.2.10 .include .if ${SSL_DEFAULT} == base IGNORE_FreeBSD_9= Requires OpenSSL 1.0.2 (set DEFAULT_VERSIONS+=ssl=openssl) IGNORE_FreeBSD_10= Requires OpenSSL 1.0.2 (set DEFAULT_VERSIONS+=ssl=openssl) .endif .if ${SSL_DEFAULT:Mlibressl*} IGNORE= Detected LibreSSL (missing numerous symbols during linking) .endif .include Index: head/www/tomcat-native/files/patch-src_ssl.c =================================================================== --- head/www/tomcat-native/files/patch-src_ssl.c (revision 432319) +++ head/www/tomcat-native/files/patch-src_ssl.c (revision 432320) @@ -1,11 +1,11 @@ --- src/ssl.c.orig 2017-01-23 08:26:47 UTC +++ src/ssl.c @@ -428,6 +428,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_threadid_np(); ++ return (unsigned long)pthread_getthreadid_np(); #elif defined(__linux__) return (unsigned long)syscall(SYS_gettid); #else