From owner-svn-ports-head@freebsd.org Sun Jun 9 06:40:56 2019 Return-Path: Delivered-To: svn-ports-head@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 0C52815BF529; Sun, 9 Jun 2019 06:40:56 +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 9E82F8BB75; Sun, 9 Jun 2019 06:40:55 +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 79C98270AC; Sun, 9 Jun 2019 06:40:55 +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 x596et46053213; Sun, 9 Jun 2019 06:40:55 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x596etds053211; Sun, 9 Jun 2019 06:40:55 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201906090640.x596etds053211@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Sun, 9 Jun 2019 06:40:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r503799 - head/www/aws X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: head/www/aws X-SVN-Commit-Revision: 503799 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 9E82F8BB75 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.98)[-0.979,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Jun 2019 06:40:56 -0000 Author: tobik Date: Sun Jun 9 06:40:54 2019 New Revision: 503799 URL: https://svnweb.freebsd.org/changeset/ports/503799 Log: www/aws: Canonicalize options group names after r503781 (D20426) Ports that expose options for selecting between GnuTLS or OpenSSL support often name the options GNUTLS and OPENSSL. Do the same here for the sake of consistency. As a side effect we get better option descriptions too. Modified: head/www/aws/Makefile head/www/aws/pkg-plist Modified: head/www/aws/Makefile ============================================================================== --- head/www/aws/Makefile Sun Jun 9 06:22:11 2019 (r503798) +++ head/www/aws/Makefile Sun Jun 9 06:40:54 2019 (r503799) @@ -3,7 +3,7 @@ PORTNAME= aws PORTVERSION= 17.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MAINTAINER= ports@FreeBSD.org @@ -35,18 +35,18 @@ BUILD_TYPE= release ADDL_RPATH= ${LOCALBASE}/lib:${LOCALBASE}/lib/aws/native/relocatable SHEBANG_FILES= tools/awsascb -OPTIONS_SINGLE= Secure-Socket-Layer +OPTIONS_SINGLE= SSL OPTIONS_DEFINE= IP6 DEBUG LDAP SHARED DOCS -OPTIONS_DEFAULT= SSL SHARED +OPTIONS_DEFAULT= OPENSSL SHARED OPTIONS_SUB= yes NO_OPTIONS_SORT= yes DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx -OPTIONS_SINGLE_Secure-Socket-Layer= SSL GNUTLS +OPTIONS_SINGLE_SSL= OPENSSL GNUTLS SHARED_DESC= Build shared libraries in addition to static ones IP6_DESC= Support IPv6 instead of IPv4 -SSL_USES= ssl +OPENSSL_USES= ssl GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls LDAP_USE= OPENLDAP=yes @@ -67,7 +67,7 @@ CONF_ARGS+= DEFAULT_LIBRARY_TYPE=static ## SSL Support ## ################### -.if ${PORT_OPTIONS:MSSL} +.if ${PORT_OPTIONS:MOPENSSL} CONF_ARGS+= SOCKET=openssl CONF_ARGS+= LPATH=${OPENSSLLIB} LINK_SSL= Modified: head/www/aws/pkg-plist ============================================================================== --- head/www/aws/pkg-plist Sun Jun 9 06:22:11 2019 (r503798) +++ head/www/aws/pkg-plist Sun Jun 9 06:40:54 2019 (r503799) @@ -525,20 +525,20 @@ %%SHARED%%lib/aws.relocatable/zlib-thin.ali %%SHARED%%lib/aws.relocatable/zlib.ali %%SHARED%%lib/libaws.so -%%SSL%%%%SHARED%%include/aws.relocatable/aws-net-ssl-certificate-impl__openssl.adb -%%SSL%%%%SHARED%%include/aws.relocatable/aws-net-ssl-certificate-impl__openssl.ads -%%SSL%%%%SHARED%%include/aws.relocatable/aws-net-ssl__openssl.adb -%%SSL%%%%SHARED%%include/aws.relocatable/ssl-thin__openssl.ads -%%SSL%%%%SHARED%%lib/aws.relocatable/aws-net-ssl-certificate-impl__openssl.ali -%%SSL%%%%SHARED%%lib/aws.relocatable/aws-net-ssl__openssl.ali -%%SSL%%%%SHARED%%lib/aws.relocatable/ssl-thin__openssl.ali -%%SSL%%include/aws/aws-net-ssl-certificate-impl__openssl.adb -%%SSL%%include/aws/aws-net-ssl-certificate-impl__openssl.ads -%%SSL%%include/aws/aws-net-ssl__openssl.adb -%%SSL%%include/aws/ssl-thin__openssl.ads -%%SSL%%lib/aws/aws-net-ssl-certificate-impl__openssl.ali -%%SSL%%lib/aws/aws-net-ssl__openssl.ali -%%SSL%%lib/aws/ssl-thin__openssl.ali +%%OPENSSL%%%%SHARED%%include/aws.relocatable/aws-net-ssl-certificate-impl__openssl.adb +%%OPENSSL%%%%SHARED%%include/aws.relocatable/aws-net-ssl-certificate-impl__openssl.ads +%%OPENSSL%%%%SHARED%%include/aws.relocatable/aws-net-ssl__openssl.adb +%%OPENSSL%%%%SHARED%%include/aws.relocatable/ssl-thin__openssl.ads +%%OPENSSL%%%%SHARED%%lib/aws.relocatable/aws-net-ssl-certificate-impl__openssl.ali +%%OPENSSL%%%%SHARED%%lib/aws.relocatable/aws-net-ssl__openssl.ali +%%OPENSSL%%%%SHARED%%lib/aws.relocatable/ssl-thin__openssl.ali +%%OPENSSL%%include/aws/aws-net-ssl-certificate-impl__openssl.adb +%%OPENSSL%%include/aws/aws-net-ssl-certificate-impl__openssl.ads +%%OPENSSL%%include/aws/aws-net-ssl__openssl.adb +%%OPENSSL%%include/aws/ssl-thin__openssl.ads +%%OPENSSL%%lib/aws/aws-net-ssl-certificate-impl__openssl.ali +%%OPENSSL%%lib/aws/aws-net-ssl__openssl.ali +%%OPENSSL%%lib/aws/ssl-thin__openssl.ali bin/ada2wsdl bin/aws_password bin/awsascb