diff --git a/srcpkgs/e2fsprogs/patches/cross.patch b/srcpkgs/e2fsprogs/patches/cross.patch
index e2a81b7544..c186338ac1 100644
--- a/srcpkgs/e2fsprogs/patches/cross.patch
+++ b/srcpkgs/e2fsprogs/patches/cross.patch
@@ -1,5 +1,5 @@
---- configure.ac.orig	2019-07-18 10:57:21.187376556 +0200
-+++ configure.ac	2019-07-18 10:58:09.968379876 +0200
+--- a/configure.ac	2019-07-18 10:57:21.187376556 +0200
++++ b/configure.ac	2019-07-18 10:58:09.968379876 +0200
 @@ -1611,6 +1611,9 @@
  if test $cross_compiling = no; then
     BUILD_CFLAGS="$CFLAGS $CPPFLAGS $INCLUDES -DHAVE_CONFIG_H"
diff --git a/srcpkgs/e2fsprogs/template b/srcpkgs/e2fsprogs/template
index 3ba60e34d2..ada38513b9 100644
--- a/srcpkgs/e2fsprogs/template
+++ b/srcpkgs/e2fsprogs/template
@@ -19,7 +19,6 @@ homepage="http://e2fsprogs.sourceforge.net/"
 distfiles="${KERNEL_SITE}/kernel/people/tytso/e2fsprogs/v${version}/e2fsprogs-${version}.tar.xz"
 checksum=23aa093295c94e71ef1be490c4004871c5b01d216a8cb4d111fa6c0aac354168
 conf_files="/etc/mke2fs.conf /etc/e2scrub.conf"
-patch_args=-Np0
 
 do_check() {
 	ln -sfv /tools/lib/lib{blk,uu}id.so.1 lib
diff --git a/srcpkgs/eb/patches/cross.patch b/srcpkgs/eb/patches/cross.patch
index 9c9f0e7a31..a48480a1ca 100644
--- a/srcpkgs/eb/patches/cross.patch
+++ b/srcpkgs/eb/patches/cross.patch
@@ -1,5 +1,5 @@
---- configure.old	2017-07-01 12:43:00.384785855 +0200
-+++ configure	2017-07-01 12:55:03.102813398 +0200
+--- a/configure.old	2017-07-01 12:43:00.384785855 +0200
++++ b/configure	2017-07-01 12:55:03.102813398 +0200
 @@ -6752,7 +6752,7 @@
  
  if test $ac_cv_header_stdc = yes; then
diff --git a/srcpkgs/eb/template b/srcpkgs/eb/template
index 6a2c71df08..9e71add969 100644
--- a/srcpkgs/eb/template
+++ b/srcpkgs/eb/template
@@ -11,7 +11,6 @@ license="BSD-3-Clause"
 homepage="https://github.com/2ion/eb"
 distfiles="https://github.com/2ion/eb/archive/${version}.tar.gz"
 checksum=16274f4d5ec34cc37ed308927390a1d0d09e0e6a2b35fbff7d17aacca0524a37
-patch_args=-Np0
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/eboard/patches/configure.patch b/srcpkgs/eboard/patches/configure.patch
index b6ae657735..d93a3d3d49 100644
--- a/srcpkgs/eboard/patches/configure.patch
+++ b/srcpkgs/eboard/patches/configure.patch
@@ -1,5 +1,5 @@
---- configure.orig	2017-01-05 01:07:49.029440284 +0100
-+++ configure	2017-01-08 19:42:47.704475698 +0100
+--- a/configure	2017-01-05 01:07:49.029440284 +0100
++++ b/configure	2017-01-08 19:42:47.704475698 +0100
 @@ -16,6 +16,7 @@
  my $manprefix   = '';
  #my $dgt         = 1;
diff --git a/srcpkgs/eboard/patches/ntext.patch b/srcpkgs/eboard/patches/ntext.patch
index 8248599ef1..b2e408139a 100644
--- a/srcpkgs/eboard/patches/ntext.patch
+++ b/srcpkgs/eboard/patches/ntext.patch
@@ -1,5 +1,5 @@
---- ntext.cc.orig	2017-01-05 00:57:16.943420989 +0100
-+++ ntext.cc	2017-01-05 00:57:29.321421367 +0100
+--- a/ntext.cc	2017-01-05 00:57:16.943420989 +0100
++++ b/ntext.cc	2017-01-05 00:57:29.321421367 +0100
 @@ -244,7 +244,7 @@
      return;
    }
diff --git a/srcpkgs/eboard/template b/srcpkgs/eboard/template
index c6d7fa2a68..187fdd3651 100644
--- a/srcpkgs/eboard/template
+++ b/srcpkgs/eboard/template
@@ -12,7 +12,6 @@ homepage="http://www.bergo.eng.br/eboard"
 distfiles="https://github.com/fbergo/eboard/archive/v${version}.tar.gz"
 checksum=2a1ba23a27c94ee4ec167bb31ab7dd6eedf148e139c9a96e8cb5ac36ec8423c1
 broken="ELF in /usr/share"
-patch_args=-Np0
 
 pre_install() {
 	mkdir -p "${DESTDIR}/usr/share/eboard"
diff --git a/srcpkgs/ecl/patches/fix-libffi-system.patch b/srcpkgs/ecl/patches/fix-libffi-system.patch
index 1838e39eaa..224041426b 100644
--- a/srcpkgs/ecl/patches/fix-libffi-system.patch
+++ b/srcpkgs/ecl/patches/fix-libffi-system.patch
@@ -2,8 +2,8 @@ Source: @pullmoll
 Upstream: no
 Reason: ffitarget.h no longer defines FFI_SYSV for *nix
 
---- src/c/ffi.d	2016-12-19 11:25:00.000000000 +0100
-+++ src/c/ffi.d	2020-04-25 13:29:05.385149890 +0200
+--- a/src/c/ffi.d	2016-12-19 11:25:00.000000000 +0100
++++ b/src/c/ffi.d	2020-04-25 13:29:05.385149890 +0200
 @@ -133,8 +133,6 @@
  #elif defined(X86_WIN64)
    {@':win64', FFI_WIN64},
diff --git a/srcpkgs/ecl/patches/fix-math_fenv_h.patch b/srcpkgs/ecl/patches/fix-math_fenv_h.patch
index 277af1ae2b..c48b835c8d 100644
--- a/srcpkgs/ecl/patches/fix-math_fenv_h.patch
+++ b/srcpkgs/ecl/patches/fix-math_fenv_h.patch
@@ -2,8 +2,8 @@ Source: @pullmoll
 Upstream: no
 Reason: Some architectures do not define all of the FE_.. constants
 
---- src/h/impl/math_fenv.h	2016-12-19 11:25:00.000000000 +0100
-+++ src/h/impl/math_fenv.h	2020-04-25 15:36:04.984693324 +0200
+--- a/src/h/impl/math_fenv.h	2016-12-19 11:25:00.000000000 +0100
++++ b/src/h/impl/math_fenv.h	2020-04-25 15:36:04.984693324 +0200
 @@ -67,8 +67,27 @@
  #endif /* !HAVE_FENV_H */
  
@@ -34,8 +34,8 @@ Reason: Some architectures do not define all of the FE_.. constants
  # define ECL_MATHERR_TEST do {                                  \
          int bits = fetestexcept(ECL_USED_EXCEPTIONS);           \
      unlikely_if (bits) ecl_deliver_fpe(bits); } while(0)
---- src/c/unixint.d	2016-12-19 11:25:00.000000000 +0100
-+++ src/c/unixint.d	2020-04-25 15:57:15.864783964 +0200
+--- a/src/c/unixint.d	2016-12-19 11:25:00.000000000 +0100
++++ b/src/c/unixint.d	2020-04-25 15:57:15.864783964 +0200
 @@ -655,22 +655,36 @@
  #else /* !_MSC_VER */
  # if defined(HAVE_FENV_H) & !defined(ECL_AVOID_FENV_H)
diff --git a/srcpkgs/ecl/template b/srcpkgs/ecl/template
index 06d2acb933..a4e160c15b 100644
--- a/srcpkgs/ecl/template
+++ b/srcpkgs/ecl/template
@@ -14,7 +14,6 @@ license="LGPL-2.1-or-later"
 homepage="https://common-lisp.net/project/ecl/"
 distfiles="https://common-lisp.net/project/ecl/static/files/release/ecl-${version}.tgz"
 checksum=76a585c616e8fa83a6b7209325a309da5bc0ca68e0658f396f49955638111254
-patch_args=-Np0
 
 if [ "$CROSS_BUILD" ]; then
 	# Depend on system ecl
diff --git a/srcpkgs/ecryptfs-utils/patches/musl_fcntl_h.patch b/srcpkgs/ecryptfs-utils/patches/musl_fcntl_h.patch
index 9772ef813a..156852b14f 100644
--- a/srcpkgs/ecryptfs-utils/patches/musl_fcntl_h.patch
+++ b/srcpkgs/ecryptfs-utils/patches/musl_fcntl_h.patch
@@ -1,5 +1,5 @@
---- src/utils/mount.ecryptfs_private.c	2015-02-10 17:59:34.000000000 +0100
-+++ src/utils/mount.ecryptfs_private.c	2015-08-07 15:21:39.847867532 +0200
+--- a/src/utils/mount.ecryptfs_private.c	2015-02-10 17:59:34.000000000 +0100
++++ b/src/utils/mount.ecryptfs_private.c	2015-08-07 15:21:39.847867532 +0200
 @@ -32,6 +32,7 @@
  #include <sys/types.h>
  #include <ctype.h>
