srcpkgs/v*: convert patches to -Np1

```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 ```
2021-06-19 10:03:21 +07:00 · 2021-06-19 10:03:21 +07:00 · 76acfa2dd2
parent 5769f150de
commit 76acfa2dd2
78 changed files with 166 additions and 189 deletions
--- a/srcpkgs/v4l-utils/patches/musl.patch
+++ b/srcpkgs/v4l-utils/patches/musl.patch
@ -1,5 +1,5 @@
--- utils/ir-ctl/ir-ctl.c.orig	2017-01-25 17:27:44.373665101 +0000
-+++ utils/ir-ctl/ir-ctl.c	2017-01-25 17:27:51.052665445 +0000
+--- a/utils/ir-ctl/ir-ctl.c	2017-01-25 17:27:44.373665101 +0000
+++ b/utils/ir-ctl/ir-ctl.c	2017-01-25 17:27:51.052665445 +0000
@@ -44,6 +44,24 @@
 
 # define N_(string) string
@ -25,8 +25,8 @@
 
 /* See drivers/media/rc/ir-lirc-codec.c line 23 */
 #define LIRCBUF_SIZE	512
--- lib/libdvbv5/dvb-dev-local.c
-+++ lib/libdvbv5/dvb-dev-local.c
+--- a/lib/libdvbv5/dvb-dev-local.c
+++ b/lib/libdvbv5/dvb-dev-local.c
@@ -60,6 +60,16 @@ struct dvb_dev_local_priv {
 	void *user_priv;
 };
--- a/srcpkgs/v4l-utils/template
+++ b/srcpkgs/v4l-utils/template
@ -14,7 +14,6 @@ homepage="http://freshmeat.net/projects/libv4l"
 distfiles="http://linuxtv.org/downloads/${pkgname}/${pkgname}-${version}.tar.bz2"
 checksum=956118713f7ccb405c55c7088a6a2490c32d54300dd9a30d8d5008c28d3726f7
 conf_files="/etc/rc_maps.cfg"
-patch_args=-Np0

 case "$XBPS_TARGET_MACHINE" in
 	*-musl) makedepends+=" argp-standalone"
--- a/srcpkgs/vala-panel/patches/wayland.patch
+++ b/srcpkgs/vala-panel/patches/wayland.patch
@ -1,5 +1,5 @@
--- meson.build.orig	2020-11-23 23:23:28.989158257 +0700
-+++ meson.build	2020-11-23 23:24:02.056503894 +0700
+--- a/meson.build	2020-11-23 23:23:28.989158257 +0700
+++ b/meson.build	2020-11-23 23:24:02.056503894 +0700
@@ -90,8 +90,8 @@
 conf_data.set('PLUGINS_DATA', applets_datadir)
 conf_data.set('DATADIR', project_datadir)
--- a/srcpkgs/vala-panel/template
+++ b/srcpkgs/vala-panel/template
@ -13,7 +13,6 @@ license="LGPL-3.0-or-later"
 homepage="https://gitlab.com/vala-panel-project/vala-panel"
 distfiles="https://gitlab.com/vala-panel-project/vala-panel/uploads/$_glhash/vala-panel-${version}.tar.xz"
 checksum=ee3a9e000133da43b218ecd1738463c2de3f45783a5a09a11b9c263df4e233d1
-patch_args=-Np0

 # Package build options
 build_options="wayland"
--- a/srcpkgs/valabind/patches/0002-vala-0.50-fix.patch
+++ b/srcpkgs/valabind/patches/0002-vala-0.50-fix.patch
@ -9,8 +9,8 @@ Subject: vala-0.50 fix

 diff --git valabindwriter.vala valabindwriter.vala
 index 5b71abd..d9e36fd 100644
