Date: Fri, 14 Apr 2017 14:42:59 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> 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 Message-ID: <201704141442.v3EEgxsI074572@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <bsd.port.pre.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201704141442.v3EEgxsI074572>