diff --git a/srcpkgs/ecryptfs-utils/patches/musl_unistd_h.patch b/srcpkgs/ecryptfs-utils/patches/musl_unistd_h.patch
index a89fa959b3..d146ed1158 100644
--- a/srcpkgs/ecryptfs-utils/patches/musl_unistd_h.patch
+++ b/srcpkgs/ecryptfs-utils/patches/musl_unistd_h.patch
@@ -1,8 +1,8 @@
 The types uid_t and gid_t are defined in <unistd.h>, which
 isn't included as a side effect with musl libc.
 
---- src/utils/io.c	2015-02-10 17:59:34.000000000 +0100
-+++ src/utils/io.c	2015-08-07 15:07:56.127793677 +0200
+--- a/src/utils/io.c	2015-02-10 17:59:34.000000000 +0100
++++ b/src/utils/io.c	2015-08-07 15:07:56.127793677 +0200
 @@ -26,6 +26,7 @@
  #include <string.h>
  #include <termios.h>
@@ -11,8 +11,8 @@ isn't included as a side effect with musl libc.
  #include <errno.h>
  #include <sys/mman.h>
  #include "ecryptfs.h"
---- src/utils/mount.ecryptfs.c	2015-03-10 17:45:52.000000000 +0100
-+++ src/utils/mount.ecryptfs.c	2015-08-07 15:15:28.411834229 +0200
+--- a/src/utils/mount.ecryptfs.c	2015-03-10 17:45:52.000000000 +0100
++++ b/src/utils/mount.ecryptfs.c	2015-08-07 15:15:28.411834229 +0200
 @@ -23,6 +23,7 @@
  
  #include <errno.h>
diff --git a/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
index 5c3e419a91..ba7e40bdcd 100644
--- a/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
+++ b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
@@ -1,6 +1,6 @@
 === modified file 'src/key_mod/ecryptfs_key_mod_openssl.c'
---- src/key_mod/ecryptfs_key_mod_openssl.c	2013-10-25 19:45:09 +0000
-+++ src/key_mod/ecryptfs_key_mod_openssl.c	2017-03-13 20:34:27 +0000
+--- a/src/key_mod/ecryptfs_key_mod_openssl.c	2013-10-25 19:45:09 +0000
++++ b/src/key_mod/ecryptfs_key_mod_openssl.c	2017-03-13 20:34:27 +0000
 @@ -50,6 +50,20 @@
  #include "../include/ecryptfs.h"
  #include "../include/decision_graph.h"
diff --git a/srcpkgs/ecryptfs-utils/template b/srcpkgs/ecryptfs-utils/template
index 72e1050a25..6bdc07b97c 100644
--- a/srcpkgs/ecryptfs-utils/template
+++ b/srcpkgs/ecryptfs-utils/template
@@ -17,7 +17,6 @@ homepage="http://ecryptfs.org/"
 distfiles="http://launchpad.net/ecryptfs/trunk/${version}/+download/${pkgname}_${version}.orig.tar.gz"
 checksum=112cb3e37e81a1ecd8e39516725dec0ce55c5f3df6284e0f4cc0f118750a987f
 lib32disabled=yes
-patch_args=-Np0
 
 CPPFLAGS="-D_FILE_OFFSET_BITS=64 -I${XBPS_CROSS_BASE}/usr/include/python2.7"
 
diff --git a/srcpkgs/edb-debugger/patches/QPainterPath.patch b/srcpkgs/edb-debugger/patches/QPainterPath.patch
index 40356b9c40..16d1e93fff 100644
--- a/srcpkgs/edb-debugger/patches/QPainterPath.patch
+++ b/srcpkgs/edb-debugger/patches/QPainterPath.patch
@@ -1,5 +1,5 @@
---- src/widgets/QDisassemblyView.cpp	2020-04-10 21:07:19.000000000 +0200
-+++ src/widgets/QDisassemblyView.cpp	2020-09-01 01:29:20.286597335 +0200
+--- a/src/widgets/QDisassemblyView.cpp	2020-04-10 21:07:19.000000000 +0200
++++ b/src/widgets/QDisassemblyView.cpp	2020-09-01 01:29:20.286597335 +0200
 @@ -40,6 +40,7 @@
  #include <QElapsedTimer>
  #include <QMouseEvent>
diff --git a/srcpkgs/edb-debugger/patches/fix-musl.patch b/srcpkgs/edb-debugger/patches/fix-musl.patch
index 7fe72187bd..da7ec85f72 100644
--- a/srcpkgs/edb-debugger/patches/fix-musl.patch
+++ b/srcpkgs/edb-debugger/patches/fix-musl.patch
@@ -2,8 +2,8 @@ Source: maxice8
 Upstream: no
 Reason: fixes compilation by avoiding using __ptrace_request as an enum.
 
---- plugins/DebuggerCore/unix/linux/arch/x86-generic/PlatformThread.cpp
-+++ plugins/DebuggerCore/unix/linux/arch/x86-generic/PlatformThread.cpp
+--- a/plugins/DebuggerCore/unix/linux/arch/x86-generic/PlatformThread.cpp
++++ b/plugins/DebuggerCore/unix/linux/arch/x86-generic/PlatformThread.cpp
 @@ -33,6 +33,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  #include <sys/ptrace.h>
  #include <sys/user.h>
diff --git a/srcpkgs/edb-debugger/patches/include-limits.patch b/srcpkgs/edb-debugger/patches/include-limits.patch
index b15e46fe6d..e12cca124c 100644
--- a/srcpkgs/edb-debugger/patches/include-limits.patch
+++ b/srcpkgs/edb-debugger/patches/include-limits.patch
@@ -1,5 +1,5 @@
---- include/ByteShiftArray.h.orig	2019-08-16 23:27:51.186731499 +0200
-+++ include/ByteShiftArray.h	2019-08-16 23:28:15.909729902 +0200
+--- a/include/ByteShiftArray.h	2019-08-16 23:27:51.186731499 +0200
++++ b/include/ByteShiftArray.h	2019-08-16 23:28:15.909729902 +0200
 @@ -22,6 +22,7 @@
  #include "API.h"
  #include <QVector>
diff --git a/srcpkgs/edb-debugger/template b/srcpkgs/edb-debugger/template
index 1f78ae3755..e2d24e173f 100644
--- a/srcpkgs/edb-debugger/template
+++ b/srcpkgs/edb-debugger/template
@@ -13,4 +13,3 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/eteran/edb-debugger"
 distfiles="${homepage}/releases/download/${version}/${pkgname}-${version}.tgz"
 checksum=86df4a0940a39c1480a6fc789f167f94e87a7a330f2d8163fe871f42c754afe8
-patch_args=-Np0
diff --git a/srcpkgs/efibootmgr/patches/efibootmgr_default_to_grub2.patch b/srcpkgs/efibootmgr/patches/efibootmgr_default_to_grub2.patch
index 4245c03331..d4d6c87848 100644
--- a/srcpkgs/efibootmgr/patches/efibootmgr_default_to_grub2.patch
+++ b/srcpkgs/efibootmgr/patches/efibootmgr_default_to_grub2.patch
@@ -1,5 +1,5 @@
---- src/efibootmgr.c
-+++ src/efibootmgr.c
+--- a/src/efibootmgr.c
++++ b/src/efibootmgr.c
 @@ -1239,7 +1239,7 @@ usage()
  	printf("\t     --ip-origin { {dhcp|static} | { static|stateless|stateful} }\n");
  #endif
diff --git a/srcpkgs/efibootmgr/patches/efivar-efi_set_verbose.patch b/srcpkgs/efibootmgr/patches/efivar-efi_set_verbose.patch
index 1d4ab7dff5..8b5eebdf8b 100644
--- a/srcpkgs/efibootmgr/patches/efivar-efi_set_verbose.patch
+++ b/srcpkgs/efibootmgr/patches/efivar-efi_set_verbose.patch
@@ -1,5 +1,5 @@
---- src/efibootmgr.c	2019-01-16 16:38:24.694719888 +0100
-+++ src/efibootmgr.c	2019-01-16 16:39:35.773715651 +0100
+--- a/src/efibootmgr.c	2019-01-16 16:38:24.694719888 +0100
++++ b/src/efibootmgr.c	2019-01-16 16:39:35.773715651 +0100
 @@ -1536,9 +1536,6 @@
  					       "invalid numeric value %s\n",
  					       optarg);
diff --git a/srcpkgs/efibootmgr/template b/srcpkgs/efibootmgr/template
index 7acb1f7500..bd2e88bbbe 100644
--- a/srcpkgs/efibootmgr/template
+++ b/srcpkgs/efibootmgr/template
@@ -11,7 +11,6 @@ homepage="https://github.com/rhinstaller/efibootmgr"
 distfiles="https://github.com/rhinstaller/efibootmgr/releases/download/${version}/${pkgname}-${version}.tar.bz2"
 distfiles="https://github.com/rhboot/efibootmgr/archive/${version}.tar.gz"
 checksum=22a95ebe0d5c9fb2915b3a100450f8f37484d1dbb8b296f55b343cc84f10397d
-patch_args=-Np0
 
 conf_files="/etc/default/efibootmgr-kernel-hook"
 
