[pkgsrc/trunk]: pkgsrc g/c RUSTFLAGS from individual package Makefiles. Handl...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8128172884a4
branches:  trunk
changeset: 456230:8128172884a4
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Thu Jul 22 16:16:35 2021 +0000

description:
g/c RUSTFLAGS from individual package Makefiles. Handled by cargo.mk.

diffstat:

 audio/librespot/Makefile   |  4 +---
 audio/ncspot/Makefile      |  3 +--
 audio/termusic/Makefile    |  3 +--
 editors/cesium/Makefile    |  3 +--
 net/maguro/Makefile        |  3 +--
 net/ncgopher/Makefile      |  3 +--
 net/phetch/Makefile        |  3 +--
 security/gpg-tui/Makefile  |  3 +--
 shells/nushell/Makefile    |  3 +--
 shells/starship/Makefile   |  3 +--
 sysutils/macchina/Makefile |  3 +--
 sysutils/xplr/Makefile     |  3 +--
 textproc/paperoni/Makefile |  3 +--
 textproc/ripgrep/Makefile  |  3 +--
 www/cratuity/Makefile      |  3 +--
 www/longboard/Makefile     |  3 +--
 www/monolith/Makefile      |  3 +--
 www/so/Makefile            |  3 +--
 www/suckit/Makefile        |  3 +--
 x11/alacritty/Makefile     |  3 +--
 x11/rterm/Makefile         |  3 +--
 21 files changed, 21 insertions(+), 43 deletions(-)

diffs (truncated from 358 to 300 lines):

diff -r 38b2a2a1bbff -r 8128172884a4 audio/librespot/Makefile
--- a/audio/librespot/Makefile  Thu Jul 22 16:09:46 2021 +0000
+++ b/audio/librespot/Makefile  Thu Jul 22 16:16:35 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2021/05/04 16:32:55 pin Exp $
+# $NetBSD: Makefile,v 1.10 2021/07/22 16:16:35 tnn Exp $
 
 DISTNAME=      librespot-0.2.0
 CATEGORIES=    audio
@@ -17,8 +17,6 @@
 
 INSTALLATION_DIRS=     bin
 
-MAKE_ENV+=     RUSTFLAGS=${RUSTFLAGS:Q}
-
 CARGO_NO_DEFAULT_FEATURES=     yes
 
 .include "options.mk"
diff -r 38b2a2a1bbff -r 8128172884a4 audio/ncspot/Makefile
--- a/audio/ncspot/Makefile     Thu Jul 22 16:09:46 2021 +0000
+++ b/audio/ncspot/Makefile     Thu Jul 22 16:16:35 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2021/05/31 20:52:13 pin Exp $
+# $NetBSD: Makefile,v 1.23 2021/07/22 16:16:35 tnn Exp $
 
 DISTNAME=      ncspot-0.7.3
 CATEGORIES=    audio
@@ -21,7 +21,6 @@
 
 MAKE_ENV+=     OPENSSL_DIR=${BUILDLINK_PREFIX.openssl:Q}
 RUSTFLAGS+=    -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib
-MAKE_ENV+=     RUSTFLAGS=${RUSTFLAGS:Q}
 
 CARGO_NO_DEFAULT_FEATURES=     YES
 
diff -r 38b2a2a1bbff -r 8128172884a4 audio/termusic/Makefile
--- a/audio/termusic/Makefile   Thu Jul 22 16:09:46 2021 +0000
+++ b/audio/termusic/Makefile   Thu Jul 22 16:16:35 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2021/07/19 15:21:09 pin Exp $
+# $NetBSD: Makefile,v 1.4 2021/07/22 16:16:36 tnn Exp $
 
 DISTNAME=      termusic-0.2.11
 CATEGORIES=    audio
@@ -21,7 +21,6 @@
 RUSTFLAGS+=    -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib
 RUSTFLAGS+=    -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.mpv}/lib
 RUSTFLAGS+=    -C link-arg=-L${BUILDLINK_PREFIX.mpv}/lib
