fix RUSTFLAGS usage

[Tobias Nygren <tnn%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By:	tnn
Date:		Thu Jul 22 18:22:50 2021 +0200
Changeset:	fb22c527845d399f2d52dc43faf67b2d878128a4

Modified Files:
	glide/Makefile
	spotify-tui/Makefile
	spotifyd/Makefile

Log Message:
fix RUSTFLAGS usage

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=fb22c527845d399f2d52dc43faf67b2d878128a4

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

diffstat:
 glide/Makefile       | 4 ++--
 spotify-tui/Makefile | 1 -
 spotifyd/Makefile    | 8 ++++----
 3 files changed, 6 insertions(+), 7 deletions(-)

diffs:
diff --git a/glide/Makefile b/glide/Makefile
index da942c5904..5dba1ecd6d 100644
--- a/glide/Makefile
+++ b/glide/Makefile
@@ -26,8 +26,8 @@ SUBST_SED.prefix+=	-e 's,/usr/bin,${PREFIX},g'
 
 INSTALLATION_DIRS=	bin share
 
-MAKE_ENV+=	RUSTFLAGS="-C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.gtk3}/lib"
-MAKE_ENV+=	RUSTFLAGS="-C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.gstreamer1}/lib"
+RUSTFLAGS+=	-C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.gtk3}/lib
+RUSTFLAGS+=	-C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.gstreamer1}/lib
 
 .include "../../wip/gst-plugins1-opengl/buildlink3.mk"
 .include "../../devel/meson/build.mk"
diff --git a/spotify-tui/Makefile b/spotify-tui/Makefile
index 6482b4e5aa..2cda75b9c0 100644
--- a/spotify-tui/Makefile
+++ b/spotify-tui/Makefile
@@ -20,7 +20,6 @@ MAKE_ENV+=	OPENSSL_DIR=${BUILDLINK_PREFIX.openssl:Q}
 RUSTFLAGS+=	-C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib
 RUSTFLAGS+=	-C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libxcb}/lib
 RUSTFLAGS+=	-C link-arg=-L${BUILDLINK_PREFIX.libxcb}/lib
-MAKE_ENV+=	RUSTFLAGS=${RUSTFLAGS:Q}
 
 INSTALLATION_DIRS=	bin
 
diff --git a/spotifyd/Makefile b/spotifyd/Makefile
index f00af82ced..c1b4694055 100644
--- a/spotifyd/Makefile
+++ b/spotifyd/Makefile
@@ -425,7 +425,8 @@ CARGO_CRATE_DEPENDS+=	xdg-2.2.0
 MAKE_ENV+=		OPENSSL_DIR=${BUILDLINK_PREFIX.openssl:Q}
 INSTALLATION_DIRS+=	bin
 
-MAKE_ENV+=	RUSTFLAGS="-C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.pulseaudio}/lib -C link-arg=-L${BUILDLINK_PREFIX.pulseaudio}/lib"
+RUSTFLAGS+=		-C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.pulseaudio}/lib
+RUSTFLAGS+=		-C link-arg=-L${BUILDLINK_PREFIX.pulseaudio}/lib
 
 # TODO investigate why this is needed
 CHECK_WRKREF_SKIP+=	bin/spotifyd
@@ -445,9 +446,8 @@ CHECK_WRKREF_SKIP+=	bin/spotifyd
 #  12. That might fail. Need to update patches, etc with help of `pkgvi` and `pkgdiff`, e.g: `pkgdiff Cargo.lock.orig Cargo.lock > ../../patches/patch-Cargo.lock`, etc
 #  13. If patches updated `make mdi`
 
-CARGO_ARGS=	${DEFAULT_CARGO_ARGS}	\
-		--no-default-features	\
-		--features pulseaudio_backend
+CARGO_NO_DEFAULT_FEATURES=	YES
+CARGO_FEATURES+=		pulseaudio_backend
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/target/release/spotifyd ${DESTDIR}${PREFIX}/bin