diff --git a/net/balsa/balsa.SMBuild b/net/balsa/balsa.SMBuild
index 3b61823..fa944db 100755
--- a/net/balsa/balsa.SMBuild
+++ b/net/balsa/balsa.SMBuild
@@ -14,7 +14,7 @@ build() {
   cd $app-$version 
   fixbuilddirpermissions
 
-  patch -p1 < $srcdir/misc.c.patch
+  applypatch $srcdir/misc.c.patch
 
   ./configure \
     --prefix="" \
diff --git a/net/bwm-ng/bwm-ng.SMBuild b/net/bwm-ng/bwm-ng.SMBuild
index 185cc3e..5f09027 100755
--- a/net/bwm-ng/bwm-ng.SMBuild
+++ b/net/bwm-ng/bwm-ng.SMBuild
@@ -14,7 +14,7 @@ build() {
   cd $app-$version
   fixbuilddirpermissions
 
-  patch -p1 < $srcdir/001-Use-static-inline-instead-of-inline.patch
+  applypatch $srcdir/001-Use-static-inline-instead-of-inline.patch
 
   ./configure \
     --prefix="" \
diff --git a/net/cifs-utils/cifs-utils.SMBuild b/net/cifs-utils/cifs-utils.SMBuild
index f634a18..85c1d0f 100755
--- a/net/cifs-utils/cifs-utils.SMBuild
+++ b/net/cifs-utils/cifs-utils.SMBuild
@@ -14,8 +14,8 @@ build() {
   cd $app-$version
   fixbuilddirpermissions
 
-  patch -p1 < $srcdir/musl-fix-includes.patch
-  patch -p1 < $srcdir/xattr_size_max.patch
+  applypatch $srcdir/musl-fix-includes.patch
+  applypatch $srcdir/xattr_size_max.patch
 
   ./configure \
     --prefix="" 
diff --git a/net/comgt/comgt.SMBuild b/net/comgt/comgt.SMBuild
index b88e209..e4a5fe6 100755
--- a/net/comgt/comgt.SMBuild
+++ b/net/comgt/comgt.SMBuild
@@ -14,7 +14,7 @@ build() {
   cd "$app.$version"
   fixbuilddirpermissions
 
-  patch -p1 < $srcdir/002-termios.patch
+  applypatch $srcdir/002-termios.patch
 
   make
 
diff --git a/net/fcgi/fcgi.SMBuild b/net/fcgi/fcgi.SMBuild
index 7dc00c4..45cce5e 100755
--- a/net/fcgi/fcgi.SMBuild
+++ b/net/fcgi/fcgi.SMBuild
@@ -15,9 +15,9 @@ build() {
   fixbuilddirpermissions
 
 
-  patch -p1 < $srcdir/fcgi-2.4.0-clientdata-pointer.patch
-  patch -p1 < $srcdir/fcgi-2.4.0-gcc44-fix-include.patch
-  patch -p1 < $srcdir/fcgi-2.4.0-html-updates.patch
+  applypatch $srcdir/fcgi-2.4.0-clientdata-pointer.patch
+  applypatch $srcdir/fcgi-2.4.0-gcc44-fix-include.patch
+  applypatch $srcdir/fcgi-2.4.0-html-updates.patch
 
   # Create some empty files to make autoreconf happy
   touch INSTALL NEWS AUTHORS ChangeLog COPYING
diff --git a/net/foxtrotgps/foxtrotgps.SMBuild b/net/foxtrotgps/foxtrotgps.SMBuild
index 6b94a1e..f00867e 100755
--- a/net/foxtrotgps/foxtrotgps.SMBuild
+++ b/net/foxtrotgps/foxtrotgps.SMBuild
@@ -14,8 +14,8 @@ build() {
   cd $app-$version
   fixbuilddirpermissions
 
-  patch -p1 < $srcdir/fix-gpsfix.patch
-  patch -p1 < $srcdir/fix-timespec.patch
+  applypatch $srcdir/fix-gpsfix.patch
+  applypatch $srcdir/fix-timespec.patch
 
   ./configure \
     --prefix="" \
diff --git a/net/gpsd/gpsd.SMBuild b/net/gpsd/gpsd.SMBuild
index cbac03a..5351813 100755
--- a/net/gpsd/gpsd.SMBuild
+++ b/net/gpsd/gpsd.SMBuild
@@ -14,7 +14,7 @@ build() {
   cd $app-$version
   fixbuilddirpermissions
 
-  patch -p1 < $srcdir/gpsd-use-local-timepps-header.patch
+  applypatch $srcdir/gpsd-use-local-timepps-header.patch
   cp $srcdir/timepps.h . 
 
   CPPFLAGS="-I. -DHAVE_SYS_TIMEPPS_H" 
diff --git a/net/hostapd/hostapd.SMBuild b/net/hostapd/hostapd.SMBuild
index 2ed0dae..c84767d 100755
--- a/net/hostapd/hostapd.SMBuild
+++ b/net/hostapd/hostapd.SMBuild
@@ -14,10 +14,10 @@ build() {
   cd $app-$version
   fixbuilddirpermissions
 
-  patch -p1 < $srcdir/01.patch
-  patch -p1 < $srcdir/02.patch
-  patch -p1 < $srcdir/03.patch
-  patch -p1 < $srcdir/CVE-2019-16275.patch
+  applypatch $srcdir/01.patch
+  applypatch $srcdir/02.patch
+  applypatch $srcdir/03.patch
+  applypatch $srcdir/CVE-2019-16275.patch
 
   cd hostapd
   cat $srcdir/hostapd.defconfig > .config
diff --git a/net/iproute2/iproute2.SMBuild b/net/iproute2/iproute2.SMBuild
index d05f957..ea97c10 100755
--- a/net/iproute2/iproute2.SMBuild
+++ b/net/iproute2/iproute2.SMBuild
@@ -14,8 +14,8 @@ build() {
   cd $app-$version
   fixbuilddirpermissions
 
-  patch -p1 < $srcdir/fix-install-errors.patch
-  patch -p1 < $srcdir/musl-fixes.patch
+  applypatch $srcdir/fix-install-errors.patch
+  applypatch $srcdir/musl-fixes.patch
 
   ./configure \
     --prefix="" \
diff --git a/net/iputils/iputils.SMBuild b/net/iputils/iputils.SMBuild
index 2a13d2d..90c0bcb 100755
--- a/net/iputils/iputils.SMBuild
+++ b/net/iputils/iputils.SMBuild
@@ -14,8 +14,8 @@ build() {
   cd $app-$version
   fixbuilddirpermissions
 
-  patch -p1 < $srcdir/fix-defines.patch
-  patch -p1 < $srcdir/fix-init-of-cmsg.patch
+  applypatch $srcdir/fix-defines.patch
+  applypatch $srcdir/fix-init-of-cmsg.patch
 
   make CC="$CC" all USE_GCRYPT=no USE_CRYPTO=no USE_NETTLE=no USE_CAP=no USE_IDN=no
 
diff --git a/net/lynx/lynx.SMBuild b/net/lynx/lynx.SMBuild
index f2bdf02..3c31dd2 100755
--- a/net/lynx/lynx.SMBuild
+++ b/net/lynx/lynx.SMBuild
@@ -13,7 +13,7 @@ build() {
   cd $app-$version-dev
   fixbuilddirpermissions
 
-  patch -p1 < $srcdir/lynx-resize.patch
+  applypatch $srcdir/lynx-resize.patch
   sed -e 's;__DATE__;"01.01.18";' -e 's;__TIME__;"00:00:00";' -i src/LYMain.c
   sed -i 's/define ACCEPT_ALL_COOKIES FALSE/define ACCEPT_ALL_COOKIES TRUE/' userdefs.h
 
diff --git a/net/minicom/minicom.SMBuild b/net/minicom/minicom.SMBuild
index 2278ed8..71d5454 100755
--- a/net/minicom/minicom.SMBuild
+++ b/net/minicom/minicom.SMBuild
@@ -14,7 +14,7 @@ build() {
   cd $app-$version
   fixbuilddirpermissions
 
-  patch -p1 < $srcdir/fix-includes.patch
+  applypatch $srcdir/fix-includes.patch
 
   ./configure \
     --prefix="" \
diff --git a/net/minidlna/minidlna.SMBuild b/net/minidlna/minidlna.SMBuild
index f5f5e41..0f740ca 100755
--- a/net/minidlna/minidlna.SMBuild
+++ b/net/minidlna/minidlna.SMBuild
@@ -14,7 +14,7 @@ build() {
   cd $app-$version
   fixbuilddirpermissions
 
-  patch -p1 < $srcdir/10-minidlna-nfo.patch
+  applypatch $srcdir/10-minidlna-nfo.patch
 
   ./configure \
     --prefix="" \
diff --git a/net/mktorrent/mktorrent.SMBuild b/net/mktorrent/mktorrent.SMBuild
index e2a32c6..9f64a1c 100755
--- a/net/mktorrent/mktorrent.SMBuild
+++ b/net/mktorrent/mktorrent.SMBuild
@@ -14,7 +14,7 @@ build() {
   cd $app-$version
   fixbuilddirpermissions
   
-  patch -p1 < $srcdir/makefile.patch
+  applypatch $srcdir/makefile.patch
   make 
   
   cp COPYING $pkgdocs/
diff --git a/net/net-snmp/net-snmp.SMBuild b/net/net-snmp/net-snmp.SMBuild
index 6f8bc0f..f3f3e42 100755
--- a/net/net-snmp/net-snmp.SMBuild
+++ b/net/net-snmp/net-snmp.SMBuild
@@ -16,9 +16,9 @@ build() {
   cd $app-$version 
   fixbuilddirpermissions
 
-  patch -p1 < $srcdir/fix-includes.patch
-  patch -p1 < $srcdir/netsnmp-swinst-crash.patch
-  patch -p1 < $srcdir/report-empty-strings-correctly.patch
+  applypatch $srcdir/fix-includes.patch
+  applypatch $srcdir/netsnmp-swinst-crash.patch
+  applypatch $srcdir/report-empty-strings-correctly.patch
 
   ./configure \
     --prefix="/" \
diff --git a/net/netcat/netcat.SMBuild b/net/netcat/netcat.SMBuild
index 76c4e27..8116715 100755
--- a/net/netcat/netcat.SMBuild
+++ b/net/netcat/netcat.SMBuild
@@ -10,8 +10,8 @@ build() {
   cd nc-110
   fixbuilddirpermissions
 
-  patch -p1 < $srcdir/nc-110-21.diff
-  patch -p1 < $srcdir/nc.diff
+  applypatch $srcdir/nc-110-21.diff
+  applypatch $srcdir/nc.diff
 
   make linux
   install -Dm 755 nc $pkg/bin/nc
diff --git a/net/nfs-utils/nfs-utils.SMBuild b/net/nfs-utils/nfs-utils.SMBuild
index 3d2c931..99e0018 100755
--- a/net/nfs-utils/nfs-utils.SMBuild
+++ b/net/nfs-utils/nfs-utils.SMBuild
@@ -14,10 +14,10 @@ build() {
   cd $app-$version 
   fixbuilddirpermissions
 
-  patch -p1 < $srcdir/musl-configure_ac.patch
-  patch -p1 < $srcdir/musl-getservbyport.patch
-  patch -p1 < $srcdir/musl-svcgssd-sysconf.patch
-  patch -p1 < $srcdir/musl-time64.patch
+  applypatch $srcdir/musl-configure_ac.patch
+  applypatch $srcdir/musl-getservbyport.patch
+  applypatch $srcdir/musl-svcgssd-sysconf.patch
+  applypatch $srcdir/musl-time64.patch
 
   ./configure \
     --prefix="" \
diff --git a/net/openssh/openssh.SMBuild b/net/openssh/openssh.SMBuild
index 83f1592..c633db1 100755
--- a/net/openssh/openssh.SMBuild
+++ b/net/openssh/openssh.SMBuild
@@ -14,7 +14,7 @@ build() {
   cd $app-$version
   fixbuilddirpermissions
 
-  patch -p1 < $srcdir/openssh-sys_param.patch
+  applypatch $srcdir/openssh-sys_param.patch
 
   # prevent from installing some things (keysign and maybe others) setuid.
   sed -i 's@-m 4711@-m 0750@g' Makefile.in
diff --git a/net/php/php.SMBuild b/net/php/php.SMBuild
index 7f09d2f..121577f 100755
--- a/net/php/php.SMBuild
+++ b/net/php/php.SMBuild
@@ -22,7 +22,7 @@ build() {
   cd ..
   ./buildconf -f
 
-  patch -p1 < $srcdir/cve-2021-21708.patch
+  applypatch $srcdir/cve-2021-21708.patch
 
   ./configure \
     --prefix="" \
diff --git a/net/poppler/poppler.SMBuild b/net/poppler/poppler.SMBuild
index 2d4863e..52c3717 100755
--- a/net/poppler/poppler.SMBuild
+++ b/net/poppler/poppler.SMBuild
@@ -14,7 +14,7 @@ build() {
   cd $app-$version
   fixbuilddirpermissions
 
-  patch -p1 < $srcdir/poppler-segfault.patch
+  applypatch $srcdir/poppler-segfault.patch
 
   ./configure \
     --prefix="" \
diff --git a/net/ppp/ppp.SMBuild b/net/ppp/ppp.SMBuild
index e456f58..8484c10 100755
--- a/net/ppp/ppp.SMBuild
+++ b/net/ppp/ppp.SMBuild
@@ -14,14 +14,14 @@ build() {
   cd $app-$version
   fixbuilddirpermissions
 
-  patch -p1 < $srcdir/0011-build-sys-don-t-put-connect-errors-log-to-etc-ppp.patch
-  patch -p1 < $srcdir/fix-bound-check-eap.patch
-  patch -p1 < $srcdir/fix-paths.patch
-  patch -p1 < $srcdir/fix-pppd-magic.h.patch
-  patch -p1 < $srcdir/fix-pppd-pppoe.h.patch
-  patch -p1 < $srcdir/musl-fix-headers.patch
-  patch -p1 < $srcdir/pppd-Ignore-received-EAP-messages-when-not-doing-EAP.patch
-  patch -p1 < $srcdir/radius-Prevent-buffer-overflow-in-rc_mksid.patch
+  applypatch $srcdir/0011-build-sys-don-t-put-connect-errors-log-to-etc-ppp.patch
+  applypatch $srcdir/fix-bound-check-eap.patch
+  applypatch $srcdir/fix-paths.patch
+  applypatch $srcdir/fix-pppd-magic.h.patch
+  applypatch $srcdir/fix-pppd-pppoe.h.patch
+  applypatch $srcdir/musl-fix-headers.patch
+  applypatch $srcdir/pppd-Ignore-received-EAP-messages-when-not-doing-EAP.patch
+  applypatch $srcdir/radius-Prevent-buffer-overflow-in-rc_mksid.patch
 
   export CFLAGS="$CFLAGS -D_GNU_SOURCE"
   sed -i "s:-O2 -pipe -Wall -g:${CFLAGS}:" pppd/Makefile.linux
diff --git a/net/remotefs/remotefs.SMBuild b/net/remotefs/remotefs.SMBuild
index 0ac0f86..6c43280 100755
--- a/net/remotefs/remotefs.SMBuild
+++ b/net/remotefs/remotefs.SMBuild
@@ -16,7 +16,7 @@ build() {
 
   sed -i 's@-Werror@@g' build/Makefiles/LinuxIcc.mk
   sed -i 's@-Werror@@g' build/Makefiles/Linux.mk
-  patch -p1 < $srcdir/client.c.patch
+  applypatch $srcdir/client.c.patch
 
   make -j1 rfs rfsd rfspasswd man 
   make install INSTALL_DIR=$pkg
diff --git a/net/rp-pppoe/rp-pppoe.SMBuild b/net/rp-pppoe/rp-pppoe.SMBuild
index dd482eb..9b83ec3 100755
--- a/net/rp-pppoe/rp-pppoe.SMBuild
+++ b/net/rp-pppoe/rp-pppoe.SMBuild
@@ -13,7 +13,7 @@ build() {
   cd $app-$version 
   fixbuilddirpermissions
 
-  patch -p1 < $srcdir/musl-fix.patch
+  applypatch $srcdir/musl-fix.patch
 
   cd src
 
diff --git a/net/rpcbind/rpcbind.SMBuild b/net/rpcbind/rpcbind.SMBuild
index be3b75c..bc82693 100755
--- a/net/rpcbind/rpcbind.SMBuild
+++ b/net/rpcbind/rpcbind.SMBuild
@@ -14,7 +14,7 @@ build() {
   cd $app-$version 
   fixbuilddirpermissions
 
-  patch -p1 < $srcdir/0001-rpcinfo-Fix-stack-buffer-overflow.patch
+  applypatch $srcdir/0001-rpcinfo-Fix-stack-buffer-overflow.patch
 
   ./configure \
     --prefix="" \
diff --git a/net/samba3/samba3.SMBuild b/net/samba3/samba3.SMBuild
index eff7340..2709c90 100755
--- a/net/samba3/samba3.SMBuild
+++ b/net/samba3/samba3.SMBuild
@@ -14,34 +14,34 @@ build() {
   cd samba-$version
   fixbuilddirpermissions
 
-  patch -p1 < $srcdir/010-patch-cve-2015-5252.patch
-  patch -p1 < $srcdir/011-patch-cve-2015-5296.patch
-  patch -p1 < $srcdir/012-patch-cve-2015-5299.patch
-  patch -p1 < $srcdir/015-patch-cve-2015-7560.patch
-  patch -p1 < $srcdir/020-CVE-preparation-v3-6.patch
-  patch -p1 < $srcdir/021-CVE-preparation-v3-6-addition.patch
-  patch -p1 < $srcdir/022-CVE-2015-5370-v3-6.patch
-  patch -p1 < $srcdir/023-CVE-2016-2110-v3-6.patch
-  patch -p1 < $srcdir/024-CVE-2016-2111-v3-6.patch
-  patch -p1 < $srcdir/025-CVE-2016-2112-v3-6.patch
-  patch -p1 < $srcdir/026-CVE-2016-2115-v3-6.patch
-  patch -p1 < $srcdir/027-CVE-2016-2118-v3-6.patch
-  patch -p1 < $srcdir/028-CVE-2016-2125-v3.6.patch
-  patch -p1 < $srcdir/029-CVE-2017-7494-v3-6.patch
-  patch -p1 < $srcdir/030-CVE-2017-15275-v3.6.patch
-  patch -p1 < $srcdir/031-CVE-2017-12163-v3.6.patch
-  patch -p1 < $srcdir/032-CVE-2017-12150-v3.6.patch
-  patch -p1 < $srcdir/032-CVE-2018-1050-v3-6.patch
-  patch -p1 < $srcdir/200-remove_printer_support.patch
-  patch -p1 < $srcdir/220-remove_services.patch
-  patch -p1 < $srcdir/230-remove_winreg_support.patch
-  patch -p1 < $srcdir/250-remove_domain_logon.patch
-  patch -p1 < $srcdir/270-remove_registry_backend.patch
-  patch -p1 < $srcdir/280-strip_srvsvc.patch
-  patch -p1 < $srcdir/300-assert_debug_level.patch
-  patch -p1 < $srcdir/310-remove_error_strings.patch
-  patch -p1 < $srcdir/320-debug_level_checks.patch
-  patch -p1 < $srcdir/330-librpc_default_print.patch
+  applypatch $srcdir/010-patch-cve-2015-5252.patch
+  applypatch $srcdir/011-patch-cve-2015-5296.patch
+  applypatch $srcdir/012-patch-cve-2015-5299.patch
+  applypatch $srcdir/015-patch-cve-2015-7560.patch
+  applypatch $srcdir/020-CVE-preparation-v3-6.patch
+  applypatch $srcdir/021-CVE-preparation-v3-6-addition.patch
+  applypatch $srcdir/022-CVE-2015-5370-v3-6.patch
+  applypatch $srcdir/023-CVE-2016-2110-v3-6.patch
+  applypatch $srcdir/024-CVE-2016-2111-v3-6.patch
+  applypatch $srcdir/025-CVE-2016-2112-v3-6.patch
+  applypatch $srcdir/026-CVE-2016-2115-v3-6.patch
+  applypatch $srcdir/027-CVE-2016-2118-v3-6.patch
+  applypatch $srcdir/028-CVE-2016-2125-v3.6.patch
+  applypatch $srcdir/029-CVE-2017-7494-v3-6.patch
+  applypatch $srcdir/030-CVE-2017-15275-v3.6.patch
+  applypatch $srcdir/031-CVE-2017-12163-v3.6.patch
+  applypatch $srcdir/032-CVE-2017-12150-v3.6.patch
+  applypatch $srcdir/032-CVE-2018-1050-v3-6.patch
+  applypatch $srcdir/200-remove_printer_support.patch
+  applypatch $srcdir/220-remove_services.patch
+  applypatch $srcdir/230-remove_winreg_support.patch
+  applypatch $srcdir/250-remove_domain_logon.patch
+  applypatch $srcdir/270-remove_registry_backend.patch
+  applypatch $srcdir/280-strip_srvsvc.patch
+  applypatch $srcdir/300-assert_debug_level.patch
+  applypatch $srcdir/310-remove_error_strings.patch
+  applypatch $srcdir/320-debug_level_checks.patch
+  applypatch $srcdir/330-librpc_default_print.patch
 
   cd source3
   ac_cv_lib_attr_getxattr=no \
diff --git a/net/samba4/samba4.SMBuild b/net/samba4/samba4.SMBuild
index b923f9e..608c201 100755
--- a/net/samba4/samba4.SMBuild
+++ b/net/samba4/samba4.SMBuild
@@ -15,15 +15,15 @@ build() {
   cd samba-$version
   fixbuilddirpermissions
 
-  patch -p1 < $srcdir/add_missing___compar_fn_t.patch
-  patch -p1 < $srcdir/getpwent_r.patch
-  patch -p1 < $srcdir/missing-headers.patch
-  patch -p1 < $srcdir/musl_rm_unistd_incl.patch
-  patch -p1 < $srcdir/musl_uintptr.patch
-  patch -p1 < $srcdir/netapp.patch
-  patch -p1 < $srcdir/netdb-defines.patch
-  patch -p1 < $srcdir/tevent.patch
-  patch -p1 < $srcdir/pidl.patch
+  applypatch $srcdir/add_missing___compar_fn_t.patch
+  applypatch $srcdir/getpwent_r.patch
+  applypatch $srcdir/missing-headers.patch
+  applypatch $srcdir/musl_rm_unistd_incl.patch
+  applypatch $srcdir/musl_uintptr.patch
+  applypatch $srcdir/netapp.patch
+  applypatch $srcdir/netdb-defines.patch
+  applypatch $srcdir/tevent.patch
+  applypatch $srcdir/pidl.patch
 
   # Samba doesn't like our C/CXXFLAGS
   unset CFLAGS CXXFLAGS
diff --git a/net/sane-backends/sane-backends.SMBuild b/net/sane-backends/sane-backends.SMBuild
index 9de0d23..fc0726d 100755
--- a/net/sane-backends/sane-backends.SMBuild
+++ b/net/sane-backends/sane-backends.SMBuild
@@ -14,7 +14,7 @@ build() {
   cd $app-$version 
   fixbuilddirpermissions
 
-  patch -p1 < $srcdir/sane-frontends-1.0.14-sane_cap_always_settable.diff
+  applypatch $srcdir/sane-frontends-1.0.14-sane_cap_always_settable.diff
 
   ./configure \
     --prefix="" \
diff --git a/net/smstools/smstools.SMBuild b/net/smstools/smstools.SMBuild
index a48fd8a..abe5a8f 100755
--- a/net/smstools/smstools.SMBuild
+++ b/net/smstools/smstools.SMBuild
@@ -14,7 +14,7 @@ build() {
   cd "smstools3"
   fixbuilddirpermissions
 
-  patch -p1 < $srcdir/fixups2.diff
+  applypatch $srcdir/fixups2.diff
 
   ( cd src && make CC="$CC -static" )
   cp LICENSE $pkgdocs
diff --git a/net/sylpheed/sylpheed.SMBuild b/net/sylpheed/sylpheed.SMBuild
index 0de31b0..d0bad5c 100755
--- a/net/sylpheed/sylpheed.SMBuild
+++ b/net/sylpheed/sylpheed.SMBuild
@@ -14,8 +14,8 @@ build() {
   cd $app-$version
   fixbuilddirpermissions
 
-  patch -p1 < $srcdir/sylpheed-pop3-cram-md5.patch
-  patch -p1 < $srcdir/sylpheed-trayicon.patch
+  applypatch $srcdir/sylpheed-pop3-cram-md5.patch
+  applypatch $srcdir/sylpheed-trayicon.patch
 
   CPPFLAGS="$CFLAGS -D_GNU_SOURCE" \
   ./configure \
diff --git a/net/vinagre/vinagre.SMBuild b/net/vinagre/vinagre.SMBuild
index 575dd40..c215e48 100755
--- a/net/vinagre/vinagre.SMBuild
+++ b/net/vinagre/vinagre.SMBuild
@@ -15,7 +15,7 @@ build() {
   fixbuilddirpermissions
 
   sed -i 's@freerdp@freerdp2@g' configure
-  patch -p1 < $srcdir/freerdp2017.diff
+  applypatch $srcdir/freerdp2017.diff
 
   ./configure \
     --prefix="" \
diff --git a/net/wireless-tools/wireless-tools.SMBuild b/net/wireless-tools/wireless-tools.SMBuild
index 31e0280..1e74599 100755
--- a/net/wireless-tools/wireless-tools.SMBuild
+++ b/net/wireless-tools/wireless-tools.SMBuild
@@ -15,8 +15,8 @@ build() {
   cd "$altname.$version"
   fixbuilddirpermissions
 
-  patch -p1 < $srcdir/wireless-tools-Makefile.patch
-  patch -p1 < $srcdir/wireless-tools-headers.patch
+  applypatch $srcdir/wireless-tools-Makefile.patch
+  applypatch $srcdir/wireless-tools-headers.patch
 
   make INSTALL_MAN="$pkg/share/man" INSTALL_DIR="$pkg/bin" CFLAGS="$CFLAGS -D_GNU_SOURCE -D_BSD_SOURCE"
   make INSTALL_MAN="$pkg/share/man" INSTALL_DIR="$pkg/bin" install DESTDIR="$pkg"
diff --git a/net/wpa_supplicant/wpa_supplicant.SMBuild b/net/wpa_supplicant/wpa_supplicant.SMBuild
index d6658cf..7f844a5 100755
--- a/net/wpa_supplicant/wpa_supplicant.SMBuild
+++ b/net/wpa_supplicant/wpa_supplicant.SMBuild
@@ -14,9 +14,9 @@ build() {
   cd $app-$version
   fixbuilddirpermissions
 
-  patch -p1 < $srcdir/dbus.patch
-  patch -p1 < $srcdir/eloop.patch
-  patch -p1 < $srcdir/CVE-2019-16275.patch
+  applypatch $srcdir/dbus.patch
+  applypatch $srcdir/eloop.patch
+  applypatch $srcdir/CVE-2019-16275.patch
 
   cd wpa_supplicant ; cp $srcdir/config .config