-MAKE_ENV+=     RUSTFLAGS=${RUSTFLAGS:Q}
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/target/release/termusic ${DESTDIR}${PREFIX}/bin
diff -r 38b2a2a1bbff -r 8128172884a4 editors/cesium/Makefile
--- a/editors/cesium/Makefile   Thu Jul 22 16:09:46 2021 +0000
+++ b/editors/cesium/Makefile   Thu Jul 22 16:16:35 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2021/04/19 14:41:02 pin Exp $
+# $NetBSD: Makefile,v 1.4 2021/07/22 16:16:36 tnn Exp $
 
 DISTNAME=      cesium-0.2.1
 CATEGORIES=    editors
@@ -18,7 +18,6 @@
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
 
 RUSTFLAGS+=    -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.ncursesw}/lib
-MAKE_ENV+=     RUSTFLAGS=${RUSTFLAGS:Q}
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/target/release/cesium ${DESTDIR}${PREFIX}/bin
diff -r 38b2a2a1bbff -r 8128172884a4 net/maguro/Makefile
--- a/net/maguro/Makefile       Thu Jul 22 16:09:46 2021 +0000
+++ b/net/maguro/Makefile       Thu Jul 22 16:16:35 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2021/05/01 14:40:11 pin Exp $
+# $NetBSD: Makefile,v 1.2 2021/07/22 16:16:36 tnn Exp $
 
 DISTNAME=      maguro-0.0.1
 CATEGORIES=    net
@@ -18,7 +18,6 @@
 
 MAKE_ENV+=     OPENSSL_DIR=${BUILDLINK_PREFIX.openssl:Q}
 RUSTFLAGS+=    -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib
-MAKE_ENV+=     RUSTFLAGS=${RUSTFLAGS:Q}
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/target/release/maguro ${DESTDIR}${PREFIX}/bin
diff -r 38b2a2a1bbff -r 8128172884a4 net/ncgopher/Makefile
--- a/net/ncgopher/Makefile     Thu Jul 22 16:09:46 2021 +0000
+++ b/net/ncgopher/Makefile     Thu Jul 22 16:16:35 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2021/04/21 11:42:27 adam Exp $
+# $NetBSD: Makefile,v 1.3 2021/07/22 16:16:36 tnn Exp $
 
 DISTNAME=      ncgopher-0.2.0
 PKGREVISION=   1
@@ -23,7 +23,6 @@
 RUSTFLAGS+=    -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib
 RUSTFLAGS+=    -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.ncursesw}/lib
 RUSTFLAGS+=    -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.sqlite3}/lib
-MAKE_ENV+=     RUSTFLAGS=${RUSTFLAGS:Q}
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/target/release/ncgopher ${DESTDIR}${PREFIX}/bin
diff -r 38b2a2a1bbff -r 8128172884a4 net/phetch/Makefile
--- a/net/phetch/Makefile       Thu Jul 22 16:09:46 2021 +0000
+++ b/net/phetch/Makefile       Thu Jul 22 16:16:35 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2020/11/17 11:52:41 pin Exp $
+# $NetBSD: Makefile,v 1.10 2021/07/22 16:16:36 tnn Exp $
 
 DISTNAME=      phetch-1.1.0
 CATEGORIES=    net
@@ -18,7 +18,6 @@
 
 MAKE_ENV+=     OPENSSL_DIR=${BUILDLINK_PREFIX.openssl:Q}
 RUSTFLAGS+=    -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib
-MAKE_ENV+=     RUSTFLAGS=${RUSTFLAGS:Q}
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/target/release/phetch ${DESTDIR}${PREFIX}/bin
diff -r 38b2a2a1bbff -r 8128172884a4 security/gpg-tui/Makefile
--- a/security/gpg-tui/Makefile Thu Jul 22 16:09:46 2021 +0000
+++ b/security/gpg-tui/Makefile Thu Jul 22 16:16:35 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2021/07/20 20:22:26 pin Exp $
+# $NetBSD: Makefile,v 1.14 2021/07/22 16:16:36 tnn Exp $
 
 DISTNAME=      gpg-tui-0.7.2
 CATEGORIES=    security
@@ -20,7 +20,6 @@
 
 RUSTFLAGS+=    -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libxcb}/lib
 RUSTFLAGS+=    -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libgpg-error}/lib
-MAKE_ENV+=     RUSTFLAGS=${RUSTFLAGS:Q}
 
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
 
