From owner-svn-ports-all@freebsd.org Fri Apr 14 14:43:01 2017 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 2CB09D3D38D; Fri, 14 Apr 2017 14:43:01 +0000 (UTC) (envelope-from mat@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 0751FC75; Fri, 14 Apr 2017 14:43:00 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v3EEh0pL074580; Fri, 14 Apr 2017 14:43:00 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3EEgxsI074572; Fri, 14 Apr 2017 14:42:59 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201704141442.v3EEgxsI074572@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Fri, 14 Apr 2017 14:42:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r438518 - in head: Mk/Uses www/libwww www/mod_auth_gssapi www/mod_spdy 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: Fri, 14 Apr 2017 14:43:01 -0000 Author: mat Date: Fri Apr 14 14:42:59 2017 New Revision: 438518 URL: https://svnweb.freebsd.org/changeset/ports/438518 Log: Rename (BROKEN|IGNORE)_OPENSSL to \1_SSL. Suggested by: sunpoet Sponsored by: Absolight Modified: head/Mk/Uses/ssl.mk head/www/libwww/Makefile (contents, props changed) head/www/mod_auth_gssapi/Makefile (contents, props changed) head/www/mod_spdy/Makefile (contents, props changed) Modified: head/Mk/Uses/ssl.mk ============================================================================== --- head/Mk/Uses/ssl.mk Fri Apr 14 14:38:50 2017 (r438517) +++ head/Mk/Uses/ssl.mk Fri Apr 14 14:42:59 2017 (r438518) @@ -77,21 +77,21 @@ OPENSSL_PORT= security/${SSL_DEFAULT} .error You are using an unsupported SSL provider ${SSL_DEFAULT} . endif -. if defined(BROKEN_OPENSSL) && ${BROKEN_OPENSSL:M${SSL_DEFAULT}} -. if defined(BROKEN_OPENSSL_REASON_${SSL_DEFAULT}) -BROKEN= ${BROKEN_OPENSSL_REASON_${SSL_DEFAULT}} -. elif defined(BROKEN_OPENSSL_REASON) -BROKEN= ${BROKEN_OPENSSL_REASON} +. if defined(BROKEN_SSL) && ${BROKEN_SSL:M${SSL_DEFAULT}} +. if defined(BROKEN_SSL_REASON_${SSL_DEFAULT}) +BROKEN= ${BROKEN_SSL_REASON_${SSL_DEFAULT}} +. elif defined(BROKEN_SSL_REASON) +BROKEN= ${BROKEN_SSL_REASON} . else BROKEN= does not build with DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT} . endif . endif -. if defined(IGNORE_OPENSSL) && ${IGNORE_OPENSSL:M${SSL_DEFAULT}} -. if defined(IGNORE_OPENSSL_REASON_${SSL_DEFAULT}) -IGNORE= ${IGNORE_OPENSSL_REASON_${SSL_DEFAULT}} -. elif defined(IGNORE_OPENSSL_REASON) -IGNORE= ${IGNORE_OPENSSL_REASON} +. if defined(IGNORE_SSL) && ${IGNORE_SSL:M${SSL_DEFAULT}} +. if defined(IGNORE_SSL_REASON_${SSL_DEFAULT}) +IGNORE= ${IGNORE_SSL_REASON_${SSL_DEFAULT}} +. elif defined(IGNORE_SSL_REASON) +IGNORE= ${IGNORE_SSL_REASON} . else IGNORE= not compatible DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT} . endif Modified: head/www/libwww/Makefile ============================================================================== --- head/www/libwww/Makefile Fri Apr 14 14:38:50 2017 (r438517) +++ head/www/libwww/Makefile Fri Apr 14 14:42:59 2017 (r438518) @@ -22,7 +22,7 @@ USES= gmake libtool perl5 ssl tar:tgz USE_PERL5= build USE_LDCONFIG= yes -BROKEN_OPENSSL= openssl-devel +BROKEN_SSL= openssl-devel post-install: ${INSTALL_DATA} ${WRKSRC}/modules/expat/xmlparse/xmlparse.h \ Modified: head/www/mod_auth_gssapi/Makefile ============================================================================== --- head/www/mod_auth_gssapi/Makefile Fri Apr 14 14:38:50 2017 (r438517) +++ head/www/mod_auth_gssapi/Makefile Fri Apr 14 14:42:59 2017 (r438518) @@ -29,8 +29,8 @@ SUB_FILES= ${APMOD_FILE} APMOD_FILE= 240_${PORTNAME}.conf.sample PLIST_SUB+= APMOD_FILE=${APMOD_FILE} -IGNORE_OPENSSL= libressl libressl-devel -IGNORE_OPENSSL_REASON= mod_auth_gssapi currently only supports OpenSSL +IGNORE_SSL= libressl libressl-devel +IGNORE_SSL_REASON= mod_auth_gssapi currently only supports OpenSSL do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR} Modified: head/www/mod_spdy/Makefile ============================================================================== --- head/www/mod_spdy/Makefile Fri Apr 14 14:38:50 2017 (r438517) +++ head/www/mod_spdy/Makefile Fri Apr 14 14:42:59 2017 (r438518) @@ -82,8 +82,8 @@ CONFIGURE_ENV+= CFLAGS="${CFLAGS}" \ LDFLAGS="${LDFLAGS}" MAKE_ENV+= BUILDTYPE=${BUILDTYPE} -BROKEN_OPENSSL= libressl libressl-devel -BROKEN_OPENSSL_REASON= incompatible with LibreSSL, please use www/apache24 with mod_http2 +BROKEN_SSL= libressl libressl-devel +BROKEN_SSL_REASON= incompatible with LibreSSL, please use www/apache24 with mod_http2 .include