diff --git a/srcpkgs/u2f-hidraw-policy/patches/Makefile.patch b/srcpkgs/u2f-hidraw-policy/patches/Makefile.patch
index 5d45501619e..0c78183394b 100644
--- a/srcpkgs/u2f-hidraw-policy/patches/Makefile.patch
+++ b/srcpkgs/u2f-hidraw-policy/patches/Makefile.patch
@@ -1,5 +1,5 @@
---- Makefile	2015-10-30 14:48:49.000000000 -0400
-+++ Makefile.bck	2016-08-16 18:38:41.989106570 -0400
+--- a/Makefile	2015-10-30 14:48:49.000000000 -0400
++++ b/Makefile.bck	2016-08-16 18:38:41.989106570 -0400
 @@ -3,7 +3,7 @@
  CFLAGS := -O2 -Wall
  
diff --git a/srcpkgs/u2f-hidraw-policy/template b/srcpkgs/u2f-hidraw-policy/template
index dc013c10cd8..26250c88a57 100644
--- a/srcpkgs/u2f-hidraw-policy/template
+++ b/srcpkgs/u2f-hidraw-policy/template
@@ -11,7 +11,6 @@ license="LGPL-2.0-or-later"
 homepage="https://github.com/amluto/u2f-hidraw-policy"
 distfiles="${homepage}/archive/${version}.tar.gz"
 checksum=50e327a9df3dd3db3b292af41fb119cc4c8d9bc29abddfb442e972053bf5e6d1
