7 files changed, 20 insertions, 20 deletions
diff --git a/regress/sys/kern/sosplice/scapy/Makefile b/regress/sys/kern/sosplice/scapy/Makefile
index 8d46dd56fb0..b15216b3ccc 100644
--- a/regress/sys/kern/sosplice/scapy/Makefile
+++ b/regress/sys/kern/sosplice/scapy/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.5 2020/01/08 21:28:00 bluhm Exp $
+#	$OpenBSD: Makefile,v 1.6 2020/01/15 20:47:13 bluhm Exp $
 
 # Copyright (c) 2017-2020 Alexander Bluhm <bluhm@openbsd.org>
 #
@@ -84,7 +84,7 @@ regress:
 .MAIN: all
 
 .if make (regress) || make (all)
-.BEGIN: addr.py
+.BEGIN:
 	@echo
 	${SUDO} true
 	ssh -t ${REMOTE_SSH} true
diff --git a/regress/sys/net/pf_forward/Makefile b/regress/sys/net/pf_forward/Makefile
index d39ac322378..c3d115cb108 100644
--- a/regress/sys/net/pf_forward/Makefile
+++ b/regress/sys/net/pf_forward/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.29 2020/01/08 21:28:00 bluhm Exp $
+#	$OpenBSD: Makefile,v 1.30 2020/01/15 20:47:13 bluhm Exp $
 
 # Copyright (c) 2012-2020 Alexander Bluhm <bluhm@openbsd.org>
 #
@@ -107,7 +107,7 @@ regress:
 
 .if ! empty (PF_SSH)
 .if make (regress) || make (all)
-.BEGIN: pf.conf addr.py
+.BEGIN:
 	@echo
 	${SUDO} true
 	ssh -t ${PF_SSH} ${SUDO} true
@@ -133,7 +133,7 @@ addr.py: Makefile
 # Load the pf rules into the kernel of the PF machine.
 # XXX pfctl does not replace variables after @.
 stamp-pfctl: addr.py pf.conf
-	cat addr.py ${.CURDIR}/pf.conf | pfctl -n -f -
+	cat addr.py ${.CURDIR}/pf.conf | /sbin/pfctl -n -f -
 	cat addr.py ${.CURDIR}/pf.conf | \
 	    sed 's/@$$PF_IFIN /@${PF_IFIN} /;s/@$$PF_IFOUT /@${PF_IFOUT} /' | \
 	    ssh ${PF_SSH} ${SUDO} pfctl -a regress -f -
diff --git a/regress/sys/net/pf_fragment/Makefile b/regress/sys/net/pf_fragment/Makefile
index 0f59aa26bd0..2c1f94e3783 100644
--- a/regress/sys/net/pf_fragment/Makefile
+++ b/regress/sys/net/pf_fragment/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.25 2020/01/08 21:28:00 bluhm Exp $
+#	$OpenBSD: Makefile,v 1.26 2020/01/15 20:47:13 bluhm Exp $
 
 # Copyright (c) 2011-2020 Alexander Bluhm <bluhm@openbsd.org>
 #
@@ -88,7 +88,7 @@ regress:
 
 .if ! empty (PF_SSH)
 .if make (regress) || make (all)
-.BEGIN: pf.conf addr.py
+.BEGIN:
 	@echo
 	${SUDO} true
 	ssh -t ${PF_SSH} ${SUDO} true
@@ -114,7 +114,7 @@ addr.py: Makefile
 # XXX pfctl does not replace variables after @
 REGRESS_SETUP +=	stamp-pfctl
 stamp-pfctl: addr.py pf.conf
-	cat addr.py ${.CURDIR}/pf.conf | pfctl -n -f -
+	cat addr.py ${.CURDIR}/pf.conf | /sbin/pfctl -n -f -
 	cat addr.py ${.CURDIR}/pf.conf | \
 	    sed 's/@$$PF_IFIN /@${PF_IFIN} /;s/@$$PF_IFOUT /@${PF_IFOUT} /' | \
 	    ssh ${PF_SSH} ${SUDO} pfctl -a regress -f -
diff --git a/regress/sys/net/pf_state/Makefile b/regress/sys/net/pf_state/Makefile
index 1a44529b0f2..ef9f438f509 100644
--- a/regress/sys/net/pf_state/Makefile
+++ b/regress/sys/net/pf_state/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.9 2020/01/08 21:28:01 bluhm Exp $
+#	$OpenBSD: Makefile,v 1.10 2020/01/15 20:47:13 bluhm Exp $
 
 # Copyright (c) 2016-2020 Alexander Bluhm <bluhm@openbsd.org>
 #
@@ -77,7 +77,7 @@ regress:
 .MAIN: all
 
 .if make (regress) || make (all)
-.BEGIN: pf.conf addr.py
+.BEGIN:
 	@echo
 	${SUDO} true
 	ssh -t ${REMOTE_SSH} ${SUDO} true