diff -r 38b2a2a1bbff -r 8128172884a4 shells/nushell/Makefile
--- a/shells/nushell/Makefile   Thu Jul 22 16:09:46 2021 +0000
+++ b/shells/nushell/Makefile   Thu Jul 22 16:16:35 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2021/07/19 15:26:20 pin Exp $
+# $NetBSD: Makefile,v 1.2 2021/07/22 16:16:36 tnn Exp $
 
 DISTNAME=      nushell-0.34.0
 CATEGORIES=    shells
@@ -20,7 +20,6 @@
 RUSTFLAGS+=    -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib
 RUSTFLAGS+=    -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libX11}/lib
 RUSTFLAGS+=    -C link-arg=-L${BUILDLINK_PREFIX.libX11}/lib
-MAKE_ENV+=     RUSTFLAGS=${RUSTFLAGS:Q}
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/target/release/nu ${DESTDIR}${PREFIX}/bin
diff -r 38b2a2a1bbff -r 8128172884a4 shells/starship/Makefile
--- a/shells/starship/Makefile  Thu Jul 22 16:09:46 2021 +0000
+++ b/shells/starship/Makefile  Thu Jul 22 16:16:35 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2021/07/14 20:44:47 pin Exp $
+# $NetBSD: Makefile,v 1.3 2021/07/22 16:16:36 tnn Exp $
 
 DISTNAME=      starship-0.56.0
 CATEGORIES=    shells
@@ -20,7 +20,6 @@
 
 MAKE_ENV+=     OPENSSL_DIR=${BUILDLINK_PREFIX.openssl:Q}
 RUSTFLAGS+=    -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib
-MAKE_ENV+=     RUSTFLAGS=${RUSTFLAGS:Q}
 
 # Disable rust-battery crate on NetBSD
 # See https://github.com/svartalf/rust-battery/issues/20
diff -r 38b2a2a1bbff -r 8128172884a4 sysutils/macchina/Makefile
--- a/sysutils/macchina/Makefile        Thu Jul 22 16:09:46 2021 +0000
+++ b/sysutils/macchina/Makefile        Thu Jul 22 16:16:35 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2021/06/18 10:44:29 tnn Exp $
+# $NetBSD: Makefile,v 1.27 2021/07/22 16:16:36 tnn Exp $
 
 DISTNAME=      macchina-0.9.2
 CATEGORIES=    sysutils
@@ -21,7 +21,6 @@
 RUSTFLAGS+=    -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libxcb}/lib
 RUSTFLAGS+=    -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libXdmcp}/lib
 RUSTFLAGS+=    -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libXau}/lib
-MAKE_ENV+=     RUSTFLAGS=${RUSTFLAGS:Q}
 
 BUILDLINK_TRANSFORM+=  opt:-pie:-fPIC
 
diff -r 38b2a2a1bbff -r 8128172884a4 sysutils/xplr/Makefile
--- a/sysutils/xplr/Makefile    Thu Jul 22 16:09:46 2021 +0000
+++ b/sysutils/xplr/Makefile    Thu Jul 22 16:16:35 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2021/07/05 09:50:34 pin Exp $
+# $NetBSD: Makefile,v 1.33 2021/07/22 16:16:37 tnn Exp $
 
 DISTNAME=      xplr-0.14.4
 CATEGORIES=    sysutils
@@ -19,7 +19,6 @@
 
 RUSTFLAGS+=    -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.LuaJIT2}/lib
 RUSTFLAGS+=    -C link-arg=-L${BUILDLINK_PREFIX.LuaJIT2}/lib
-MAKE_ENV+=     RUSTFLAGS=${RUSTFLAGS:Q}
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/target/release/xplr ${DESTDIR}${PREFIX}/bin
diff -r 38b2a2a1bbff -r 8128172884a4 textproc/paperoni/Makefile
--- a/textproc/paperoni/Makefile        Thu Jul 22 16:09:46 2021 +0000
+++ b/textproc/paperoni/Makefile        Thu Jul 22 16:16:35 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2021/06/24 08:47:13 pin Exp $
+# $NetBSD: Makefile,v 1.5 2021/07/22 16:16:37 tnn Exp $
 
 DISTNAME=      v0.5.0-alpha1
 PKGNAME=       paperoni-0.5.0
@@ -20,7 +20,6 @@
 
 MAKE_ENV+=     OPENSSL_DIR=${BUILDLINK_PREFIX.openssl:Q}
 RUSTFLAGS+=    -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib
