CVS commit: pkgsrc/www/aws

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

Module Name:    pkgsrc
Committed By:   rillig
Date:           Fri May  1 07:10:19 UTC 2020

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

Log Message:
www/aws: fix pkglint warnings


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 pkgsrc/www/aws/Makefile
cvs rdiff -u -r1.11 -r1.12 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.33 pkgsrc/www/aws/Makefile:1.34
--- pkgsrc/www/aws/Makefile:1.33        Fri May  1 07:00:16 2020
+++ pkgsrc/www/aws/Makefile     Fri May  1 07:10:19 2020
@@ -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 @@ CONFIGURE_ARGS+=    ZPATH=${BUILDLINK_PREFI
 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};

Index: pkgsrc/www/aws/options.mk
diff -u pkgsrc/www/aws/options.mk:1.11 pkgsrc/www/aws/options.mk:1.12
--- pkgsrc/www/aws/options.mk:1.11      Mon Nov  4 22:09:51 2019
+++ pkgsrc/www/aws/options.mk   Fri May  1 07:10:19 2020
@@ -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 @@ DOTBUILD=             release
 # 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