Index: head/net/wireguard/Makefile
===================================================================
--- head/net/wireguard/Makefile	(revision 529907)
+++ head/net/wireguard/Makefile	(revision 529908)
@@ -1,32 +1,33 @@
 # $FreeBSD$
 
 PORTNAME=	wireguard
 PORTVERSION=	1.0.20200319
+PORTREVISION=	1
 CATEGORIES=	net net-vpn
 MASTER_SITES=	https://git.zx2c4.com/wireguard-tools/snapshot/
 DISTNAME=	wireguard-tools-${PORTVERSION}
 
 MAINTAINER=	decke@FreeBSD.org
 COMMENT=	Fast, modern and secure VPN Tunnel
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKDIR}/${DISTNAME}/COPYING
 
 RUN_DEPENDS=	bash:shells/bash \
 		wireguard-go:net/wireguard-go
 
 USES=		gmake tar:xz
 USE_RC_SUBR=	${PORTNAME}
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
 MAKE_ARGS=	WITH_WGQUICK=yes WITH_BASHCOMPLETION=yes
 MAKE_ENV+=	MANDIR="${MANPREFIX}/man" \
 		SYSCONFDIR="${PREFIX}/etc"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 		${WRKSRC}/completion/wg-quick.bash-completion \
 		${WRKSRC}/wg-quick/freebsd.bash
 
 .include <bsd.port.mk>
Index: head/net/wireguard/files/wireguard.in
===================================================================
--- head/net/wireguard/files/wireguard.in	(revision 529907)
+++ head/net/wireguard/files/wireguard.in	(revision 529908)
@@ -1,50 +1,48 @@
 #!/bin/sh
 
 # $FreeBSD$
 #
 # PROVIDE: wireguard
 # REQUIRE: DAEMON
 # KEYWORD: shutdown
 #
 # wireguard_enable (bool):    Set to "YES" to enable wireguard.
 #                             (default: "NO")
 #
 # wireguard_interfaces (str): List of interfaces to bring up/down
 #                             on start/stop. (eg: "wg0 wg1")
 #                             (default: "")
-# wireguard_impl (str):       Wireguard userspace implementation
-#                             (default: "wireguard-go")
-#                             Possible choices:
-#                                wireguard-go, boringtun
+# wireguard_env (str):        Environment variables for the userspace
+#                             implementation. (eg: "LOG_LEVEL=debug")
 
 . /etc/rc.subr
 
 name=wireguard
 rcvar=wireguard_enable
 
 start_cmd="${name}_start"
 stop_cmd="${name}_stop"
 
 wireguard_start()
 {
-	export WG_QUICK_USERSPACE_IMPLEMENTATION=${wireguard_impl}
+	${wireguard_env:+eval export $wireguard_env}
 
 	for interface in ${wireguard_interfaces}; do
 		%%PREFIX%%/bin/wg-quick up ${interface}
 	done
 }
 
 wireguard_stop()
 {
 	for interface in ${wireguard_interfaces}; do
 		%%PREFIX%%/bin/wg-quick down ${interface}
 	done
 }
 
 load_rc_config $name
 
 : ${wireguard_enable="NO"}
 : ${wireguard_interfaces=""}
-: ${wireguard_impl="wireguard-go"}
+: ${wireguard_env=""}
 
 run_rc_command "$1"