diff --git a/srcpkgs/efl/patches/eina-debug.patch b/srcpkgs/efl/patches/eina-debug.patch
index c7370f3eb8..cf16dc48fd 100644
--- a/srcpkgs/efl/patches/eina-debug.patch
+++ b/srcpkgs/efl/patches/eina-debug.patch
@@ -1,7 +1,7 @@
 Use release-type parameters even with buildtype=plain.
 
---- src/lib/eina/meson.build
-+++ src/lib/eina/meson.build
+--- a/src/lib/eina/meson.build
++++ b/src/lib/eina/meson.build
 @@ -205,7 +205,7 @@ if get_option('buildtype') == 'debug'
       debug_threads=true
       default_mempool=true
diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index 4980400087..8786d5d94e 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -56,7 +56,6 @@ changelog="https://git.enlightenment.org/core/efl.git/plain/NEWS"
 distfiles="https://download.enlightenment.org/rel/libs/efl/efl-${version}.tar.xz"
 checksum=351ca0211ca000234527a503585f039f985607ec9439e34b49d8b8bbf35a7e6b
 make_check=extended
-patch_args=-Np0
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -Dbuild-tests=true"
diff --git a/srcpkgs/electron10/template b/srcpkgs/electron10/template
index 9d6d3d0ef7..0f2c83f6f4 100644
--- a/srcpkgs/electron10/template
+++ b/srcpkgs/electron10/template
@@ -33,7 +33,6 @@ distfiles="https://github.com/electron/electron/archive/v$version.tar.gz>electro
 checksum="d75b78107656ef854cc99a967b225eeb1e5989c0a1307d9efad3f8039d387cd8
  e018547e54566410fb365d9f3dae10037c30fca5debe6ba8baceef3ad3b03d28
  dcd0a1e619ff326399ca8fd87f61c255f4d1e9bff47860064993f01e4ff37fe1"
-patch_args=-Np0
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*-musl) makedepends+=" libucontext-devel" ;;
diff --git a/srcpkgs/electron12/template b/srcpkgs/electron12/template
index 3f236d8dec..51c50b0f74 100644
--- a/srcpkgs/electron12/template
+++ b/srcpkgs/electron12/template
@@ -34,7 +34,6 @@ distfiles="https://github.com/electron/electron/archive/v$version.tar.gz>electro
 checksum="1b4073baa3e93bb410591688b7ca6e59201ae9c8cf18f05e5a05ecfd7ffebfc8
  1a75ea6aeb98f2d3b6feae1fbf5692679e93d5b7631bc7c762dd873499deda5b
  bcdf869b0743405515ee897b1047b5e851a717e426b4974d26537c9b10dfd53a"
-patch_args=-Np0
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*-musl) makedepends+=" libucontext-devel" ;;
diff --git a/srcpkgs/elogind/patches/id-nobody.patch b/srcpkgs/elogind/patches/id-nobody.patch
index 6ceecba74d..5e9e5cdea9 100644
--- a/srcpkgs/elogind/patches/id-nobody.patch
+++ b/srcpkgs/elogind/patches/id-nobody.patch
@@ -1,5 +1,5 @@
---- src/basic/user-util.h
-+++ src/basic/user-util.h
+--- a/src/basic/user-util.h
++++ b/src/basic/user-util.h
 @@ -70,8 +70,8 @@ int take_etc_passwd_lock(const char *root);
  #define UID_INVALID ((uid_t) -1)
  #define GID_INVALID ((gid_t) -1)
diff --git a/srcpkgs/elogind/patches/mips.patch b/srcpkgs/elogind/patches/mips.patch
index bce29b86ce..ca1c0974cb 100644
--- a/srcpkgs/elogind/patches/mips.patch
+++ b/srcpkgs/elogind/patches/mips.patch
@@ -1,5 +1,5 @@
---- src/basic/missing_syscall.h	2021-01-15 08:12:02.000000000 +0100
-+++ src/basic/missing_syscall.h	2021-02-24 07:20:32.026355819 +0100
+--- a/src/basic/missing_syscall.h	2021-01-15 08:12:02.000000000 +0100
++++ b/src/basic/missing_syscall.h	2021-02-24 07:20:32.026355819 +0100
 @@ -11,7 +11,7 @@
  #include <sys/wait.h>
  #include <unistd.h>
diff --git a/srcpkgs/elogind/patches/ppc64-bad-tuple.patch b/srcpkgs/elogind/patches/ppc64-bad-tuple.patch
index 93a0f08189..f6237ffff4 100644
--- a/srcpkgs/elogind/patches/ppc64-bad-tuple.patch
+++ b/srcpkgs/elogind/patches/ppc64-bad-tuple.patch
@@ -9,8 +9,8 @@ Subject: [PATCH] fix ppc64 arch tuple
 
 diff --git src/basic/architecture.h src/basic/architecture.h
 index 620b522..3ea6e52 100644
---- src/basic/architecture.h
-+++ src/basic/architecture.h
+--- a/src/basic/architecture.h
++++ b/src/basic/architecture.h
 @@ -77,7 +77,7 @@ int uname_architecture(void);
  #elif defined(__powerpc64__)
  #  if __BYTE_ORDER == __BIG_ENDIAN
diff --git a/srcpkgs/elogind/patches/ppcle.patch b/srcpkgs/elogind/patches/ppcle.patch
index 4ae5faf44f..b986b0f37d 100644
--- a/srcpkgs/elogind/patches/ppcle.patch
+++ b/srcpkgs/elogind/patches/ppcle.patch
@@ -9,8 +9,8 @@ Subject: [PATCH] add ppcle arch tuple
 
 diff --git src/basic/architecture.h src/basic/architecture.h
 index 620b522..afdff7a 100644
---- src/basic/architecture.h
-+++ src/basic/architecture.h
+--- a/src/basic/architecture.h
++++ b/src/basic/architecture.h
 @@ -94,7 +94,7 @@ int uname_architecture(void);
  #    endif
  #  else
diff --git a/srcpkgs/elogind/template b/srcpkgs/elogind/template
index bf02b6d0f5..8e9fb0ef6c 100644
--- a/srcpkgs/elogind/template
+++ b/srcpkgs/elogind/template
@@ -22,7 +22,6 @@ checksum=dd2fcf22a89a078cad22e633d2f14a4cc9f4a9c8bae25c0e39fc4aec3e273bc9
 conf_files="/etc/elogind/*.conf"
 # tests fail differently due to containerization and kernel features
 make_check=ci-skip
-patch_args=-Np0
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" -Dutmp=false"
diff --git a/srcpkgs/emerald/patches/CCfix.patch b/srcpkgs/emerald/patches/CCfix.patch
index 06102ef74a..bf2724f042 100644
--- a/srcpkgs/emerald/patches/CCfix.patch
+++ b/srcpkgs/emerald/patches/CCfix.patch
@@ -1,5 +1,5 @@
---- configure.ac.old	2017-07-24 11:11:08.588672399 -0700
-+++ configure.ac	2017-07-24 11:51:52.841737854 -0700
+--- a/configure.ac.old	2017-07-24 11:11:08.588672399 -0700
++++ b/configure.ac	2017-07-24 11:51:52.841737854 -0700
 @@ -132,8 +132,12 @@
      AC_MSG_NOTICE([Using decorator interface version ${decor_ver}])
    ],
diff --git a/srcpkgs/emerald/template b/srcpkgs/emerald/template
index e486c3a575..736828d1e6 100644
--- a/srcpkgs/emerald/template
+++ b/srcpkgs/emerald/template
@@ -12,7 +12,6 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/compiz-reloaded"
 distfiles="https://github.com/compiz-reloaded/emerald/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
 checksum=53112b557c0d726ad75450b69df1649412ab5fcdf6c0827e383889f58bf437b1
