[pkgsrc/trunk]: pkgsrc/www/aws www/aws: fix pkglint warnings

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/00bf25c16b74
branches:  trunk
changeset: 430493:00bf25c16b74
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Fri May 01 07:10:19 2020 +0000

description:
www/aws: fix pkglint warnings

diffstat:

 www/aws/Makefile   |  13 ++++++-------
 www/aws/options.mk |   4 ++--
 2 files changed, 8 insertions(+), 9 deletions(-)

diffs (45 lines):

diff -r 3d727e72013d -r 00bf25c16b74 www/aws/Makefile
--- a/www/aws/Makefile  Fri May 01 07:01:59 2020 +0000
+++ b/www/aws/Makefile  Fri May 01 07:10:19 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2020/05/01 07:00:16 rillig Exp $
+# $NetBSD: Makefile,v 1.34 2020/05/01 07:10:19 rillig Exp $
 
 DISTNAME=      aws-${AWS_VERSION}
 PKGREVISION=   16
@@ -40,12 +40,11 @@
 SUBST_CLASSES+=                rpath
 SUBST_STAGE.rpath=     pre-configure
 SUBST_MESSAGE.rpath=   Adjust rpaths of shared libraries
-SUBST_FILES.rpath=     src/src.gpr include/include.gpr \
-                       demos/test_ldap/test_ldap.gpr tools/tools.gpr
-SUBST_SED.rpath=       -e "s,@ADDITIONAL_RPATH@,${ADDITIONAL_RPATH}," \
-                       -e "s,@PREFIX@,${PREFIX},g" \
-                       -e "s,@RFLAG@,${LINKER_RPATH_FLAG},g" \
-                       -e "s,@SSL_RPATH@,${BUILDLINK_PREFIX.openssl}/lib,g"
+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,@SSL_RPATH@,${BUILDLINK_PREFIX.openssl}/lib,g"
 ADDITIONAL_RPATH=      ${PREFIX}/lib:${PREFIX}/lib/aws/relocatable
 
 GENERATE_PLIST=                cd ${DESTDIR}${PREFIX};
diff -r 3d727e72013d -r 00bf25c16b74 www/aws/options.mk
--- a/www/aws/options.mk        Fri May 01 07:01:59 2020 +0000
+++ b/www/aws/options.mk        Fri May 01 07:10:19 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.11 2019/11/04 22:09:51 rillig Exp $
+# $NetBSD: options.mk,v 1.12 2020/05/01 07:10:19 rillig Exp $
 
 
 # xmlada is built-in (not optional) due to gprbuild dependency
@@ -35,7 +35,7 @@
 # NetBSD until NetBSD upgrades it's libgcc or until a new GNAT and GPRBuild
 # are delivered that don't have this bug.
 
-.if $(OPSYS) == NetBSD
+.if ${OPSYS} == NetBSD
 CONFIGURE_ARGS+=       ZLIB=false
 .else
 CONFIGURE_ARGS+=       ZLIB=true