CVS commit: pkgsrc/net/wireguard-tools

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri Jul 19 09:51:36 UTC 2024

Modified Files:
        pkgsrc/net/wireguard-tools: Makefile PLIST

Log Message:
wireguard-tools: Include additional features.

Install the bash-completion script on all OS, and install wg-quick on OS that
provide an implementation for it.

Requested in TritonDataCenter/pkgsrc#384.  Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/wireguard-tools/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/wireguard-tools/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/wireguard-tools/Makefile
diff -u pkgsrc/net/wireguard-tools/Makefile:1.4 pkgsrc/net/wireguard-tools/Makefile:1.5
--- pkgsrc/net/wireguard-tools/Makefile:1.4     Wed Aug 30 21:46:34 2023
+++ pkgsrc/net/wireguard-tools/Makefile Fri Jul 19 09:51:36 2024
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2023/08/30 21:46:34 js Exp $
+# $NetBSD: Makefile,v 1.5 2024/07/19 09:51:36 jperkin Exp $
 
 DISTNAME=      wireguard-tools-1.0.20210914
+PKGREVISION=   1
 CATEGORIES=    net
 MASTER_SITES=  https://git.zx2c4.com/wireguard-tools/snapshot/
 EXTRACT_SUFX=  .tar.xz
@@ -10,14 +11,40 @@ HOMEPAGE=   https://git.zx2c4.com/wireguar
 COMMENT=       Userspace tooling for using and configuring WireGuard tunnels
 LICENSE=       gnu-gpl-v2
 
+WRKSRC=                ${WRKDIR}/${DISTNAME}/src
+
 USE_LANGUAGES= c
 USE_TOOLS+=    gmake
+
 MAKE_FLAGS+=   MANDIR=${PREFIX}/${PKGMANDIR}
-MAKE_FLAGS+=   WITH_BASHCOMPLETION=no
-# wg-quick is a bunch of OS-specific shell scripts, currently lacking NetBSD
-MAKE_FLAGS+=   WITH_WGQUICK=no
+MAKE_FLAGS+=   SYSCONFDIR=${PKG_SYSCONFDIR}
+MAKE_FLAGS+=   WITH_BASHCOMPLETION=yes
 MAKE_FLAGS+=   WITH_SYSTEMDUNITS=no
 
-WRKSRC=                ${WRKDIR}/${DISTNAME}/src
+SUBST_CLASSES+=                paths
+SUBST_STAGE.paths=     pre-configure
+SUBST_FILES.paths=     completion/wg-quick.bash-completion
+SUBST_FILES.paths+=    wg-quick/*.bash
+SUBST_SED.paths=       -e 's,/usr/local/etc,${PKG_SYSCONFDIR},g'
+
+PLIST_VARS+=           wg-quick
+PRINT_PLIST_AWK+=      /wg-quick/ { print "$${PLIST.wg-quick}" $$0; next }
+
+.include "../../mk/bsd.prefs.mk"
+
+# Darwin's native bash 3.x isn't sufficient
+.if ${OPSYS} == "Darwin" && "${TOOLS_PLATFORM.bash}" == "/bin/bash"
+TOOLS_PLATFORM.bash=
+.endif
+
+.if ${OPSYS} == "Darwin" || ${OPSYS} == "FreeBSD" \
+ || ${OPSYS} == "Linux" || ${OPSYS} == "OpenBSD"
+USE_TOOLS+=            bash:run
+REPLACE_BASH+=         wg-quick/*.bash
+MAKE_FLAGS+=           WITH_WGQUICK=yes
+PLIST.wg-quick=                yes
+.else
+MAKE_FLAGS+=           WITH_WGQUICK=no
+.endif
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/wireguard-tools/PLIST
diff -u pkgsrc/net/wireguard-tools/PLIST:1.2 pkgsrc/net/wireguard-tools/PLIST:1.3
--- pkgsrc/net/wireguard-tools/PLIST:1.2        Fri Sep 18 14:58:14 2020
+++ pkgsrc/net/wireguard-tools/PLIST    Fri Jul 19 09:51:36 2024
@@ -1,3 +1,7 @@
-@comment $NetBSD: PLIST,v 1.2 2020/09/18 14:58:14 js Exp $
+@comment $NetBSD: PLIST,v 1.3 2024/07/19 09:51:36 jperkin Exp $
 bin/wg
+${PLIST.wg-quick}bin/wg-quick
+${PLIST.wg-quick}man/man8/wg-quick.8
 man/man8/wg.8
+share/bash-completion/completions/wg
+${PLIST.wg-quick}share/bash-completion/completions/wg-quick