svn commit: r527755 - in head: Mk/Uses audio/ncspot audio/spotifyd sysutils/tealdeer

[Tobias Kortkamp]

Author: tobik
Date: Wed Mar  4 15:00:17 2020
New Revision: 527755
URL: https://svnweb.freebsd.org/changeset/ports/527755

Log:
  Mk/Uses/cargo.mk: Allow disabling default features via CARGO_FEATURES
  
  CARGO_FEATURES is overloaded to accept --no-default-features as a
  special token which will set CARGO_{BUILD,INSTALL,TEST}_ARGS
  appropriately.  This is done in preference over introducing yet
  another knob.

Modified:
  head/Mk/Uses/cargo.mk
  head/audio/ncspot/Makefile
  head/audio/spotifyd/Makefile
  head/sysutils/tealdeer/Makefile

Modified: head/Mk/Uses/cargo.mk
==============================================================================
--- head/Mk/Uses/cargo.mk	Wed Mar  4 14:57:30 2020	(r527754)
+++ head/Mk/Uses/cargo.mk	Wed Mar  4 15:00:17 2020	(r527755)
@@ -21,6 +21,8 @@ IGNORE+=	USES=cargo takes no arguments
 CARGO_CRATES?=
 
 # List of features to build (space separated list).
+# Use special token --no-default-features to disable default
+# features by passing it to cargo build/install/test.
 CARGO_FEATURES?=
 
 # Name of the local directory for vendoring crates.
@@ -108,10 +110,15 @@ CARGO_USE_GITHUB?=	no
 CARGO_USE_GITLAB?=	no
 
 # Manage crate features.
-.if !empty(CARGO_FEATURES)
-CARGO_BUILD_ARGS+=	--features='${CARGO_FEATURES}'
-CARGO_INSTALL_ARGS+=	--features='${CARGO_FEATURES}'
-CARGO_TEST_ARGS+=	--features='${CARGO_FEATURES}'
+.if !empty(CARGO_FEATURES:M--no-default-features)
+CARGO_BUILD_ARGS+=	--no-default-features
+CARGO_INSTALL_ARGS+=	--no-default-features
+CARGO_TEST_ARGS+=	--no-default-features
+.endif
+.if !empty(CARGO_FEATURES:N--no-default-features)
+CARGO_BUILD_ARGS+=	--features='${CARGO_FEATURES:N--no-default-features}'
+CARGO_INSTALL_ARGS+=	--features='${CARGO_FEATURES:N--no-default-features}'
+CARGO_TEST_ARGS+=	--features='${CARGO_FEATURES:N--no-default-features}'
 .endif
 
 .if !defined(WITH_DEBUG)

Modified: head/audio/ncspot/Makefile
==============================================================================
--- head/audio/ncspot/Makefile	Wed Mar  4 14:57:30 2020	(r527754)
+++ head/audio/ncspot/Makefile	Wed Mar  4 15:00:17 2020	(r527755)
@@ -395,10 +395,7 @@ CARGO_CRATES=	adler32-1.0.4 \
 		x11-clipboard-0.3.3 \
 		xcb-0.8.2 \
 		xi-unicode-0.2.0
-CARGO_FEATURES=		cursive/pancurses-backend
-CARGO_BUILD_ARGS=	--no-default-features
-CARGO_INSTALL_ARGS=	--no-default-features
-CARGO_TEST_ARGS=	--no-default-features
+CARGO_FEATURES=		--no-default-features cursive/pancurses-backend
 
 PLIST_FILES=	bin/ncspot
 PORTDOCS=	README.md

Modified: head/audio/spotifyd/Makefile
==============================================================================
--- head/audio/spotifyd/Makefile	Wed Mar  4 14:57:30 2020	(r527754)
+++ head/audio/spotifyd/Makefile	Wed Mar  4 15:00:17 2020	(r527755)
@@ -360,10 +360,7 @@ CARGO_CRATES=	adler32-1.0.4 \
 		winapi-x86_64-pc-windows-gnu-0.4.0 \
 		ws2_32-sys-0.2.1 \
 		xdg-2.2.0
-
-CARGO_BUILD_ARGS=	--no-default-features
-CARGO_INSTALL_ARGS=	--no-default-features
-CARGO_TEST_ARGS=	--no-default-features
+CARGO_FEATURES=	--no-default-features
 
 PLIST_FILES=	bin/spotifyd \
 		"@sample etc/spotifyd.conf.sample"

Modified: head/sysutils/tealdeer/Makefile
==============================================================================
--- head/sysutils/tealdeer/Makefile	Wed Mar  4 14:57:30 2020	(r527754)
+++ head/sysutils/tealdeer/Makefile	Wed Mar  4 15:00:17 2020	(r527755)
@@ -182,9 +182,7 @@ CARGO_CRATES=	adler32-1.0.4 \
 		ws2_32-sys-0.2.1 \
 		xattr-0.2.2 \
 		xdg-2.2.0
-CARGO_BUILD_ARGS=	--no-default-features
-CARGO_INSTALL_ARGS=	--no-default-features
-CARGO_TEST_ARGS=	--no-default-features
+CARGO_FEATURES=	--no-default-features
 
 PLIST_FILES=	bin/tldr \
 		etc/bash_completion.d/tldr.bash \