net/wireguard: Fix instructions, kernel module is loaded by ifconfig automatically (magic?!)

3 files changed, 14 insertions, 18 deletions

diff --git a/UPDATING b/UPDATING
index 0f0ca76243ad..14fd9dc36cf5 100644
--- a/UPDATING
+++ b/UPDATING
@@ -12,16 +12,14 @@ you update your ports collection, before attempting any port upgrades.
   A wireguard kernel implementation supporting FreeBSD 12.1 and newer was
   added as net/wireguard-kmod recently.
 
-  The new default for users of net/wireguard is the kernel module where it
-  is supported and needs to be loaded at boot time from your /etc/rc.conf
-  or /etc/rc.conf.d/wireguard file:
-
-  kld_list="/boot/modules/if_wg.ko"
+  The new default for users of net/wireguard is the kernel module.
 
   If you experience problems with it you can switch back to wireguard-go
-  easily by unloading (or not loading) the kernel module. The userland
-  tools wg-quick(8) and wg(8) try to use kernel support and otherwise fall
-  back to wireguard-go automatically. Config files are fully compatible.
+  by removing net/wireguard-kmod and making sure net/wireguard-go is
+  installed.
+  The userland tools wg-quick(8) and wg(8) try to use kernel support if
+  the kernel module is available and otherwise fall back to wireguard-go
+  automatically. Config files are fully compatible.
 
 20210317:
   AFFECTS: users of security/strongswan
diff --git a/net/wireguard/Makefile b/net/wireguard/Makefile
index 1547e23985d6..6c85be8748e4 100644
--- a/net/wireguard/Makefile
+++ b/net/wireguard/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	wireguard
-PORTVERSION=	1
+PORTVERSION=	2
 PORTEPOCH=	1
 CATEGORIES=	net net-vpn
 
diff --git a/net/wireguard/pkg-message b/net/wireguard/pkg-message
index 089763ed4eca..967ea4e54b52 100644
--- a/net/wireguard/pkg-message
+++ b/net/wireguard/pkg-message
@@ -4,16 +4,14 @@
 For FreeBSD < 12.1 only the userland implementation wireguard-go is
 available.
 
-For FreeBSD >= 12.1 we default to use the kernel module if_wg(4). If
-you experience problems with it you can switch back to wireguard-go
-easily by unloading the kernel module. The userland tools wg-quick(8)
-and wg(8) try to use if_wg(4) if available and otherwise fallback to
-wireguard-go. Config files are fully compatible.
+For FreeBSD >= 12.1 we default to use the kernel module if_wg(4).
 
-To load the kernel module at boot add this to your /etc/rc.conf or
-/etc/rc.conf.d/wireguard file:
-
-kld_list="/boot/modules/if_wg.ko"
+If you experience problems with it you can switch back to wireguard-go
+by removing net/wireguard-kmod and making sure net/wireguard-go is
+installed.
+The userland tools wg-quick(8) and wg(8) try to use kernel support if 
+the kernel module is available and otherwise fall back to wireguard-go
+automatically. Config files are fully compatible.
 EOM
 }
 ]