From owner-svn-ports-all@freebsd.org Wed Dec 12 20:00:50 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3F4B4132395B; Wed, 12 Dec 2018 20:00:50 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DA2F976230; Wed, 12 Dec 2018 20:00:49 +0000 (UTC) (envelope-from tobik@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D07D5CD7D; Wed, 12 Dec 2018 20:00:49 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wBCK0n0D041604; Wed, 12 Dec 2018 20:00:49 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wBCK0nNf041603; Wed, 12 Dec 2018 20:00:49 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201812122000.wBCK0nNf041603@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Wed, 12 Dec 2018 20:00:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r487323 - head/devel/ptlib X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: head/devel/ptlib X-SVN-Commit-Revision: 487323 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: DA2F976230 X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-1.64 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-0.83)[-0.828,0]; NEURAL_HAM_SHORT(-0.81)[-0.812,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 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: Wed, 12 Dec 2018 20:00:50 -0000 Author: tobik Date: Wed Dec 12 20:00:49 2018 New Revision: 487323 URL: https://svnweb.freebsd.org/changeset/ports/487323 Log: devel/ptlib builds fine with OpenSSL 1.1.1 after r484518 Also apply the OpenSSL 1.1.1 patch when SSL_DEFAULT=openssl111. http://beefy11.nyi.freebsd.org/data/head-i386-default/p485718_s340864/logs/ptlib-2.10.11_2.log Modified: head/devel/ptlib/Makefile Modified: head/devel/ptlib/Makefile ============================================================================== --- head/devel/ptlib/Makefile Wed Dec 12 19:57:07 2018 (r487322) +++ head/devel/ptlib/Makefile Wed Dec 12 20:00:49 2018 (r487323) @@ -12,9 +12,6 @@ COMMENT= Cross platform C++ library, used by OPAL LICENSE= MPL10 -BROKEN_SSL= openssl111 -BROKEN_SSL_REASON_openssl111= use of undeclared identifier 'BIO_s_file_internal' - LIB_DEPENDS= libexpat.so:textproc/expat2 CONFLICTS= pwlib-1.* @@ -46,7 +43,7 @@ DEBUG_DESC= Install debug library .include -.if ${OSVERSION} > 1200085 +.if (${OPSYS} == FreeBSD && ${OSVERSION} > 1200085 && ${SSL_DEFAULT} == base) || ${SSL_DEFAULT} == openssl111 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src_ptclib_pssl.cxx-openssl111 .else EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src_ptclib_pssl.cxx