diff --git a/net-misc/nx/files/nx-3.5.99.26-binutils-2.36.patch b/net-misc/nx/files/nx-3.5.99.26-binutils-2.36.patch deleted file mode 100644 index ec2925da97901..0000000000000 --- a/net-misc/nx/files/nx-3.5.99.26-binutils-2.36.patch +++ /dev/null @@ -1,42 +0,0 @@ -From d35eba919c229cecf3c52a7dd034b9cd6b120ede Mon Sep 17 00:00:00 2001 -From: ponce -Date: Mon, 5 Apr 2021 08:44:00 +0200 -Subject: [PATCH] fix building with binutils >= 2.36. - -The l option of ar in the newer binutils versions switched -from being unused to being used to specify dependencies -so here should be safely removed ---- - nx-X11/config/cf/Imake.tmpl | 12 ------------ - 1 file changed, 12 deletions(-) - -diff --git a/nx-X11/config/cf/Imake.tmpl b/nx-X11/config/cf/Imake.tmpl -index 25d985d75f..de1fca937e 100644 ---- a/nx-X11/config/cf/Imake.tmpl -+++ b/nx-X11/config/cf/Imake.tmpl -@@ -1015,25 +1015,13 @@ TCLIBDIR = TclLibDir - #define ArCmdBase ar - #endif - #ifndef ArCmd --#if HasLargeTmp || SystemV4 - #define ArCmd ArCmdBase cq --#else --#define ArCmd ArCmdBase clq --#endif - #endif - #ifndef ArAddCmd --#if HasLargeTmp || SystemV4 - #define ArAddCmd ArCmdBase ru --#else --#define ArAddCmd ArCmdBase rul --#endif - #endif - #ifndef ArExtCmd --#if HasLargeTmp || SystemV4 - #define ArExtCmd ArCmdBase x --#else --#define ArExtCmd ArCmdBase xl --#endif - #endif - #ifndef BootstrapCFlags - #define BootstrapCFlags /**/ diff --git a/net-misc/nx/files/nx-3.5.99.26-riscv64-support.patch b/net-misc/nx/files/nx-3.5.99.26-riscv64-support.patch deleted file mode 100644 index 79ef8b9b5f18f..0000000000000 --- a/net-misc/nx/files/nx-3.5.99.26-riscv64-support.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 460562852eb4b1e14d2eeb81d2b96ea5de6ef683 Mon Sep 17 00:00:00 2001 -From: Alexandre Ghiti -Date: Fri, 10 Sep 2021 08:51:53 +0200 -Subject: [PATCH] nx-X11: Add support for riscv64 architecture - -Signed-off-by: Xin Yang ---- - nx-X11/config/cf/Imake.cf | 5 +++++ - nx-X11/config/cf/Imake.tmpl | 2 ++ - nx-X11/config/cf/linux.cf | 9 +++++++++ - 3 files changed, 16 insertions(+) - -diff --git a/nx-X11/config/cf/Imake.cf b/nx-X11/config/cf/Imake.cf -index 9d683b85..612bc4e3 100644 ---- a/nx-X11/config/cf/Imake.cf -+++ b/nx-X11/config/cf/Imake.cf -@@ -878,6 +878,11 @@ XCOMM Keep cpp from replacing path elements containing i486/i586/i686 - # undef __powerpc64__ - # undef tmp_set_big_endian - # endif -+# ifdef __riscv -+# if __riscv_xlen == 64 -+# define Riscv64Architecture -+# endif -+# endif - # ifdef sparc - # define SparcArchitecture - # undef sparc -diff --git a/nx-X11/config/cf/Imake.tmpl b/nx-X11/config/cf/Imake.tmpl -index de1fca93..266be8c5 100644 ---- a/nx-X11/config/cf/Imake.tmpl -+++ b/nx-X11/config/cf/Imake.tmpl -@@ -509,6 +509,8 @@ XCOMM the platform-specific parameters - edit site.def to change - #define ByteOrder X_BIG_ENDIAN - #elif defined(Ppc64LeArchitecture) - #define ByteOrder X_LITTLE_ENDIAN -+#elif defined(Riscv64Architecture) -+#define ByteOrder X_LITTLE_ENDIAN - #elif defined(HPArchitecture) - #define ByteOrder X_BIG_ENDIAN - #elif defined(SuperHArchitecture) -diff --git a/nx-X11/config/cf/linux.cf b/nx-X11/config/cf/linux.cf -index c3e9eaaf..6851be55 100644 ---- a/nx-X11/config/cf/linux.cf -+++ b/nx-X11/config/cf/linux.cf -@@ -783,6 +783,15 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) - # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines - #endif /* PpcArchitecture */ - -+#ifdef Riscv64Architecture -+# ifndef OptimizedCDebugFlags -+# define OptimizedCDebugFlags -O3 -+# endif -+# define LinuxMachineDefines -D__riscv64__ -+# define ServerOSDefines XFree86ServerOSDefines -+# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 -+#endif /* Riscv64Achitecture */ -+ - #ifdef s390Architecture - # ifndef OptimizedCDebugFlags - # define OptimizedCDebugFlags -O2 -fomit-frame-pointer GccAliasingArgs --- -2.38.1 - 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 deleted file mode 100644 index abc1f9e1a8d31..0000000000000 --- a/net-misc/nx/files/nx-3.5.99.26-which.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- 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