From 4a117a51c85f7700ae099ab16c44027bf71dc858 Mon Sep 17 00:00:00 2001
From: Ørjan Malde <red@foxi.me>
Date: Feb 26 2024 13:13:10 +0000
Subject: groups.d/211.native_packages_cmdline.group: {busybox,ninvaders,sash,toilet,terminally_tetris}: drop spurious path arguments


Signed-off-by: Ørjan Malde <red@foxi.me>

---

diff --git a/groups.d/211.native_packages_cmdline.group b/groups.d/211.native_packages_cmdline.group
index a92321b..a3e2952 100644
--- a/groups.d/211.native_packages_cmdline.group
+++ b/groups.d/211.native_packages_cmdline.group
@@ -31,7 +31,6 @@ the_silver_searcher toilet tree terminally_tetris ubase which zsh";
 : ${PKG_BUSYBOX_INSTALL_FILES_V2:="
 	:%[_builddir]/_install/bin/%<*>=bin/%[FNAME]"};
 : ${PKG_BUSYBOX_PREFIX:=${PREFIX_NATIVE}/busybox};
-: ${PKG_BUSYBOX_ENV_VARS_EXTRA:="LDFLAGS=--sysroot=${PREFIX_NATIVE}"};
 : ${PKG_CABEXTRACT_DEPENDS:="libiconv libmspack"};
 : ${PKG_CABEXTRACT_SHA256SUM:=b5546db1155e4c718ff3d4b278573604f30dd64c3c5bfd4657cd089b823a3ac6};
 : ${PKG_CABEXTRACT_VERSION:=1.11};
@@ -185,7 +184,7 @@ ac_cv_path__libcurl_config=${PREFIX_NATIVE}/bin/curl-config"};
 : ${PKG_NINVADERS_CFLAGS_BUILD_EXTRA:="-g3 -O0 -I${PREFIX_NATIVE}/include -I${PREFIX_NATIVE}/include/ncurses"};
 : ${PKG_NINVADERS_INSTALL_FILES_V2:="+../ninvaders-${PKG_NINVADERS_VERSION}/nInvaders=bin/%[FNAME]"};
 : ${PKG_NINVADERS_IN_TREE:=1};
-: ${PKG_NINVADERS_MAKEFLAGS_BUILD:="LIBS=-Wl,-L${PREFIX_NATIVE}/lib,-lncurses,-ltinfo"};
+: ${PKG_NINVADERS_MAKEFLAGS_BUILD:="-lncurses,-ltinfo"};
 : ${PKG_NINVADERS_SUBDIR:=ninvaders-${PKG_NINVADERS_VERSION}};
 : ${PKG_OPENBSD_BASEUTILS_DEPENDS:="musl_compat"};
 : ${PKG_OPENBSD_BASEUTILS_URLS_GIT:="baseutils=https://github.com/ibara/baseutils.git@master"};
@@ -228,7 +227,6 @@ rc_cv_sysv_sigcld=no"};
 : ${PKG_SASH_URL:=http://members.tip.net.au/%7Edbell/programs/sash-${PKG_SASH_VERSION}.tar.gz};
 : ${PKG_SASH_BUILD_DIR:=sash-${PKG_SASH_VERSION}};
 : ${PKG_SASH_CFLAGS_BUILD_EXTRA:="${NATIVE_PACKAGES_CFLAGS_CONFIGURE} -DHAVE_GZIP=1 -DHAVE_LINUX_ATTR=0 -DHAVE_LINUX_CHROOT=0 -DHAVE_LINUX_LOSETUP=0 -DHAVE_LINUX_PIVOT=0"};
-: ${PKG_SASH_LDFLAGS_BUILD_EXTRA:="-L${PREFIX_NATIVE}/lib"};
 : ${PKG_SBASE_URLS_GIT:="sbase=http://git.suckless.org/sbase@master"};
 : ${PKG_SBASE_DESTDIR:=destdir/suckless};
 : ${PKG_SBASE_CFLAGS_BUILD_EXTRA:="-std=c99 --include=sys/sysmacros.h"};
@@ -276,7 +274,6 @@ libopts_cv_run_fopen_binary=yes"};
 
 : ${PKG_TOILET_DEPENDS:="libcaca"};
 : ${PKG_TOILET_URLS_GIT:=toilet=https://github.com/cacalabs/toilet@master};
-: ${PKG_TOILET_ENV_VARS_EXTRA:="CACA_CFLAGS=-I${PREFIX_NATIVE}/include:CACA_LIBS=-L${PREFIX_NATIVE} -lcaca"};
 : ${PKG_TREE_SHA256SUM:=d3c3d55f403af7c76556546325aa1eca90b918cbaaf6d3ab60a49d8367ab90d5};
 : ${PKG_TREE_VERSION:=2.1.1};
 : ${PKG_TREE_URL:=http://mama.indstate.edu/users/ice/tree/src/tree-${PKG_TREE_VERSION}.tgz};
@@ -291,7 +288,7 @@ libopts_cv_run_fopen_binary=yes"};
 	../terminally_tetris/build/ttetris=bin/%[FNAME]
 	../terminally_tetris/man/ttetris.1=share/man/man1/%[FNAME]"};
 : ${PKG_TERMINALLY_TETRIS_IN_TREE:=1};
-: ${PKG_TERMINALLY_TETRIS_LDFLAGS_BUILD_EXTRA:="-L${PREFIX_NATIVE}/lib -lncurses -Wl,--as-needed -ltinfo -Wl,--no-as-needed"};
+: ${PKG_TERMINALLY_TETRIS_LDFLAGS_BUILD_EXTRA:="-lncurses -Wl,--as-needed -ltinfo -Wl,--no-as-needed"};
 : ${PKG_TERMINALLY_TETRIS_MAKEFLAGS_BUILD_EXTRA_LIST:=C=${DEFAULT_NATIVE_CC}};
 : ${PKG_UBASE_URLS_GIT:="ubase=http://git.suckless.org/ubase@master"};
 : ${PKG_UBASE_DESTDIR:=destdir/suckless};