svn commit: r503799 - head/www/aws

[Tobias Kortkamp]

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 at 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