-patch_args=-Np0
 
 pre_configure() {
 	mkdir -p m4
diff --git a/srcpkgs/endless-sky-gl21/patches/fix-std-string.patch b/srcpkgs/endless-sky-gl21/patches/fix-std-string.patch
index cbe1fe44de..b62630b0dd 100644
--- a/srcpkgs/endless-sky-gl21/patches/fix-std-string.patch
+++ b/srcpkgs/endless-sky-gl21/patches/fix-std-string.patch
@@ -1,5 +1,5 @@
---- source/Panel.h	2021-01-17 14:25:52.952063261 +0100
-+++ source/Panel.h	2021-01-17 14:29:26.466536974 +0100
+--- a/source/Panel.h	2021-01-17 14:25:52.952063261 +0100
++++ b/source/Panel.h	2021-01-17 14:29:26.466536974 +0100
 @@ -15,6 +15,7 @@
  
  #include "Rectangle.h"
diff --git a/srcpkgs/endless-sky-gl21/patches/paths.patch b/srcpkgs/endless-sky-gl21/patches/paths.patch
index cf765e07cf..c283ff8052 100644
--- a/srcpkgs/endless-sky-gl21/patches/paths.patch
+++ b/srcpkgs/endless-sky-gl21/patches/paths.patch
@@ -1,5 +1,5 @@
---- SConstruct.old	2017-12-06 12:54:20.524502000 -0800
-+++ SConstruct	2017-12-12 12:39:21.764384877 -0800
+--- a/SConstruct.old	2017-12-06 12:54:20.524502000 -0800
++++ b/SConstruct	2017-12-12 12:39:21.764384877 -0800
 @@ -18,7 +18,7 @@
  	env.Append(LINKFLAGS = ["-static-libstdc++"])
  
diff --git a/srcpkgs/endless-sky-gl21/template b/srcpkgs/endless-sky-gl21/template
index fe920ce655..5bb8355dc5 100644
--- a/srcpkgs/endless-sky-gl21/template
+++ b/srcpkgs/endless-sky-gl21/template
@@ -15,7 +15,6 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/SolraBizna/endless-sky"
 distfiles="https://github.com/SolraBizna/endless-sky/archive/${_commit}.tar.gz"
 checksum=46918d0cc35aaeb1219194099223e3338245aa04aa3f29fd76e3376bf5779376
-patch_args=-Np0
 
 endless-sky-gl21-data_package() {
 	short_desc+=" - data files"
diff --git a/srcpkgs/endless-sky/patches/paths.patch b/srcpkgs/endless-sky/patches/paths.patch
index 8516bdfb93..e80095b88e 100644
--- a/srcpkgs/endless-sky/patches/paths.patch
+++ b/srcpkgs/endless-sky/patches/paths.patch
@@ -1,5 +1,5 @@
---- SConstruct
-+++ SConstruct
+--- a/SConstruct
++++ b/SConstruct
 @@ -41,7 +41,7 @@
  	PathVariable("BUILDDIR", "Directory to store compiled object files in", "build", PathVariable.PathIsDirCreate),
  	PathVariable("BIN_DIR", "Directory to store binaries in", ".", PathVariable.PathIsDirCreate),
diff --git a/srcpkgs/endless-sky/patches/string.patch b/srcpkgs/endless-sky/patches/string.patch
index 68e7a9e055..45e7e01734 100644
--- a/srcpkgs/endless-sky/patches/string.patch
+++ b/srcpkgs/endless-sky/patches/string.patch
@@ -1,5 +1,5 @@
---- source/Panel.h	2020-05-01 21:02:38.000000000 +0200
-+++ source/Panel.h	2020-09-05 07:34:01.667091079 +0200
+--- a/source/Panel.h	2020-05-01 21:02:38.000000000 +0200
++++ b/source/Panel.h	2020-09-05 07:34:01.667091079 +0200
 @@ -15,6 +15,7 @@
  
  #include "Rectangle.h"
diff --git a/srcpkgs/endless-sky/template b/srcpkgs/endless-sky/template
index 1cd6906a89..00583361ce 100644
--- a/srcpkgs/endless-sky/template
+++ b/srcpkgs/endless-sky/template
@@ -12,4 +12,3 @@ homepage="http://endless-sky.github.io/"
 distfiles="https://github.com/endless-sky/endless-sky/archive/v${version}.tar.gz"
 checksum=001c8a28bbec7491f2725fbaa52b1ade813d33cec2d16521f241c80d04685b9d
 replaces="endless-sky-data>=0"
-patch_args=-Np0
diff --git a/srcpkgs/engrampa/patches/zstd-mime-type.patch b/srcpkgs/engrampa/patches/zstd-mime-type.patch
index 0e0a6cd4fb..cf56c55509 100644
--- a/srcpkgs/engrampa/patches/zstd-mime-type.patch
+++ b/srcpkgs/engrampa/patches/zstd-mime-type.patch
@@ -1,6 +1,6 @@
 diff --git caja/caja-engrampa.c caja/caja-engrampa.c
---- caja/caja-engrampa.c
-+++ caja/caja-engrampa.c
+--- a/caja/caja-engrampa.c
++++ b/caja/caja-engrampa.c
 @@ -191,7 +191,8 @@ static struct {
  		{ "application/x-zip", TRUE },
  		{ "application/x-zip-compressed", TRUE },
@@ -12,8 +12,8 @@ diff --git caja/caja-engrampa.c caja/caja-engrampa.c
  		{ "application/zip", TRUE },
  		{ "multipart/x-zip", TRUE },
 diff --git configure.ac configure.ac
---- configure.ac
-+++ configure.ac
+--- a/configure.ac
++++ b/configure.ac
 @@ -141,7 +141,6 @@ AC_ARG_ENABLE([magic],
                AS_HELP_STRING([--enable-magic], [use libmagic to detect file type]),,
                [enable_magic=no])
@@ -81,8 +81,8 @@ diff --git configure.ac configure.ac
  AC_ARG_VAR([CPIO], [Path to the `cpio` command])
  AC_PATH_PROGS(CPIO, gcpio cpio, cpio)
 diff --git data/engrampa.desktop.in.in data/engrampa.desktop.in.in
---- data/engrampa.desktop.in.in
-+++ data/engrampa.desktop.in.in
+--- a/data/engrampa.desktop.in.in
++++ b/data/engrampa.desktop.in.in
 @@ -11,7 +11,7 @@ Type=Application
  Icon=engrampa
  # Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
@@ -93,8 +93,8 @@ diff --git data/engrampa.desktop.in.in data/engrampa.desktop.in.in
  Keywords=MATE;archive;manager;compression;
  X-MATE-DocPath=engrampa/engrampa.xml
 diff --git src/fr-command-cfile.c src/fr-command-cfile.c
---- src/fr-command-cfile.c
-+++ src/fr-command-cfile.c
+--- a/src/fr-command-cfile.c
++++ b/src/fr-command-cfile.c
 @@ -301,7 +301,8 @@ fr_command_cfile_add (FrCommand     *comm,
  		compressed_filename = g_strconcat (filename, ".rz", NULL);
  	}
@@ -156,8 +156,8 @@ diff --git src/fr-command-cfile.c src/fr-command-cfile.c
  
  	return NULL;
 diff --git src/fr-init.c src/fr-init.c
---- src/fr-init.c
-+++ src/fr-init.c
+--- a/src/fr-init.c
++++ b/src/fr-init.c
 @@ -108,7 +108,8 @@ FrMimeTypeDescription mime_type_desc[] = {
  	{ "application/x-xz",                                         ".xz",       N_("Xz compressed file"), 0 },
  	{ "application/x-xz-compressed-tar",                          ".tar.xz",   N_("Tar compressed with xz"), 0 },
diff --git a/srcpkgs/engrampa/template b/srcpkgs/engrampa/template
index 3bf7459fc2..ac402d6fb4 100644
--- a/srcpkgs/engrampa/template
+++ b/srcpkgs/engrampa/template
@@ -15,7 +15,6 @@ license="GPL-2.0-or-later"
 homepage="https://mate-desktop.org"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=ee280d288c974732ec7bc2d1c3e18fa563b33a30f3e4cb3e976ebc71be6c4674
-patch_args=-Np0
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/enigma/patches/fix-ifstream_test.patch b/srcpkgs/enigma/patches/fix-ifstream_test.patch
index 57c10d75b5..3a7723f990 100644
--- a/srcpkgs/enigma/patches/fix-ifstream_test.patch
+++ b/srcpkgs/enigma/patches/fix-ifstream_test.patch
@@ -1,5 +1,5 @@
---- src/lev/Proxy.cc	2014-12-19 22:24:37.000000000 +0100
-+++ src/lev/Proxy.cc	2017-09-01 16:55:50.009413332 +0200
+--- a/src/lev/Proxy.cc	2014-12-19 22:24:37.000000000 +0100
++++ b/src/lev/Proxy.cc	2017-09-01 16:55:50.009413332 +0200
 @@ -933,7 +933,7 @@
                      } else if (haveLocalCopy) {
                          // plain file
diff --git a/srcpkgs/enigma/patches/musl-redirect.patch b/srcpkgs/enigma/patches/musl-redirect.patch
index cfbedf12ce..ec145fcf99 100644
--- a/srcpkgs/enigma/patches/musl-redirect.patch
+++ b/srcpkgs/enigma/patches/musl-redirect.patch
@@ -1,8 +1,8 @@
 We can't assign to *stdout and *stderr with musl libc
 because both file pointers are const.
 
---- src/main.cc	2014-12-19 22:24:38.000000000 +0100
-+++ src/main.cc	2015-11-19 13:53:23.419299858 +0100
+--- a/src/main.cc	2014-12-19 22:24:38.000000000 +0100
++++ b/src/main.cc	2015-11-19 13:53:23.419299858 +0100
 @@ -301,21 +301,25 @@
      if (ap.redirect) {
          FILE *newfp;
diff --git a/srcpkgs/enigma/patches/remove-SDL_ttf-check.patch b/srcpkgs/enigma/patches/remove-SDL_ttf-check.patch
index 128dfbae0b..3d1454d61f 100644
--- a/srcpkgs/enigma/patches/remove-SDL_ttf-check.patch
+++ b/srcpkgs/enigma/patches/remove-SDL_ttf-check.patch
@@ -1,8 +1,8 @@
 Do not check for SDL_ttf version because it fails when
 cross compiling.
 
---- configure.ac	2014-12-19 22:26:06.000000000 +0100
-+++ configure.ac	2015-11-19 12:08:46.996789539 +0100
+--- a/configure.ac	2014-12-19 22:26:06.000000000 +0100
++++ b/configure.ac	2015-11-19 12:08:46.996789539 +0100
 @@ -176,19 +176,6 @@
  dnl ----------------------------------------
  dnl Check for SDL_ttf library
diff --git a/srcpkgs/enigma/template b/srcpkgs/enigma/template
index 861fec84d4..d04fa51124 100644
--- a/srcpkgs/enigma/template
+++ b/srcpkgs/enigma/template
@@ -12,7 +12,6 @@ homepage="http://www.nongnu.org/enigma/"
 distfiles="${SOURCEFORGE_SITE}/enigma-game/Release%20${version}/${pkgname}-${version}.tar.gz"
 checksum=d872cf067d8eb560d3bb1cb17245814bc56ac3953ae1f12e2229c8eb6f82ce01
 replaces="enigma-data>=0"
-patch_args=-Np0
 
 CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/SDL"
 
diff --git a/srcpkgs/enlightenment/patches/mips-name-clash.patch b/srcpkgs/enlightenment/patches/mips-name-clash.patch
index 06190e8b04..3570dc5828 100644
--- a/srcpkgs/enlightenment/patches/mips-name-clash.patch
+++ b/srcpkgs/enlightenment/patches/mips-name-clash.patch
@@ -2,8 +2,8 @@ Source: @pullmoll
 Upstream: no
 Reason: variable name 'mips' clashes with target system headers
 
---- src/bin/e_wallpaper_gen_main.c	2020-05-31 20:22:37.495587000 +0200
-+++ src/bin/e_wallpaper_gen_main.c	2020-11-09 17:21:27.533538646 +0100
+--- a/src/bin/e_wallpaper_gen_main.c	2020-05-31 20:22:37.495587000 +0200
++++ b/src/bin/e_wallpaper_gen_main.c	2020-11-09 17:21:27.533538646 +0100
 @@ -85,33 +85,33 @@
  {
     int i, j = 0;
diff --git a/srcpkgs/enlightenment/template b/srcpkgs/enlightenment/template
index 2ffabb259e..db9c886dc9 100644
--- a/srcpkgs/enlightenment/template
+++ b/srcpkgs/enlightenment/template
@@ -20,7 +20,6 @@ checksum=be18e2f18d6c0b058f633e769863d3cbc4c07b629058ae670dec74cd7906dff1
 lib32disabled=yes
 build_options="wayland"
 build_options_default="wayland"
-patch_args=-Np0
 
 if [ "$CROSS_BUILD" -a "$build_option_wayland" ]; then
 	hostmakedepends+=" wayland-devel"
diff --git a/srcpkgs/entr/patches/include-sysctl.patch b/srcpkgs/entr/patches/include-sysctl.patch
index 2656d48f67..3765de2393 100644
--- a/srcpkgs/entr/patches/include-sysctl.patch
+++ b/srcpkgs/entr/patches/include-sysctl.patch
@@ -1,5 +1,5 @@
---- missing/kqueue_inotify.c	2020-01-02 21:20:12.000000000 +0100
-+++ -	2020-02-15 16:35:42.567901553 +0100
+--- a/missing/kqueue_inotify.c	2020-01-02 21:20:12.000000000 +0100
++++ b/missing/kqueue_inotify.c	2020-01-02 21:20:12.000000000 +0100
 @@ -16,6 +16,7 @@
  #include <sys/inotify.h>
  #include <sys/event.h>
diff --git a/srcpkgs/entr/template b/srcpkgs/entr/template
index 0e8f027eab..fa608a4d0d 100644
--- a/srcpkgs/entr/template
+++ b/srcpkgs/entr/template
@@ -10,7 +10,6 @@ homepage="http://entrproject.org"
 changelog="https://raw.githubusercontent.com/eradman/entr/master/NEWS"
 distfiles="$homepage/code/$pkgname-$version.tar.gz"
 checksum=e256a4d2fbe46f6132460833ba447e65d7f35ba9d0b265e7c4150397cc4405a2
-patch_args=-Np0
 
 post_extract() {
 	case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/enyo-doom/patches/cmake.patch b/srcpkgs/enyo-doom/patches/cmake.patch
index 8c9d9f4c66..4fa5135c2c 100644
--- a/srcpkgs/enyo-doom/patches/cmake.patch
+++ b/srcpkgs/enyo-doom/patches/cmake.patch
@@ -1,5 +1,5 @@
---- CMakeLists.txt	2020-09-20 23:03:04.000000000 +0200
-+++ -	2021-02-08 16:29:03.621982747 +0100
+--- a/CMakeLists.txt	2020-09-20 23:03:04.000000000 +0200
++++ b/CMakeLists.txt	2020-09-20 23:03:04.000000000 +0200
 @@ -22,8 +22,8 @@
  include_directories ( ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
  find_package ( Qt5Core REQUIRED )
diff --git a/srcpkgs/enyo-doom/template b/srcpkgs/enyo-doom/template
index d529a51490..9e900f2799 100644
--- a/srcpkgs/enyo-doom/template
+++ b/srcpkgs/enyo-doom/template
@@ -10,7 +10,6 @@ license="GPL-3.0-or-later"
 homepage="https://gitlab.com/sdcofer70/enyo-doom"
 distfiles="https://gitlab.com/sdcofer70/enyo-doom/-/archive/${version}/enyo-doom-${version}.tar.bz2"
 checksum=03d490081753dfd1d40b7cc8142b8f0e7642bad6f3d724f9ba9cfad0253f1a34
-patch_args=-Np0
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel"
diff --git a/srcpkgs/eolie/patches/python-3.8.patch b/srcpkgs/eolie/patches/python-3.8.patch
index 1c80a7e8a4..39e0437b33 100644
--- a/srcpkgs/eolie/patches/python-3.8.patch
+++ b/srcpkgs/eolie/patches/python-3.8.patch
@@ -1,5 +1,5 @@
---- python-webextension/meson.build.orig
-+++ python-webextension/meson.build
+--- a/python-webextension/meson.build
++++ b/python-webextension/meson.build
 @@ -2,7 +2,7 @@
  
  webkitextension = dependency('webkit2gtk-web-extension-4.0')
diff --git a/srcpkgs/eolie/template b/srcpkgs/eolie/template
index 8dfb6676db..4249e34262 100644
--- a/srcpkgs/eolie/template
+++ b/srcpkgs/eolie/template
@@ -15,4 +15,3 @@ license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Eolie"
 distfiles="https://gitlab.gnome.org/World/eolie/uploads/${_eolie_hash}/eolie-${version}.tar.xz"
 checksum=9da359895306cf5929a01acb60d1506afb0a04ddbbd0d80ae1d0ba831e34671b
-patch_args=-Np0
diff --git a/srcpkgs/epdfview/patches/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch b/srcpkgs/epdfview/patches/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch
index 6b5797385a..9eef6950ac 100644
--- a/srcpkgs/epdfview/patches/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch
+++ b/srcpkgs/epdfview/patches/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch
@@ -12,8 +12,8 @@ git-svn-id: svn://svn.emma-soft.com/epdfview/trunk@367 cb4bfb15-1111-0410-82e2-9
 
 diff --git a/src/PDFDocument.cxx b/src/PDFDocument.cxx
 index df5d75f..63b3513 100644
---- src/PDFDocument.cxx
-+++ src/PDFDocument.cxx
+--- a/src/PDFDocument.cxx
++++ b/src/PDFDocument.cxx
 @@ -20,6 +20,7 @@
  #include <time.h>
  #include <poppler.h>
diff --git a/srcpkgs/epdfview/patches/epdfview.desktop.patch b/srcpkgs/epdfview/patches/epdfview.desktop.patch
index d86fc30883..93dbc03d4b 100644
--- a/srcpkgs/epdfview/patches/epdfview.desktop.patch
+++ b/srcpkgs/epdfview/patches/epdfview.desktop.patch
@@ -1,5 +1,5 @@
---- data/epdfview.desktop.bak	2009-04-05 16:55:56.000000000 -0700
-+++ data/epdfview.desktop	2009-04-05 16:56:33.000000000 -0700
+--- a/data/epdfview.desktop.bak	2009-04-05 16:55:56.000000000 -0700
++++ b/data/epdfview.desktop	2009-04-05 16:56:33.000000000 -0700
 @@ -7,7 +7,7 @@
  GenericName=PDF Viewer
  GenericName[ca]=Visor PDF
diff --git a/srcpkgs/epdfview/patches/glib2_headers.patch b/srcpkgs/epdfview/patches/glib2_headers.patch
index 25e34ce008..b5bc5c2113 100644
--- a/srcpkgs/epdfview/patches/glib2_headers.patch
+++ b/srcpkgs/epdfview/patches/glib2_headers.patch
@@ -1,7 +1,7 @@
 diff --git a/src/gtk/StockIcons.h b/src/gtk/StockIcons.h
 index c142a7a..58fcf2e 100644
---- src/gtk/StockIcons.h
-+++ src/gtk/StockIcons.h
+--- a/src/gtk/StockIcons.h
++++ b/src/gtk/StockIcons.h
 @@ -18,7 +18,7 @@
  #if !defined (__STOCK_ICONS_H__)
  #define __STOCK_ICONS_H__
diff --git a/srcpkgs/epdfview/template b/srcpkgs/epdfview/template
index 06d6a4fd44..2c6b5774b4 100644
--- a/srcpkgs/epdfview/template
+++ b/srcpkgs/epdfview/template
@@ -12,7 +12,6 @@ license="GPL-2.0-or-later"
 homepage="http://freshmeat.sourceforge.net/projects/epdfview"
 distfiles="http://anduin.linuxfromscratch.org/BLFS/epdfview/epdfview-${version}.tar.bz2"
 checksum=948648ae7c9d7b3b408d738bd4f48d87375b1196cae1129d6b846a8de0f2f8f0
-patch_args=-Np0
 
 post_install() {
 	for f in 24 32 48; do
diff --git a/srcpkgs/epson-inkjet-printer-escpr/patches/xfifo_header.patch b/srcpkgs/epson-inkjet-printer-escpr/patches/xfifo_header.patch
index 76f155d7e1..c582dd64ac 100644
--- a/srcpkgs/epson-inkjet-printer-escpr/patches/xfifo_header.patch
+++ b/srcpkgs/epson-inkjet-printer-escpr/patches/xfifo_header.patch
@@ -1,5 +1,5 @@
---- src/filter.c
-+++ src/filter.c
+--- a/src/filter.c
++++ b/src/filter.c
 @@ -45,6 +45,7 @@
  #include "libprtX.h"
  #include "optBase.h"
diff --git a/srcpkgs/epson-inkjet-printer-escpr/template b/srcpkgs/epson-inkjet-printer-escpr/template
index fb4053ab40..dda44942ff 100644
--- a/srcpkgs/epson-inkjet-printer-escpr/template
+++ b/srcpkgs/epson-inkjet-printer-escpr/template
@@ -12,4 +12,3 @@ license="GPL-2.0-or-later"
 homepage="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
 distfiles="https://download3.ebz.epson.net/dsc/f/03/00/10/49/18/f3016be6120a7271a6d9cb64872f817bce1920b8/${pkgname}-${version}-1lsb3.2.tar.gz"
 checksum=8d964368a1395a8902b8637e3dc176d6793f0afdfe3f21e95509f29894700d4e
-patch_args=-Np0
diff --git a/srcpkgs/espeakup/patches/use-with-espeak-ng.patch b/srcpkgs/espeakup/patches/use-with-espeak-ng.patch
index c974d99a66..bd235bdf87 100644
--- a/srcpkgs/espeakup/patches/use-with-espeak-ng.patch
+++ b/srcpkgs/espeakup/patches/use-with-espeak-ng.patch
@@ -1,5 +1,5 @@
---- Makefile.orig	2020-12-15 20:40:30.660983776 -0500
-+++ Makefile	2020-12-15 20:41:07.473982625 -0500
+--- a/Makefile	2020-12-15 20:40:30.660983776 -0500
++++ b/Makefile	2020-12-15 20:41:07.473982625 -0500
 @@ -6,7 +6,7 @@
  WARNFLAGS = -Wall
  CFLAGS += ${DEPFLAGS} ${WARNFLAGS}
diff --git a/srcpkgs/espeakup/template b/srcpkgs/espeakup/template
index 569162c685..6cbc9d0da5 100644
--- a/srcpkgs/espeakup/template
+++ b/srcpkgs/espeakup/template
@@ -10,7 +10,6 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/williamh/espeakup"
 distfiles="https://github.com/williamh/espeakup/archive/v${version}.tar.gz"
 checksum="4de284e30b6bdb0f9dee9c8ea02d13a3d20a61415b812338446b8b381e997ef4"
-patch_args=-Np0
 
 post_install() {
 	vsv espeakup
diff --git a/srcpkgs/eukleides/patches/eukleides-1.5.4.patch b/srcpkgs/eukleides/patches/eukleides-1.5.4.patch
index 042753f650..114fe03e95 100644
--- a/srcpkgs/eukleides/patches/eukleides-1.5.4.patch
+++ b/srcpkgs/eukleides/patches/eukleides-1.5.4.patch
@@ -1,5 +1,5 @@
---- doc/eukleides.texi	2010-04-27 06:31:00 UTC
-+++ doc/eukleides.texi	
+--- a/doc/eukleides.texi	2010-04-27 06:31:00 UTC
++++ b/doc/eukleides.texi	
 @@ -6,12 +6,14 @@ 
  
  % ------------------------------------------------------------------------------
diff --git a/srcpkgs/eukleides/template b/srcpkgs/eukleides/template
index 992cfa8e25..a955ef5bc9 100644
--- a/srcpkgs/eukleides/template
+++ b/srcpkgs/eukleides/template
@@ -12,7 +12,6 @@ homepage="http://www.eukleides.org/"
 distfiles="http://www.eukleides.org/files/${pkgname}-${version}.tar.bz2"
 checksum=18c489460cb2cb98f4ea9c0187519ef77b4422117fd43bcd4e4836580ef40c69
 disable_parallel_build=yes
-patch_args=-Np0
 
 CFLAGS="-fcommon"
 
diff --git a/srcpkgs/evemu/patches/musl.patch b/srcpkgs/evemu/patches/musl.patch
index c620fd629f..fd7e1ac8c3 100644
--- a/srcpkgs/evemu/patches/musl.patch
+++ b/srcpkgs/evemu/patches/musl.patch
@@ -9,8 +9,8 @@ Subject: [PATCH] musl build fix
 
 diff --git tools/find_event_devices.c tools/find_event_devices.c
 index 2a43d54..70314e8 100644
---- tools/find_event_devices.c
-+++ tools/find_event_devices.c
+--- a/tools/find_event_devices.c
++++ b/tools/find_event_devices.c
 @@ -32,7 +32,7 @@
  #include <sys/stat.h>
  #include <fcntl.h>
diff --git a/srcpkgs/evemu/patches/time64.patch b/srcpkgs/evemu/patches/time64.patch
index 172e94fbc6..bc10f198c7 100644
--- a/srcpkgs/evemu/patches/time64.patch
+++ b/srcpkgs/evemu/patches/time64.patch
@@ -1,5 +1,5 @@
---- src/evemu.c	2017-06-02 10:02:09.000000000 +0200
-+++ src/evemu.c	2020-12-11 16:11:53.764932154 +0100
+--- a/src/evemu.c	2017-06-02 10:02:09.000000000 +0200
++++ b/src/evemu.c	2020-12-11 16:11:53.764932154 +0100
 @@ -53,6 +53,7 @@
  #include <ctype.h>
  #include <unistd.h>
diff --git a/srcpkgs/evemu/template b/srcpkgs/evemu/template
index bc53c54383..e65f2f63ac 100644
--- a/srcpkgs/evemu/template
+++ b/srcpkgs/evemu/template
@@ -11,7 +11,6 @@ license="LGPL-3.0-only, MIT"
 homepage="https://freedesktop.org/wiki/Evemu/"
 distfiles=${FREEDESKTOP_SITE}/evemu/evemu-$version.tar.xz
 checksum=78c9400d55eeeb5ab75161360543f9376438c4da4934cb34cdda5b46021ae379
-patch_args=-Np0
 
 post_install() {
 	sed -n '/Copyright/,/IN THE SOFTWARE/p' src/evemu.c >LICENSE
diff --git a/srcpkgs/evolution-data-server/patches/gen-tables.patch b/srcpkgs/evolution-data-server/patches/gen-tables.patch
index 30a54f1e0f..d21fa8c617 100644
--- a/srcpkgs/evolution-data-server/patches/gen-tables.patch
+++ b/srcpkgs/evolution-data-server/patches/gen-tables.patch
@@ -1,8 +1,8 @@
 camel-gen-tables and gen-western-table are executed in the build process so
 they need to be built for the host architecture
 
---- src/camel/CMakeLists.txt.orig       2018-10-27 15:24:42.168166299 +0200
-+++ src/camel/CMakeLists.txt    2018-10-27 15:37:04.341765727 +0200
+--- a/src/camel/CMakeLists.txt.orig       2018-10-27 15:24:42.168166299 +0200
++++ b/src/camel/CMakeLists.txt    2018-10-27 15:37:04.341765727 +0200
 @@ -1,17 +1,10 @@
  glib_mkenums(camel-enumtypes camel-enums.h CAMEL_ENUMTYPES_H)
 
@@ -24,8 +24,8 @@ they need to be built for the host architecture
 
  set(SOURCES
 
---- src/addressbook/libebook-contacts/CMakeLists.txt.orig       2018-10-27 15:42:14.644088211 +0200
-+++ src/addressbook/libebook-contacts/CMakeLists.txt    2018-10-27 15:45:43.359285829 +0200
+--- a/src/addressbook/libebook-contacts/CMakeLists.txt.orig       2018-10-27 15:42:14.644088211 +0200
++++ b/src/addressbook/libebook-contacts/CMakeLists.txt    2018-10-27 15:45:43.359285829 +0200
 @@ -2,31 +2,12 @@
 
  add_pkgconfig_file(libebook-contacts.pc.in libebook-contacts-${API_VERSION}.pc)
diff --git a/srcpkgs/evolution-data-server/patches/gir.patch b/srcpkgs/evolution-data-server/patches/gir.patch
index c6a5832e2a..8d0ad5f9ce 100644
--- a/srcpkgs/evolution-data-server/patches/gir.patch
+++ b/srcpkgs/evolution-data-server/patches/gir.patch
@@ -1,5 +1,5 @@
---- cmake/modules/GObjectIntrospection.cmake
-+++ cmake/modules/GObjectIntrospection.cmake
+--- a/cmake/modules/GObjectIntrospection.cmake
++++ b/cmake/modules/GObjectIntrospection.cmake
 @@ -122,7 +122,7 @@
  		file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${_gir_name}_files "${_gir_files}")
  
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index b4cc9ccbab..136c47804c 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -20,7 +20,6 @@ homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://raw.githubusercontent.com/GNOME/evolution-data-server/gnome-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=ec82951639f32a5cece80a8b0b9aa3f66b7d318e3ee2c1c35234f2e2bde8a418
-patch_args=-Np0
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/evolution/patches/cmake.patch b/srcpkgs/evolution/patches/cmake.patch
index dfb7711178..ff844b5915 100644
--- a/srcpkgs/evolution/patches/cmake.patch
+++ b/srcpkgs/evolution/patches/cmake.patch
@@ -1,5 +1,5 @@
---- CMakeLists.txt	2017-03-20 03:14:35.000000000 -0600
-+++ CMakeLists.txt	2017-04-06 15:05:22.473504016 -0600
+--- a/CMakeLists.txt	2017-03-20 03:14:35.000000000 -0600
++++ b/CMakeLists.txt	2017-04-06 15:05:22.473504016 -0600
 @@ -350,10 +350,6 @@
  CHECK_C_SOURCE_RUNS("#include \"${CMAKE_SOURCE_DIR}/iconv-detect.c\"" _correct_iconv)
  unset(CMAKE_REQUIRED_LIBRARIES)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index 84071a14f9..1b3b6fa7e9 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -22,7 +22,6 @@ distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=9b4c31352332fb9dc0ff23625ba1552c13808f1c9ba019496b750be87e07a5fd
 shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so
  libevolution-mail.so libevolution-shell.so libevolution-mail-formatter.so"
-patch_args=-Np0
 
 evolution-devel_package() {
 	depends="webkit2gtk-devel gtk+3-devel libglib-devel evolution-data-server-devel
diff --git a/srcpkgs/evtest/patches/0001-Add-missing-limits.h-include.patch b/srcpkgs/evtest/patches/0001-Add-missing-limits.h-include.patch
index 88ccfc13fd..51ca0ff261 100644
--- a/srcpkgs/evtest/patches/0001-Add-missing-limits.h-include.patch
+++ b/srcpkgs/evtest/patches/0001-Add-missing-limits.h-include.patch
@@ -22,8 +22,8 @@ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
 
 diff --git evtest.c evtest.c
 index 37d4f85..548c203 100644
---- evtest.c
-+++ evtest.c
+--- a/evtest.c
++++ b/evtest.c
 @@ -56,6 +56,7 @@
  #include <getopt.h>
  #include <ctype.h>
diff --git a/srcpkgs/evtest/patches/time64.patch b/srcpkgs/evtest/patches/time64.patch
index 9d7e12b4b1..ad8cde3e1e 100644
--- a/srcpkgs/evtest/patches/time64.patch
+++ b/srcpkgs/evtest/patches/time64.patch
@@ -1,5 +1,5 @@
---- evtest.c	2019-08-02 20:14:30.000000000 +0200
-+++ evtest.c	2020-12-11 15:33:15.895384954 +0100
+--- a/evtest.c	2019-08-02 20:14:30.000000000 +0200
++++ b/evtest.c	2020-12-11 15:33:15.895384954 +0100
 @@ -1139,7 +1139,7 @@
  			type = ev[i].type;
  			code = ev[i].code;
diff --git a/srcpkgs/evtest/template b/srcpkgs/evtest/template
index ee6bca695a..1feed55a9d 100644
--- a/srcpkgs/evtest/template
+++ b/srcpkgs/evtest/template
@@ -10,7 +10,6 @@ license="GPL-2.0-or-later"
 homepage="https://cgit.freedesktop.org/evtest/"
 distfiles="https://cgit.freedesktop.org/evtest/snapshot/evtest-${version}.tar.xz"
 checksum=e49f1f160b30c8f7c2a4caef5ab655f1caf816483d19fdedd6db2d251d7ab80e
-patch_args=-Np0
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/ex-vi/patches/increase-tube.patch b/srcpkgs/ex-vi/patches/increase-tube.patch
index 5010798ce6..7642c14be7 100644
--- a/srcpkgs/ex-vi/patches/increase-tube.patch
+++ b/srcpkgs/ex-vi/patches/increase-tube.patch
@@ -1,5 +1,5 @@
---- config.h	2005-02-19 05:25:39.000000000 -0500
-+++ config.h.fixed	2010-01-04 22:02:01.000000000 -0500
+--- a/config.h	2005-02-19 05:25:39.000000000 -0500
++++ b/config.h.fixed	2010-01-04 22:02:01.000000000 -0500
 @@ -95,8 +95,8 @@
  #define TUBESIZE        6000    /* Maximum screen size for visual */
  #else	/* VMUNIX */
diff --git a/srcpkgs/ex-vi/patches/navkeys.patch b/srcpkgs/ex-vi/patches/navkeys.patch
index 658912621c..ecc8bff51b 100644
--- a/srcpkgs/ex-vi/patches/navkeys.patch
+++ b/srcpkgs/ex-vi/patches/navkeys.patch
@@ -1,5 +1,5 @@
---- ex_tty.c	2005-03-04 13:42:58.000000000 +0100
-+++ ex_tty.c	2009-06-25 20:06:57.000000000 +0200
+--- a/ex_tty.c	2005-03-04 13:42:58.000000000 +0100
++++ b/ex_tty.c	2009-06-25 20:06:57.000000000 +0200
 @@ -132,7 +132,8 @@
  	&ED, &EI, &F0, &F1, &F2, &F3, &F4, &F5, &F6, &F7, &F8, &F9,
  	&HO, &IC, &IM, &IP, &KD, &KE, &KH, &KL, &KR, &KS, &KU, &LL, &ND, &xNL,
@@ -33,8 +33,8 @@
  	sp = sstrs;
  	do {
  		string = tgetstr(namp, &aoftspace);
---- ex_tty.h	2004-12-01 19:21:06.000000000 +0100
-+++ ex_tty.h	2009-06-25 20:06:05.000000000 +0200
+--- a/ex_tty.h	2004-12-01 19:21:06.000000000 +0100
++++ b/ex_tty.h	2009-06-25 20:06:05.000000000 +0200
 @@ -183,6 +183,15 @@
  var	bool	XX;		/* Tektronix 4025 insert line */
  	/* X? is reserved for severely nauseous glitches */
diff --git a/srcpkgs/ex-vi/template b/srcpkgs/ex-vi/template
index 84e0dbe713..ea54bb4378 100644
--- a/srcpkgs/ex-vi/template
+++ b/srcpkgs/ex-vi/template
@@ -15,7 +15,6 @@ distfiles="${SOURCEFORGE_SITE}/$pkgname/ex-${version}.tar.bz2"
 checksum=da4be7cf67e94572463b19e56850aa36dc4e39eb0d933d3688fe8574bb632409
 CFLAGS=-I.
 disable_parallel_build=yes
-patch_args=-Np0
 
 alternatives="
  vi:ex:/usr/bin/ex-ex
diff --git a/srcpkgs/exfat-dkms/patches/linux4.18.patch b/srcpkgs/exfat-dkms/patches/linux4.18.patch
index 5b33766286..3771c516be 100644
--- a/srcpkgs/exfat-dkms/patches/linux4.18.patch
+++ b/srcpkgs/exfat-dkms/patches/linux4.18.patch
@@ -1,7 +1,7 @@
 diff --git exfat_super.c exfat_super.c
 index 312de36..262b74d 100644
---- exfat_super.c
-+++ exfat_super.c
+--- a/exfat_super.c
++++ b/exfat_super.c
 @@ -97,6 +97,11 @@ static int exfat_default_codepage = CONFIG_EXFAT_DEFAULT_CODEPAGE;
  static char exfat_default_iocharset[] = CONFIG_EXFAT_DEFAULT_IOCHARSET;
  
diff --git a/srcpkgs/exfat-dkms/template b/srcpkgs/exfat-dkms/template
index 1f590f1e8c..f0d28ef17d 100644
--- a/srcpkgs/exfat-dkms/template
+++ b/srcpkgs/exfat-dkms/template
@@ -10,7 +10,6 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/dorimanx/exfat-nofuse"
 distfiles="https://github.com/dorimanx/exfat-nofuse/archive/${_commit}.tar.gz"
 checksum=b88a98f0a7e1b987465f5ccfcafb384b293506c7fec9d3b91b803e0fe5b16e0a
-patch_args=-Np0
 
 dkms_modules="exfat ${version}"
 depends="dkms"
diff --git a/srcpkgs/exfat-utils/patches/musl-not-found.patch b/srcpkgs/exfat-utils/patches/musl-not-found.patch
index cdec1ceb15..0401617964 100644
--- a/srcpkgs/exfat-utils/patches/musl-not-found.patch
+++ b/srcpkgs/exfat-utils/patches/musl-not-found.patch
@@ -1,5 +1,5 @@
---- libexfat/platform.h.orig	2015-08-17 23:32:56.701648786 +0200
-+++ libexfat/platform.h	2015-08-17 23:33:04.219648224 +0200
+--- a/libexfat/platform.h	2015-08-17 23:32:56.701648786 +0200
++++ b/libexfat/platform.h	2015-08-17 23:33:04.219648224 +0200
 @@ -57,7 +57,14 @@
  #define EXFAT_BIG_ENDIAN _BIG_ENDIAN
  
diff --git a/srcpkgs/exfat-utils/template b/srcpkgs/exfat-utils/template
index 6ca86c434c..6c62704fa5 100644
--- a/srcpkgs/exfat-utils/template
+++ b/srcpkgs/exfat-utils/template
@@ -9,4 +9,3 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/relan/exfat"
 distfiles="${homepage}/releases/download/v${version}/${pkgname}-${version}.tar.gz"
 checksum=dfebd07a7b907e2d603d3a9626e6440bd43ec6c4e8c07ccfc57ce9502b724835
-patch_args=-Np0
diff --git a/srcpkgs/exo/patches/configure-crosscompile.patch b/srcpkgs/exo/patches/configure-crosscompile.patch
index dac3a86a9b..935cd5f465 100644
--- a/srcpkgs/exo/patches/configure-crosscompile.patch
+++ b/srcpkgs/exo/patches/configure-crosscompile.patch
@@ -1,5 +1,5 @@
---- configure.ac.orig
-+++ configure.ac
+--- a/configure.ac
++++ b/configure.ac
 @@ -137,22 +137,29 @@ AC_FUNC_MMAP()
  dnl ***************************************
  dnl *** Check for strftime() extensions ***
diff --git a/srcpkgs/exo/template b/srcpkgs/exo/template
index e872f31c77..65ff908fb9 100644
--- a/srcpkgs/exo/template
+++ b/srcpkgs/exo/template
@@ -13,7 +13,6 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://xfce.org/"
 distfiles="https://archive.xfce.org/src/xfce/exo/${version%.*}/exo-${version}.tar.bz2"
 checksum=4e89f5536afbf1cb9191cceb720fb2764df1a4fae3459512b7320841ab5a9e9d
-patch_args=-Np0
 
 pre_configure() {
 	if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/expect/patches/0001-init-CC.patch b/srcpkgs/expect/patches/0001-init-CC.patch
index 1069798a0d..0c7d14dd9d 100644
--- a/srcpkgs/expect/patches/0001-init-CC.patch
+++ b/srcpkgs/expect/patches/0001-init-CC.patch
@@ -5,8 +5,8 @@ From: Đoàn Trần Công Danh <congdanhqx@gmail.com>
 
 diff --git configure.in configure.in
 index aa6fd6e..ad8db32 100755
---- configure.in
-+++ configure.in
+--- a/configure.in
++++ b/configure.in
 @@ -9,6 +9,8 @@ TEA_INIT([3.9])
  
  AC_CONFIG_AUX_DIR(tclconfig)
diff --git a/srcpkgs/expect/patches/0002-cross-WNOHANG-requires-POSIX_SOURCE.patch b/srcpkgs/expect/patches/0002-cross-WNOHANG-requires-POSIX_SOURCE.patch
index b1fb36b53a..b4a7003522 100644
--- a/srcpkgs/expect/patches/0002-cross-WNOHANG-requires-POSIX_SOURCE.patch
+++ b/srcpkgs/expect/patches/0002-cross-WNOHANG-requires-POSIX_SOURCE.patch
@@ -5,8 +5,8 @@ From: Đoàn Trần Công Danh <congdanhqx@gmail.com>
 
 diff --git configure.in configure.in
 index ad8db32..6570a07 100755
---- configure.in
-+++ configure.in
+--- a/configure.in
++++ b/configure.in
 @@ -469,21 +469,19 @@ memcpy(s1,s2,0);
  # and if so that WNOHANG is not defined.  The only place I've
  # seen this is ISC.
diff --git a/srcpkgs/expect/patches/0003-cross-wnohang-value.patch b/srcpkgs/expect/patches/0003-cross-wnohang-value.patch
index c735f2f523..9dfd3909ce 100644
--- a/srcpkgs/expect/patches/0003-cross-wnohang-value.patch
+++ b/srcpkgs/expect/patches/0003-cross-wnohang-value.patch
@@ -5,8 +5,8 @@ From: Đoàn Trần Công Danh <congdanhqx@gmail.com>
 
 diff --git configure.in configure.in
 index 6570a07..0e4c9d1 100755
---- configure.in
-+++ configure.in
+--- a/configure.in
++++ b/configure.in
 @@ -486,6 +486,25 @@ AC_LANG_PROGRAM([[
  
  AC_MSG_CHECKING([if any value exists for WNOHANG])
diff --git a/srcpkgs/expect/patches/0004-cross-misc.patch b/srcpkgs/expect/patches/0004-cross-misc.patch
index f45f6e5213..6ef4dd2129 100644
--- a/srcpkgs/expect/patches/0004-cross-misc.patch
+++ b/srcpkgs/expect/patches/0004-cross-misc.patch
@@ -5,8 +5,8 @@ From: Đoàn Trần Công Danh <congdanhqx@gmail.com>
 
 diff --git configure.in configure.in
 index 0e4c9d1..d41a7a4 100755
---- configure.in
-+++ configure.in
+--- a/configure.in
++++ b/configure.in
 @@ -732,20 +732,17 @@ fi
  
  # first check for the pure bsd
diff --git a/srcpkgs/expect/patches/0005-fix-buf-overflow-when-logging.patch b/srcpkgs/expect/patches/0005-fix-buf-overflow-when-logging.patch
index 2f63daf197..4d4b58964c 100644
--- a/srcpkgs/expect/patches/0005-fix-buf-overflow-when-logging.patch
+++ b/srcpkgs/expect/patches/0005-fix-buf-overflow-when-logging.patch
@@ -1,6 +1,6 @@
 diff -up exp_log.c.orig exp_log.c
---- exp_log.c.orig	2013-12-12 12:43:38.527854189 +0100
-+++ exp_log.c	2013-12-12 12:49:26.866576387 +0100
+--- a/exp_log.c	2013-12-12 12:43:38.527854189 +0100
++++ b/exp_log.c	2013-12-12 12:49:26.866576387 +0100
 @@ -176,7 +176,7 @@ expStdoutLog TCL_VARARGS_DEF(int,arg1)
  
      if ((!tsdPtr->logUser) && (!force_stdout) && (!tsdPtr->logAll)) return;
diff --git a/srcpkgs/expect/template b/srcpkgs/expect/template
index 59a7d2c99a..2d0bdbd4e4 100644
--- a/srcpkgs/expect/template
+++ b/srcpkgs/expect/template
@@ -14,7 +14,6 @@ license="Public Domain"
 homepage="http://www.nist.gov/el/msid/expect.cfm"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/Expect/${version}/${pkgname}${version}.tar.gz"
 checksum=49a7da83b0bdd9f46d04a04deec19c7767bb9a323e40c4781f89caf760b92c34
-patch_args=-Np0
 
 alternatives="
  mkpasswd:mkpasswd:/usr/bin/expect-mkpasswd
diff --git a/srcpkgs/extra-cmake-modules/patches/musl.patch b/srcpkgs/extra-cmake-modules/patches/musl.patch
index 3056a6ccbd..2d31cc0aa6 100644
--- a/srcpkgs/extra-cmake-modules/patches/musl.patch
+++ b/srcpkgs/extra-cmake-modules/patches/musl.patch
@@ -15,8 +15,8 @@ Signed-off-by: A. Wilcox <AWilcox@Wilcox-Tech.com>
 
 diff --git a/kde-modules/KDECompilerSettings.cmake b/kde-modules/KDECompilerSettings.cmake
 index dfa29f7..f50911c 100644
---- kde-modules/KDECompilerSettings.cmake
-+++ kde-modules/KDECompilerSettings.cmake
+--- a/kde-modules/KDECompilerSettings.cmake
++++ b/kde-modules/KDECompilerSettings.cmake
 @@ -140,6 +140,9 @@ if (UNIX)
      # implementation recognize it?
      _kde_add_platform_definitions(-D_LARGEFILE64_SOURCE)
diff --git a/srcpkgs/extra-cmake-modules/template b/srcpkgs/extra-cmake-modules/template
index 26197cf56b..c7f83efd7f 100644
--- a/srcpkgs/extra-cmake-modules/template
+++ b/srcpkgs/extra-cmake-modules/template
@@ -14,7 +14,6 @@ homepage="https://invent.kde.org/frameworks/extra-cmake-modules"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=72b7f3b3917f3208fff10f0402b0fa3a65815aca924f0f94a4f96383d8e0f81e
 python_version=3
-patch_args=-Np0
 
 do_check() {
 	cd build
diff --git a/srcpkgs/extundelete/patches/fix-ftbfs.patch b/srcpkgs/extundelete/patches/fix-ftbfs.patch
index a4fc32a13f..283621c57c 100644
--- a/srcpkgs/extundelete/patches/fix-ftbfs.patch
+++ b/srcpkgs/extundelete/patches/fix-ftbfs.patch
@@ -1,5 +1,5 @@
---- src/insertionops.cc
-+++ src/insertionops.cc
+--- a/src/insertionops.cc
++++ b/src/insertionops.cc
 @@ -33,7 +33,7 @@ std::ostream& operator<<(std::ostream& o
    os << "File flags: " << inode.i_flags << std::endl;
    os << "File version (for NFS): " << inode.i_generation << std::endl;
diff --git a/srcpkgs/extundelete/template b/srcpkgs/extundelete/template
index 87b9c1fdf9..3ae6119c38 100644
--- a/srcpkgs/extundelete/template
+++ b/srcpkgs/extundelete/template
@@ -10,4 +10,3 @@ license="GPL-2.0-only"
 homepage="http://extundelete.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
 checksum=a1f9dd61247056d36401ce5d6785e74d08a184340eebd3865c345ddaa93f19f4
-patch_args=-Np0