-patch_args=-Np0
 
 post_install() {
 	vmkdir usr
diff --git a/srcpkgs/u9fs/patches/makefile.patch b/srcpkgs/u9fs/patches/makefile.patch
index cf0860bff0c..3e3f403ffd1 100644
--- a/srcpkgs/u9fs/patches/makefile.patch
+++ b/srcpkgs/u9fs/patches/makefile.patch
@@ -1,5 +1,5 @@
---- makefile.orig	2016-10-10 13:35:16.980246499 +0200
-+++ makefile	2016-10-10 13:35:39.805246090 +0200
+--- a/makefile	2016-10-10 13:35:16.980246499 +0200
++++ b/makefile	2016-10-10 13:35:39.805246090 +0200
 @@ -15,9 +15,8 @@
  # If you need <inttypes.h> copy sun-inttypes.h to inttypes.h.
  #
diff --git a/srcpkgs/u9fs/patches/musl-no-rhosts-auth.patch b/srcpkgs/u9fs/patches/musl-no-rhosts-auth.patch
index 0b5245c41ef..72403476686 100644
--- a/srcpkgs/u9fs/patches/musl-no-rhosts-auth.patch
+++ b/srcpkgs/u9fs/patches/musl-no-rhosts-auth.patch
@@ -1,5 +1,5 @@
---- authrhosts.c.orig	2016-10-10 13:51:34.924228986 +0200
-+++ authrhosts.c	2016-10-10 13:51:37.359228942 +0200
+--- a/authrhosts.c	2016-10-10 13:51:34.924228986 +0200
++++ b/authrhosts.c	2016-10-10 13:51:37.359228942 +0200
 @@ -24,11 +24,16 @@
  {
  	USED(tx);
diff --git a/srcpkgs/u9fs/template b/srcpkgs/u9fs/template
index adeadd264e5..79decd0299d 100644
--- a/srcpkgs/u9fs/template
+++ b/srcpkgs/u9fs/template
@@ -12,7 +12,6 @@ license="custom:MIT-like"
 homepage="https://bitbucket.org/plan9-from-bell-labs/u9fs"
 distfiles="https://bitbucket.org/plan9-from-bell-labs/u9fs/get/${_commit}.tar.gz"
 checksum=201619c1c29bad1c9ed1bc886afe7b4965cfd0781b2296c9de87db10ba71615d
-patch_args=-Np0
 
 do_install() {
 	vbin u9fs
diff --git a/srcpkgs/ucl/patches/gcc6.patch b/srcpkgs/ucl/patches/gcc6.patch
index df24cb8e4f6..69cf9da304f 100644
--- a/srcpkgs/ucl/patches/gcc6.patch
+++ b/srcpkgs/ucl/patches/gcc6.patch
@@ -1,5 +1,5 @@
---- acc/acc_defs.h
-+++ acc/acc_defs.h
+--- a/acc/acc_defs.h
++++ b/acc/acc_defs.h
 @@ -87,6 +87,9 @@
  
  /* This can be put into a header file but may get ignored by some compilers. */
diff --git a/srcpkgs/ucl/template b/srcpkgs/ucl/template
index 3c62edf1d41..fa5dc492fae 100644
--- a/srcpkgs/ucl/template
+++ b/srcpkgs/ucl/template
@@ -10,4 +10,3 @@ homepage="http://www.oberhumer.com/opensource/ucl/"
 distfiles="http://www.oberhumer.com/opensource/ucl/download/ucl-${version}.tar.gz"
 checksum=b865299ffd45d73412293369c9754b07637680e5c826915f097577cd27350348
 conflicts="libucl-devel>=0"
-patch_args=-Np0
diff --git a/srcpkgs/ucspi-ssl/patches/fix-syntax.patch b/srcpkgs/ucspi-ssl/patches/fix-syntax.patch
index c486e58724a..b2bbc5a17a5 100644
--- a/srcpkgs/ucspi-ssl/patches/fix-syntax.patch
+++ b/srcpkgs/ucspi-ssl/patches/fix-syntax.patch
@@ -1,5 +1,5 @@
---- host/superscript.com/net/ucspi-ssl-0.11.6a/src/sslperl.c	2019-06-22 10:19:41.000000000 +0200
-+++ host/superscript.com/net/ucspi-ssl-0.11.6a/src/sslperl.c	2020-09-28 23:36:57.970547752 +0200
+--- a/host/superscript.com/net/ucspi-ssl-0.11.6a/src/sslperl.c	2019-06-22 10:19:41.000000000 +0200
++++ b/host/superscript.com/net/ucspi-ssl-0.11.6a/src/sslperl.c	2020-09-28 23:36:57.970547752 +0200
 @@ -14,7 +14,7 @@
  #define call_argv perl_call_argv
  #endif
diff --git a/srcpkgs/ucspi-ssl/template b/srcpkgs/ucspi-ssl/template
index c90b0c6c237..1f2c6c36793 100644
--- a/srcpkgs/ucspi-ssl/template
+++ b/srcpkgs/ucspi-ssl/template
@@ -17,7 +17,6 @@ distfiles="http://www.fehcom.de/ipnet/ucspi-ssl/ucspi-ssl-${version}.tgz"
 checksum=e7fcd4ceec351a0f36b7d27188758709a6c095460ed4dce434e0c5d463c4c4ea
 # ad hoc build system breaks parallel build and cross-compilation
 disable_parallel_build="ad hoc build system breaks parallel build"
-patch_args=-Np0
 
 CFLAGS="-fcommon"
 
diff --git a/srcpkgs/udptunnel/patches/01-multicast.diff b/srcpkgs/udptunnel/patches/01-multicast.diff
index 034ddb44ed3..7d57ee23123 100644
--- a/srcpkgs/udptunnel/patches/01-multicast.diff
+++ b/srcpkgs/udptunnel/patches/01-multicast.diff
@@ -3,8 +3,8 @@
 Description: Fix issue where udptunnel was failing to receive packets sent to a multicast address. (See #254834).
 Author: singh_chinmay@extenprise.net
 
---- udptunnel.c
-+++ udptunnel.c
+--- a/udptunnel.c
++++ b/udptunnel.c
 @@ -217,7 +217,7 @@
      (*relays)[i].udpaddr.sin_port = htons(udpport + i);
      (*relays)[i].udpaddr.sin_family = AF_INET;
diff --git a/srcpkgs/udptunnel/patches/02-strlen-prototype.diff b/srcpkgs/udptunnel/patches/02-strlen-prototype.diff
index b809f059986..dd8eedbe4e1 100644
--- a/srcpkgs/udptunnel/patches/02-strlen-prototype.diff
+++ b/srcpkgs/udptunnel/patches/02-strlen-prototype.diff
@@ -4,8 +4,8 @@ Description: Include string.h header for strlen prototype for GCC 4.4. compatibi
 Author: Chris Lamb <chris@chris-lamb.co.uk>
 
 diff -urNad /tmp/bp-build/udptunnel-1.1.orig.orig/host2ip.c /tmp/bp-build/udptunnel-1.1.orig/host2ip.c
---- host2ip.c	2008-08-28 07:50:41.000000000 +0100
-+++ host2ip.c	2008-08-28 07:50:49.000000000 +0100
+--- a/host2ip.c	2008-08-28 07:50:41.000000000 +0100
++++ b/host2ip.c	2008-08-28 07:50:49.000000000 +0100
 @@ -6,6 +6,7 @@
  #include <arpa/inet.h>       /* inet_addr() */
  #include <rpcsvc/ypclnt.h>   /* YP */
diff --git a/srcpkgs/udptunnel/patches/rpc.patch b/srcpkgs/udptunnel/patches/rpc.patch
index 98cda95c926..f996e752dbc 100644
--- a/srcpkgs/udptunnel/patches/rpc.patch
+++ b/srcpkgs/udptunnel/patches/rpc.patch
@@ -1,7 +1,7 @@
 # reason: rpcsvc/ypclnt.h is only present in glibc, so check for it
 
---- configure.in
-+++ configure.in
+--- a/configure.in
++++ b/configure.in
 @@ -19,6 +19,7 @@
  dnl Checks for header files.
  AC_HEADER_STDC
@@ -11,8 +11,8 @@
  dnl Checks for typedefs, structures, and compiler characteristics.
  AC_CHECK_SIZEOF(short)
 
---- host2ip.c
-+++ host2ip.c
+--- a/host2ip.c
++++ b/host2ip.c
 @@ -4,7 +4,9 @@
  #include <netdb.h>           /* gethostbyname() */
  #include <netinet/in.h>      /* sockaddr_in */
diff --git a/srcpkgs/udptunnel/template b/srcpkgs/udptunnel/template
index 79c54ae0ad6..dfc7ee1fe5e 100644
--- a/srcpkgs/udptunnel/template
+++ b/srcpkgs/udptunnel/template
@@ -10,7 +10,6 @@ license="BSD-3-Clause"
 homepage="http://www.cs.columbia.edu/~lennox/udptunnel/"
 distfiles="http://www.cs.columbia.edu/~lennox/udptunnel/udptunnel-${version}.tar.gz"
 checksum=45c0e12045735bc55734076ebbdc7622c746d1fe4e6f7267fa122e2421754670
-patch_args=-Np0
 
 pre_configure() {
 	autoreconf -vfi
diff --git a/srcpkgs/ufoai/patches/fix-gcc6.patch b/srcpkgs/ufoai/patches/fix-gcc6.patch
index 4c507af8c0e..af6e455c6f2 100644
--- a/srcpkgs/ufoai/patches/fix-gcc6.patch
+++ b/srcpkgs/ufoai/patches/fix-gcc6.patch
@@ -1,8 +1,8 @@
 With gcc6 this logic error needs to be fixed. I think
 the intention here was to continue, if FS_CheckFile() fails.
 
---- src/client/battlescape/events/e_main.cpp	2014-06-05 06:18:39.000000000 +0200
-+++ src/client/battlescape/events/e_main.cpp	2017-01-25 16:18:47.764221448 +0100
+--- a/src/client/battlescape/events/e_main.cpp	2014-06-05 06:18:39.000000000 +0200
++++ b/src/client/battlescape/events/e_main.cpp	2017-01-25 16:18:47.764221448 +0100
 @@ -221,7 +221,7 @@
  		return sound;
  
@@ -15,8 +15,8 @@ the intention here was to continue, if FS_CheckFile() fails.
 
 With gcc6 the checks for narrowing integer types are very strict.
 Explicitly cast the flag combinations to int.
---- src/client/battlescape/cl_particle.cpp	2014-06-05 06:18:39.000000000 +0200
-+++ src/client/battlescape/cl_particle.cpp	2017-01-25 16:23:44.737146135 +0100
+--- a/src/client/battlescape/cl_particle.cpp	2014-06-05 06:18:39.000000000 +0200
++++ b/src/client/battlescape/cl_particle.cpp	2017-01-25 16:23:44.737146135 +0100
 @@ -144,12 +144,17 @@
  	V_UNTYPED, V_UNTYPED, V_UNTYPED,
  	V_VECS, V_VECS,
diff --git a/srcpkgs/ufoai/patches/kill-pangox.patch b/srcpkgs/ufoai/patches/kill-pangox.patch
index c72a37648b5..49b9588fc56 100644
--- a/srcpkgs/ufoai/patches/kill-pangox.patch
+++ b/srcpkgs/ufoai/patches/kill-pangox.patch
@@ -1,5 +1,5 @@
---- src/tools/radiant/libs/gtkutil/glfont.cpp.orig	2020-10-10 12:51:38.707431160 +0700
-+++ src/tools/radiant/libs/gtkutil/glfont.cpp	2020-10-10 12:51:59.843621038 +0700
+--- a/src/tools/radiant/libs/gtkutil/glfont.cpp	2020-10-10 12:51:38.707431160 +0700
++++ b/src/tools/radiant/libs/gtkutil/glfont.cpp	2020-10-10 12:51:59.843621038 +0700
 @@ -26,35 +26,7 @@
  
  GLFont glfont_create (const std::string& font_string)
diff --git a/srcpkgs/ufoai/patches/musl-execinfo.patch b/srcpkgs/ufoai/patches/musl-execinfo.patch
index e011495a379..581beb44aee 100644
--- a/srcpkgs/ufoai/patches/musl-execinfo.patch
+++ b/srcpkgs/ufoai/patches/musl-execinfo.patch
@@ -1,5 +1,5 @@
---- src/tools/radiant/radiant/stacktrace.cpp	2014-06-05 06:18:39.000000000 +0200
-+++ src/tools/radiant/radiant/stacktrace.cpp	2015-10-30 10:51:24.956710075 +0100
+--- a/src/tools/radiant/radiant/stacktrace.cpp	2014-06-05 06:18:39.000000000 +0200
++++ b/src/tools/radiant/radiant/stacktrace.cpp	2015-10-30 10:51:24.956710075 +0100
 @@ -24,7 +24,7 @@
  
  #include "environment.h"
diff --git a/srcpkgs/ufoai/patches/sdl2_gl_macros.patch b/srcpkgs/ufoai/patches/sdl2_gl_macros.patch
index 4675b56b6fc..0a9572e9839 100644
--- a/srcpkgs/ufoai/patches/sdl2_gl_macros.patch
+++ b/srcpkgs/ufoai/patches/sdl2_gl_macros.patch
@@ -1,5 +1,5 @@
---- src/client/renderer/r_program.h	2014-06-05 06:18:39.000000000 +0200
-+++ src/client/renderer/r_program.h	2017-01-25 16:15:42.467269009 +0100
+--- a/src/client/renderer/r_program.h	2014-06-05 06:18:39.000000000 +0200
++++ b/src/client/renderer/r_program.h	2017-01-25 16:15:42.467269009 +0100
 @@ -30,8 +30,12 @@
  	char name[MAX_QPATH];
  } r_shader_t;
diff --git a/srcpkgs/ufoai/patches/sdl2_gl_orthof.patch b/srcpkgs/ufoai/patches/sdl2_gl_orthof.patch
index 3d9ffd070ce..c2d3ae6c0e4 100644
--- a/srcpkgs/ufoai/patches/sdl2_gl_orthof.patch
+++ b/srcpkgs/ufoai/patches/sdl2_gl_orthof.patch
@@ -2,8 +2,8 @@ SDL_opengl.h dosen't have the nessecary headers. GL/gl.h has the parts
 of SDL_opengl.h needed for SDL_opengl_glext.h, then include
 SDL_opengl_glext.h which has the *f functions.
 
---- src/client/renderer/r_gl.h  2020-10-08 07:50:29.818581990 +1100
-+++ src/client/renderer/r_gl.h  2020-10-08 07:52:16.805006133 +1100
+--- a/src/client/renderer/r_gl.h  2020-10-08 07:50:29.818581990 +1100
++++ b/src/client/renderer/r_gl.h  2020-10-08 07:52:16.805006133 +1100
 @@ -29,7 +29,8 @@
  #include "../../ports/android/r_gles_android.h"
  #include <stdlib.h>
diff --git a/srcpkgs/ufoai/template b/srcpkgs/ufoai/template
index 41c4c499889..3b36cf0d6db 100644
--- a/srcpkgs/ufoai/template
+++ b/srcpkgs/ufoai/template
@@ -22,7 +22,6 @@ checksum="0c7cc3bc9efeb276f71cbe6ee8ff7c76f98d183de79f1a069fa63059cf182a8f
 replaces="ufoai-data>=0"
 ignore_elf_dirs="/usr/share/ufoai"
 broken="game doesn't work"
-patch_args=-Np0
 
 # suppress a lot of warnings
 CXXFLAGS="-Wno-cast-align -Wno-cast-qual -Wno-inline"
diff --git a/srcpkgs/ufraw/patches/001-no-gimp-remote.patch b/srcpkgs/ufraw/patches/001-no-gimp-remote.patch
index 41036e62409..ca4f4beb624 100644
--- a/srcpkgs/ufraw/patches/001-no-gimp-remote.patch
+++ b/srcpkgs/ufraw/patches/001-no-gimp-remote.patch
@@ -1,6 +1,6 @@
 Don't use gimp-remote since gimp 2.4 already includes gimp-remote functionality
---- ufraw_conf.c
-+++ ufraw_conf.c
+--- a/ufraw_conf.c
++++ b/ufraw_conf.c
 @@ -137,7 +137,7 @@
  #elif HAVE_GIMP_2_4
      "gimp", /* remoteGimpCommand */
diff --git a/srcpkgs/ufraw/patches/002-fix_abs_int.patch b/srcpkgs/ufraw/patches/002-fix_abs_int.patch
index 17d5f333372..6fc552769c9 100644
--- a/srcpkgs/ufraw/patches/002-fix_abs_int.patch
+++ b/srcpkgs/ufraw/patches/002-fix_abs_int.patch
@@ -1,5 +1,5 @@
---- dcraw.cc	2015-06-16 05:58:38.000000000 +0200
-+++ dcraw.cc	2018-02-04 14:46:54.489951076 +0100
+--- a/dcraw.cc	2015-06-16 05:58:38.000000000 +0200
++++ b/dcraw.cc	2018-02-04 14:46:54.489951076 +0100
 @@ -9242,7 +9242,7 @@
      if (make[0] == 'O') {
        i = find_green (12, 32, 1188864, 3576832);
diff --git a/srcpkgs/ufraw/patches/03_fix-unsigned-char.patch b/srcpkgs/ufraw/patches/03_fix-unsigned-char.patch
index 333f56a7462..8690f87ca7d 100644
--- a/srcpkgs/ufraw/patches/03_fix-unsigned-char.patch
+++ b/srcpkgs/ufraw/patches/03_fix-unsigned-char.patch
@@ -1,8 +1,8 @@
 Source: written by John Paul Adrian Glaubitz for Debian
 Upstream: https://sourceforge.net/p/ufraw/bugs/417
 Reason: fixes a compilation failure on arm architectures
---- dcraw.cc
-+++ dcraw.cc
+--- a/dcraw.cc
++++ b/dcraw.cc
 @@ -2285,7 +2285,7 @@ void CLASS quicktake_100_load_raw()
  
  void CLASS kodak_radc_load_raw()
diff --git a/srcpkgs/ufraw/patches/exiv-0.27.patch b/srcpkgs/ufraw/patches/exiv-0.27.patch
index 2d1251aa1e3..b5b4140fff8 100644
--- a/srcpkgs/ufraw/patches/exiv-0.27.patch
+++ b/srcpkgs/ufraw/patches/exiv-0.27.patch
@@ -1,5 +1,5 @@
---- ufraw_exiv2.cc	2015-06-16 05:58:38.000000000 +0200
-+++ ufraw_exiv2.cc	2018-12-29 22:51:23.291894430 +0100
+--- a/ufraw_exiv2.cc	2015-06-16 05:58:38.000000000 +0200
++++ b/ufraw_exiv2.cc	2018-12-29 22:51:23.291894430 +0100
 @@ -15,9 +15,7 @@
  #include "ufraw.h"
  
diff --git a/srcpkgs/ufraw/patches/iostream.patch b/srcpkgs/ufraw/patches/iostream.patch
index e7e5683203e..6d15869f63d 100644
--- a/srcpkgs/ufraw/patches/iostream.patch
+++ b/srcpkgs/ufraw/patches/iostream.patch
@@ -1,8 +1,8 @@
 ufraw_exiv2.cc:343:10: note: 'std::cerr' is defined in header '<iostream>'
 ufraw_exiv2.cc:365:14: error: 'cerr' is not a member of 'std'
 
---- ufraw_exiv2.cc
-+++ ufraw_exiv2.cc
+--- a/ufraw_exiv2.cc
++++ b/ufraw_exiv2.cc
 @@ -17,6 +17,7 @@
  #ifdef HAVE_EXIV2
  #include <exiv2/exiv2.hpp>
diff --git a/srcpkgs/ufraw/template b/srcpkgs/ufraw/template
index 8cec750cdaa..476435c6aba 100644
--- a/srcpkgs/ufraw/template
+++ b/srcpkgs/ufraw/template
@@ -15,7 +15,6 @@ license="GPL-2.0-or-later"
 homepage="http://ufraw.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/ufraw/ufraw/ufraw-${version}/ufraw-${version}.tar.gz"
 checksum=f7abd28ce587db2a74b4c54149bd8a2523a7ddc09bedf4f923246ff0ae09a25e
-patch_args=-Np0
 
 build_options="extras"
 
diff --git a/srcpkgs/uftrace/patches/strerror.patch b/srcpkgs/uftrace/patches/strerror.patch
index 984a731ae01..0dfb8c33de8 100644
--- a/srcpkgs/uftrace/patches/strerror.patch
+++ b/srcpkgs/uftrace/patches/strerror.patch
@@ -1,5 +1,5 @@
---- utils/debug.c.orig
-+++ utils/debug.c
+--- a/utils/debug.c
++++ b/utils/debug.c
 @@ -120,7 +120,7 @@
  	vfprintf(logfp, fmt, ap);
  	va_end(ap);
@@ -9,8 +9,8 @@
  
  	color(TERM_COLOR_RESET, logfp);
  
---- libtraceevent/event-parse.c	2017-12-05 06:11:38.000000000 +0100
-+++ libtraceevent/event-parse.c	2017-12-06 21:02:42.135421115 +0100
+--- a/libtraceevent/event-parse.c	2017-12-05 06:11:38.000000000 +0100
++++ b/libtraceevent/event-parse.c	2017-12-06 21:02:42.135421115 +0100
 @@ -5353,12 +5353,19 @@
  	const char *msg;
  
diff --git a/srcpkgs/uftrace/template b/srcpkgs/uftrace/template
index ed711e2f1c0..9f4f44d4765 100644
--- a/srcpkgs/uftrace/template
+++ b/srcpkgs/uftrace/template
@@ -13,7 +13,6 @@ license="GPL-2.0-only"
 homepage="https://github.com/namhyung/uftrace"
 distfiles="https://github.com/namhyung/uftrace/archive/v${version}.tar.gz"
 checksum=b8b56d540ea95c3eafe56440d6a998e0a140d53ca2584916b6ca82702795bbd9
-patch_args=-Np0
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) makedepends+=" argp-standalone"; export LDFLAGS=-largp;;
diff --git a/srcpkgs/uhubctl/patches/Makefile.patch b/srcpkgs/uhubctl/patches/Makefile.patch
index 04cbd19fc9c..429a805e354 100644
--- a/srcpkgs/uhubctl/patches/Makefile.patch
+++ b/srcpkgs/uhubctl/patches/Makefile.patch
@@ -1,7 +1,7 @@
 diff --git Makefile Makefile
 index f6d69d3..58a9d98 100644
---- Makefile
-+++ Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -4,7 +4,7 @@ UNAME_S := $(shell uname -s)
  
  DESTDIR ?=
diff --git a/srcpkgs/uhubctl/template b/srcpkgs/uhubctl/template
index 7b841638417..748b10a9b32 100644
--- a/srcpkgs/uhubctl/template
+++ b/srcpkgs/uhubctl/template
@@ -11,4 +11,3 @@ license="GPL-2.0-only"
 homepage="https://github.com/mvp/uhubctl"
 distfiles="https://github.com/mvp/uhubctl/archive/v${version}.tar.gz"
 checksum=227fdd541067b84eaa0e15cdc171458a56de7591f7a1deaff3e6d42d2809450b
-patch_args=-Np0
diff --git a/srcpkgs/uim/patches/anthy-0.4.patch b/srcpkgs/uim/patches/anthy-0.4.patch
index 082bbd764a1..4a3812bf6a4 100644
--- a/srcpkgs/uim/patches/anthy-0.4.patch
+++ b/srcpkgs/uim/patches/anthy-0.4.patch
@@ -1,7 +1,7 @@
 Index: configure.ac
 ===================================================================
---- configure.ac.orig
-+++ configure.ac
+--- a/configure.ac
++++ b/configure.ac
 @@ -124,7 +124,7 @@ AC_ARG_WITH(anthy-utf8,
    [with_anthy_utf8=no])
  
diff --git a/srcpkgs/uim/patches/replace_obsolete_since_emacs22.1.patch b/srcpkgs/uim/patches/replace_obsolete_since_emacs22.1.patch
index 61b28da7208..499549c3f73 100644
--- a/srcpkgs/uim/patches/replace_obsolete_since_emacs22.1.patch
+++ b/srcpkgs/uim/patches/replace_obsolete_since_emacs22.1.patch
@@ -12,8 +12,8 @@ see https://www.gnu.org/software/emacs/news/NEWS.22.1 and https://git.savannah.g
 
 diff --git emacs/uim-helper.el emacs/uim-helper.el
 index e86e32d06..19ecd4538 100644
---- emacs/uim-helper.el
-+++ emacs/uim-helper.el
+--- a/emacs/uim-helper.el
++++ b/emacs/uim-helper.el
 @@ -106,7 +106,7 @@
      (if (not proc)
  	(error "uim.el: Couldn't invoke uim-el-helper-agent."))
@@ -25,8 +25,8 @@ index e86e32d06..19ecd4538 100644
      (let ((patience uim-startup-timeout) (ok nil))
 diff --git emacs/uim.el emacs/uim.el
 index 9110c3cb6..7e1fadbba 100644
---- emacs/uim.el
-+++ emacs/uim.el
+--- a/emacs/uim.el
++++ b/emacs/uim.el
 @@ -488,7 +488,7 @@
  	(error "uim.el: Couldn't invoke uim-el-agent."))
      
diff --git a/srcpkgs/uim/template b/srcpkgs/uim/template
index 6ea0e07ba05..1a782b680f7 100644
--- a/srcpkgs/uim/template
+++ b/srcpkgs/uim/template
@@ -17,7 +17,6 @@ license="BSD-3-Clause"
 homepage="https://github.com/uim/uim/wiki"
 distfiles="https://github.com/uim/uim/releases/download/${version}/uim-${version}.tar.bz2"
 checksum=34599bbcc4e5ab87832370763e38be5100984a64237555e9234a1ea225a0fadc
-patch_args=-Np0
 
 CFLAGS="-fcommon"
 
diff --git a/srcpkgs/ulauncher/patches/shutup-distutils.patch b/srcpkgs/ulauncher/patches/shutup-distutils.patch
index cbe610f3423..0d8d4558362 100644
--- a/srcpkgs/ulauncher/patches/shutup-distutils.patch
+++ b/srcpkgs/ulauncher/patches/shutup-distutils.patch
@@ -1,5 +1,5 @@
---- ulauncher/api/shared/item/SmallResultItem.py.orig	2020-10-27 19:02:14.175943597 +0700
-+++ ulauncher/api/shared/item/SmallResultItem.py	2020-10-27 19:02:23.472931496 +0700
+--- a/ulauncher/api/shared/item/SmallResultItem.py	2020-10-27 19:02:14.175943597 +0700
++++ b/ulauncher/api/shared/item/SmallResultItem.py	2020-10-27 19:02:23.472931496 +0700
 @@ -1,4 +1,4 @@
 -from .ResultItem import ResultItem
 +from ulauncher.api.shared.item.ResultItem import ResultItem
diff --git a/srcpkgs/ulauncher/template b/srcpkgs/ulauncher/template
index be7bdd1bdfc..78888538e06 100644
--- a/srcpkgs/ulauncher/template
+++ b/srcpkgs/ulauncher/template
@@ -15,7 +15,6 @@ license="GPL-3.0-or-later"
 homepage="https://ulauncher.io/"
 distfiles="https://github.com/Ulauncher/Ulauncher/releases/download/${version}/${pkgname}_${version}.tar.gz"
 checksum=c4433bb06d0d456a2e0eee8dc4d03de164f273290484f2380728c3936ca31e3a
-patch_args=-Np0
 
 pre_build() {
 	export DISPLAY=
diff --git a/srcpkgs/ulogd/patches/00-musl-path.patch b/srcpkgs/ulogd/patches/00-musl-path.patch
index 39a02d9a434..f50c65cce43 100644
--- a/srcpkgs/ulogd/patches/00-musl-path.patch
+++ b/srcpkgs/ulogd/patches/00-musl-path.patch
@@ -1,5 +1,5 @@
---- src/ulogd.c
-+++ src/ulogd.c
+--- a/src/ulogd.c
++++ b/src/ulogd.c
 @@ -65,6 +65,7 @@
  #include <sys/time.h>
  #include <sys/stat.h>
diff --git a/srcpkgs/ulogd/template b/srcpkgs/ulogd/template
index 98a990f5af4..55e9ae34a0e 100644
--- a/srcpkgs/ulogd/template
+++ b/srcpkgs/ulogd/template
@@ -15,7 +15,6 @@ distfiles="${homepage}/files/${pkgname}-${version}.tar.bz2"
 checksum=990a05494d9c16029ba0a83f3b7294fc05c756546b8d60d1c1572dc25249a92b
 CFLAGS="-D_GNU_SOURCE"
 system_accounts="_ulogd"
-patch_args=-Np0
 
 post_install() {
 	vinstall ulogd.conf 644 etc
diff --git a/srcpkgs/unison/patches/musl.patch b/srcpkgs/unison/patches/musl.patch
index 15f06cb74d8..d9bbf9cb4a3 100644
--- a/srcpkgs/unison/patches/musl.patch
+++ b/srcpkgs/unison/patches/musl.patch
@@ -1,5 +1,5 @@
---- src/fsmonitor/linux/inotify_stubs.c
-+++ src/fsmonitor/linux/inotify_stubs.c
+--- a/src/fsmonitor/linux/inotify_stubs.c
++++ b/src/fsmonitor/linux/inotify_stubs.c
 @@ -35,7 +35,7 @@
  #define GLIBC_SUPPORT_INOTIFY 0
  #endif
diff --git a/srcpkgs/unison/template b/srcpkgs/unison/template
index a9f349f00f7..c3cb8e454c8 100644
--- a/srcpkgs/unison/template
+++ b/srcpkgs/unison/template
@@ -10,7 +10,6 @@ homepage="http://www.cis.upenn.edu/~bcpierce/unison/"
 distfiles="https://github.com/bcpierce00/unison/archive/v${version}.tar.gz"
 checksum=0c287d17f52729440b2bdc28edf4d19b2d5ea5869983d78e780d501c5866914b
 nocross="OCaml does not cross compile"
-patch_args=-Np0
 
 do_build() {
 	CFLAGS= make ${makejobs} UISTYLE=text DEBUGGING=false THREADS=true
diff --git a/srcpkgs/unknown-horizons/patches/py38.patch b/srcpkgs/unknown-horizons/patches/py38.patch
index 59194750cd1..d49d971e11d 100644
--- a/srcpkgs/unknown-horizons/patches/py38.patch
+++ b/srcpkgs/unknown-horizons/patches/py38.patch
@@ -1,5 +1,5 @@
---- setup.py.orig
-+++ setup.py
+--- a/setup.py
++++ b/setup.py
 @@ -39,10 +39,7 @@
  # Ensure we are in the correct directory
  os.chdir(os.path.realpath(os.path.dirname(__file__)))
diff --git a/srcpkgs/unknown-horizons/patches/remove_atlas_generation.patch b/srcpkgs/unknown-horizons/patches/remove_atlas_generation.patch
index 71c962d4df4..e2defc41ca7 100644
--- a/srcpkgs/unknown-horizons/patches/remove_atlas_generation.patch
+++ b/srcpkgs/unknown-horizons/patches/remove_atlas_generation.patch
@@ -1,5 +1,5 @@
---- setup.py	2019-01-21 16:11:35.644513578 +0100
-+++ setup.py	2019-01-21 16:11:50.592513273 +0100
+--- a/setup.py	2019-01-21 16:11:35.644513578 +0100
++++ b/setup.py	2019-01-21 16:11:50.592513273 +0100
 @@ -228,8 +228,6 @@
  				rmtree(os.path.join("content", "lang"))
  			copytree(os.path.join("build", "mo"), os.path.join("content", "lang"))
diff --git a/srcpkgs/unknown-horizons/template b/srcpkgs/unknown-horizons/template
index fa7dc8ad7ed..56404addb86 100644
--- a/srcpkgs/unknown-horizons/template
+++ b/srcpkgs/unknown-horizons/template
@@ -10,7 +10,6 @@ license="GPL-2.0-or-later, MIT, BSD-3-Clause, CC-BY-SY-3.0"
 homepage="http://unknown-horizons.org"
 distfiles="https://github.com/unknown-horizons/unknown-horizons/archive/${version}.tar.gz"
 checksum=a417fd3d342212fd190e4f21be82ef13c10e1ed7c288fbbe46e46200cf3de4d8
-patch_args=-Np0
 
 pre_install() {
 	python3 horizons/engine/generate_atlases.py 2048
diff --git a/srcpkgs/urbanterror/patches/musl.patch b/srcpkgs/urbanterror/patches/musl.patch
index f4e7b5f0de2..601325ed4d9 100644
--- a/srcpkgs/urbanterror/patches/musl.patch
+++ b/srcpkgs/urbanterror/patches/musl.patch
@@ -9,8 +9,8 @@ Subject: [PATCH] musl
 
 diff --git code/unix/unix_main.c code/unix/unix_main.c
 index ab3608b..f823800 100644
---- code/unix/unix_main.c
-+++ code/unix/unix_main.c
+--- a/code/unix/unix_main.c
++++ b/code/unix/unix_main.c
 @@ -53,7 +53,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  #include <dlfcn.h>
  #endif
diff --git a/srcpkgs/urbanterror/template b/srcpkgs/urbanterror/template
index 27453d5f8e5..947a12cf2d8 100644
--- a/srcpkgs/urbanterror/template
+++ b/srcpkgs/urbanterror/template
@@ -12,7 +12,6 @@ homepage="https://github.com/Barbatos/ioq3-for-UrbanTerror-4"
 distfiles="https://github.com/Barbatos/ioq3-for-UrbanTerror-4/archive/release-${version}.tar.gz"
 checksum=ce9d09a8ad149f8a1d36a85a586e1dd8ec9b8dcb3e5e9e82ec2a33017655bf43
 nocross=yes
-patch_args=-Np0
 
 do_build() {
 	case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/urlview/patches/glibc-missing-include.patch b/srcpkgs/urlview/patches/glibc-missing-include.patch
index c948a235543..2c143c3f7d0 100644
--- a/srcpkgs/urlview/patches/glibc-missing-include.patch
+++ b/srcpkgs/urlview/patches/glibc-missing-include.patch
@@ -1,5 +1,5 @@
---- urlview.c.orig	2005-02-06 17:10:54.000000000 +0100
-+++ urlview.c	2005-02-06 17:57:06.998290062 +0100
+--- a/urlview.c	2005-02-06 17:10:54.000000000 +0100
++++ b/urlview.c	2005-02-06 17:57:06.998290062 +0100
 @@ -40,6 +40,8 @@
  #include <fcntl.h>
  #include <sys/stat.h>
diff --git a/srcpkgs/urlview/template b/srcpkgs/urlview/template
index 5144c2ea8b4..7fdbb311957 100644
--- a/srcpkgs/urlview/template
+++ b/srcpkgs/urlview/template
@@ -12,7 +12,6 @@ license="GPL-2.0"
 homepage="https://github.com/sigpipe/urlview"
 distfiles="https://gnupg.org/ftp/mutt/contrib/$pkgname-$version.tar.gz"
 checksum=74d18026e84e3cd70a3fdd1a7247a68031b0c1c1c6d761d64b7063ff71091cc3
-patch_args=-Np0
 
 pre_configure() {
 	sed -i '/install-data-local/,/^$/d' Makefile.am
diff --git a/srcpkgs/usb-modeswitch-data/patches/0001-fix-destdir.patch b/srcpkgs/usb-modeswitch-data/patches/0001-fix-destdir.patch
index 054bc55fdf2..f8915009387 100644
--- a/srcpkgs/usb-modeswitch-data/patches/0001-fix-destdir.patch
+++ b/srcpkgs/usb-modeswitch-data/patches/0001-fix-destdir.patch
@@ -1,5 +1,5 @@
---- Makefile.orig	2016-08-03 19:08:23.000000000 +0200
-+++ Makefile	2016-08-04 23:44:35.642686213 +0200
+--- a/Makefile	2016-08-03 19:08:23.000000000 +0200
++++ b/Makefile	2016-08-04 23:44:35.642686213 +0200
 @@ -1,9 +1,9 @@
  PROG        = usb-modeswitch-data
  VERS        = 20160803
diff --git a/srcpkgs/usb-modeswitch-data/template b/srcpkgs/usb-modeswitch-data/template
index 4da5049e3ce..6412b7035a8 100644
--- a/srcpkgs/usb-modeswitch-data/template
+++ b/srcpkgs/usb-modeswitch-data/template
@@ -10,4 +10,3 @@ license="GPL-2.0-or-later"
 homepage="http://www.draisberghof.de/usb_modeswitch/"
 distfiles="http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-${version}.tar.bz2"
 checksum=3f039b60791c21c7cb15c7986cac89650f076dc274798fa242231b910785eaf9
-patch_args=-Np0
diff --git a/srcpkgs/usb-modeswitch/patches/0001-fix-destdir.patch b/srcpkgs/usb-modeswitch/patches/0001-fix-destdir.patch
index 61dde12cdfd..47263a5ec49 100644
--- a/srcpkgs/usb-modeswitch/patches/0001-fix-destdir.patch
+++ b/srcpkgs/usb-modeswitch/patches/0001-fix-destdir.patch
@@ -1,5 +1,5 @@
---- Makefile.orig	2019-11-11 21:45:13.000000000 +0100
-+++ Makefile	2020-05-04 21:22:53.680445703 +0200
+--- a/Makefile	2019-11-11 21:45:13.000000000 +0100
++++ b/Makefile	2020-05-04 21:22:53.680445703 +0200
 @@ -5,11 +5,11 @@ CFLAGS      += -Wall -Wno-deprecated-dec
  LIBS        = `pkg-config --libs --cflags libusb-1.0`
  RM          = /bin/rm -f
diff --git a/srcpkgs/usb-modeswitch/template b/srcpkgs/usb-modeswitch/template
index f38c8b46cdb..475c1695fab 100644
--- a/srcpkgs/usb-modeswitch/template
+++ b/srcpkgs/usb-modeswitch/template
@@ -14,4 +14,3 @@ license="GPL-2"
 homepage="http://www.draisberghof.de/usb_modeswitch/"
 distfiles="http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-${version}.tar.bz2"
 checksum=c215236e6bada6e659fc195a31d611ea298a4bdb4d57a0d68c553b56585f8ba3
-patch_args=-Np0
diff --git a/srcpkgs/usbguard/patches/musl.patch b/srcpkgs/usbguard/patches/musl.patch
index 066c70c8e86..6ce93444484 100644
--- a/srcpkgs/usbguard/patches/musl.patch
+++ b/srcpkgs/usbguard/patches/musl.patch
@@ -1,5 +1,5 @@
---- src/CLI/usbguard.cpp.orig	2019-06-13 11:51:53.787863657 +0000
-+++ src/CLI/usbguard.cpp	2019-08-23 01:52:34.233056882 +0000
+--- a/src/CLI/usbguard.cpp	2019-06-13 11:51:53.787863657 +0000
++++ b/src/CLI/usbguard.cpp	2019-08-23 01:52:34.233056882 +0000
 @@ -26,10 +26,8 @@
  #include <map>
  #include <iostream>
@@ -22,8 +22,8 @@
  
      if (argc == 1) {
        showTopLevelHelp();
---- src/CLI/usbguard-rule-parser.cpp.orig	2019-06-13 11:51:53.783863704 +0000
-+++ src/CLI/usbguard-rule-parser.cpp	2019-08-23 01:52:34.234056870 +0000
+--- a/src/CLI/usbguard-rule-parser.cpp	2019-06-13 11:51:53.783863704 +0000
++++ b/src/CLI/usbguard-rule-parser.cpp	2019-08-23 01:52:34.234056870 +0000
 @@ -24,10 +24,8 @@
  #include "RuleParser.hpp"
  
@@ -49,8 +49,8 @@
    stream << std::endl;
    stream << " Options:" << std::endl;
    stream << "  -f, --file       Interpret the argument as a path to a file that should be parsed." << std::endl;
---- src/DBus/gdbus-server.cpp.orig	2019-06-28 08:45:27.616687137 +0000
-+++ src/DBus/gdbus-server.cpp	2019-08-23 01:52:34.274056367 +0000
+--- a/src/DBus/gdbus-server.cpp	2019-06-28 08:45:27.616687137 +0000
++++ b/src/DBus/gdbus-server.cpp	2019-08-23 01:52:34.274056367 +0000
 @@ -23,6 +23,7 @@
  #include <stdlib.h>
  #include <iostream>
@@ -70,8 +70,8 @@
    stream << std::endl;
    stream << " Options:" << std::endl;
    stream << "  -s, --system   Listen on the system bus." << std::endl;
---- src/Library/public/usbguard/Exception.hpp.orig	2019-06-28 08:45:27.620687089 +0000
-+++ src/Library/public/usbguard/Exception.hpp	2019-08-23 01:52:34.323055751 +0000
+--- a/src/Library/public/usbguard/Exception.hpp	2019-06-28 08:45:27.620687089 +0000
++++ b/src/Library/public/usbguard/Exception.hpp	2019-08-23 01:52:34.323055751 +0000
 @@ -116,7 +116,8 @@
      static std::string reasonFromErrno(const int errno_value)
      {
diff --git a/srcpkgs/usbguard/template b/srcpkgs/usbguard/template
index 54ad0e6e9df..c2c6829a13a 100644
--- a/srcpkgs/usbguard/template
+++ b/srcpkgs/usbguard/template
@@ -14,7 +14,6 @@ license="GPL-2.0-or-later"
 homepage="https://usbguard.github.io"
 distfiles="https://github.com/USBGuard/usbguard/releases/download/usbguard-$version/usbguard-$version.tar.gz"
 checksum=5617986cd5dd1a2d311041648a1977d836cf4e33a4121d7f82599f21496abc42
-patch_args=-Np0
 
 post_install() {
 	vsv usbguard
diff --git a/srcpkgs/uwm/patches/fix-docdir.patch b/srcpkgs/uwm/patches/fix-docdir.patch
index bee58a06854..2d6eba11f94 100644
--- a/srcpkgs/uwm/patches/fix-docdir.patch
+++ b/srcpkgs/uwm/patches/fix-docdir.patch
@@ -1,5 +1,5 @@
---- doc/Makefile.in.orig	2014-10-12 15:50:27.000000000 +0000
-+++ doc/Makefile.in	2016-12-10 18:43:26.681283216 +0000
+--- a/doc/Makefile.in	2014-10-12 15:50:27.000000000 +0000
++++ b/doc/Makefile.in	2016-12-10 18:43:26.681283216 +0000
 @@ -273,7 +273,7 @@
  	manual.pdf
  
diff --git a/srcpkgs/uwm/template b/srcpkgs/uwm/template
index f7fc99bf8be..071a909fa44 100644
--- a/srcpkgs/uwm/template
+++ b/srcpkgs/uwm/template
@@ -10,6 +10,5 @@ license="GPL-2.0-only"
 homepage="http://udeproject.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/project/udeproject/UWM/uwm-${version}%20stable/uwm-${version}.tar.gz"
 checksum=dd056857c98b75c9203861917db33bcaf87ba074bdd204cf732ce4cb777cb408
-patch_args=-Np0
 
 CFLAGS="-fcommon"
diff --git a/srcpkgs/uwsgi/patches/musl-fix-python.patch b/srcpkgs/uwsgi/patches/musl-fix-python.patch
index c4f401f2fd5..b4b8fd240f5 100644
--- a/srcpkgs/uwsgi/patches/musl-fix-python.patch
+++ b/srcpkgs/uwsgi/patches/musl-fix-python.patch
@@ -1,7 +1,7 @@
 diff --git a/plugins/python/uwsgi_python.h b/plugins/python/uwsgi_python.h
 index 0c5c1c8..5c0dc6d 100644
---- plugins/python/uwsgi_python.h
-+++ plugins/python/uwsgi_python.h
+--- a/plugins/python/uwsgi_python.h
++++ b/plugins/python/uwsgi_python.h
 @@ -1,4 +1,8 @@
  #include <uwsgi.h>
 +/* seems like Python.h explicitlyl redefines _GNU_SOURCE */
diff --git a/srcpkgs/uwsgi/patches/musl-locking-fix.patch b/srcpkgs/uwsgi/patches/musl-locking-fix.patch
index fa6e16fd096..ce3b080a290 100644
--- a/srcpkgs/uwsgi/patches/musl-locking-fix.patch
+++ b/srcpkgs/uwsgi/patches/musl-locking-fix.patch
@@ -1,5 +1,5 @@
---- core/lock.c
-+++ core/lock.c
+--- a/core/lock.c
++++ b/core/lock.c
 @@ -96,7 +96,9 @@
  #endif
  	if (pthread_mutexattr_setprotocol(&attr, PTHREAD_PRIO_INHERIT)) {
diff --git a/srcpkgs/uwsgi/template b/srcpkgs/uwsgi/template
index 30dc164b333..507987723d7 100644
--- a/srcpkgs/uwsgi/template
+++ b/srcpkgs/uwsgi/template
@@ -10,7 +10,6 @@ license="GPL-2.0-linking-exception"
 homepage="http://projects.unbit.it/uwsgi"
 distfiles="https://github.com/unbit/uwsgi/archive/${version}.tar.gz"
 checksum=bf17cdbb9bd8bcb7c1633e34d9d7308cb4cc19eb0ff2d61057f840c1ba1fc41b
-patch_args=-Np0
 
 _libdir=usr/lib/uwsgi