@@ -97,7 +97,7 @@ addr.py: Makefile
 # load the pf rules into the kernel of the REMOTE and LOCAL machine
 REGRESS_SETUP +=	stamp-pfctl
 stamp-pfctl: addr.py pf.conf
-	cat addr.py ${.CURDIR}/pf.conf | pfctl -n -f -
+	cat addr.py ${.CURDIR}/pf.conf | /sbin/pfctl -n -f -
 	cat addr.py ${.CURDIR}/pf.conf | \
 	    ssh ${REMOTE_SSH} ${SUDO} pfctl -a regress -f -
 .if ! empty(PF_ANCHOR:Mregress)
diff --git a/regress/sys/netinet/frag/Makefile b/regress/sys/netinet/frag/Makefile
index 990c26fb6de..ae55e9951ff 100644
--- a/regress/sys/netinet/frag/Makefile
+++ b/regress/sys/netinet/frag/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.5 2019/05/10 02:22:34 bluhm Exp $
+#	$OpenBSD: Makefile,v 1.6 2020/01/15 20:47:13 bluhm Exp $
 
 # The following ports must be installed:
 #
@@ -6,7 +6,7 @@
 # scapy               powerful interactive packet manipulation in python
 
 .if ! exists(/usr/local/bin/python2.7) || ! exists(/usr/local/bin/scapy)
-.BEGIN: addr.py
+.BEGIN:
 	@true
 regress:
 	@echo Install python and the scapy module for additional tests.
@@ -82,7 +82,7 @@ stamp-stack:
 stamp-pf: addr.py pf.conf
 	@echo '\n======== $@ ========'
 	rm -f stamp-stack stamp-pf
-	cat addr.py ${.CURDIR}/pf.conf | pfctl -n -f -
+	cat addr.py ${.CURDIR}/pf.conf | /sbin/pfctl -n -f -
 	cat addr.py ${.CURDIR}/pf.conf | \
 	    ssh ${REMOTE_SSH} ${SUDO} pfctl -a regress -f -
 	-ssh ${REMOTE_SSH} ${SUDO} pfctl -e
diff --git a/regress/sys/netinet/ipsec/Makefile b/regress/sys/netinet/ipsec/Makefile
index d9e5a8d4bd8..a914125ef8c 100644
--- a/regress/sys/netinet/ipsec/Makefile
+++ b/regress/sys/netinet/ipsec/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.25 2020/01/08 21:28:01 bluhm Exp $
+#	$OpenBSD: Makefile,v 1.26 2020/01/15 20:47:13 bluhm Exp $
 
 # This test needs a manual setup of four machines, the make
 # target create-setup can be used to distribute the configuration.
@@ -162,7 +162,7 @@ regress:
 	@echo SKIPPED
 
 .elif make (regress) || make (all)
-.BEGIN: ipsec.conf addr.py
+.BEGIN:
 	@echo
 	${SUDO} true
 	ssh -t ${IPS_SSH} ${SUDO} true
@@ -195,7 +195,7 @@ addr.py: Makefile
 # Load the ipsec sa and flow into the kernel of the SRC and IPS machine.
 stamp-ipsec: addr.py ipsec.conf
 	@echo '\n======== $@ ========'
-	cat addr.py ${.CURDIR}/ipsec.conf | ipsecctl -n -f -
+	cat addr.py ${.CURDIR}/ipsec.conf | /sbin/ipsecctl -n -f -
 	${SUDO} ipsecctl -F
 	cat addr.py ${.CURDIR}/ipsec.conf | ${SUDO} ipsecctl -f -
 	ssh ${IPS_SSH} ${SUDO} ipsecctl -F
@@ -206,7 +206,7 @@ stamp-ipsec: addr.py ipsec.conf
 # Load a pf log enc0 pass any rule into the kernel of the IPS machine.
 stamp-pfctl: addr.py pf.conf
 	@echo '\n======== $@ ========'
-	cat addr.py ${.CURDIR}/pf.conf | pfctl -n -f -
+	cat addr.py ${.CURDIR}/pf.conf | /sbin/pfctl -n -f -
 	cat addr.py ${.CURDIR}/pf.conf | \
 	    ssh ${IPS_SSH} ${SUDO} pfctl -a regress -f -
 	@date >$@
diff --git a/regress/sys/netinet6/rh0/Makefile b/regress/sys/netinet6/rh0/Makefile
index 633cdac6e5a..2521c2fa4f8 100644
--- a/regress/sys/netinet6/rh0/Makefile
+++ b/regress/sys/netinet6/rh0/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.12 2019/05/10 02:22:34 bluhm Exp $
+#	$OpenBSD: Makefile,v 1.13 2020/01/15 20:47:14 bluhm Exp $
 
 # The following ports must be installed:
 #
@@ -53,7 +53,7 @@ regress:
 .MAIN: all
 
 .if make (regress) || make (all)
-.BEGIN: addr.py
+.BEGIN:
 	@echo
 	${SUDO} true
 	ssh -t ${REMOTE_SSH} ${SUDO} true