commit: 400e59fbd6ecdda47ea2ad1d3ec6c6440d057152
Author: Cristian Othón Martínez Vera <cfuga <AT> cfuga <DOT> mx>
AuthorDate: Tue Mar 28 19:51:36 2023 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Fri Mar 31 20:23:44 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=400e59fb
net-misc/nx: patch to remove BDEPEND on sys-apps/which
Signed-off-by: Cristian Othón Martínez Vera <cfuga <AT> cfuga.mx>
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
net-misc/nx/files/nx-3.5.99.26-which.patch | 33 ++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
diff --git a/net-misc/nx/files/nx-3.5.99.26-which.patch
b/net-misc/nx/files/nx-3.5.99.26-which.patch
new file mode 100644
index 000000000000..abc1f9e1a8d3
--- /dev/null
+++ b/net-misc/nx/files/nx-3.5.99.26-which.patch
@@ -0,0 +1,33 @@
+--- a/nx-X11/Makefile
++++ b/nx-X11/Makefile
+@@ -70,7 +70,7 @@
+ else \
+ exit 0; \
+ fi
+- which $(IMAKE) 1>/dev/null && $(IMAKE_CMD) $(MFLAGS) -s xmakefile
-DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR)
++ command -v $(IMAKE) 1>/dev/null && $(IMAKE_CMD) $(MFLAGS) -s xmakefile
-DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR)
+
+ # don't allow any default rules in this Makefile
+ .SUFFIXES:
+--- a/nx-X11/extras/Mesa_6.4.2/bin/mklib
++++ b/nx-X11/extras/Mesa_6.4.2/bin/mklib
+@@ -285,7 +285,7 @@
+ # -linker was not specified, choose default linker now
+ if [ $CPLUSPLUS = 1 ] ; then
+ # determine linker and options for C++ code
+- if [ `which c++` ] ; then
++ if [ `command -v c++` ] ; then
+ # use Sun c++
+ LINK="c++"
+ elif [ `type g++` ] ; then
+--- a/nx-X11/x-indent.sh
++++ b/nx-X11/x-indent.sh
+@@ -2,7 +2,7 @@
+
+ # We want GNU indent, so first search for gindent to avoid /usr/bin/indent
+ # on the BSDs, which won't work for us
+-INDENT=$(which gnuindent || which gindent || which indent)
++INDENT=$(command -v gnuindent || command -v gindent || command -v indent)
+
+ if [ -z "${INDENT}" ] ; then
+ echo "Could not find indent, sorry..." >&2
