srcpkgs/p*: convert patches to -Np1

* par is kept at -Np0

```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
	for p in ${template%/template}/patches/*; do
		sed -i '
			\,^[+-][+-][+-] /dev/null,b
			/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
			s,^[*][*][*] ,&a/,
			/^--- /{
				s,\(^--- \)\(./\)*,\1a/,
				s,[.-][Oo][Rr][Ii][Gg]\([	/]\),\1,
				s/[.-][Oo][Rr][Ii][Gg]$//
				s/[.]patched[.]\([^.]\)/.\1/
				h
			}
			/^+++ -/{
				g
				s/^--- a/+++ b/
				b
			}
			s,\(^+++ \)\(./\)*,\1b/,
		' "$p"
	done
	sed -i '/^patch_args=/d' $template
done
```

srcpkgs/p7zip/patches/20-CVE-2018-5996.patch

@@ -17,8 +17,8 @@ Bug-Debian: https://bugs.debian.org/#888314
 
 diff --git a/CPP/7zip/Compress/Rar1Decoder.cpp b/CPP/7zip/Compress/Rar1Decoder.cpp
 index 1aaedcc..68030c7 100644
---- CPP/7zip/Compress/Rar1Decoder.cpp
-+++ CPP/7zip/Compress/Rar1Decoder.cpp
+--- a/CPP/7zip/Compress/Rar1Decoder.cpp
++++ b/CPP/7zip/Compress/Rar1Decoder.cpp
 @@ -29,7 +29,7 @@ public:
  };
  */
@@ -58,8 +58,8 @@ index 1aaedcc..68030c7 100644
  STDMETHODIMP CDecoder::SetDecoderProperties2(const Byte *data, UInt32 size)
 diff --git a/CPP/7zip/Compress/Rar1Decoder.h b/CPP/7zip/Compress/Rar1Decoder.h
 index 630f089..01b606b 100644
---- CPP/7zip/Compress/Rar1Decoder.h
-+++ CPP/7zip/Compress/Rar1Decoder.h
+--- a/CPP/7zip/Compress/Rar1Decoder.h
++++ b/CPP/7zip/Compress/Rar1Decoder.h
 @@ -39,6 +39,7 @@ public:
  
    Int64 m_UnpackSize;
@@ -70,8 +70,8 @@ index 630f089..01b606b 100644
    HRESULT CopyBlock(UInt32 distance, UInt32 len);
 diff --git a/CPP/7zip/Compress/Rar2Decoder.cpp b/CPP/7zip/Compress/Rar2Decoder.cpp
 index b3f2b4b..0580c8d 100644
---- CPP/7zip/Compress/Rar2Decoder.cpp
-+++ CPP/7zip/Compress/Rar2Decoder.cpp
+--- a/CPP/7zip/Compress/Rar2Decoder.cpp
++++ b/CPP/7zip/Compress/Rar2Decoder.cpp
 @@ -80,7 +80,8 @@ static const UInt32 kHistorySize = 1 << 20;
  static const UInt32 kWindowReservSize = (1 << 22) + 256;
  
@@ -112,8 +112,8 @@ index b3f2b4b..0580c8d 100644
    {
 diff --git a/CPP/7zip/Compress/Rar2Decoder.h b/CPP/7zip/Compress/Rar2Decoder.h
 index 3a0535c..0e9005f 100644
---- CPP/7zip/Compress/Rar2Decoder.h
-+++ CPP/7zip/Compress/Rar2Decoder.h
+--- a/CPP/7zip/Compress/Rar2Decoder.h
++++ b/CPP/7zip/Compress/Rar2Decoder.h
 @@ -139,6 +139,7 @@ class CDecoder :
  
    UInt64 m_PackSize;
@@ -124,8 +124,8 @@ index 3a0535c..0e9005f 100644
    UInt32 ReadBits(unsigned numBits);
 diff --git a/CPP/7zip/Compress/Rar3Decoder.cpp b/CPP/7zip/Compress/Rar3Decoder.cpp
 index 3bf2513..6cb8a6a 100644
---- CPP/7zip/Compress/Rar3Decoder.cpp
-+++ CPP/7zip/Compress/Rar3Decoder.cpp
+--- a/CPP/7zip/Compress/Rar3Decoder.cpp
++++ b/CPP/7zip/Compress/Rar3Decoder.cpp
 @@ -92,7 +92,8 @@ CDecoder::CDecoder():
    _writtenFileSize(0),
    _vmData(0),
@@ -201,8 +201,8 @@ index 3bf2513..6cb8a6a 100644
  }
 diff --git a/CPP/7zip/Compress/Rar3Decoder.h b/CPP/7zip/Compress/Rar3Decoder.h
 index c130cec..2f72d7d 100644
---- CPP/7zip/Compress/Rar3Decoder.h
-+++ CPP/7zip/Compress/Rar3Decoder.h
+--- a/CPP/7zip/Compress/Rar3Decoder.h
++++ b/CPP/7zip/Compress/Rar3Decoder.h
 @@ -192,6 +192,7 @@ class CDecoder:
    UInt32 _lastFilter;
  

srcpkgs/p7zip/patches/30-CVE-2018-10115.patch

@@ -19,8 +19,8 @@ Bugs-Debian: https://bugs.debian.org/897674
 
 diff --git a/CPP/7zip/Compress/Rar1Decoder.cpp b/CPP/7zip/Compress/Rar1Decoder.cpp
 index 68030c7..8c890c8 100644
---- CPP/7zip/Compress/Rar1Decoder.cpp
-+++ CPP/7zip/Compress/Rar1Decoder.cpp
+--- a/CPP/7zip/Compress/Rar1Decoder.cpp
++++ b/CPP/7zip/Compress/Rar1Decoder.cpp
 @@ -29,7 +29,7 @@ public:
  };
  */
@@ -86,8 +86,8 @@ index 68030c7..8c890c8 100644
  
 diff --git a/CPP/7zip/Compress/Rar1Decoder.h b/CPP/7zip/Compress/Rar1Decoder.h
 index 01b606b..8abb3a3 100644
---- CPP/7zip/Compress/Rar1Decoder.h
-+++ CPP/7zip/Compress/Rar1Decoder.h
+--- a/CPP/7zip/Compress/Rar1Decoder.h
++++ b/CPP/7zip/Compress/Rar1Decoder.h
 @@ -38,7 +38,8 @@ public:
    UInt32 LastLength;
  
@@ -100,8 +100,8 @@ index 01b606b..8abb3a3 100644
    UInt32 ReadBits(int numBits);
 diff --git a/CPP/7zip/Compress/Rar2Decoder.cpp b/CPP/7zip/Compress/Rar2Decoder.cpp
 index 0580c8d..be8d842 100644
---- CPP/7zip/Compress/Rar2Decoder.cpp
-+++ CPP/7zip/Compress/Rar2Decoder.cpp
+--- a/CPP/7zip/Compress/Rar2Decoder.cpp
++++ b/CPP/7zip/Compress/Rar2Decoder.cpp
 @@ -80,7 +80,8 @@ static const UInt32 kHistorySize = 1 << 20;
  static const UInt32 kWindowReservSize = (1 << 22) + 256;
  
@@ -167,8 +167,8 @@ index 0580c8d..be8d842 100644
  
 diff --git a/CPP/7zip/Compress/Rar2Decoder.h b/CPP/7zip/Compress/Rar2Decoder.h
 index 0e9005f..370bce2 100644
---- CPP/7zip/Compress/Rar2Decoder.h
-+++ CPP/7zip/Compress/Rar2Decoder.h
+--- a/CPP/7zip/Compress/Rar2Decoder.h
++++ b/CPP/7zip/Compress/Rar2Decoder.h
 @@ -138,7 +138,8 @@ class CDecoder :
    Byte m_LastLevels[kMaxTableSize];
  
@@ -181,8 +181,8 @@ index 0e9005f..370bce2 100644
    void InitStructures();
 diff --git a/CPP/7zip/Compress/Rar3Decoder.cpp b/CPP/7zip/Compress/Rar3Decoder.cpp
 index 6cb8a6a..7b85833 100644
---- CPP/7zip/Compress/Rar3Decoder.cpp
-+++ CPP/7zip/Compress/Rar3Decoder.cpp
+--- a/CPP/7zip/Compress/Rar3Decoder.cpp
++++ b/CPP/7zip/Compress/Rar3Decoder.cpp
 @@ -92,7 +92,8 @@ CDecoder::CDecoder():
    _writtenFileSize(0),
    _vmData(0),
@@ -251,8 +251,8 @@ index 6cb8a6a..7b85833 100644
  
 diff --git a/CPP/7zip/Compress/Rar3Decoder.h b/CPP/7zip/Compress/Rar3Decoder.h
 index 2f72d7d..32c8943 100644
---- CPP/7zip/Compress/Rar3Decoder.h
-+++ CPP/7zip/Compress/Rar3Decoder.h
+--- a/CPP/7zip/Compress/Rar3Decoder.h
++++ b/CPP/7zip/Compress/Rar3Decoder.h
 @@ -191,7 +191,8 @@ class CDecoder:
    CRecordVector<CTempFilter *>  _tempFilters;
    UInt32 _lastFilter;
