py3-scapy is now scapy

OK bluhm sthen

12 files changed, 35 insertions, 35 deletions

diff --git a/regress/sbin/slaacd/Makefile b/regress/sbin/slaacd/Makefile
index dea89a07a6d..fbc12c1843b 100644
--- a/regress/sbin/slaacd/Makefile
+++ b/regress/sbin/slaacd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.9 2020/12/25 14:30:00 bluhm Exp $
+#	$OpenBSD: Makefile,v 1.10 2020/12/30 21:40:32 kn Exp $
 
 # The following ports must be installed:
 #
@@ -17,9 +17,9 @@ INTERFACES != sh -c "ifconfig ${PAIR1} 2>/dev/null; \
     ifconfig ${PAIR2} 2>/dev/null" || true
 .endif
 
-.if ! exists(/usr/local/bin/scapy-3)
+.if ! exists(/usr/local/bin/scapy)
 regress:
-	@echo Install py3-scapy package to run this regress.
+	@echo Install scapy package to run this regress.
 	@echo SKIPPED
 .endif
 
diff --git a/regress/sys/kern/sosplice/scapy/Makefile b/regress/sys/kern/sosplice/scapy/Makefile
index f3ddfd50579..a1f772d5997 100644
--- a/regress/sys/kern/sosplice/scapy/Makefile
+++ b/regress/sys/kern/sosplice/scapy/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.8 2020/12/25 16:50:40 bluhm Exp $
+#	$OpenBSD: Makefile,v 1.9 2020/12/30 21:40:32 kn Exp $
 
 # Copyright (c) 2017-2020 Alexander Bluhm <bluhm@openbsd.org>
 #
@@ -22,9 +22,9 @@
 
 .if ! (make(clean) || make(cleandir) || make(obj))
 
-.if ! exists(/usr/local/bin/scapy-3)
+.if ! exists(/usr/local/bin/scapy)
 regress:
-	@echo Install py3-scapy package to run this regress.
+	@echo Install scapy package to run this regress.
 	@echo SKIPPED
 .endif
 
diff --git a/regress/sys/net/pf_forward/Makefile b/regress/sys/net/pf_forward/Makefile
index aea57f25406..167a242d44f 100644
--- a/regress/sys/net/pf_forward/Makefile
+++ b/regress/sys/net/pf_forward/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.33 2020/12/24 22:39:57 bluhm Exp $
+#	$OpenBSD: Makefile,v 1.34 2020/12/30 21:40:32 kn Exp $
 
 # Copyright (c) 2012-2020 Alexander Bluhm <bluhm@openbsd.org>
 #
@@ -18,9 +18,9 @@
 #
 # scapy               powerful interactive packet manipulation in python
 
-.if ! exists(/usr/local/bin/scapy-3)
+.if ! exists(/usr/local/bin/scapy)
 regress:
-	@echo Install py3-scapy package to run this regress.
+	@echo Install scapy package to run this regress.
 	@echo SKIPPED
 .endif
 
diff --git a/regress/sys/net/pf_fragment/Makefile b/regress/sys/net/pf_fragment/Makefile
index 3a914a4c9b4..885a24ba082 100644
--- a/regress/sys/net/pf_fragment/Makefile
+++ b/regress/sys/net/pf_fragment/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.28 2020/12/25 00:49:49 bluhm Exp $
+#	$OpenBSD: Makefile,v 1.29 2020/12/30 21:40:33 kn Exp $
 
 # Copyright (c) 2011-2020 Alexander Bluhm <bluhm@openbsd.org>
 #
@@ -18,9 +18,9 @@
 #
 # scapy               powerful interactive packet manipulation in python
 
-.if ! exists(/usr/local/bin/scapy-3)
+.if ! exists(/usr/local/bin/scapy)
 regress:
-	@echo Install py3-scapy package to run this regress.
+	@echo Install scapy package to run this regress.
 	@echo SKIPPED
 .endif
 
diff --git a/regress/sys/net/pf_state/Makefile b/regress/sys/net/pf_state/Makefile
index 0e30288ad3d..1ea064bd5c9 100644
--- a/regress/sys/net/pf_state/Makefile
+++ b/regress/sys/net/pf_state/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.12 2020/12/24 16:25:15 bluhm Exp $
+#	$OpenBSD: Makefile,v 1.13 2020/12/30 21:40:33 kn Exp $
 
 # Copyright (c) 2016-2020 Alexander Bluhm <bluhm@openbsd.org>
 #
@@ -22,9 +22,9 @@
 
 .if ! (make(clean) || make(cleandir) || make(obj))
 
-.if ! exists(/usr/local/bin/scapy-3)
+.if ! exists(/usr/local/bin/scapy)
 regress:
-	@echo Install py3-scapy package to run this regress.
+	@echo Install scapy package to run this regress.
 	@echo SKIPPED
 .endif
 
diff --git a/regress/sys/netinet/arp/Makefile b/regress/sys/netinet/arp/Makefile
index 89d03797d2e..5e12d679472 100644
--- a/regress/sys/netinet/arp/Makefile
+++ b/regress/sys/netinet/arp/Makefile
@@ -1,12 +1,12 @@
-#	$OpenBSD: Makefile,v 1.14 2020/12/25 16:17:00 bluhm Exp $
+#	$OpenBSD: Makefile,v 1.15 2020/12/30 21:40:33 kn Exp $
 
 # The following ports must be installed:
 #
 # scapy               powerful interactive packet manipulation in python
 
-.if ! exists(/usr/local/bin/scapy-3)
+.if ! exists(/usr/local/bin/scapy)
 regress:
-	@echo Install py3-scapy package to run this regress.
+	@echo Install scapy package to run this regress.
 	@echo SKIPPED
 .endif
 
diff --git a/regress/sys/netinet/frag/Makefile b/regress/sys/netinet/frag/Makefile
index b147e89ba26..29f01c0e202 100644
--- a/regress/sys/netinet/frag/Makefile
+++ b/regress/sys/netinet/frag/Makefile
@@ -1,14 +1,14 @@
-#	$OpenBSD: Makefile,v 1.9 2020/12/25 22:59:27 bluhm Exp $
+#	$OpenBSD: Makefile,v 1.10 2020/12/30 21:40:33 kn Exp $
 
 # The following ports must be installed:
 #
 # scapy               powerful interactive packet manipulation in python
 
-.if ! exists(/usr/local/bin/scapy-3)
+.if ! exists(/usr/local/bin/scapy)
 .BEGIN:
 	@true
 regress:
-	@echo Install py3-scapy package to run this regress.
+	@echo Install scapy package to run this regress.
 	@echo SKIPPED
 .endif
 
diff --git a/regress/sys/netinet/pmtu/Makefile b/regress/sys/netinet/pmtu/Makefile
index 87dfc570d0d..484c722cb27 100644
--- a/regress/sys/netinet/pmtu/Makefile
+++ b/regress/sys/netinet/pmtu/Makefile
@@ -1,12 +1,12 @@
-#	$OpenBSD: Makefile,v 1.14 2020/12/25 19:01:09 bluhm Exp $
+#	$OpenBSD: Makefile,v 1.15 2020/12/30 21:40:33 kn Exp $
 
 # The following ports must be installed:
 #
 # scapy               powerful interactive packet manipulation in python
 
-.if ! exists(/usr/local/bin/scapy-3)
+.if ! exists(/usr/local/bin/scapy)
 regress:
-	@echo Install py3-scapy package to run this regress.
+	@echo Install scapy package to run this regress.
 	@echo SKIPPED
 .endif
 
diff --git a/regress/sys/netinet6/frag6/Makefile b/regress/sys/netinet6/frag6/Makefile
index 60bd2e1e1c0..338fc9cc44b 100644
--- a/regress/sys/netinet6/frag6/Makefile
+++ b/regress/sys/netinet6/frag6/Makefile
@@ -1,14 +1,14 @@
-#	$OpenBSD: Makefile,v 1.27 2020/12/25 20:18:11 bluhm Exp $
+#	$OpenBSD: Makefile,v 1.28 2020/12/30 21:40:33 kn Exp $
 
 # The following ports must be installed:
 #
 # scapy               powerful interactive packet manipulation in python
 
-.if ! exists(/usr/local/bin/scapy-3)
+.if ! exists(/usr/local/bin/scapy)
 .BEGIN:
 	@true
 regress:
-	@echo Install py3-scapy package to run this regress.
+	@echo Install scapy package to run this regress.
 	@echo SKIPPED
 .endif
 
diff --git a/regress/sys/netinet6/nd6/Makefile b/regress/sys/netinet6/nd6/Makefile
index 0b07af66a57..85b0b81b53c 100644
--- a/regress/sys/netinet6/nd6/Makefile
+++ b/regress/sys/netinet6/nd6/Makefile
@@ -1,12 +1,12 @@
-#	$OpenBSD: Makefile,v 1.12 2020/12/26 00:12:03 bluhm Exp $
+#	$OpenBSD: Makefile,v 1.13 2020/12/30 21:40:33 kn Exp $
 
 # The following ports must be installed:
 #
 # scapy               powerful interactive packet manipulation in python
 
-.if ! exists(/usr/local/bin/scapy-3)
+.if ! exists(/usr/local/bin/scapy)
 regress:
-	@echo Install py3-scapy package to run this regress.
+	@echo Install scapy package to run this regress.
 	@echo SKIPPED
 .endif
 
diff --git a/regress/sys/netinet6/rh0/Makefile b/regress/sys/netinet6/rh0/Makefile
index ab2b9e7f577..0e26075c2f1 100644
--- a/regress/sys/netinet6/rh0/Makefile
+++ b/regress/sys/netinet6/rh0/Makefile
@@ -1,14 +1,14 @@
-#	$OpenBSD: Makefile,v 1.15 2020/12/25 22:16:03 bluhm Exp $
+#	$OpenBSD: Makefile,v 1.16 2020/12/30 21:40:33 kn Exp $
 
 # The following ports must be installed:
 #
 # scapy			powerful interactive packet manipulation in python
 
-.if ! exists(/usr/local/bin/scapy-3)
+.if ! exists(/usr/local/bin/scapy)
 .BEGIN:
 	@true
 regress:
-	@echo Install py3-scapy package to run this regress.
+	@echo Install scapy package to run this regress.
 	@echo SKIPPED
 .endif
 
diff --git a/regress/sys/netinet6/rip6cksum/Makefile b/regress/sys/netinet6/rip6cksum/Makefile
index 63534cf71f3..d4bbb0b2ab6 100644
--- a/regress/sys/netinet6/rip6cksum/Makefile
+++ b/regress/sys/netinet6/rip6cksum/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.5 2020/12/25 13:47:43 bluhm Exp $
+# $OpenBSD: Makefile,v 1.6 2020/12/30 21:40:33 kn Exp $
 
 # The following ports must be installed:
 #
 # scapy               powerful interactive packet manipulation in python
 
-.if ! exists(/usr/local/bin/scapy-3)
+.if ! exists(/usr/local/bin/scapy)
 regress:
 	@echo Install scapy package to run this regress.
 	@echo SKIPPED