-MAKE_ENV+=     RUSTFLAGS=${RUSTFLAGS:Q}
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/target/release/paperoni ${DESTDIR}${PREFIX}/bin
diff -r 38b2a2a1bbff -r 8128172884a4 textproc/ripgrep/Makefile
--- a/textproc/ripgrep/Makefile Thu Jul 22 16:09:46 2021 +0000
+++ b/textproc/ripgrep/Makefile Thu Jul 22 16:16:35 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2021/06/12 17:15:29 pin Exp $
+# $NetBSD: Makefile,v 1.17 2021/07/22 16:16:37 tnn Exp $
 
 DISTNAME=      ripgrep-13.0.0
 CATEGORIES=    textproc
@@ -18,7 +18,6 @@
 
 RUSTFLAGS+=    -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.pcre2}/lib
 RUSTFLAGS+=    -C link-arg=-L${BUILDLINK_PREFIX.pcre2}/lib
-MAKE_ENV+=     RUSTFLAGS=${RUSTFLAGS:Q}
 
 CARGO_NO_DEFAULT_FEATURES=     YES
 CARGO_FEATURES+=               pcre2
diff -r 38b2a2a1bbff -r 8128172884a4 www/cratuity/Makefile
--- a/www/cratuity/Makefile     Thu Jul 22 16:09:46 2021 +0000
+++ b/www/cratuity/Makefile     Thu Jul 22 16:16:35 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2021/05/02 20:02:56 pin Exp $
+# $NetBSD: Makefile,v 1.2 2021/07/22 16:16:37 tnn Exp $
 
 DISTNAME=      cratuity-0.1.4
 CATEGORIES=    www
@@ -19,7 +19,6 @@
 
 MAKE_ENV+=     OPENSSL_DIR=${BUILDLINK_PREFIX.openssl:Q}
 RUSTFLAGS+=    -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib
-MAKE_ENV+=     RUSTFLAGS=${RUSTFLAGS:Q}
 
 CARGO_NO_DEFAULT_FEATURES=     YES
 CARGO_FEATURES+=               no-copy
diff -r 38b2a2a1bbff -r 8128172884a4 www/longboard/Makefile
--- a/www/longboard/Makefile    Thu Jul 22 16:09:46 2021 +0000
+++ b/www/longboard/Makefile    Thu Jul 22 16:16:35 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2021/05/21 07:05:20 pin Exp $
+# $NetBSD: Makefile,v 1.2 2021/07/22 16:16:37 tnn Exp $
 
 DISTNAME=      longboard-0.0.7
 CATEGORIES=    www
@@ -18,7 +18,6 @@
 
 MAKE_ENV+=     OPENSSL_DIR=${BUILDLINK_PREFIX.openssl:Q}
 RUSTFLAGS+=    -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib
-MAKE_ENV+=     RUSTFLAGS=${RUSTFLAGS:Q}
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/target/release/longboard ${DESTDIR}${PREFIX}/bin
diff -r 38b2a2a1bbff -r 8128172884a4 www/monolith/Makefile
--- a/www/monolith/Makefile     Thu Jul 22 16:09:46 2021 +0000
+++ b/www/monolith/Makefile     Thu Jul 22 16:16:35 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2021/07/05 08:21:00 pin Exp $
+# $NetBSD: Makefile,v 1.5 2021/07/22 16:16:38 tnn Exp $
 
 DISTNAME=      monolith-2.6.1
 CATEGORIES=    www
@@ -18,7 +18,6 @@
 
 MAKE_ENV+=     OPENSSL_DIR=${BUILDLINK_PREFIX.openssl:Q}
 RUSTFLAGS+=    -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib
-MAKE_ENV+=     RUSTFLAGS=${RUSTFLAGS:Q}
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/target/release/monolith ${DESTDIR}${PREFIX}/bin
diff -r 38b2a2a1bbff -r 8128172884a4 www/so/Makefile
--- a/www/so/Makefile   Thu Jul 22 16:09:46 2021 +0000
+++ b/www/so/Makefile   Thu Jul 22 16:16:35 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2021/06/30 11:33:37 pin Exp $
+# $NetBSD: Makefile,v 1.3 2021/07/22 16:16:37 tnn Exp $
 
 DISTNAME=      so-0.4.5
 CATEGORIES=    www
@@ -18,7 +18,6 @@