@@ -265,8 +265,8 @@ index 2f72d7d..32c8943 100644
    bool _lzMode;
 diff --git a/CPP/7zip/Compress/Rar5Decoder.cpp b/CPP/7zip/Compress/Rar5Decoder.cpp
 index dc8830f..a826d5a 100644
---- CPP/7zip/Compress/Rar5Decoder.cpp
-+++ CPP/7zip/Compress/Rar5Decoder.cpp
+--- a/CPP/7zip/Compress/Rar5Decoder.cpp
++++ b/CPP/7zip/Compress/Rar5Decoder.cpp
 @@ -72,6 +72,7 @@ CDecoder::CDecoder():
      _writtenFileSize(0),
      _dictSizeLog(0),
@@ -299,8 +299,8 @@ index dc8830f..a826d5a 100644
  
 diff --git a/CPP/7zip/Compress/Rar5Decoder.h b/CPP/7zip/Compress/Rar5Decoder.h
 index b0a4dd1..3db5018 100644
---- CPP/7zip/Compress/Rar5Decoder.h
-+++ CPP/7zip/Compress/Rar5Decoder.h
+--- a/CPP/7zip/Compress/Rar5Decoder.h
++++ b/CPP/7zip/Compress/Rar5Decoder.h
 @@ -271,6 +271,7 @@ class CDecoder:
    Byte _dictSizeLog;
    bool _tableWasFilled;

srcpkgs/p7zip/patches/CVE-2016-9296.patch