--- valabindwriter.vala
-+++ valabindwriter.vala
+--- a/valabindwriter.vala
+++ b/valabindwriter.vala
@@ -36,7 +36,7 @@ public class ValabindWriter : CodeVisitor {
 #if VALA_0_50
 		// required to avoid ugly runtime errors
--- a/srcpkgs/valabind/patches/cross.patch
+++ b/srcpkgs/valabind/patches/cross.patch
@ -1,5 +1,5 @@
--- meson.build
-+++ meson.build
+--- a/meson.build
+++ b/meson.build
@@ -26,7 +26,8 @@ libvala_dep = dependency('libvala-@0@'.format(libvala_version))
 glib_dep = dependency('glib-2.0')
 gobject_dep = dependency('gobject-2.0')
--- a/srcpkgs/valabind/template
+++ b/srcpkgs/valabind/template
@ -12,4 +12,3 @@ license="GPL-3.0-or-later"
 homepage="https://radare.org/r/"
 distfiles="https://github.com/radare/valabind/archive/${version}.tar.gz"
 checksum=643c1ddc85e31de975df361a20e3f39d385f5ced0e50483c6e96b33bb3d32261
-patch_args=-Np0
--- a/srcpkgs/vanitygen/patches/4b814a646873c8439d3b5ee3a2278e727575521f.patch
+++ b/srcpkgs/vanitygen/patches/4b814a646873c8439d3b5ee3a2278e727575521f.patch
@ -29,8 +29,8 @@ Subject: [PATCH] Fix OpenSSL 1.1.0 incompatibilities (#56)

 diff --git a/keyconv.c b/keyconv.c
 index f7475e5..394c3a0 100644
--- keyconv.c
-+++ keyconv.c
+--- a/keyconv.c
+++ b/keyconv.c
@@ -1160,7 +1160,7 @@ main(int argc, char **argv)
 
 	if (key2_in) {
@ -70,8 +70,8 @@ index f7475e5..394c3a0 100644
 
 diff --git a/oclengine.c b/oclengine.c
 index 4085edd..6f65846 100644
--- oclengine.c
-+++ oclengine.c
+--- a/oclengine.c
+++ b/oclengine.c
@@ -43,6 +43,34 @@
 #include "pattern.h"
 #include "util.h"
@ -339,8 +339,8 @@ index 4085edd..6f65846 100644
 
 diff --git a/pattern.c b/pattern.c
 index b84334e..5673a7e 100644
--- pattern.c
-+++ pattern.c
+--- a/pattern.c
+++ b/pattern.c
@@ -151,12 +151,12 @@ vg_exec_context_init(vg_context_t *vcp, vg_exec_context_t *vxcp)
 
 	vxcp->vxc_vc = vcp;
@ -895,8 +895,8 @@ index b84334e..5673a7e 100644
 
 diff --git a/pattern.h b/pattern.h
 index 3ce2d1f..0b604ea 100644
--- pattern.h
-+++ pattern.h
+--- a/pattern.h
+++ b/pattern.h
@@ -51,10 +51,10 @@ struct _vg_exec_context_s {
 	EC_KEY				*vxc_key;
 	int				vxc_delta;
@ -914,8 +914,8 @@ index 3ce2d1f..0b604ea 100644
 	pthread_t			vxc_pthread;
 diff --git a/util.c b/util.c
 index 4f3cbb8..35cd592 100644
--- util.c
-+++ util.c
+--- a/util.c
+++ b/util.c
@@ -110,19 +110,19 @@ vg_b58_encode_check(void *buf, size_t len, char *result)
 
 	BN_CTX *bnctx;
@ -1137,8 +1137,8 @@ index 4f3cbb8..35cd592 100644
 
 diff --git a/vanitygen.c b/vanitygen.c
 index fb7925a..992e5d7 100644
--- vanitygen.c
-+++ vanitygen.c
+--- a/vanitygen.c
+++ b/vanitygen.c
@@ -94,8 +94,8 @@ vg_thread_loop(void *arg)
 		exit(1);
 	}
--- a/srcpkgs/vanitygen/patches/5f163e6fff7da52c4aecbd898d9df2e60a56f134.patch
+++ b/srcpkgs/vanitygen/patches/5f163e6fff7da52c4aecbd898d9df2e60a56f134.patch
@ -11,8 +11,8 @@ Fixes #114

 diff --git a/oclengine.c b/oclengine.c
 index 6585fc6..c69bd4b 100644
--- oclengine.c
-+++ oclengine.c
+--- a/oclengine.c
+++ b/oclengine.c
@@ -5,7 +5,7 @@
  * Vanitygen is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@ -68,8 +68,8 @@ index 6585fc6..c69bd4b 100644
 				while (vocp->voc_ocl_slot != -1) {
 diff --git a/vanitygen.c b/vanitygen.c
 index 992e5d7..5e49df7 100644
--- vanitygen.c
-+++ vanitygen.c
+--- a/vanitygen.c
+++ b/vanitygen.c
@@ -129,7 +129,15 @@ vg_thread_loop(void *arg)
 			EC_KEY_generate_key(pkey);
 			if (vcp->vc_privkey_prefix_length > 0) {
--- a/srcpkgs/vanitygen/template
+++ b/srcpkgs/vanitygen/template
@ -11,7 +11,6 @@ homepage="https://github.com/exploitagency/vanitygen-plus"
 changelog="https://raw.githubusercontent.com/exploitagency/vanitygen-plus/master/CHANGELOG"
 distfiles="https://github.com/exploitagency/vanitygen-plus/archive/PLUS${version}.tar.gz"
 checksum=976a9afe2a4470551a8b6b0da97101a3a2e6c54c5a26dc870ae755bb2d8c7041
-patch_args=-Np0

 do_build() {
 	make CC=$CC CFLAGS="$CFLAGS $LDFLAGS" ${makejobs}
--- a/srcpkgs/vapoursynth-editor/patches/project-file.patch
+++ b/srcpkgs/vapoursynth-editor/patches/project-file.patch
@ -1,7 +1,7 @@
 diff --git pro/pro.pro pro/pro.pro
 index d698c82..cbc4f61 100644
--- pro/pro.pro
-+++ pro/pro.pro
+--- a/pro/pro.pro
+++ b/pro/pro.pro
@@ -1,9 +1,9 @@
 TEMPLATE = subdirs
 
--- a/srcpkgs/vapoursynth-editor/template
+++ b/srcpkgs/vapoursynth-editor/template
@ -14,7 +14,6 @@ license="MIT"
 homepage="https://bitbucket.org/mystery_keeper/vapoursynth-editor"
 distfiles="${homepage}/get/r${version}.tar.gz"
 checksum=41e09a6c1411536f7a223a16263145b31de4715189cfe2ebe62b4ad69d6ec342
-patch_args=-Np0

 pre_configure() {
 	mv pro/pro.pro .
--- a/srcpkgs/varnish/patches/musl.patch
+++ b/srcpkgs/varnish/patches/musl.patch
@ -1,5 +1,5 @@
--- include/vpf.h	2016-03-03 14:40:01.000000000 +0100
-+++ include/vpf.h	2018-01-11 11:45:26.521900821 +0100
+--- a/include/vpf.h	2016-03-03 14:40:01.000000000 +0100
+++ b/include/vpf.h	2018-01-11 11:45:26.521900821 +0100
@@ -30,6 +30,8 @@
 #ifndef VPF_H_INCLUDED
 #define VPF_H_INCLUDED
@ -9,8 +9,8 @@
 struct vpf_fh;
 
 struct vpf_fh *VPF_Open(const char *path, mode_t mode, pid_t *pidptr);
--- include/vsb.h	2017-11-14 14:39:22.000000000 +0100
-+++ include/vsb.h	2018-01-11 11:48:15.505912873 +0100
+--- a/include/vsb.h	2017-11-14 14:39:22.000000000 +0100
+++ b/include/vsb.h	2018-01-11 11:48:15.505912873 +0100
@@ -31,6 +31,8 @@
 #ifndef VSB_H_INCLUDED
 #define VSB_H_INCLUDED
--- a/srcpkgs/varnish/template
+++ b/srcpkgs/varnish/template
@ -13,7 +13,6 @@ homepage="https://varnish-cache.org/"
 distfiles="https://varnish-cache.org/_downloads/${pkgname}-${version}.tgz"
 checksum=d5ff82f2041276dfaeb9a652a88b6d7287cfcf7ca345bb02c438fb65d2bca2e5
 lib32disabled=yes
-patch_args=-Np0

 build_options="pcrejit"

--- a/srcpkgs/vba-m/patches/x86-asm.patch
+++ b/srcpkgs/vba-m/patches/x86-asm.patch
@ -12,8 +12,8 @@ Signed-off-by: Rafael Kitover <rkitover@gmail.com>

 diff --git src/filters/xBRZ/xbrz.cpp src/filters/xBRZ/xbrz.cpp
 index 36d70be26..13e6cdc13 100644
--- src/filters/xBRZ/xbrz.cpp
-+++ src/filters/xBRZ/xbrz.cpp
+--- a/src/filters/xBRZ/xbrz.cpp
+++ b/src/filters/xBRZ/xbrz.cpp
@@ -66,17 +66,17 @@ uint32_t gradientARGB(uint32_t pixFront, uint32_t pixBack) //find intermediate c
 
 inline double fastSqrt(double n)
--- a/srcpkgs/vba-m/template
+++ b/srcpkgs/vba-m/template
@ -16,4 +16,3 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/visualboyadvance-m/visualboyadvance-m/"
 distfiles="https://github.com/visualboyadvance-m/visualboyadvance-m/archive/v${version}.tar.gz"
 checksum=8342e017212842de66b0d86bc7610c82349af2d4e59951d969a33fff956c39ba
-patch_args=-Np0
--- a/srcpkgs/vboot-utils/patches/format-glibc.patch
+++ b/srcpkgs/vboot-utils/patches/format-glibc.patch
@ -14,8 +14,8 @@ Date:   Sun Feb 21 00:45:12 2021 -0300

 diff --git Makefile Makefile
 index 3a72d3d..0f9caa4 100644
--- Makefile
-+++ Makefile
+--- a/Makefile
+++ b/Makefile
@@ -252,7 +252,7 @@ CFLAGS += -D_GNU_SOURCE
 # but if the environment doesn't support it, at least compile support
 # for what is possible.
@ -27,8 +27,8 @@ index 3a72d3d..0f9caa4 100644
 # Code coverage
 diff --git futility/cmd_gbb_utility.c futility/cmd_gbb_utility.c
 index 2a76ecb..ab0d568 100644
--- futility/cmd_gbb_utility.c
-+++ futility/cmd_gbb_utility.c
+--- a/futility/cmd_gbb_utility.c
+++ b/futility/cmd_gbb_utility.c
@@ -225,7 +225,7 @@ static uint8_t *read_entire_file(const char *filename, off_t *sizeptr)
 	buf = (uint8_t *) malloc(sb.st_size);
 	if (!buf) {
--- a/srcpkgs/vboot-utils/template
+++ b/srcpkgs/vboot-utils/template
@ -18,7 +18,6 @@ checksum=@3d8edd7e3a1672b29f02d93c4cf89f19ad7477694968b0653aa968783c8ba3e6
 # 2crypto specifies a section for some variables, which lead to text relocations in the binary
 # let's play it safe and disable PIE
 nopie=yes
-patch_args=-Np0

 case $XBPS_TARGET_MACHINE in
 	x86_64*) _arch=x86_64 ;;
--- a/srcpkgs/vde2/patches/musl.patch
+++ b/srcpkgs/vde2/patches/musl.patch
@ -1,7 +1,7 @@
 diff --git src/vde_switch/plugins/dump.c src/vde_switch/plugins/dump.c
 index 6132158..e7da1e6 100644
--- src/vde_switch/plugins/dump.c
-+++ src/vde_switch/plugins/dump.c
+--- a/src/vde_switch/plugins/dump.c
+++ b/src/vde_switch/plugins/dump.c
@@ -2,6 +2,7 @@

 #include <stdio.h>
@ -12,8 +12,8 @@ index 6132158..e7da1e6 100644
 #include <vde.h>
 diff --git src/vdetaplib/libvdetap.c src/vdetaplib/libvdetap.c
 index 00cd401..843a14e 100644
--- src/vdetaplib/libvdetap.c
-+++ src/vdetaplib/libvdetap.c
+--- a/src/vdetaplib/libvdetap.c
+++ b/src/vdetaplib/libvdetap.c
@@ -102,6 +102,10 @@ void libvdetap_fini(void)
 	}
 }
--- a/srcpkgs/vde2/patches/vde_cryptcab-compile-against-openssl-1.1.0.patch
+++ b/srcpkgs/vde2/patches/vde_cryptcab-compile-against-openssl-1.1.0.patch
@ -3,8 +3,8 @@ Source: Taken from Arch repo
 https://raw.githubusercontent.com/archlinux/svntogit-packages/e4ea86ebebfc446113d858542cf23723f1b2a891/trunk/vde_cryptcab-compile-against-openssl-1.1.0.patch
 edited wto also support LIBRESSL

--- src/vde_cryptcab/cryptcab.c	2011-11-23 16:41:17.000000000 +0000
-+++ src/vde_cryptcab/cryptcab.c	2017-03-20 22:54:20.452975075 +0000
+--- a/src/vde_cryptcab/cryptcab.c	2011-11-23 16:41:17.000000000 +0000
+++ b/src/vde_cryptcab/cryptcab.c	2017-03-20 22:54:20.452975075 +0000
@@ -22,7 +22,7 @@
 	exit(1);
 }
--- a/srcpkgs/vde2/template
+++ b/srcpkgs/vde2/template
@ -19,7 +19,6 @@ license="GPL-2, LGPL-2.1, BSD"
 homepage="http://sourceforge.net/projects/vde/"
 distfiles="${SOURCEFORGE_SITE}/vde/vde2-$version.tar.bz2"
 checksum=cbea9b7e03097f87a6b5e98b07890d2275848f1fe4b9fcda77b8994148bc9542
-patch_args=-Np0

 lib32disabled=yes
 disable_parallel_build=yes
--- a/srcpkgs/vdirsyncer/patches/0001-Update-usage-of-deprecated-method.patch
+++ b/srcpkgs/vdirsyncer/patches/0001-Update-usage-of-deprecated-method.patch
@ -3,8 +3,8 @@ Upstream: Yes
 Reason: Python 3.9 compatibility fix.
 diff --git a/vdirsyncer/storage/dav.py b/vdirsyncer/storage/dav.py
 index 07d164f..a7e2422 100644
--- vdirsyncer/storage/dav.py
-+++ vdirsyncer/storage/dav.py
+--- a/vdirsyncer/storage/dav.py
+++ b/vdirsyncer/storage/dav.py
@@ -124,7 +124,7 @@ def _merge_xml(items):
         return None
     rv = items[0]
--- a/srcpkgs/vdirsyncer/template
+++ b/srcpkgs/vdirsyncer/template
@ -12,7 +12,6 @@ license="BSD-3-Clause"
 homepage="https://vdirsyncer.pimutils.org/"
 distfiles="${PYPI_SITE}/v/vdirsyncer/vdirsyncer-${version}.tar.gz"
 checksum=bfdb422f52e1d4d60bd0635d203fb59fa7f613397d079661eb48e79464ba13c5
-patch_args=-Np0

 pre_build() {
 	sed -i setup.py \
--- a/srcpkgs/vdrift/patches/0001-Allow-to-override-build-date-with-SOURCE_DATE_EPOCH.patch
+++ b/srcpkgs/vdrift/patches/0001-Allow-to-override-build-date-with-SOURCE_DATE_EPOCH.patch
@ -15,8 +15,8 @@ Also use UTC/gmtime to be independent of timezone.

 diff --git SConstruct SConstruct
 index 950a5289..763f2e36 100644
--- SConstruct
-+++ SConstruct
+--- a/SConstruct
+++ b/SConstruct
@@ -1,5 +1,4 @@
 -import os, sys, errno, SCons
 -from time import gmtime, strftime
--- a/srcpkgs/vdrift/patches/0002-Scons-python-3-fixes.patch
+++ b/srcpkgs/vdrift/patches/0002-Scons-python-3-fixes.patch
@ -10,8 +10,8 @@ Subject: [PATCH 2/3] Scons python 3 fixes.

 diff --git SConstruct SConstruct
 index 763f2e36..f20e1745 100644
--- SConstruct
-+++ SConstruct
+--- a/SConstruct
+++ b/SConstruct
@@ -91,9 +91,9 @@ elif sys.platform == 'darwin':
 
     for a in env['universal']:
@ -49,8 +49,8 @@ index 763f2e36..f20e1745 100644
 env = conf.Finish()
 diff --git src/SConscript src/SConscript
 index c980a2e6..67cecebd 100644
--- src/SConscript
-+++ src/SConscript
+--- a/src/SConscript
+++ b/src/SConscript
@@ -151,7 +151,7 @@ src = Split("""
 		utils.cpp
 		window.cpp""")
--- a/srcpkgs/vdrift/patches/0003-SConstruct-Python-3-fix.patch
+++ b/srcpkgs/vdrift/patches/0003-SConstruct-Python-3-fix.patch
@ -10,8 +10,8 @@ Subject: [PATCH 3/3] SConstruct Python 3 fix

 diff --git SConstruct SConstruct
 index f20e1745..0e7f02e9 100644
--- SConstruct
-+++ SConstruct
+--- a/SConstruct
+++ b/SConstruct
@@ -140,11 +140,11 @@ else:
         CC = 'gcc', CXX = 'g++',
         options = opts)
--- a/srcpkgs/vdrift/patches/fix-gcc6.patch
+++ b/srcpkgs/vdrift/patches/fix-gcc6.patch
@ -1,5 +1,5 @@
--- src/graphics/model_obj.cpp
-+++ src/graphics/model_obj.cpp
+--- a/src/graphics/model_obj.cpp
+++ b/src/graphics/model_obj.cpp
@@ -221,7 +221,7 @@ bool ModelObj::Save(const std::string &
 	std::ofstream f(strFileName.c_str());
 	if (!f)
--- a/srcpkgs/vdrift/template
+++ b/srcpkgs/vdrift/template
@ -17,7 +17,6 @@ homepage="http://vdrift.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version//./-}.tar.bz2"
 checksum=458d45d59075c2ce943ec6bc271a5bd0eb6bc6ed123670b65038703345020be3
 python_version=2
-patch_args=-Np0

 post_install() {
 	# install .desktop file
--- a/srcpkgs/virglrenderer/patches/musl.patch
+++ b/srcpkgs/virglrenderer/patches/musl.patch
@ -10,8 +10,8 @@ Signed-off-by: Nathan Owens <ndowens04@gmail.com>

 diff --git vtest/vtest_server.c vtest/vtest_server.c
 index ed2f74b..ca2cca1 100644
--- vtest/vtest_server.c
-+++ vtest/vtest_server.c
+--- a/vtest/vtest_server.c
+++ b/vtest/vtest_server.c
@@ -33,7 +33,7 @@
 #include <fcntl.h>
 #include <getopt.h>
--- a/srcpkgs/virglrenderer/template
+++ b/srcpkgs/virglrenderer/template
@ -12,7 +12,6 @@ license="MIT"
 homepage="https://gitlab.freedesktop.org/virgl/virglrenderer"
 distfiles="https://gitlab.freedesktop.org/virgl/virglrenderer/-/archive/virglrenderer-${version}/virglrenderer-virglrenderer-${version}.tar.gz"
 checksum=9fa93095cd9a3e5b13c740e5e3b656a989356732bdaf3e22acb7c38a1f1f4411
-patch_args=-Np0

 post_install() {
 	vlicense COPYING
--- a/srcpkgs/virtualbox-ose/patches/005-gsoap-build.patch
+++ b/srcpkgs/virtualbox-ose/patches/005-gsoap-build.patch
@ -1,5 +1,5 @@
--- src/VBox/Main/webservice/Makefile.kmk	2016-08-16 22:00:21.000000000 +0200
-+++ src/VBox/Main/webservice/Makefile.kmk	2016-08-18 10:05:45.548857031 +0200
+--- a/src/VBox/Main/webservice/Makefile.kmk	2016-08-16 22:00:21.000000000 +0200
+++ b/src/VBox/Main/webservice/Makefile.kmk	2016-08-18 10:05:45.548857031 +0200
@@ -724,7 +724,7 @@
 		$(RECOMPILE_ON_MAKEFILE_CURRENT) | $$(dir $$@)
 	$(call MSG_GENERATE,,lots of files,$(GSOAPH_RELEVANT))
--- a/srcpkgs/virtualbox-ose/patches/008-no-vboxvideo.patch
+++ b/srcpkgs/virtualbox-ose/patches/008-no-vboxvideo.patch
@ -1,5 +1,5 @@
--- src/VBox/Additions/x11/vboxvideo/Makefile.kmk.orig	2016-10-11 02:49:23.184986182 +0100
-+++ src/VBox/Additions/x11/vboxvideo/Makefile.kmk	2016-10-11 02:49:39.879176964 +0100
+--- a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk	2016-10-11 02:49:23.184986182 +0100
+++ b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk	2016-10-11 02:49:39.879176964 +0100
@@ -376,7 +376,7 @@ vboxvideo_drv_118_SOURCES := $(vboxvideo
 
 ifdef VBOX_USE_SYSTEM_XORG_HEADERS
--- a/srcpkgs/virtualbox-ose/patches/013-Makefile.patch
+++ b/srcpkgs/virtualbox-ose/patches/013-Makefile.patch
@ -1,7 +1,7 @@
 diff --git a/src/VBox/HostDrivers/linux/Makefile b/src/VBox/HostDrivers/linux/Makefile
 index 18466b48..7c7de4e5 100644
--- src/VBox/HostDrivers/linux/Makefile
-+++ src/VBox/HostDrivers/linux/Makefile
+--- a/src/VBox/HostDrivers/linux/Makefile
+++ b/src/VBox/HostDrivers/linux/Makefile
@@ -23,25 +23,25 @@
 # terms and conditions of either the GPL or the CDDL or both.
 #
--- a/srcpkgs/virtualbox-ose/patches/016-disable-cloud.patch
+++ b/srcpkgs/virtualbox-ose/patches/016-disable-cloud.patch
@ -1,5 +1,5 @@
--- Config.kmk
-+++ Config.kmk
+--- a/Config.kmk
+++ b/Config.kmk
@@ -802,7 +802,7 @@ endif
 # Use new VBoxNetDhcpd instead of old VBoxNetDHCP
 VBOX_WITH_DHCPD = 1
--- a/srcpkgs/virtualbox-ose/patches/017-libvdeplug-soname.patch
+++ b/srcpkgs/virtualbox-ose/patches/017-libvdeplug-soname.patch
@ -4,8 +4,8 @@ Author: Felix Geyer <fgeyer@debian.org>

 Index: virtualbox/include/VBox/VDEPlugSymDefs.h
 ===================================================================
--- include/VBox/VDEPlugSymDefs.h
-+++ include/VBox/VDEPlugSymDefs.h
+--- a/include/VBox/VDEPlugSymDefs.h
+++ b/include/VBox/VDEPlugSymDefs.h
@@ -1,5 +1,5 @@
 /** @file
 - * Symbols from libvdeplug.so to be loaded at runtime for DrvVDE.cpp
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@ -10,7 +10,6 @@ homepage="https://www.virtualbox.org"
 changelog="https://www.virtualbox.org/wiki/Changelog"
 distfiles="http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"
 checksum=e690c91974a2e7a5aca2c0939ad514382f9a2136797a5e0b96aab778e42bc8a7
-patch_args=-Np0

 nopie=yes
 lib32disabled=yes
--- a/srcpkgs/virtuoso/patches/always-ieee-floats.patch
+++ b/srcpkgs/virtuoso/patches/always-ieee-floats.patch
@ -12,8 +12,8 @@ Fixes platforms for which this is not checked.

 diff --git libsrc/Dk/Dkmarshal.c libsrc/Dk/Dkmarshal.c
 index da15a21..b2b6c71 100644
--- libsrc/Dk/Dkmarshal.c
-+++ libsrc/Dk/Dkmarshal.c
+--- a/libsrc/Dk/Dkmarshal.c
+++ b/libsrc/Dk/Dkmarshal.c
@@ -31,25 +31,7 @@
 # include <netinet/in.h>			 /* for ntohl, htonl */
 #endif
--- a/srcpkgs/virtuoso/patches/fix-utf8-bittest.patch
+++ b/srcpkgs/virtuoso/patches/fix-utf8-bittest.patch
@ -2,8 +2,8 @@ Source: @pullmoll
 Upstream: no
 Reason: expression requires binary AND, not logical

--- libsrc/util/pcrelib/pcre_study.c	2018-08-16 01:06:21.000000000 +0200
-+++ libsrc/util/pcrelib/pcre_study.c	2020-01-27 15:44:57.715821355 +0100
+--- a/libsrc/util/pcrelib/pcre_study.c	2018-08-16 01:06:21.000000000 +0200
+++ b/libsrc/util/pcrelib/pcre_study.c	2020-01-27 15:44:57.715821355 +0100
@@ -432,7 +432,7 @@
           for (c = 0; c < 16; c++) start_bits[c] |= tcode[c];
           for (c = 128; c < 256; c++)
--- a/srcpkgs/virtuoso/patches/musl-page_size.patch
+++ b/srcpkgs/virtuoso/patches/musl-page_size.patch
@ -10,8 +10,8 @@ This fixes musl builds.

 diff --git libsrc/Dk/tlsf.h libsrc/Dk/tlsf.h
 index ddce478..a9687f4 100644
--- libsrc/Dk/tlsf.h
-+++ libsrc/Dk/tlsf.h
+--- a/libsrc/Dk/tlsf.h
+++ b/libsrc/Dk/tlsf.h
@@ -20,6 +20,7 @@
 #define _TLSF_H_
 
--- a/srcpkgs/virtuoso/patches/remove-openssl-version-check.patch
+++ b/srcpkgs/virtuoso/patches/remove-openssl-version-check.patch
@ -2,8 +2,8 @@ Source: @pullmoll
 Upstream: no
 Reason: Enable subdir-objects and strip openssl version check which fails for libressl

--- configure.ac	2018-08-16 01:06:21.000000000 +0200
-+++ configure.ac	2020-01-27 15:02:36.946922663 +0100
+--- a/configure.ac	2018-08-16 01:06:21.000000000 +0200
+++ b/configure.ac	2020-01-27 15:02:36.946922663 +0100
@@ -58,7 +58,7 @@
 dnl	AM_INIT_AUTOMAKE([1.8])
 dnl	AM_INIT_AUTOMAKE([1.9 tar-ustar])
--- a/srcpkgs/virtuoso/patches/ssl-connect-state.patch
+++ b/srcpkgs/virtuoso/patches/ssl-connect-state.patch
@ -2,8 +2,8 @@ Source: @pullmoll
 Upstream: no
 Reason: Use the proper interface of libressl which does not expose the internal structure of SSL

--- libsrc/Wi/http.c	2018-08-16 01:06:21.000000000 +0200
-+++ libsrc/Wi/http.c	2020-01-27 15:09:53.284905265 +0100
+--- a/libsrc/Wi/http.c	2018-08-16 01:06:21.000000000 +0200
+++ b/libsrc/Wi/http.c	2020-01-27 15:09:53.284905265 +0100
@@ -9949,7 +9949,7 @@
 	  cli_ssl_get_error_string (err_buf, sizeof (err_buf));
 	  sqlr_new_error ("42000", "..002", "SSL_do_handshake failed %s", err_buf);
--- a/srcpkgs/virtuoso/patches/ssl1.1.patch
+++ b/srcpkgs/virtuoso/patches/ssl1.1.patch
@ -22,8 +22,8 @@ Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
 libsrc/util/sslengine.c  |   6 +-
 7 files changed, 524 insertions(+), 254 deletions(-)

--- libsrc/Wi/bif_crypto.c
-+++ libsrc/Wi/bif_crypto.c
+--- a/libsrc/Wi/bif_crypto.c
+++ b/libsrc/Wi/bif_crypto.c
@@ -181,21 +181,26 @@ box_hmac (caddr_t box, caddr_t key, int
   unsigned char temp[EVP_MAX_MD_SIZE];
   unsigned int size = 0;
@ -381,8 +381,8 @@ Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
 		b = BIO_new (BIO_s_mem());
 		i2d_RSA_PUBKEY_bio (b, x);
 		len = BIO_get_mem_data (b, &data_ptr);
--- libsrc/Wi/xmlenc.c
-+++ libsrc/Wi/xmlenc.c
+--- a/libsrc/Wi/xmlenc.c
+++ b/libsrc/Wi/xmlenc.c
@@ -1215,36 +1215,45 @@ void xenc_key_remove (xenc_key_t * key,
 }
 
@ -932,8 +932,8 @@ Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
 	  caddr_t itm;
 	  int blen;
 	  BIO_reset (in);
--- libsrc/Wi/xmlenc.h
-+++ libsrc/Wi/xmlenc.h
+--- a/libsrc/Wi/xmlenc.h
+++ b/libsrc/Wi/xmlenc.h
@@ -38,6 +38,7 @@
 #include <openssl/dsa.h>
 #include <openssl/rsa.h>
@ -1126,8 +1126,8 @@ Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
 +
 #endif
 
--- libsrc/Wi/xmlenc_algos.c
-+++ libsrc/Wi/xmlenc_algos.c
+--- a/libsrc/Wi/xmlenc_algos.c
+++ b/libsrc/Wi/xmlenc_algos.c
@@ -1149,7 +1149,7 @@ int
 dsig_hmac_sha256_digest (dk_session_t * ses_in, long len, xenc_key_t * key, caddr_t * sign_out)
 {
@ -1357,8 +1357,8 @@ Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
     {
       if (key->xek_x509_KI)
 	key = xenc_get_key_by_keyidentifier (key->xek_x509_KI, 1);
--- libsrc/util/sslengine.c
-+++ libsrc/util/sslengine.c
+--- a/libsrc/util/sslengine.c
+++ b/libsrc/util/sslengine.c
@@ -29,7 +29,11 @@
 int
 ssl_engine_startup (void)
@ -1372,8 +1372,8 @@ Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
   ERR_load_crypto_strings();
   OpenSSL_add_all_algorithms();
 
--- libsrc/Wi/http.c
-+++ libsrc/Wi/http.c
+--- a/libsrc/Wi/http.c
+++ b/libsrc/Wi/http.c
@@ -8886,7 +8886,7 @@ ssl_server_set_certificate (SSL_CTX* ssl
 		  log_error ("SSL: The stored certificate '%s' can not be used as extra chain certificate", tok);
 		  break;
@ -1383,8 +1383,8 @@ Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
               tok = strtok_r (NULL, ",", &tok_s);
 	    }
 	  dk_free_box (str);
--- libsrc/Dk/Dkernel.c
-+++ libsrc/Dk/Dkernel.c
+--- a/libsrc/Dk/Dkernel.c
+++ b/libsrc/Dk/Dkernel.c
@@ -5280,7 +5280,11 @@ ssl_server_init ()
   }
 #endif
--- a/srcpkgs/virtuoso/patches/ssl1.1_more.patch
+++ b/srcpkgs/virtuoso/patches/ssl1.1_more.patch
@ -3,8 +3,8 @@ Author: Andreas Tille <tille@debian.org>
 Bug-Debian: https://bugs.debian.org/828594
 Last-Update: Mo 11. Feb 13:50:17 CET 2019

--- libsrc/Dk/Dkernel.c
-+++ libsrc/Dk/Dkernel.c
+--- a/libsrc/Dk/Dkernel.c
+++ b/libsrc/Dk/Dkernel.c
@@ -5161,10 +5161,12 @@ ssl_ctx_set_protocol_options(SSL_CTX *ct
       else if (!strcasecmp (name, "TLSv1_2") || !strcasecmp (name, "TLSv1.2"))
 	opt = SSL_PROTOCOL_TLSV1_2;
--- a/srcpkgs/virtuoso/patches/use-mkstemp.patch
+++ b/srcpkgs/virtuoso/patches/use-mkstemp.patch
@ -2,8 +2,8 @@ Source: @pullmoll
 Upstream: no
 Reason: Avoid mktemp(3) because "Never use this function; see BUGS."

--- libsrc/Dk/Dksesstr.c	2018-08-16 01:06:21.000000000 +0200
-+++ libsrc/Dk/Dksesstr.c	2020-01-27 15:22:00.953876251 +0100
+--- a/libsrc/Dk/Dksesstr.c	2018-08-16 01:06:21.000000000 +0200
+++ b/libsrc/Dk/Dksesstr.c	2020-01-27 15:22:00.953876251 +0100
@@ -298,8 +298,10 @@
       if (!ses2->ses_file->ses_max_blocks_in_mem)
 	{
--- a/srcpkgs/virtuoso/patches/yacc-pure-parser.patch
+++ b/srcpkgs/virtuoso/patches/yacc-pure-parser.patch
@ -2,8 +2,8 @@ Source: @pullmoll
 Upstream: no
 Reason: In yacc mode %pure-parser emits a warning to use %define api.pure instead

--- libsrc/Wi/nquad_p.y	2018-08-16 01:06:21.000000000 +0200
-+++ libsrc/Wi/nquad_p.y	2020-01-27 15:58:33.086194051 +0100
+--- a/libsrc/Wi/nquad_p.y	2018-08-16 01:06:21.000000000 +0200
+++ b/libsrc/Wi/nquad_p.y	2020-01-27 15:58:33.086194051 +0100
@@ -21,7 +21,7 @@
  *
  */
@ -13,8 +13,8 @@ Reason: In yacc mode %pure-parser emits a warning to use %define api.pure instea
 %parse-param {ttlp_t * ttlp_arg}
 %parse-param {yyscan_t yyscanner}
 %lex-param {ttlp_t * ttlp_arg}
--- libsrc/Wi/sparql_p.y	2018-08-16 01:06:21.000000000 +0200
-+++ libsrc/Wi/sparql_p.y	2020-01-27 15:58:32.947194056 +0100
+--- a/libsrc/Wi/sparql_p.y	2018-08-16 01:06:21.000000000 +0200
+++ b/libsrc/Wi/sparql_p.y	2020-01-27 15:58:32.947194056 +0100
@@ -36,7 +36,7 @@
 
 Whitespaces in all other places, including two whitespaces after "::=" in BNF comments */
@ -24,8 +24,8 @@ Reason: In yacc mode %pure-parser emits a warning to use %define api.pure instea
 %parse-param {sparp_t * sparp_arg}
 %lex-param {sparp_t * sparp_arg}
 %expect 14
--- libsrc/Wi/sql3.y	2018-08-16 01:06:21.000000000 +0200
-+++ libsrc/Wi/sql3.y	2020-01-27 15:58:33.013194054 +0100
+--- a/libsrc/Wi/sql3.y	2018-08-16 01:06:21.000000000 +0200
+++ b/libsrc/Wi/sql3.y	2020-01-27 15:58:33.013194054 +0100
@@ -25,7 +25,7 @@
  *
  */
@ -35,8 +35,8 @@ Reason: In yacc mode %pure-parser emits a warning to use %define api.pure instea
 %parse-param {yyscan_t scanner}
 %lex-param {yyscan_t scanner}
 /*%parse-param {sql_comp_context_t* scs_arg}*/
--- libsrc/Wi/turtle_p.y	2018-08-16 01:06:21.000000000 +0200
-+++ libsrc/Wi/turtle_p.y	2020-01-27 15:58:33.083194051 +0100
+--- a/libsrc/Wi/turtle_p.y	2018-08-16 01:06:21.000000000 +0200
+++ b/libsrc/Wi/turtle_p.y	2020-01-27 15:58:33.083194051 +0100
@@ -21,7 +21,7 @@
  *
  */
@ -46,8 +46,8 @@ Reason: In yacc mode %pure-parser emits a warning to use %define api.pure instea
 %parse-param {ttlp_t * ttlp_arg}
 %parse-param {yyscan_t yyscanner}
 %lex-param {ttlp_t * ttlp_arg}
--- libsrc/Wi/xpathp.y	2018-08-16 01:06:21.000000000 +0200
-+++ libsrc/Wi/xpathp.y	2020-01-27 15:58:33.086194051 +0100
+--- a/libsrc/Wi/xpathp.y	2018-08-16 01:06:21.000000000 +0200
+++ b/libsrc/Wi/xpathp.y	2020-01-27 15:58:33.086194051 +0100
@@ -25,7 +25,7 @@
  *
  */
--- a/srcpkgs/virtuoso/template
+++ b/srcpkgs/virtuoso/template
@ -16,7 +16,6 @@ distfiles="https://github.com/openlink/virtuoso-opensource/archive/v${version}.t
 checksum=3e4807e94098b8265f8cf00867d1215bb1e9d0d274878e59a420742d2de471c2
 # cannot execute binary file: Exec format error
 nocross="https://build.voidlinux.org/builders/armv6l_builder/builds/29187/steps/shell_3/logs/stdio"
-patch_args=-Np0

 case "$XBPS_TARGET_MACHINE" in
 	*-musl) makedepends+=" libexecinfo-devel"; LDFLAGS+=" -lexecinfo";;
--- a/srcpkgs/visitors/patches/fix-ldflags.patch
+++ b/srcpkgs/visitors/patches/fix-ldflags.patch
@ -1,5 +1,5 @@
--- Makefile.orig	2016-05-24 11:36:01.042181370 +0200
-+++ Makefile	2016-05-24 11:36:11.309180602 +0200
+--- a/Makefile	2016-05-24 11:36:01.042181370 +0200
+++ b/Makefile	2016-05-24 11:36:11.309180602 +0200
@@ -14,7 +14,7 @@ all: visitors
 
 visitors.o: visitors.c blacklist.h
--- a/srcpkgs/visitors/template
+++ b/srcpkgs/visitors/template
@ -10,7 +10,6 @@ license="GPL-2.0-only"
 homepage="http://www.hping.org/visitors/"
 distfiles="http://www.hping.org/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=d2149e33ffe96b1f52b0587cff65973b0bc0b24ec43cdf072a782c1bd52148ab
-patch_args=-Np0

 do_install() {
 	vbin visitors
--- a/srcpkgs/vitetris/patches/Makefile.patch
+++ b/srcpkgs/vitetris/patches/Makefile.patch
@ -1,5 +1,5 @@
--- Makefile.orig
-+++ Makefile
+--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
 include config.mk
 
@ -21,8 +21,8 @@
 	if [ -n "$(pixmapdir)" ]; then \
   $(INSTALL) -d $(DESTDIR)$(pixmapdir) && \
   $(INSTALL) -m644 vitetris.xpm $(DESTDIR)$(pixmapdir); fi
--- src/config2.h.orig
-+++ src/config2.h
+--- a/src/config2.h
+++ b/src/config2.h
@@ -15,7 +15,7 @@
 #endif
 
--- a/srcpkgs/vitetris/template
+++ b/srcpkgs/vitetris/template
@ -12,7 +12,6 @@ license="BSD-2-Clause"
 homepage="http://www.victornils.net/tetris/"
 distfiles="https://github.com/vicgeralds/vitetris/archive/v${version}.tar.gz"
 checksum=699443df03c8d4bf2051838c1015da72039bbbdd0ab0eede891c59c840bdf58d
-patch_args=-Np0

 post_install() {
 	sed -i 's/Exec=tetris/Exec=vitetris/' $DESTDIR/usr/share/applications/vitetris.desktop
--- a/srcpkgs/vlc/patches/fix-waitpid-usage.patch
+++ b/srcpkgs/vlc/patches/fix-waitpid-usage.patch
@ -1,5 +1,5 @@
--- modules/misc/inhibit/xdg.c	2015-02-28 08:48:24.264968381 -0200
-+++ modules/misc/inhibit/xdg.c	2015-02-28 08:48:43.081636013 -0200
+--- a/modules/misc/inhibit/xdg.c	2015-02-28 08:48:24.264968381 -0200
+++ b/modules/misc/inhibit/xdg.c	2015-02-28 08:48:43.081636013 -0200
@@ -26,6 +26,7 @@
 #include <vlc_plugin.h>
 #include <vlc_inhibit.h>
@ -17,8 +17,8 @@
     }
     else
         msg_Warn (ih, "error starting xdg-screensaver: %s",
--- modules/stream_filter/decomp.c	2018-04-25 01:54:04.472412122 +0200
-+++ modules/stream_filter/decomp.c	2018-04-25 01:55:13.065411209 +0200
+--- a/modules/stream_filter/decomp.c	2018-04-25 01:54:04.472412122 +0200
+++ b/modules/stream_filter/decomp.c	2018-04-25 01:55:13.065411209 +0200
@@ -330,7 +330,7 @@
     if (ret != VLC_SUCCESS)
     {
@ -37,8 +37,8 @@
     msg_Dbg (obj, "exit status %d", status);
 
     vlc_mutex_destroy (&p_sys->lock);
--- src/posix/netconf.c	2018-04-25 01:55:26.929411024 +0200
-+++ src/posix/netconf.c	2018-04-25 01:56:29.878410186 +0200
+--- a/src/posix/netconf.c	2018-04-25 01:55:26.929411024 +0200
+++ b/src/posix/netconf.c	2018-04-25 01:56:29.878410186 +0200
@@ -28,6 +28,7 @@
 
 #include <sys/types.h>
--- a/srcpkgs/vlc/patches/fribidi_allow_deprecated.patch
+++ b/srcpkgs/vlc/patches/fribidi_allow_deprecated.patch
@ -1,5 +1,5 @@
--- modules/text_renderer/freetype/text_layout.c.orig   2018-04-25 00:37:34.697473228 +0200
-+++ modules/text_renderer/freetype/text_layout.c        2018-04-25 00:37:59.444472898 +0200
+--- a/modules/text_renderer/freetype/text_layout.c.orig   2018-04-25 00:37:34.697473228 +0200
+++ b/modules/text_renderer/freetype/text_layout.c        2018-04-25 00:37:59.444472898 +0200
@@ -52,7 +52,6 @@

 /* RTL */
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@ -18,7 +18,6 @@ homepage="https://www.videolan.org/vlc/"
 changelog="https://www.videolan.org/developers/vlc-branch/NEWS"
 distfiles="https://download.videolan.org/pub/videolan/vlc/${version}/vlc-${version}.tar.xz"
 checksum=7b9635061ae14dfdf71623a7fd479b4f0d6929de75ff3c23d39b6b4b65b31b56
-patch_args=-Np0

 lib32disabled=yes

--- a/srcpkgs/voltron/patches/fix-py3.8.patch
+++ b/srcpkgs/voltron/patches/fix-py3.8.patch
@ -11,8 +11,8 @@ Subject: [PATCH] Renaming the async variable

 diff --git a/voltron/plugins/view/memory.py b/voltron/plugins/view/memory.py
 index 09e4d65..b18abed 100644
--- voltron/plugins/view/memory.py
-+++ voltron/plugins/view/memory.py
+--- a/voltron/plugins/view/memory.py
+++ b/voltron/plugins/view/memory.py
@@ -13,7 +13,7 @@
 class MemoryView(TerminalView):
     printable_filter = ''.join([(len(repr(chr(x))) == 3) and chr(x) or '.' for x in range(256)])
--- a/srcpkgs/voltron/patches/fix-werkzeug.patch
+++ b/srcpkgs/voltron/patches/fix-werkzeug.patch
@ -13,8 +13,8 @@ Co-authored-by: zcutlip <uid000@gmail.com>

 diff --git a/voltron/core.py b/voltron/core.py
 index f22f375..351a0ea 100644
--- voltron/core.py
-+++ voltron/core.py
+--- a/voltron/core.py
+++ b/voltron/core.py
@@ -15,7 +15,8 @@
 import voltron
 from flask import Flask, Response, make_response, redirect, render_template, request
--- a/srcpkgs/voltron/template
+++ b/srcpkgs/voltron/template
@ -13,7 +13,6 @@ license="MIT"
 homepage="https://github.com/snare/voltron"
 distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=2919dabe5ebc05672dcedf400754e3fbce8c3b9f8608a64cea205591f3b47f63
-patch_args=-Np0

 post_install() {
 	vlicense LICENSE
--- a/srcpkgs/volumeicon/patches/locale.patch
+++ b/srcpkgs/volumeicon/patches/locale.patch
@ -1,7 +1,7 @@
 Index: configure
 ===================================================================
--- configure.orig
-+++ configure
+--- a/configure
+++ b/configure
@@ -5950,7 +5950,7 @@ fi
 	    ;;
 	    *)
--- a/srcpkgs/volumeicon/patches/notify.patch
+++ b/srcpkgs/volumeicon/patches/notify.patch
@ -1,7 +1,7 @@
 Index: configure
 ===================================================================
--- configure.orig
-+++ configure
+--- a/configure
+++ b/configure
@@ -6644,7 +6644,7 @@ else
 $as_echo "yes" >&6; }
 
--- a/srcpkgs/volumeicon/template
+++ b/srcpkgs/volumeicon/template
@ -12,7 +12,6 @@ license="GPL-3.0-only, ISC, MIT"
 homepage="http://softwarebakery.com/maato/volumeicon.html"
 distfiles="http://softwarebakery.com/maato/files/volumeicon/volumeicon-${version}.tar.gz"
 checksum=24b8c1d0a81d708b201ce6e67301fc175d65588d892d01859f667b8db8a05da0
-patch_args=-Np0

 post_patch() {
 	sed -ne '/Copyright/,/IN THE SOFTWARE/s/ [*] *//p' src/bind.c >LICENSE.MIT
--- a/srcpkgs/vpcs/patches/ldflags.patch
+++ b/srcpkgs/vpcs/patches/ldflags.patch
@ -1,5 +1,5 @@
--- src/Makefile.linux.orig	2017-01-20 15:51:20.339835620 -0600
-+++ src/Makefile.linux	2017-01-20 15:52:18.975831788 -0600
+--- a/src/Makefile.linux	2017-01-20 15:51:20.339835620 -0600
+++ b/src/Makefile.linux	2017-01-20 15:52:18.975831788 -0600
@@ -4,8 +4,8 @@
 CPUTYPE=i386
 HVOPT=-DHV
--- a/srcpkgs/vpcs/patches/musl.patch
+++ b/srcpkgs/vpcs/patches/musl.patch
@ -1,5 +1,5 @@
--- src/remote.c.orig
-+++ src/remote.c
+--- a/src/remote.c
+++ b/src/remote.c
@@ -34,6 +34,8 @@
 #include <sys/ioctl.h>
 #include <sys/socket.h>
@ -10,8 +10,8 @@
 
 #include <net/if.h>

--- src/hv.c.orig
-+++ src/hv.c
+--- a/src/hv.c
+++ b/src/hv.c
@@ -42,7 +42,6 @@
 #include <fcntl.h>
 
--- a/srcpkgs/vpcs/patches/readline.patch
+++ b/srcpkgs/vpcs/patches/readline.patch
@ -1,5 +1,5 @@
--- src/readline.c.orig	2017-04-21 00:27:54.248062134 -0500
-+++ src/readline.c	2017-04-21 00:28:07.690155810 -0500
+--- a/src/readline.c	2017-04-21 00:27:54.248062134 -0500
+++ b/src/readline.c	2017-04-21 00:28:07.690155810 -0500
@@ -431,7 +431,7 @@
 		i = kb[0];
 		if (!isprint(i))
--- a/srcpkgs/vpcs/template
+++ b/srcpkgs/vpcs/template
@ -11,7 +11,6 @@ license="BSD-2-Clause"
 homepage="https://sourceforge.net/projects/vpcs"
 distfiles="${SOURCEFORGE_SITE}/project/vpcs/${version}/${pkgname}-${version}-src.tbz"
 checksum=dca602d0571ba852c916632c4c0060aa9557dd744059c0f7368860cfa8b3c993
-patch_args=-Np0

 archs="i686* x86_64*"

--- a/srcpkgs/vpn-ws/patches/fixprototypes.patch
+++ b/srcpkgs/vpn-ws/patches/fixprototypes.patch
@ -1,5 +1,5 @@
--- src/ssl.c	2014-11-21 09:48:57.000000000 -0500
-+++ src/ssl.c.fixed	2017-09-27 01:46:07.908463177 -0400
+--- a/src/ssl.c	2014-11-21 09:48:57.000000000 -0500
+++ b/src/ssl.c.fixed	2017-09-27 01:46:07.908463177 -0400
@@ -1,7 +1,7 @@
 #include "vpn-ws.h"
 
--- a/srcpkgs/vpn-ws/patches/openssl.patch
+++ b/srcpkgs/vpn-ws/patches/openssl.patch
@ -10,8 +10,8 @@ Fixing OpenSSL 1.1 deprecation of OPENSSL_config

 diff --git a/src/ssl.c b/src/ssl.c
 index 4f0405c..996e9b0 100644
--- src/ssl.c
-+++ src/ssl.c
+--- a/src/ssl.c
+++ b/src/ssl.c
@@ -225,7 +225,11 @@ static SSL_CTX *ssl_ctx = NULL;
 
 void *vpn_ws_ssl_handshake(vpn_ws_peer *peer, char *sni, char *key, char *crt) {
@ -40,8 +40,8 @@ This helps is your server uses 3rd party certificate like Let's Encrypt.

 diff --git a/src/ssl.c b/src/ssl.c
 index 996e9b0..3759d5b 100644
--- src/ssl.c
-+++ src/ssl.c
+--- a/src/ssl.c
+++ b/src/ssl.c
@@ -254,6 +254,7 @@ void *vpn_ws_ssl_handshake(vpn_ws_peer *peer, char *sni, char *key, char *crt) {
 			SSL_CTX_set_verify(ssl_ctx, SSL_VERIFY_NONE, NULL);
 		}
--- a/srcpkgs/vpn-ws/template
+++ b/srcpkgs/vpn-ws/template
@ -11,7 +11,6 @@ license="MIT"
 homepage="https://github.com/unbit/vpn-ws"
 distfiles="https://github.com/unbit/vpn-ws/archive/v${version}.tar.gz"
 checksum=f35d16d192ef333390ccc7d342df4392676a86502fa087f310eab9758afd565a
-patch_args=-Np0

 CFLAGS+=" -Wno-stringop-truncation -fcommon"

--- a/srcpkgs/vsftpd/patches/001-destdir.patch
+++ b/srcpkgs/vsftpd/patches/001-destdir.patch
@ -1,5 +1,5 @@
--- Makefile.orig
-+++ Makefile
+--- a/Makefile
+++ b/Makefile
@@ -22,6 +22,8 @@ OBJS	=	main.o utility.o prelogin.o ftpcm
     seccompsandbox.o
 
--- a/srcpkgs/vsftpd/patches/002-find_libs.patch
+++ b/srcpkgs/vsftpd/patches/002-find_libs.patch
@ -1,5 +1,5 @@
--- Makefile.orig
-+++ Makefile
+--- a/Makefile
+++ b/Makefile
@@ -8,8 +8,8 @@ CFLAGS	=	-O2 -fPIE -fstack-protector --p
 	-D_FORTIFY_SOURCE=2 \
 	#-pedantic -Wconversion
--- a/srcpkgs/vsftpd/patches/003-chroot.patch
+++ b/srcpkgs/vsftpd/patches/003-chroot.patch
@ -1,5 +1,5 @@
--- tunables.c.orig	2015-12-03 23:13:22.888994282 +0100
-+++ tunables.c	2015-12-03 23:13:33.716994236 +0100
+--- a/tunables.c	2015-12-03 23:13:22.888994282 +0100
+++ b/tunables.c	2015-12-03 23:13:33.716994236 +0100
@@ -254,7 +254,7 @@ tunables_load_defaults()
   /* -rw------- */
   tunable_chown_upload_mode = 0600;
--- a/srcpkgs/vsftpd/patches/004-disable-capabilities.patch
+++ b/srcpkgs/vsftpd/patches/004-disable-capabilities.patch
@ -1,5 +1,5 @@
--- sysdeputil.c.orig
-+++ sysdeputil.c
+--- a/sysdeputil.c
+++ b/sysdeputil.c
@@ -165,6 +165,9 @@
 #endif
 /* END config */
--- a/srcpkgs/vsftpd/patches/005-disable-pam.patch
+++ b/srcpkgs/vsftpd/patches/005-disable-pam.patch
@ -1,5 +1,5 @@
--- builddefs.h.orig
-+++ builddefs.h
+--- a/builddefs.h
+++ b/builddefs.h
@@ -2,7 +2,7 @@
 #define VSF_BUILDDEFS_H
 
--- a/srcpkgs/vsftpd/patches/006-musl-compatibility.patch
+++ b/srcpkgs/vsftpd/patches/006-musl-compatibility.patch
@ -1,5 +1,5 @@
--- sysdeputil.c.orig
-+++ sysdeputil.c
+--- a/sysdeputil.c
+++ b/sysdeputil.c
@@ -58,7 +58,9 @@
 #define VSF_SYSDEP_HAVE_SHADOW
 #define VSF_SYSDEP_HAVE_USERSHELL
--- a/srcpkgs/vsftpd/patches/007-CVE-2015-1419.patch
+++ b/srcpkgs/vsftpd/patches/007-CVE-2015-1419.patch
@ -5,8 +5,8 @@ Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=776922
 Last-Update: 2015-02-24
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- ls.c.orig
-+++ ls.c
+--- a/ls.c
+++ b/ls.c
@@ -7,6 +7,7 @@
  * Would you believe, code to handle directory listing.
  */
@ -69,8 +69,8 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
   str_free(&filter_remain_str);
   str_free(&name_remain_str);
   str_free(&temp_str);
--- str.c.orig
-+++ str.c
+--- a/str.c
+++ b/str.c
@@ -711,3 +711,14 @@ str_replace_unprintable(struct mystr* p_
   }
 }
@ -86,8 +86,8 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +  if (str_isempty(d_str))
 +   str_copy (d_str, path);
 +}
--- str.h.orig
-+++ str.h
+--- a/str.h
+++ b/str.h
@@ -100,6 +100,7 @@ void str_replace_unprintable(struct myst
 int str_atoi(const struct mystr* p_str);
 filesize_t str_a_to_filesize_t(const struct mystr* p_str);
--- a/srcpkgs/vsftpd/patches/008-allow-getrandom.patch
+++ b/srcpkgs/vsftpd/patches/008-allow-getrandom.patch
@ -1,5 +1,5 @@
--- seccompsandbox.c.orig
-+++ seccompsandbox.c
+--- a/seccompsandbox.c
+++ b/seccompsandbox.c
@@ -286,6 +286,9 @@
 static void
 seccomp_sandbox_setup_base()
--- a/srcpkgs/vsftpd/patches/009-i686-musl.patch
+++ b/srcpkgs/vsftpd/patches/009-i686-musl.patch
@ -1,5 +1,5 @@
--- ptracesandbox.c.orig	2018-04-25 10:43:45.885676254 +0200
-+++ ptracesandbox.c	2018-04-25 10:44:23.021677437 +0200
+--- a/ptracesandbox.c	2018-04-25 10:43:45.885676254 +0200
+++ b/ptracesandbox.c	2018-04-25 10:44:23.021677437 +0200
@@ -854,8 +854,12 @@
       arg2 != F_SETOWN &&
       arg2 != F_SETLK &&
--- a/srcpkgs/vsftpd/template
+++ b/srcpkgs/vsftpd/template
@ -10,7 +10,6 @@ license="GPL-2.0-only"
 homepage="https://security.appspot.com/vsftpd.html"
 distfiles="https://security.appspot.com/downloads/${pkgname}-${version}.tar.gz"
 checksum=6b9421bd27e8a6cdeed5b31154f294a20b003a11a26c09500715a0a6b1b86a26
-patch_args=-Np0

 system_accounts="ftp"
 ftp_pgroup=nogroup
--- a/srcpkgs/vte3/patches/fix-W_EXITCODE.patch
+++ b/srcpkgs/vte3/patches/fix-W_EXITCODE.patch
@ -2,8 +2,8 @@ Source: https://mail-archives.apache.org/mod_mbox/mesos-reviews/201610.mbox/%3C2
 Upstream: No
 Reason: fixes compilation with musl that doesn't define W* macros.

--- src/widget.cc
-+++ src/widget.cc
+--- a/src/widget.cc
+++ b/src/widget.cc
@@ -28,6 +28,10 @@
 #include "vtegtk.hh"
 #include "debug.h"
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@ -16,7 +16,6 @@ license="GPL-3.0-or-later, LGPL-2.1-or-later, LGPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Terminal/VTE"
 distfiles="${GNOME_SITE}/vte/${version%.*}/vte-${version}.tar.xz"
 checksum=12fb41a9ff8e03c5f1711b46560910a4b9b3102aec3e9e7609ceef4dfa98aa2a
-patch_args=-Np0

 # Suppress warnings as errors for NULL format strings (musl libc)
 CXXFLAGS="-Wno-error=format="