From owner-svn-ports-all@freebsd.org Tue Sep 13 18:40:22 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6F1A2BD9783; Tue, 13 Sep 2016 18:40:22 +0000 (UTC) (envelope-from marino@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3F427E38; Tue, 13 Sep 2016 18:40:22 +0000 (UTC) (envelope-from marino@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8DIeLIl099500; Tue, 13 Sep 2016 18:40:21 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8DIeL3R099499; Tue, 13 Sep 2016 18:40:21 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201609131840.u8DIeL3R099499@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Tue, 13 Sep 2016 18:40:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r422056 - head/www/tomcat-native X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Sep 2016 18:40:22 -0000 Author: marino Date: Tue Sep 13 18:40:21 2016 New Revision: 422056 URL: https://svnweb.freebsd.org/changeset/ports/422056 Log: www/tomcat-native: remove USE_OPENSSL_PORT and IGNORE LibreSSL Even with LibreSSL using the OpenSSL 1.0.2 compatibility definitions, there are numerous unreferenced symbols during linking. It doesn't seem trivial to fix so IGNORE when SSL_DEFAULT=libressl* This version of Tomcat also requires OpenSSL version 1.0.2 which is not available in FreeBSD 9 base nor FreeBSD 10 base. Set IGNORE when base SSL libraries are used for those 2 platforms. Approved by: SSL blanket Modified: head/www/tomcat-native/Makefile Modified: head/www/tomcat-native/Makefile ============================================================================== --- head/www/tomcat-native/Makefile Tue Sep 13 18:37:43 2016 (r422055) +++ head/www/tomcat-native/Makefile Tue Sep 13 18:40:21 2016 (r422056) @@ -16,9 +16,7 @@ LIB_DEPENDS= libapr-1.so:devel/apr1 WRKSRC= ${WRKDIR}/${DISTNAME}/native -USES= libtool -USE_OPENSSL= yes -WITH_OPENSSL_PORT= yes +USES= libtool ssl USE_JAVA= yes USE_LDCONFIG= yes JAVA_VERSION= 1.6+ @@ -35,4 +33,15 @@ PLIST_FILES= lib/libtcnative-1.a \ post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtcnative-1.so.0.2.7 -.include +.include + +.if ${SSL_DEFAULT} == base +IGNORE_FreeBSD_9= Requires OpenSSL 1.0.2 (set SSL_DEFAULT=openssl) +IGNORE_FreeBSD_10= Requires OpenSSL 1.0.2 (set_SSL_DEFAULT=openssl) +.endif + +.if ${SSL_DEFAULT:Mlibressl*} +IGNORE= Detected LibreSSL (missing numerous symbols during linking) +.endif + +.include