Index: head/net/wireguard/Makefile
===================================================================
--- head/net/wireguard/Makefile	(revision 566556)
+++ head/net/wireguard/Makefile	(revision 566557)
@@ -1,32 +1,44 @@
 # $FreeBSD$
 
 PORTNAME=	wireguard
-PORTVERSION=	1.0.20200827
+PORTVERSION=	1.0.20210223
 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_ARGS+=	WITH_SYSTEMDUNITS=no DEBUG=no
 MAKE_ENV+=	MANDIR="${MANPREFIX}/man" \
 		SYSCONFDIR="${PREFIX}/etc"
+
+OPTIONS_DEFINE=	BASHCOMPLETION WGQUICK
+OPTIONS_DEFAULT=BASHCOMPLETION WGQUICK
+OPTIONS_SUB=	yes
+
+BASHCOMPLETION_DESC=		Command completion files for Bash shell
+BASHCOMPLETION_RUN_DEPENDS=	bash:shells/bash
+BASHCOMPLETION_MAKE_ARGS=	WITH_BASHCOMPLETION=yes
+BASHCOMPLETION_MAKE_ARGS_OFF=	WITH_BASHCOMPLETION=no
+
+WGQUICK_DESC=		wg-quick(8) userland utility
+WGQUICK_RUN_DEPENDS=	bash:shells/bash \
+			wireguard-go:net/wireguard-go
+WGQUICK_MAKE_ARGS=	WITH_WGQUICK=yes
+WGQUICK_MAKE_ARGS_OFF=	WITH_WGQUICK=no
 
 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/distinfo
===================================================================
--- head/net/wireguard/distinfo	(revision 566556)
+++ head/net/wireguard/distinfo	(revision 566557)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1598771471
-SHA256 (wireguard-tools-1.0.20200827.tar.xz) = 51bc85e33a5b3cf353786ae64b0f1216d7a871447f058b6137f793eb0f53b7fd
-SIZE (wireguard-tools-1.0.20200827.tar.xz) = 94788
+TIMESTAMP = 1614269282
+SHA256 (wireguard-tools-1.0.20210223.tar.xz) = 1f72da217044622d79e0bab57779e136a3df795e3761a3fc1dc0941a9055877c
+SIZE (wireguard-tools-1.0.20210223.tar.xz) = 95444
Index: head/net/wireguard/pkg-plist
===================================================================
--- head/net/wireguard/pkg-plist	(revision 566556)
+++ head/net/wireguard/pkg-plist	(revision 566557)
@@ -1,7 +1,7 @@
 bin/wg
-bin/wg-quick
-man/man8/wg-quick.8.gz
+%%WGQUICK%%bin/wg-quick
+%%WGQUICK%%man/man8/wg-quick.8.gz
 man/man8/wg.8.gz
-share/bash-completion/completions/wg
-share/bash-completion/completions/wg-quick
-@dir etc/wireguard
+%%BASHCOMPLETION%%share/bash-completion/completions/wg
+%%BASHCOMPLETION%%share/bash-completion/completions/wg-quick
+%%WGQUICK%%@dir etc/wireguard