CVS commit: pkgsrc/www/aws

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sun May  3 19:08:52 UTC 2020

Modified Files:
        pkgsrc/www/aws: Makefile options.mk

Log Message:
www/aws: clean up package definition


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 pkgsrc/www/aws/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/www/aws/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/aws/Makefile
diff -u pkgsrc/www/aws/Makefile:1.34 pkgsrc/www/aws/Makefile:1.35
--- pkgsrc/www/aws/Makefile:1.34        Fri May  1 07:10:19 2020
+++ pkgsrc/www/aws/Makefile     Sun May  3 19:08:52 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2020/05/01 07:10:19 rillig Exp $
+# $NetBSD: Makefile,v 1.35 2020/05/03 19:08:52 rillig Exp $
 
 DISTNAME=      aws-${AWS_VERSION}
 PKGREVISION=   16
@@ -26,8 +26,8 @@ USE_LANGUAGES=                c ada c++ fortran
 
 MY_MAKE_ENV+=          ADA_PROJECT_PATH=${PREFIX}/lib/gnat
 MY_MAKE_ENV+=          AWK=awk
-MY_MAKE_ENV+=          PATH=${PREFIX}/gcc5-aux/bin:${PATH}
-MY_CONF_ENV+=          PATH=${PREFIX}/gcc5-aux/bin:${PATH}
+MY_MAKE_ENV+=          PATH=${PREFIX}/gcc5-aux/bin:${PATH:Q}
+MY_CONF_ENV+=          PATH=${PREFIX}/gcc5-aux/bin:${PATH:Q}
 CONFIGURE_ARGS+=       LPATH=${BUILDLINK_PREFIX.openssl}/lib
 CONFIGURE_ARGS+=       ZPATH=${BUILDLINK_PREFIX.zlib}/lib
 
@@ -43,7 +43,7 @@ SUBST_MESSAGE.rpath=  Adjust rpaths of sh
 SUBST_FILES.rpath=     src/src.gpr include/include.gpr
 SUBST_FILES.rpath+=    demos/test_ldap/test_ldap.gpr tools/tools.gpr
 SUBST_VARS.rpath=      ADDITIONAL_RPATH PREFIX
-SUBST_SED.rpath+=      -e "s,@RFLAG@,${LINKER_RPATH_FLAG},g"
+SUBST_SED.rpath+=      -e s,@RFLAG@,${LINKER_RPATH_FLAG},g
 SUBST_SED.rpath+=      -e "s,@SSL_RPATH@,${BUILDLINK_PREFIX.openssl}/lib,g"
 ADDITIONAL_RPATH=      ${PREFIX}/lib:${PREFIX}/lib/aws/relocatable
 

Index: pkgsrc/www/aws/options.mk
diff -u pkgsrc/www/aws/options.mk:1.12 pkgsrc/www/aws/options.mk:1.13
--- pkgsrc/www/aws/options.mk:1.12      Fri May  1 07:10:19 2020
+++ pkgsrc/www/aws/options.mk   Sun May  3 19:08:52 2020
@@ -1,5 +1,4 @@
-# $NetBSD: options.mk,v 1.12 2020/05/01 07:10:19 rillig Exp $
-
+# $NetBSD: options.mk,v 1.13 2020/05/03 19:08:52 rillig Exp $
 
 # xmlada is built-in (not optional) due to gprbuild dependency
 # zlib is built-in because it's mandatory.  It even comes with AWS.
@@ -23,7 +22,6 @@ CONFIGURE_ARGS+=      PROCESSORS=${MAKE_JOBS}
 CONFIGURE_ARGS+=       PYTHON=python${PYVERSSUFFIX}
 CONFIGURE_ARGS+=       XMLADA=true
 CONFIGURE_ARGS+=       prefix=${PREFIX}
-DOTBUILD=              release
 
 # The system libgcc is from version 4.1 which doesn't include the symbol
 # _Unwind_GetIPInfo.  If AWS uses the system zlib or if it's configured to use
@@ -41,10 +39,6 @@ CONFIGURE_ARGS+=     ZLIB=false
 CONFIGURE_ARGS+=       ZLIB=true
 .endif
 
-###################
-##  SSL Support  ##
-###################
-
 .if !empty(PKG_OPTIONS:Mssl)
 .include "../../security/openssl/buildlink3.mk"
 CONFIGURE_ARGS+= SOCKET=openssl
@@ -57,45 +51,20 @@ CONFIGURE_ARGS+= SOCKET=openssl
 CONFIGURE_ARGS+= SOCKET=gnutls
 .endif
 
-
-####################
-##  LDAP Support  ##
-####################
-
 .if !empty(PKG_OPTIONS:Mldap)
 CONFIGURE_ARGS+= LDAP=true
 .include "../../databases/openldap-client/buildlink3.mk"
 .endif
 
-####################
-##  IPv6 Support  ##
-####################
-
-PLIST_VARS+=           ipv6 noipv6
-.if !empty(PKG_OPTIONS:Mipv6)
+.if !empty(PKG_OPTIONS:Minet6)
 CONFIGURE_ARGS+=       IPv6=true
 .endif
 
-#####################
-##  Debug Support  ##
-#####################
-
 .if !empty(PKG_OPTIONS:Mdebug)
 CONFIGURE_ARGS+=       DEBUG=true
-DOTBUILD=              debug
 .endif
 
-##############################
-##  Shared Runtime Library  ##
-##############################
-
-#.if !empty(PKG_OPTIONS:Mdisable-shared-rt)
 CONFIGURE_ARGS+=       ENABLE_SHARED=false
-#.endif
-
-############################
-##  Default Library Type  ##
-############################
 
 .if !empty(PKG_OPTIONS:Mrelocatable)
 CONFIGURE_ARGS+=       DEFAULT_LIBRARY_TYPE=relocatable