@@ -1,5 +1,5 @@
---- CPP/7zip/Archive/7z/7zIn.cpp.orig	Sun Nov 20 09:29:41 2016
-+++ CPP/7zip/Archive/7z/7zIn.cpp	Sun Nov 20 09:31:22 2016
+--- a/CPP/7zip/Archive/7z/7zIn.cpp	Sun Nov 20 09:29:41 2016
++++ b/CPP/7zip/Archive/7z/7zIn.cpp	Sun Nov 20 09:31:22 2016
 @@ -1097,7 +1097,8 @@ HRESULT CInArchive::ReadAndDecodePackedStreams(
        if (CrcCalc(data, unpackSize) != folders.FolderCRCs.Vals[i])
          ThrowIncorrect();

srcpkgs/p7zip/patches/CVE-2017-17969.patch

@@ -8,8 +8,8 @@ Subject: backport of the CVE-2017-17969 fix from 7zip 18.00-beta
 
 diff --git a/CPP/7zip/Compress/ShrinkDecoder.cpp b/CPP/7zip/Compress/ShrinkDecoder.cpp
 index 80b7e67..4acdce5 100644
---- CPP/7zip/Compress/ShrinkDecoder.cpp
-+++ CPP/7zip/Compress/ShrinkDecoder.cpp
+--- a/CPP/7zip/Compress/ShrinkDecoder.cpp
++++ b/CPP/7zip/Compress/ShrinkDecoder.cpp
 @@ -121,7 +121,12 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *
      {
        _stack[i++] = _suffixes[cur];

srcpkgs/p7zip/template

@@ -10,7 +10,6 @@ license="LGPL-2.1-or-later"
 homepage="http://p7zip.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}_${version}_src_all.tar.bz2"
 checksum=5eb20ac0e2944f6cb9c2d51dd6c4518941c185347d4089ea89087ffdd6e2341f
-patch_args=-Np0
 
 CXXFLAGS="-Wno-narrowing"
 

srcpkgs/pa-applet/patches/fix-volume-notification.patch

@@ -1,7 +1,7 @@
 diff --git a/src/notifications.c b/src/notifications.c
 index f5ac1f8..e366a12 100644
---- src/notifications.c
-+++ src/notifications.c
+--- a/src/notifications.c
++++ b/src/notifications.c
 @@ -7,6 +7,7 @@
   *
   */

srcpkgs/pa-applet/template

@@ -13,7 +13,6 @@ license="BSD-2-Clause"
 homepage="https://github.com/fernandotcl/pa-applet"
 distfiles="$homepage/archive/$_commit.tar.gz"
 checksum=db30c04a6954e1d138c6bc80739dae80d667a0af151b015db503e48fb30b0b7a
-patch_args=-Np0
 
 pre_configure() {
 	sed -i -e 's| -Werror||' src/Makefile.am

srcpkgs/pacman/patches/gpg2gpg2.patch

@@ -4,8 +4,8 @@ This patches all references to the gpg command to use
 gpg2 instead.
 
 diff -Naur pacman-5.2.1.orig/scripts/pacman-key.sh.in pacman-5.2.1/scripts/pacman-key.sh.in
---- scripts/pacman-key.sh.in	2019-10-24 06:29:08.000000000 -0700
-+++ scripts/pacman-key.sh.in	2020-05-24 02:30:26.838797182 -0700
+--- a/scripts/pacman-key.sh.in	2019-10-24 06:29:08.000000000 -0700
++++ b/scripts/pacman-key.sh.in	2020-05-24 02:30:26.838797182 -0700
 @@ -51,6 +51,7 @@
  UPDATEDB=0
  USE_COLOR='y'

srcpkgs/pacman/template

@@ -17,7 +17,6 @@ license="GPL-2.0-or-later"
 homepage="https://www.archlinux.org/pacman/"
 distfiles="https://sources.archlinux.org/other/pacman/pacman-${version}.tar.gz"
 checksum=bb201a9f2fb53c28d011f661d50028efce6eef2c1d2a36728bdd0130189349a0
-patch_args=-Np0
 
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	do_check() {

srcpkgs/pahole/patches/fix_always_inline.patch

@@ -1,5 +1,5 @@
---- dutil.h.orig
-+++ dutil.h
+--- a/dutil.h
++++ b/dutil.h
 @@ -28,6 +28,10 @@
  #define __pure __attribute__ ((pure))
  #endif
@@ -11,8 +11,8 @@
  #define roundup(x,y) ((((x) + ((y) - 1)) / (y)) * (y))
  
  static inline __attribute__((const)) bool is_power_of_2(unsigned long n)
---- lib/bpf/src/libbpf.c.orig
-+++ lib/bpf/src/libbpf.c
+--- a/lib/bpf/src/libbpf.c
++++ b/lib/bpf/src/libbpf.c
 @@ -10,6 +10,10 @@
   * Copyright (C) 2019 Isovalent, Inc.
   */

srcpkgs/pahole/patches/fix_limits.patch

@@ -1,7 +1,7 @@
 diff --git dwarves.c dwarves.c
 index 8cb359f..98b8b6b 100644
---- dwarves.c
-+++ dwarves.c
+--- a/dwarves.c
++++ b/dwarves.c
 @@ -22,6 +22,7 @@
  #include <unistd.h>
  #include <sys/stat.h>
@@ -12,8 +12,8 @@ index 8cb359f..98b8b6b 100644
  #include "list.h"
 diff --git pahole.c pahole.c
 index dac7a49..15c0c29 100644
---- pahole.c
-+++ pahole.c
+--- a/pahole.c
++++ b/pahole.c
 @@ -10,6 +10,7 @@
  #include <assert.h>
  #include <stdio.h>

srcpkgs/pahole/patches/fix_sysconf.patch

@@ -1,5 +1,5 @@
---- dwarves_fprintf.c.orig
-+++ dwarves_fprintf.c
+--- a/dwarves_fprintf.c
++++ b/dwarves_fprintf.c
 @@ -1683,11 +1683,13 @@
  void dwarves__fprintf_init(uint16_t user_cacheline_size)
  {

srcpkgs/pahole/patches/fix_wordsize.patch

@@ -1,5 +1,5 @@
---- hash.h.orig
-+++ hash.h
+--- a/hash.h
++++ b/hash.h
 @@ -16,6 +16,9 @@
  
  #include <stdint.h>

srcpkgs/pahole/template

@@ -12,7 +12,6 @@ license="GPL-2.0-only"
 homepage="http://git.kernel.org/?p=devel/pahole/pahole.git;a=summary"
 distfiles="https://fedorapeople.org/~acme/dwarves/dwarves-${version}.tar.xz"
 checksum=33a8bed6c0e1a5889578e01d1afed3f752353dc087d8bda36d258fe83e42a476
-patch_args=-Np0
 
 case $XBPS_TARGET_MACHINE in
 	*-musl) makedepends+=" musl-obstack-devel argp-standalone"

srcpkgs/pam-mount/patches/add-luks2-support.patch

@@ -1,6 +1,6 @@
 From: https://sourceforge.net/p/pam-mount/pam-mount/ci/d4434c05e7c0cf05d87089404cfa2deedc60811a/tree/src/crypto-dmc.c?diff=e47b8ee42f14926b013a78cc487b794059edccff
---- src/crypto-dmc.c
-+++ src/crypto-dmc.c
+--- a/src/crypto-dmc.c
++++ b/src/crypto-dmc.c
 @@ -21,6 +21,12 @@
  #include "libcryptmount.h"
  #include "pam_mount.h"

srcpkgs/pam-mount/template

@@ -16,7 +16,6 @@ homepage="http://pam-mount.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/pam-mount/pam_mount/${version}/pam_mount-${version}.tar.xz"
 checksum=ae0207ea6c96189414f906a7b0880abc7751a98e26b3d0375c9afab3722471e7
 conf_files="/etc/security/pam_mount.conf.xml"
-patch_args=-Np0
 
 libpam-mount_package() {
 	short_desc+=" - runtime library"

srcpkgs/pam-u2f/patches/musl.patch

@@ -1,7 +1,7 @@
 diff --git b64.c b64.c
 index 0649c1e..7788089 100644
---- b64.c
-+++ b64.c
+--- a/b64.c
++++ b/b64.c
 @@ -4,6 +4,7 @@
  
  #include <openssl/bio.h>
@@ -12,8 +12,8 @@ index 0649c1e..7788089 100644
  
 diff --git util.c util.c
 index 3ec4e71..5989c6c 100644
---- util.c
-+++ util.c
+--- a/util.c
++++ b/util.c
 @@ -9,6 +9,7 @@
  #include <openssl/ec.h>
  #include <openssl/obj_mac.h>

srcpkgs/pam-u2f/template

@@ -14,7 +14,6 @@ homepage="https://developers.yubico.com/pam-u2f/"
 #changelog="https://raw.githubusercontent.com/Yubico/pam-u2f/master/NEWS"
 distfiles="https://developers.yubico.com/pam-u2f/Releases/pam_u2f-${version}.tar.gz"
 checksum=0dc3bf96ebb69c6e398b5f8991493b37a8ce1af792948af71e694f695d5edc05
-patch_args=-Np0
 
 post_install() {
 	vlicense COPYING

srcpkgs/pam_rundir/patches/fix.patch

@@ -1,5 +1,5 @@
---- pam_rundir.c	2015-09-23 12:57:53.000000000 -0400
-+++ pam_rundir2.c	2019-08-24 13:17:11.241470935 -0400
+--- a/pam_rundir.c	2015-09-23 12:57:53.000000000 -0400
++++ b/pam_rundir2.c	2019-08-24 13:17:11.241470935 -0400
 @@ -24,6 +24,8 @@
  #include <sys/types.h>
  #include <sys/stat.h>

srcpkgs/pam_rundir/template

@@ -11,4 +11,3 @@ license="GPL-2.0-or-later"
 homepage="https://jjacky.com/pam_rundir"
 distfiles="https://jjacky.com/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=c779b699ed23777a3bdba87b7f67ed395fe957f3c96138faee45f87a27bcc020
-patch_args=-Np0

srcpkgs/pam_ssh/patches/fix-cross-compile-openssl-feature-checks.patch

@@ -2,8 +2,8 @@ The configure script contains checks that cannot run when cross-compiling. This
 patch disables them
 
 diff -Naur configure.orig configure
---- configure.orig	2016-08-01 15:39:25.194784834 +0200
-+++ configure	2016-08-01 15:40:38.914790397 +0200
+--- a/configure	2016-08-01 15:39:25.194784834 +0200
++++ b/configure	2016-08-01 15:40:38.914790397 +0200
 @@ -11621,10 +11621,6 @@
  		# Basic test to check for compatible version and correct linking
  		# *does not* test for RSA - that comes later.

srcpkgs/pam_ssh/template

@@ -14,7 +14,6 @@ license="BSD-2-Clause"
 homepage="http://pam-ssh.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/pam-ssh/${pkgname}-${version}.tar.xz"
 checksum=0c456f6a5c9e47ce6825ac50d467e7a797e14239b2b9a72bfeb2df0100f4af31
-patch_args=-Np0
 
 CFLAGS="-fcommon"
 

srcpkgs/pam_ssh_agent_auth/patches/openssl.patch

@@ -23,8 +23,8 @@ The patch works on FreeBSD head (will be 12.0) but the --without-openssl-header-
 
 diff --git a/authfd.c b/authfd.c
 index 7b96921..35f8de1 100644
---- authfd.c
-+++ authfd.c
+--- a/authfd.c
++++ b/authfd.c
 @@ -372,6 +372,7 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
  	case 1:
  		key = pamsshagentauth_key_new(KEY_RSA1);
@@ -145,8 +145,8 @@ index 7b96921..35f8de1 100644
  		pamsshagentauth_buffer_put_char(&msg, SSH2_AGENTC_REMOVE_IDENTITY);
 diff --git a/bufbn.c b/bufbn.c
 index 6a49c73..4ecedc1 100644
---- bufbn.c
-+++ bufbn.c
+--- a/bufbn.c
++++ b/bufbn.c
 @@ -151,7 +151,11 @@ pamsshagentauth_buffer_put_bignum2_ret(Buffer *buffer, const BIGNUM *value)
  		pamsshagentauth_buffer_put_int(buffer, 0);
  		return 0;
@@ -161,8 +161,8 @@ index 6a49c73..4ecedc1 100644
  	}
 diff --git a/cipher.h b/cipher.h
 index 49bbc16..64f59ca 100644
---- cipher.h
-+++ cipher.h
+--- a/cipher.h
++++ b/cipher.h
 @@ -59,15 +59,18 @@
  #define CIPHER_DECRYPT		0
  
@@ -191,8 +191,8 @@ index 49bbc16..64f59ca 100644
  #endif				/* CIPHER_H */
 diff --git a/kex.h b/kex.h
 index 8e29c90..81ca57d 100644
---- kex.h
-+++ kex.h
+--- a/kex.h
++++ b/kex.h
 @@ -70,7 +70,7 @@ enum kex_exchange {
  #define KEX_INIT_SENT	0x0001
  
@@ -245,8 +245,8 @@ index 8e29c90..81ca57d 100644
  #endif
 diff --git a/key.c b/key.c
 index 107a442..aedbbb5 100644
---- key.c
-+++ key.c
+--- a/key.c
++++ b/key.c
 @@ -77,15 +77,21 @@ pamsshagentauth_key_new(int type)
  	case KEY_RSA:
  		if ((rsa = RSA_new()) == NULL)
@@ -578,8 +578,8 @@ index 107a442..aedbbb5 100644
  		pamsshagentauth_fatal("key_demote: implement me");
 diff --git a/ssh-dss.c b/ssh-dss.c
 index 9fdaa5d..1051ae2 100644
---- ssh-dss.c
-+++ ssh-dss.c
+--- a/ssh-dss.c
++++ b/ssh-dss.c
 @@ -48,37 +48,53 @@ ssh_dss_sign(const Key *key, u_char **sigp, u_int *lenp,
  {
  	DSA_SIG *sig;
@@ -701,8 +701,8 @@ index 9fdaa5d..1051ae2 100644
  
 diff --git a/ssh-ecdsa.c b/ssh-ecdsa.c
 index efa0f3d..c213959 100644
---- ssh-ecdsa.c
-+++ ssh-ecdsa.c
+--- a/ssh-ecdsa.c
++++ b/ssh-ecdsa.c
 @@ -41,22 +41,27 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
  {
      ECDSA_SIG *sig;
@@ -807,8 +807,8 @@ index efa0f3d..c213959 100644
 +}
 diff --git a/ssh-rsa.c b/ssh-rsa.c
 index d05844b..9d74eb6 100644
---- ssh-rsa.c
-+++ ssh-rsa.c
+--- a/ssh-rsa.c
++++ b/ssh-rsa.c
 @@ -40,7 +40,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
      const u_char *data, u_int datalen)
  {

srcpkgs/pam_ssh_agent_auth/template

@@ -12,7 +12,6 @@ license="MIT"
 homepage="http://pamsshagentauth.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/pamsshagentauth/${pkgname}-${version}.tar.bz2"
 checksum=3c53d358d6eaed1b211239df017c27c6f9970995d14102ae67bae16d4f47a763
-patch_args=-Np0
 
 post_extract() {
 	vsed -e '/^AR=/d' -i Makefile.in -i openbsd-compat/Makefile.in

srcpkgs/papi/patches/gnu_source.patch

@@ -1,5 +1,5 @@
---- src/components/perf_event/tests/perf_event_system_wide.c.orig	2019-10-12 17:48:40.217216625 +0200
-+++ src/components/perf_event/tests/perf_event_system_wide.c	2019-10-12 17:49:48.246645644 +0200
+--- a/src/components/perf_event/tests/perf_event_system_wide.c	2019-10-12 17:48:40.217216625 +0200
++++ b/src/components/perf_event/tests/perf_event_system_wide.c	2019-10-12 17:49:48.246645644 +0200
 @@ -15,6 +15,9 @@
  #define __USE_GNU
  #endif

srcpkgs/papi/template

@@ -11,7 +11,6 @@ license="BSD-3-Clause"
 homepage="http://icl.cs.utk.edu/papi/"
 distfiles="http://icl.utk.edu/projects/papi/downloads/papi-${version}.tar.gz"
 checksum=d1a3bb848e292c805bc9f29e09c27870e2ff4cda6c2fba3b7da8b4bba6547589
-patch_args=-Np0
 
 if [ -n "$CROSS_BUILD" ]; then
 	_ARCH="${XBPS_TARGET_MACHINE%-musl}"

srcpkgs/par2cmdline/patches/avoid-corrupt-files-in-wrkdir.patch

@@ -12,8 +12,8 @@ Signed-off-by: BlackEagle <ike.devolder@gmail.com>
 
 diff --git Makefile.am Makefile.am
 index f404fd0..64ed9d2 100755
---- Makefile.am
-+++ Makefile.am
+--- a/Makefile.am
++++ b/Makefile.am
 @@ -19,6 +19,8 @@
  
  AUTOMAKE_OPTIONS = subdir-objects

srcpkgs/par2cmdline/template

@@ -11,7 +11,6 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/Parchive/par2cmdline"
 distfiles="https://github.com/Parchive/par2cmdline/archive/v${version}.tar.gz"
 checksum=529f85857ec44e501cd8d95b0c8caf47477d7daa5bfb989e422c800bb71b689a
-patch_args=-Np0
 
 pre_configure() {
 	autoreconf -fi

srcpkgs/paraview/patches/cmake-py39.patch

@@ -1,5 +1,5 @@
---- VTK/CMake/patches/99/FindPython/Support.cmake.orig	2020-10-08 00:54:51.788984364 -0400
-+++ VTK/CMake/patches/99/FindPython/Support.cmake	2020-10-08 00:54:56.640977251 -0400
+--- a/VTK/CMake/patches/99/FindPython/Support.cmake	2020-10-08 00:54:51.788984364 -0400
++++ b/VTK/CMake/patches/99/FindPython/Support.cmake	2020-10-08 00:54:56.640977251 -0400
 @@ -46,7 +46,7 @@
    message (FATAL_ERROR "FindPython: INTERNAL ERROR")
  endif()

srcpkgs/paraview/patches/fix-page_size-macro.patch

@@ -1,5 +1,5 @@
---- Plugins/Datamine/Readers/dmfile.cxx	2020-08-04 22:12:01.000000000 +0200
-+++ Plugins/Datamine/Readers/dmfile.cxx	2020-08-30 13:22:12.387889301 +0200
+--- a/Plugins/Datamine/Readers/dmfile.cxx	2020-08-04 22:12:01.000000000 +0200
++++ b/Plugins/Datamine/Readers/dmfile.cxx	2020-08-30 13:22:12.387889301 +0200
 @@ -421,8 +421,8 @@
  
    // number of records per page

srcpkgs/paraview/patches/fix-vtksys-execinfo.patch

@@ -1,5 +1,5 @@
---- VTK/Utilities/KWSys/vtksys/CMakeLists.txt	2020-08-30 14:24:27.200081977 +0200
-+++ VTK/Utilities/KWSys/vtksys/CMakeLists.txt	2020-08-30 14:26:38.533088752 +0200
+--- a/VTK/Utilities/KWSys/vtksys/CMakeLists.txt	2020-08-30 14:24:27.200081977 +0200
++++ b/VTK/Utilities/KWSys/vtksys/CMakeLists.txt	2020-08-30 14:26:38.533088752 +0200
 @@ -592,7 +592,8 @@
      # check for simple stack trace
      # usually it's in libc but on FreeBSD

srcpkgs/paraview/patches/vtk-isnan.patch

@@ -1,5 +1,5 @@
---- VTK/Common/Core/vtkGenericDataArrayLookupHelper.h	2020-08-04 22:12:01.000000000 +0200
-+++ VTK/Common/Core/vtkGenericDataArrayLookupHelper.h	2020-08-29 22:33:06.824012475 +0200
+--- a/VTK/Common/Core/vtkGenericDataArrayLookupHelper.h	2020-08-04 22:12:01.000000000 +0200
++++ b/VTK/Common/Core/vtkGenericDataArrayLookupHelper.h	2020-08-29 22:33:06.824012475 +0200
 @@ -36,20 +36,20 @@
  template <typename T>
  struct has_NaN<T, true>

srcpkgs/paraview/template

@@ -34,7 +34,6 @@ license="BSD-3-Clause"
 homepage="https://www.paraview.org"
 distfiles="https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v${version:0:3}&type=source&os=Sources&downloadFile=ParaView-v${version}.tar.xz>paraview-${version}.tar.xz"
 checksum=7653950392a0d7c0287c26f1d3a25cdbaa11baa7524b0af0e6a1a0d7d487d034
-patch_args=-Np0
 
 CFLAGS="-DYYERROR_VERBOSE -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DGNU_SOURCE -fcommon"
 CXXFLAGS="${CFLAGS}"

srcpkgs/parcellite/patches/locale.patch

@@ -1,7 +1,7 @@
 Index: configure
 ===================================================================
---- configure.orig
-+++ configure
+--- a/configure
++++ b/configure
 @@ -4981,8 +4981,8 @@ fi
              DATADIRNAME=share
  	    ;;

srcpkgs/parcellite/template

@@ -12,6 +12,5 @@ license="GPL-3.0-or-later"
 homepage="http://parcellite.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/parcellite/${version}/parcellite-${version}.tar.gz"
 checksum=aba1c7c56c7607e219ce9855723eefa552c5376982891aefbfb5a2d3297ef046
-patch_args=-Np0
 
 export LIBS=-lgio-2.0

srcpkgs/partclone/patches/0001-musl.patch

@@ -10,8 +10,8 @@ Subject: [PATCH] musl
 
 diff --git src/btrfs/kernel-lib/rbtree.h src/btrfs/kernel-lib/rbtree.h
 index 6d68907..affab1d 100644
---- src/btrfs/kernel-lib/rbtree.h
-+++ src/btrfs/kernel-lib/rbtree.h
+--- a/src/btrfs/kernel-lib/rbtree.h
++++ b/src/btrfs/kernel-lib/rbtree.h
 @@ -38,6 +38,10 @@
  extern "C" {
  #endif
@@ -25,8 +25,8 @@ index 6d68907..affab1d 100644
  	struct rb_node *rb_right;
 diff --git src/main.c src/main.c
 index babcf0c..8a543f3 100644
---- src/main.c
-+++ src/main.c
+--- a/src/main.c
++++ b/src/main.c
 @@ -22,7 +22,6 @@
  #include <sys/types.h>
  #include <stdio.h>

srcpkgs/partclone/template

@@ -16,7 +16,6 @@ homepage="http://www.partclone.org/"
 distfiles="https://github.com/Thomas-Tsai/${pkgname}/archive/${version}.tar.gz"
 checksum=ef1391db3801e4b3ef82fc9417f1d7f0542b7229b3394120072b2dfeae0bbbb0
 CFLAGS="-DBTRFS_DISABLE_BACKTRACE"
-patch_args=-Np0
 
 pre_configure() {
 	./autogen

srcpkgs/passwordsafe/patches/use-gtest-from-package.patch

@@ -1,5 +1,5 @@
---- CMakeLists.txt.ORIG	2021-02-25 23:45:37.917034534 +0100
-+++ CMakeLists.txt	2021-02-26 00:05:34.138397928 +0100
+--- a/CMakeLists.txt	2021-02-25 23:45:37.917034534 +0100
++++ b/CMakeLists.txt	2021-02-26 00:05:34.138397928 +0100
 @@ -255,34 +255,6 @@
  endif (USE_ASAN)
  endif (MSVC)

srcpkgs/passwordsafe/template

@@ -16,7 +16,6 @@ license="Artistic-2.0"
 homepage="https://pwsafe.org"
 distfiles="https://github.com/pwsafe/pwsafe/archive/${version}.tar.gz"
 checksum=8962edf57b7f901d9ed23496c8ec387a4f186855976e8ac98f2dd55560c82ebe
-patch_args=-Np0
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DNO_GTEST=OFF"

srcpkgs/pax/patches/musl-headers.patch

@@ -1,5 +1,5 @@
---- pax/strtonum.c	2020-03-13 01:26:39.000000000 +0100
-+++ pax/strtonum.c	2020-09-06 01:13:30.359370537 +0200
+--- a/pax/strtonum.c	2020-03-13 01:26:39.000000000 +0100
++++ b/pax/strtonum.c	2020-09-06 01:13:30.359370537 +0200
 @@ -21,6 +21,8 @@
  #include <errno.h>
  #include <limits.h>

srcpkgs/pax/template

@@ -11,7 +11,6 @@ license="BSD-3-Clause"
 homepage="https://www.mirbsd.org/MirOS/dist/mir/cpio/"
 distfiles="https://www.mirbsd.org/MirOS/dist/mir/cpio/paxmirabilis-${version}.cpio.gz"
 checksum=fe3f99c28ba7a46c4bce0b329da3742908b87fe8fbe17f0db1f99a1bd053d46b
-patch_args=-Np0
 
 alternatives="
  pax:pax:/usr/bin/paxmirabilis

srcpkgs/pcaudiolib/patches/upstream-fix-alsa-sample-size.patch

@@ -6,8 +6,8 @@ Date:   Sat Mar 10 06:55:58 2018 +0100
 
 diff --git src/alsa.c src/alsa.c
 index 34e39be..6af1941 100644
---- src/alsa.c
-+++ src/alsa.c
+--- a/src/alsa.c
++++ b/src/alsa.c
 @@ -53,7 +53,7 @@ alsa_object_open(struct audio_object *object,
  		return -EEXIST;
  

srcpkgs/pcaudiolib/patches/upstream-fix-snappiness.patch

@@ -13,8 +13,8 @@ Date:   Sun Oct 11 17:34:57 2020 +0200
 
 diff --git src/alsa.c src/alsa.c
 index 64d5a90..c856788 100644
---- src/alsa.c
-+++ src/alsa.c
+--- a/src/alsa.c
++++ b/src/alsa.c
 @@ -99,6 +99,7 @@ alsa_object_open(struct audio_object *object,
  
  	snd_pcm_hw_params_t *params = NULL;
@@ -34,8 +34,8 @@ index 64d5a90..c856788 100644
  	if ((err = snd_pcm_prepare(self->handle)) < 0)
 diff --git src/audio_priv.h src/audio_priv.h
 index 9526138..669a037 100644
---- src/audio_priv.h
-+++ src/audio_priv.h
+--- a/src/audio_priv.h
++++ b/src/audio_priv.h
 @@ -52,6 +52,10 @@ struct audio_object
  	                         int error);
  };
@@ -49,8 +49,8 @@ index 9526138..669a037 100644
  #include <windows.h>
 diff --git src/pulseaudio.c src/pulseaudio.c
 index d23366d..2f80c62 100644
---- src/pulseaudio.c
-+++ src/pulseaudio.c
+--- a/src/pulseaudio.c
++++ b/src/pulseaudio.c
 @@ -74,6 +74,13 @@ pulseaudio_object_open(struct audio_object *object,
  	}
  

srcpkgs/pcaudiolib/template

@@ -11,7 +11,6 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/espeak-ng/pcaudiolib"
 distfiles="https://github.com/espeak-ng/pcaudiolib/archive/${version}.tar.gz"
 checksum=699a5a347b1e12dc5b122e192e19f4db01621826bf41b9ebefb1cbc63ae2180b
-patch_args=-Np0
 
 pre_configure() {
 	./autogen.sh

srcpkgs/pcc/patches/build_PIC.patch

@@ -1,7 +1,7 @@
 Respect passed CFLAGS to configure and force PIC object generation.
 
---- pcc-libs/csu/linux/Makefile.orig	2011-02-24 12:59:36.988078869 +0100
-+++ pcc-libs/csu/linux/Makefile	2011-02-24 13:01:29.434007771 +0100
+--- a/pcc-libs/csu/linux/Makefile	2011-02-24 12:59:36.988078869 +0100
++++ b/pcc-libs/csu/linux/Makefile	2011-02-24 13:01:29.434007771 +0100
 @@ -4,7 +4,7 @@ VERSION ?= 0.9.9
  PCCLIBDIR ?= /usr/local/lib/pcc/$(TARGET)/$(VERSION)/lib
  SRCDIR ?= .
@@ -11,8 +11,8 @@ Respect passed CFLAGS to configure and force PIC object generation.
  
  OBJS = crt0.o crt1.o gcrt1.o crti.o crtn.o crtbegin.o crtend.o
  
---- pcc-libs/libpcc/Makefile.in.orig	2011-02-24 13:02:15.570566278 +0100
-+++ pcc-libs/libpcc/Makefile.in	2011-02-24 13:02:33.577393664 +0100
+--- a/pcc-libs/libpcc/Makefile.in	2011-02-24 13:02:15.570566278 +0100
++++ b/pcc-libs/libpcc/Makefile.in	2011-02-24 13:02:33.577393664 +0100
 @@ -12,6 +12,7 @@ exec_prefix = @exec_prefix@
  libdir = @libdir@
  
@@ -21,8 +21,8 @@ Respect passed CFLAGS to configure and force PIC object generation.
  TARGMACH = @targmach@
  TARGOS = @targos@
  TARGET = @target@
---- pcc-libs/libsoftfloat/Makefile.in.orig	2011-02-24 13:02:54.937188695 +0100
-+++ pcc-libs/libsoftfloat/Makefile.in	2011-02-24 13:03:09.281050924 +0100
+--- a/pcc-libs/libsoftfloat/Makefile.in	2011-02-24 13:02:54.937188695 +0100
++++ b/pcc-libs/libsoftfloat/Makefile.in	2011-02-24 13:03:09.281050924 +0100
 @@ -12,6 +12,7 @@ exec_prefix = @exec_prefix@
  libdir = @libdir@
  

srcpkgs/pcc/patches/void.patch

@@ -1,5 +1,5 @@
---- pcc/os/linux/ccconfig.h.orig	2019-04-21 12:16:53.029059057 +0200
-+++ pcc/os/linux/ccconfig.h	2019-04-21 12:18:19.757287684 +0200
+--- a/pcc/os/linux/ccconfig.h	2019-04-21 12:16:53.029059057 +0200
++++ b/pcc/os/linux/ccconfig.h	2019-04-21 12:18:19.757287684 +0200
 @@ -39,26 +39,31 @@
  
  #if defined(mach_i386)

srcpkgs/pcc/patches/x86-build-fix.patch

@@ -2,8 +2,8 @@ Fix x86 build failure: only use MULTIARCH_PATH if it's defined :-)
 
 	--xtraeme
 
---- pcc/cc/cc/cc.c.orig	2014-12-18 14:57:43.961103113 +0100
-+++ pcc/cc/cc/cc.c	2014-12-18 14:57:52.881207162 +0100
+--- a/pcc/cc/cc/cc.c	2014-12-18 14:57:43.961103113 +0100
++++ b/pcc/cc/cc/cc.c	2014-12-18 14:57:52.881207162 +0100
 @@ -207,9 +207,9 @@ char *cppmdadd[] = CPPMDADD;
  #endif
  #ifndef DEFLIBDIRS	/* default library search paths */

srcpkgs/pcc/template

@@ -19,7 +19,6 @@ distfiles="
 checksum="a114dfca04b8b0559ea5d67b87d2d0fcb2bae2b4d9b9ba16ebc27960b921c812
  e810aa4d6683e769f490f734b13a296b33c2511ddba646bc526eb85532f1a23a"
 nocross=yes
-patch_args=-Np0
 
 CFLAGS="-fcommon"
 

srcpkgs/pchar/patches/fix-build.patch

@@ -1,5 +1,5 @@
---- ResultTable.cc.orig	2018-01-10 19:18:31.278796587 +0100
-+++ ResultTable.cc	2018-01-10 19:18:18.193831083 +0100
+--- a/ResultTable.cc	2018-01-10 19:18:31.278796587 +0100
++++ b/ResultTable.cc	2018-01-10 19:18:18.193831083 +0100
 @@ -909,8 +909,8 @@ void ResultTable::lmsint(double &a, doub
  	l = 0;
  	for (i = 0; i < columns; i++) {

srcpkgs/pchar/patches/no-SO_BSDCOMPAT-2.diff

@@ -1,5 +1,5 @@
---- PctestIpv4Raw.cc.t	2008-03-13 12:33:16.058194372 -0700
-+++ PctestIpv4Raw.cc	2008-03-13 12:33:37.708748679 -0700
+--- a/PctestIpv4Raw.cc.t	2008-03-13 12:33:16.058194372 -0700
++++ b/PctestIpv4Raw.cc	2008-03-13 12:33:37.708748679 -0700
 @@ -101,7 +101,7 @@
  	return rc;
      }

srcpkgs/pchar/patches/no-SO_BSDCOMPAT-3.diff

@@ -1,5 +1,5 @@
---- PctestIpv6Udp.cc.t	2008-03-13 12:34:41.350681733 -0700
-+++ PctestIpv6Udp.cc	2008-03-13 12:34:52.625368131 -0700
+--- a/PctestIpv6Udp.cc.t	2008-03-13 12:34:41.350681733 -0700
++++ b/PctestIpv6Udp.cc	2008-03-13 12:34:52.625368131 -0700
 @@ -73,7 +73,7 @@
  	return socketOut;
      }

srcpkgs/pchar/patches/no-SO_BSDCOMPAT.diff

@@ -1,5 +1,5 @@
---- PctestIpv4Udp.cc.t	2008-03-13 12:32:02.312337354 -0700
-+++ PctestIpv4Udp.cc	2008-03-13 12:32:19.682770489 -0700
+--- a/PctestIpv4Udp.cc.t	2008-03-13 12:32:02.312337354 -0700
++++ b/PctestIpv4Udp.cc	2008-03-13 12:32:19.682770489 -0700
 @@ -49,7 +49,7 @@
  	return socketOut;
      }

srcpkgs/pchar/template

@@ -9,7 +9,6 @@ license="custom"
 homepage="http://www.kitchenlab.org/www/bmah/Software/pchar/"
 distfiles="http://www.kitchenlab.org/www/bmah/Software/pchar/${pkgname}-${version}.tar.gz"
 checksum=7019297084f1000557a019501532ecae67772851717329cc02227f5c17e36d27
-patch_args=-Np0
 
 do_install() {
 	vbin pchar

srcpkgs/pcsclite/patches/python3.patch

@@ -1,5 +1,5 @@
---- src/spy/pcsc-spy.orig	2019-12-26 20:48:20.222069705 +0700
-+++ src/spy/pcsc-spy	2019-12-26 20:48:41.407288561 +0700
+--- a/src/spy/pcsc-spy	2019-12-26 20:48:20.222069705 +0700
++++ b/src/spy/pcsc-spy	2019-12-26 20:48:41.407288561 +0700
 @@ -1,4 +1,4 @@
 -#! /usr/bin/python
 +#!/usr/bin/python3

srcpkgs/pcsclite/template

@@ -14,7 +14,6 @@ license="BSD-2-Clause"
 homepage="https://salsa.debian.org/debian/pcsc-lite"
 distfiles="https://salsa.debian.org/debian/pcsc-lite/-/archive/upstream/${version}/pcsc-lite-upstream-${version}.tar.gz"
 checksum=686fbd1c29e282388111f01b6fdfa4fe6b8349908236645b869115b21e4f73e8
-patch_args=-Np0
 
 post_install() {
 	vsv pcscd

srcpkgs/pcsx2/patches/6b7f20a9e048e4bd9d7760cb72e6335aee8155d4.patch

@@ -10,8 +10,8 @@ closes #2796
 
 diff --git pcsx2/gui/AppAssert.cpp pcsx2/gui/AppAssert.cpp
 index a282715c4e..4ce151f86f 100644
---- pcsx2/gui/AppAssert.cpp
-+++ pcsx2/gui/AppAssert.cpp
+--- a/pcsx2/gui/AppAssert.cpp
++++ b/pcsx2/gui/AppAssert.cpp
 @@ -19,6 +19,7 @@
  
  #include <wx/stackwalk.h>

srcpkgs/pcsx2/template

@@ -2,7 +2,6 @@
 archs="i686*"
 lib32mode="full"
 nopie=yes
-patch_args=-Np0
 
 pkgname=pcsx2
 version=1.6.0

srcpkgs/pd/patches/musl-no-qsort_r.patch

@@ -1,7 +1,7 @@
 Index: src/x_text.c
 ===================================================================
---- src/x_text.c.orig
-+++ src/x_text.c
+--- a/src/x_text.c
++++ b/src/x_text.c
 @@ -475,7 +475,8 @@ equal:
   * Both are not available in Emscripten, Android or older MSVC versions.
   * 'stupid_sortcompare' is thread-safe but not reentrant.

srcpkgs/pd/template

@@ -15,7 +15,6 @@ license="BSD-3-Clause"
 homepage="https://puredata.info"
 distfiles="http://msp.ucsd.edu/Software/pd-$_ver.src.tar.gz"
 checksum=52591f18316e9f2471ca21c3d6b41c56336e0615ec40a093232e95cc230bfcc1
-patch_args=-Np0
 
 pre_configure() {
 	./autogen.sh

srcpkgs/pdfgrep/patches/fix-musl.patch

@@ -1,7 +1,7 @@
 diff --git a/src/pdfgrep.cc b/src/pdfgrep.cc
 index 7f8bdf8..5283e16 100644
---- ./src/pdfgrep.cc
-+++ ./src/pdfgrep.cc
+--- a/src/pdfgrep.cc
++++ b/src/pdfgrep.cc
 @@ -460,7 +460,9 @@ int main(int argc, char** argv)
         // Set locale to user-preference. If this locale is an UTF-8 locale, the
         // regex-functions regcomp/regexec become unicode aware, which means

srcpkgs/pdfgrep/template

@@ -11,4 +11,3 @@ license="GPL-2.0-or-later"
 homepage="https://pdfgrep.org"
 distfiles="https://pdfgrep.org/download/pdfgrep-${version}.tar.gz"
 checksum=0ef3dca1d749323f08112ffe68e6f4eb7bc25f56f90a2e933db477261b082aba
-patch_args=-Np0

srcpkgs/pdfsandwich/patches/00-fix-tesseract-path.patch

@@ -1,7 +1,7 @@
 diff --git pdfsandwich.ml pdfsandwich.ml
 index 10c92a0..c32f803 100644
---- pdfsandwich.ml
-+++ pdfsandwich.ml
+--- a/pdfsandwich.ml
++++ b/pdfsandwich.ml
 @@ -19,7 +19,7 @@ let global_temp_dir = Filename.temp_file "pdfsandwich_tmp" "";;
  let unpaper = ref "unpaper";;
  let identify = ref "identify";;

srcpkgs/pdfsandwich/template

@@ -12,4 +12,3 @@ license="GPL-2.0-only"
 homepage="http://www.tobias-elze.de/pdfsandwich/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
 checksum=9795ffea84b9b6b501f38d49a4620cf0469ddf15aac31bac6dbdc9ec1716fa39
-patch_args=-Np0

srcpkgs/pdsh/patches/fix_configure_ac.patch

@@ -1,7 +1,7 @@
 configure.ac relies on git, which doesn't work for release tarball.
 See: https://github.com/chaos/pdsh/issues/116
---- configure.ac	2017-06-28 19:28:26.000000000 -0500
-+++ configure.ac	2019-09-11 08:41:27.613006239 -0500
+--- a/configure.ac	2017-06-28 19:28:26.000000000 -0500
++++ b/configure.ac	2019-09-11 08:41:27.613006239 -0500
 @@ -4,12 +4,11 @@
  # Copyright (C) 2000-2002 Regents of the University of California
  # See ./DISCLAIMER

srcpkgs/pdsh/template

@@ -26,7 +26,6 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/chaos/pdsh"
 distfiles="https://github.com/chaos/pdsh/archive/pdsh-${version}.tar.gz"
 checksum=36e1b3c734ae9b4baf054c656b9735206cc56b290d2c0ec4f7825cdd9f7dff54
-patch_args=-Np0
 
 build_options="rsh exec ssh mrsh xcpu netgroup readline"
 build_options_default="rsh exec ssh mrsh readline"

srcpkgs/pekwm/patches/sysconfdir.patch

@@ -1,5 +1,5 @@
---- CMakeLists.txt	2021-03-01 07:37:20.447294425 -0500
-+++ CMakeLists.txt	2021-03-01 07:39:40.222030571 -0500
+--- a/CMakeLists.txt	2021-03-01 07:37:20.447294425 -0500
++++ b/CMakeLists.txt	2021-03-01 07:39:40.222030571 -0500
 @@ -10,6 +10,9 @@
  set(pekwm_VERSION_PATCH 18)
  set(pekwm_VERSION "${pekwm_VERSION_MAJOR}.${pekwm_VERSION_MINOR}.${pekwm_VERSION_PATCH}")
@@ -19,8 +19,8 @@
  set(CMAKE_INSTALL_RPATH_USE_LINK_PATH True)
  
  # Subdirectories
---- data/CMakeLists.txt.orig	2021-03-01 07:39:48.323015276 -0500
-+++ data/CMakeLists.txt	2021-03-01 07:40:19.475956467 -0500
+--- a/data/CMakeLists.txt	2021-03-01 07:39:48.323015276 -0500
++++ b/data/CMakeLists.txt	2021-03-01 07:40:19.475956467 -0500
 @@ -16,4 +16,4 @@
    mouse_sloppy
    start

srcpkgs/pekwm/template

@@ -15,4 +15,3 @@ homepage="https://www.pekwm.se/"
 distfiles="https://github.com/pekdon/pekwm/archive/release-${version}.tar.gz"
 checksum=e04e14ab7b212ec7c3a36e4c24b6228383df4ca3768f9fea7ba22dcd107d5d5a
 conf_files="/etc/pekwm/*"
-patch_args=-Np0

srcpkgs/perl-Authen-SASL/patches/inc.patch

@@ -1,5 +1,5 @@
---- Makefile.PL.orig
-+++ Makefile.PL
+--- a/Makefile.PL
++++ b/Makefile.PL
 @@ -3,6 +3,7 @@
  use strict;
  use warnings;

srcpkgs/perl-Authen-SASL/template

@@ -13,4 +13,3 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Authen-SASL"
 distfiles="${CPAN_SITE}/Authen/${pkgname/perl-/}-${version}.tar.gz"
 checksum=6614fa7518f094f853741b63c73f3627168c5d3aca89b1d02b1016dc32854e09
-patch_args=-Np0

srcpkgs/perl-Crypt-DH/patches/force_require_bigint_gmp.patch

@@ -1,5 +1,5 @@
---- Makefile.PL
-+++ Makefile.PL
+--- a/Makefile.PL
++++ b/Makefile.PL
 @@ -15,14 +15,8 @@ include 'ExtUtils::AutoInstall';
  
  perl_version '5.006';

srcpkgs/perl-Crypt-DH/template

@@ -13,4 +13,3 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Crypt-DH"
 distfiles="${CPAN_SITE}/Crypt/Crypt-DH-${version}.tar.gz"
 checksum=c88cf3423b01e6782e8986d7fe5304436ab84b0925c4498c6fdfa17ef9a37f5f
-patch_args=-Np0

srcpkgs/perl-Crypt-Rijndael/patches/use-stdint_h.patch

@@ -1,5 +1,5 @@
---- rijndael.h
-+++ rijndael.h
+--- a/rijndael.h
++++ b/rijndael.h
 @@ -72,6 +72,11 @@
  	typedef u_char    UINT8;
  #endif

srcpkgs/perl-Crypt-Rijndael/template

@@ -13,4 +13,3 @@ license="LGPL-2.0-or-later"
 homepage="https://metacpan.org/release/Crypt-Rijndael"
 distfiles="${CPAN_SITE}/Crypt/Crypt-Rijndael-${version}.tar.gz"
 checksum=6451c3dffe8703523be2bb08d1adca97e77df2a8a4dd46944d18a99330b7850e
-patch_args=-Np0

srcpkgs/perl-Fuse/patches/build-fix.patch

@@ -1,5 +1,5 @@
---- Fuse.xs	2013-09-13 06:16:35.000000000 +0400
-+++ Fuse.xs	2013-10-29 14:38:44.000000000 +0400
+--- a/Fuse.xs	2013-09-13 06:16:35.000000000 +0400
++++ b/Fuse.xs	2013-10-29 14:38:44.000000000 +0400
 @@ -754,6 +754,9 @@
  
  int _PLfuse_release (const char *file, struct fuse_file_info *fi) {
@@ -12,8 +12,8 @@
  	DEBUGf("release begin\n");
 diff --git Fuse.xs Fuse.xs
 index b41c761..266978b 100755
---- Fuse.xs
-+++ Fuse.xs
+--- a/Fuse.xs
++++ b/Fuse.xs
 @@ -2,7 +2,7 @@
  #include "EXTERN.h"
  #include "perl.h"

srcpkgs/perl-Fuse/template

@@ -13,4 +13,3 @@ license="LGPL-2.1-only"
 homepage="https://metacpan.org/release/Fuse"
 distfiles="${CPAN_SITE}/Fuse/Fuse-$version.tar.gz"
 checksum=30a939fe5816b00ba9cabb6cd811f894e6a74361ce29d786ae1811b0021d7aa1
-patch_args=-Np0

srcpkgs/perl-OpenGL/patches/0001-no_glversion.patch

@@ -1,5 +1,5 @@
---- Makefile.PL
-+++ Makefile.PL
+--- a/Makefile.PL
++++ b/Makefile.PL
 @@ -879,9 +879,9 @@ sub get_extensions
      my($key,$val) = split('=',$line);
      $gldata->{$key} = $val;
@@ -40,8 +40,8 @@
  
    # Make an empty exclusion file if a Windows distribution build
    if ($no_excl)
---- utils/Makefile
-+++ utils/Makefile
+--- a/utils/Makefile
++++ b/utils/Makefile
 @@ -21,7 +21,8 @@ EXTRALIBS=-lGLU -lXi -lXmu -lXext -lX11 -lm
  all: glversion.txt
  

srcpkgs/perl-OpenGL/template

@@ -13,4 +13,3 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/OpenGL"
 distfiles="${CPAN_SITE}/OpenGL/${pkgname#perl-}-${version}.tar.gz"
 checksum=b20e2af4404b4901ab35bba6ad5e3a8aa60bff72413c99288f01018c4cf874e0
-patch_args=-Np0

srcpkgs/perl-Text-BibTeX/patches/FORTIFY_SOURCE.patch

@@ -1,7 +1,7 @@
 Void Linux uses -D_FORTIFY_SOURCE=2. Remove the flag to not interfere (just in case).
 
---- inc/MyBuilder.pm.orig	2019-04-29 17:02:41.000000000 +0200
-+++ inc/MyBuilder.pm	2019-11-24 08:35:16.561126918 +0100
+--- a/inc/MyBuilder.pm	2019-04-29 17:02:41.000000000 +0200
++++ b/inc/MyBuilder.pm	2019-11-24 08:35:16.561126918 +0100
 @@ -208,7 +208,7 @@
          $object =~ s/\.c/.o/;
          next if $self->up_to_date($file, $object);

srcpkgs/perl-Text-BibTeX/patches/lib64.patch

@@ -1,5 +1,5 @@
---- Build.PL
-+++ Build.PL
+--- a/Build.PL
++++ b/Build.PL
 @@ -88,17 +88,7 @@ if ( $^O =~ /mswin32/i ) {
      }
  }

srcpkgs/perl-Text-BibTeX/template

@@ -13,7 +13,6 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Text-BibTeX/"
 distfiles="${CPAN_SITE}/Text/${pkgname/perl-/}-${version}.tar.gz"
 checksum=b014586e68bdbcafb0a2cfa0401eb0a04ea5de8c4d5bc36dd0f7faeab6acf42c
-patch_args=-Np0
 
 if [ "$CROSS_BUILD" ]; then
 	_perlprefix=${XBPS_STATEDIR}/perlprefix-${XBPS_TARGET_MACHINE}

srcpkgs/perl-Tk/patches/cross.patch

@@ -2,8 +2,8 @@ For libpng and libjpeg Makefile.PL tries to run a short test program to see if
 the system libraries can be used. From native builds we know they can so remove
 the test.
 
---- PNG/Makefile.PL.orig	2013-11-18 10:04:04.000000000 +0100
-+++ PNG/Makefile.PL	2018-09-14 09:31:08.785202470 +0200
+--- a/PNG/Makefile.PL	2013-11-18 10:04:04.000000000 +0100
++++ b/PNG/Makefile.PL	2018-09-14 09:31:08.785202470 +0200
 @@ -53,8 +53,7 @@
   $all_libs   = "$libpng_libs $zlib_libs";
  }
@@ -14,8 +14,8 @@ the test.
   {
    warn "Using system's -lpng\n";
    Tk::MMutil::TkExtMakefile(
---- JPEG/Makefile.PL.orig	2013-11-18 10:04:04.000000000 +0100
-+++ JPEG/Makefile.PL	2018-09-14 09:35:28.041623709 +0200
+--- a/JPEG/Makefile.PL	2013-11-18 10:04:04.000000000 +0100
++++ b/JPEG/Makefile.PL	2018-09-14 09:35:28.041623709 +0200
 @@ -6,7 +6,7 @@
  
  use Tk::MMtry;

srcpkgs/perl-Tk/template

@@ -14,7 +14,6 @@ homepage="https://metacpan.org/release/Tk"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 distfiles="${CPAN_SITE}/Tk/Tk-${version}.tar.gz"
 checksum=4d2b80291ba6de34d8ec886a085a6dbd2b790b926035a087e99025614c5ffdd4
-patch_args=-Np0
 
 post_configure() {
 	sed -i 's,X11/Xproto.h,,; s,X11/Xutil.h,,' pTk/Makefile

srcpkgs/perl-WWW-Curl/patches/curl-7.50.2.patch

@@ -1,7 +1,7 @@
 CPAN RT#132197
 
---- Makefile.PL
-+++ Makefile.PL
+--- a/Makefile.PL
++++ b/Makefile.PL
 @@ -127,7 +127,7 @@
      close H;
  
@@ -11,8 +11,8 @@ CPAN RT#132197
            next;
         }
         my ($group) = $e =~ m/^([^_]+_)/;
---- Curl.xs
-+++ Curl.xs
+--- a/Curl.xs
++++ b/Curl.xs
 @@ -18,6 +18,10 @@
  #include <curl/easy.h>
  #include <curl/multi.h>

srcpkgs/perl-WWW-Curl/template

@@ -13,7 +13,6 @@ homepage="https://metacpan.org/release/WWW-Curl"
 license="MIT"
 distfiles="${CPAN_SITE}/WWW/WWW-Curl-$version.tar.gz"
 checksum=52ffab110e32348d775f241c973eb56f96b08eedbc110d77d257cdb0a24ab7ba
-patch_args=-Np0
 
 post_install() {
 	vlicense LICENSE

srcpkgs/perl-XML-LibXSLT/patches/fix-cross-remove-have_library.patch

@@ -2,8 +2,8 @@ Remove the 'have_library()' check. It breaks cross compilation.
 The checked for libxslt and libexslt are pulled in via makedepends
 and therefore do exist, anyway.
 
---- Makefile.PL.orig
-+++ Makefile.PL
+--- a/Makefile.PL
++++ b/Makefile.PL
 @@ -157,20 +157,8 @@
      $config{LIBS} .= $::is_Win32 ? '' :' -lm';
  }

srcpkgs/perl-XML-LibXSLT/template

@@ -13,4 +13,3 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/XML-LibXSLT/"
 distfiles="${CPAN_SITE}/XML/${pkgname/perl-/}-${version}.tar.gz"
 checksum=127e17a877fb61e47b9e8b87bf8daad31339a62a00121f9751d522b438b0f7f0
-patch_args=-Np0

srcpkgs/perl-XML-SAX/patches/fix-installation.patch

@@ -2,8 +2,8 @@ Source: maxice8
 Upstream: No
 Reason: Fixes installation
 
---- Makefile.PL
-+++ Makefile.PL
+--- a/Makefile.PL
++++ b/Makefile.PL
 @@ -12,43 +12,3 @@ WriteMakefile(
          'XML::NamespaceSupport' => 0.03,
      },    

srcpkgs/perl-XML-SAX/template

@@ -13,4 +13,3 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/XML-SAX"
 distfiles="${CPAN_SITE}/XML/XML-SAX-${version}.tar.gz"
 checksum=4506c387043aa6a77b455f00f57409f3720aa7e553495ab2535263b4ed1ea12a
-patch_args=-Np0

srcpkgs/perl/patches/D-SHA-CFLAGS.diff

@@ -14,8 +14,8 @@ Original-By: Matthias Maier <tamiko@gentoo.org>
 
 diff --git a/cpan/Digest-SHA/Makefile.PL b/cpan/Digest-SHA/Makefile.PL
 index af2c0c3..65f4771 100644
---- cpan/Digest-SHA/Makefile.PL
-+++ cpan/Digest-SHA/Makefile.PL
+--- a/cpan/Digest-SHA/Makefile.PL
++++ b/cpan/Digest-SHA/Makefile.PL
 @@ -64,12 +64,6 @@ if ($^O eq 'VMS') {
  	}
  }

srcpkgs/perl/patches/cleanup-paths.diff

@@ -1,5 +1,5 @@
---- Configure
-+++ Configure
+--- a/Configure
++++ b/Configure
 @@ -107,28 +107,6 @@
  	fi
  fi

srcpkgs/perl/patches/cpan_definstalldirs.diff

@@ -16,8 +16,8 @@ Patch-Name: gentoo/cpan_definstalldirs.diff
 
 diff --git a/cpan/CPAN/lib/CPAN/FirstTime.pm b/cpan/CPAN/lib/CPAN/FirstTime.pm
 index 5030ef9..5953cb7 100644
---- cpan/CPAN/lib/CPAN/FirstTime.pm
-+++ cpan/CPAN/lib/CPAN/FirstTime.pm
+--- a/cpan/CPAN/lib/CPAN/FirstTime.pm
++++ b/cpan/CPAN/lib/CPAN/FirstTime.pm
 @@ -990,7 +990,7 @@ sub init {
      my_prompt_loop(prefer_installer => 'MB', $matcher, 'MB|EUMM|RAND');
  

srcpkgs/perl/patches/cross-Makefile.SH.patch

@@ -1,5 +1,5 @@
---- Makefile.SH.orig	2015-06-16 13:22:55.921083153 +0200
-+++ Makefile.SH	2015-06-16 13:26:14.198352302 +0200
+--- a/Makefile.SH	2015-06-16 13:22:55.921083153 +0200
++++ b/Makefile.SH	2015-06-16 13:26:14.198352302 +0200
 @@ -311,6 +311,7 @@
  OBJ_EXT = $_o
  PATH_SEP = $p_

srcpkgs/perl/patches/drop_fstack_protector.diff

@@ -11,8 +11,8 @@ Original by Torsten Veller, ported to perl 5.20
 
 
 diff -ruN perl-5.24.0-RC5.orig/Configure perl-5.24.0-RC5/Configure
---- Configure	2016-04-27 00:11:09.000000000 +0200
-+++ Configure	2016-05-05 21:32:53.575232970 +0200
+--- a/Configure	2016-04-27 00:11:09.000000000 +0200
++++ b/Configure	2016-05-05 21:32:53.575232970 +0200
 @@ -5474,23 +5474,6 @@
  	# is to add the flag to the flags passed to the compiler at link time,
  	# as that way the compiler can do the right implementation dependant

srcpkgs/perl/patches/usr_local.diff

@@ -14,8 +14,8 @@ Original-By: Torsten Veller <tove@gentoo.org>
 
 diff --git a/Configure b/Configure
 index 63b8848..d0a3c28 100755
---- Configure
-+++ Configure
+--- a/Configure
++++ b/Configure
 @@ -1315,8 +1315,7 @@ archobjs=''
  archname=''
  : Possible local include directories to search.

srcpkgs/perl/template

@@ -16,7 +16,6 @@ distfiles="https://www.cpan.org/src/5.0/perl-${version}.tar.gz
  https://github.com/arsv/perl-cross/releases/download/${_perl_cross_version}/perl-cross-${_perl_cross_version}.tar.gz"
 checksum="03b693901cd8ae807231b1787798cf1f2e0b8a56218d07b7da44f784a7caeb2c
  91c66f6b2b99fccfd4fee14660b677380b0c98f9456359e91449798c2ad2ef25"
-patch_args=-Np0
 
 # Before updating this package to a new major version, run ${FILESDIR}/provides.pl
 # against ${wrksrc} to find the list of built in packages.

srcpkgs/pgadmin3/patches/pgadmin3-fix-segfault.patch

@@ -1,7 +1,7 @@
 https://bugs.archlinux.org/task/52683
 
---- pgadmin/frm/plugins.cpp
-+++ pgadmin/frm/plugins.cpp
+--- a/pgadmin/frm/plugins.cpp
++++ b/pgadmin/frm/plugins.cpp
 @@ -380,7 +380,7 @@ bool pluginUtilityFactory::CheckEnable(p
  	{
  		// If we need a specific server type, we can't enable unless

srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch

@@ -1,6 +1,6 @@
 diff -rupN configure.ac.in configure.ac.in
---- configure.ac.in	2020-03-24 05:15:11.000000000 +0100
-+++ configure.ac.in	2020-04-09 14:54:07.189090418 +0200
+--- a/configure.ac.in	2020-03-24 05:15:11.000000000 +0100
++++ b/configure.ac.in	2020-04-09 14:54:07.189090418 +0200
 @@ -26,7 +26,6 @@ AC_CHECK_HEADERS([errno.h fcntl.h stdio.
  AC_CHECK_HEADERS([sys/select.h sys/socket.h sys/ioctl.h sys/time.h])
  AC_CHECK_HEADERS([sys/un.h], [have_sys_un_h=yes], [have_sys_un_h=no])
@@ -10,8 +10,8 @@ diff -rupN configure.ac.in configure.ac.in
  # Checks for typedefs, structures, and compiler characteristics.
  AC_HEADER_STDBOOL
 diff -rupN pgadmin/include/module.mk pgadmin/include/module.mk
---- pgadmin/include/module.mk	2020-03-24 05:15:11.000000000 +0100
-+++ pgadmin/include/module.mk	2020-04-09 14:54:07.190090419 +0200
+--- a/pgadmin/include/module.mk	2020-03-24 05:15:11.000000000 +0100
++++ b/pgadmin/include/module.mk	2020-04-09 14:54:07.190090419 +0200
 @@ -36,5 +36,4 @@ include include/gqb/module.mk
  include include/hotdraw/module.mk
  include include/utils/module.mk
@@ -19,8 +19,8 @@ diff -rupN pgadmin/include/module.mk pgadmin/include/module.mk
 -include include/libssh2/module.mk
  
 diff -rupN pgadmin/Makefile.am pgadmin/Makefile.am
---- pgadmin/Makefile.am	2020-03-24 05:15:11.000000000 +0100
-+++ pgadmin/Makefile.am	2020-04-09 14:54:09.880094260 +0200
+--- a/pgadmin/Makefile.am	2020-03-24 05:15:11.000000000 +0100
++++ b/pgadmin/Makefile.am	2020-04-09 14:54:09.880094260 +0200
 @@ -49,7 +49,6 @@ include gqb/module.mk
  include hotdraw/module.mk
  include ui/module.mk
@@ -55,8 +55,8 @@ diff -rupN pgadmin/Makefile.am pgadmin/Makefile.am
  install-exec-hook:
  	cd $(bindir) ;\
 diff -rupN pgadmin/utils/sshTunnel.cpp pgadmin/utils/sshTunnel.cpp
---- pgadmin/utils/sshTunnel.cpp	2020-03-24 05:15:11.000000000 +0100
-+++ pgadmin/utils/sshTunnel.cpp	2020-04-09 14:54:07.191090420 +0200
+--- a/pgadmin/utils/sshTunnel.cpp	2020-03-24 05:15:11.000000000 +0100
++++ b/pgadmin/utils/sshTunnel.cpp	2020-04-09 14:54:07.191090420 +0200
 @@ -15,7 +15,7 @@
  
  #undef ssize_t

srcpkgs/pgadmin3/template

@@ -13,7 +13,6 @@ homepage="http://www.pgadmin.org"
 distfiles="https://ftp.postgresql.org/pub/pgadmin/pgadmin3/v${version}/src/pgadmin3-${version}.tar.gz"
 checksum=9b68b0e3d3f0a261344fb8196825967d1e7acaca1d8cc82c42e12368ca5844ac
 nocross=yes
-patch_args=-Np0
 
 CXXFLAGS="-Wno-narrowing"
 

srcpkgs/php/patches/php-706-crypt.patch

@@ -1,5 +1,5 @@
---- ext/standard/crypt.c.orig	2016-04-28 14:13:00.000000000 -0400
-+++ ext/standard/crypt.c	2016-04-28 21:45:24.340955313 -0400
+--- a/ext/standard/crypt.c	2016-04-28 14:13:00.000000000 -0400
++++ b/ext/standard/crypt.c	2016-04-28 21:45:24.340955313 -0400
 @@ -267,6 +267,12 @@
  	}
  # elif defined(HAVE_CRYPT)

srcpkgs/php/patches/php-cross-config.patch

@@ -1,5 +1,5 @@
---- configure	2020-03-17 11:40:20.000000000 +0100
-+++ configure	2020-04-12 19:51:57.216350534 +0200
+--- a/configure	2020-03-17 11:40:20.000000000 +0100
++++ b/configure	2020-04-12 19:51:57.216350534 +0200
 @@ -6374,10 +6374,12 @@ IFS="- /.
      as_fn_error $? "Please note that Apache version >= 2.0.44 is required" "$LINENO" 5
    fi