From a2d667d99652a16336e27678a077525433dab2ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Fri, 16 Jul 2021 02:51:39 -0300 Subject: [PATCH] wireguard-tools: include contrib/ contents in package. Other distros are putting them in /usr/share/wireguard-tools/examples, so we also do that for consistency. Also move patching to post_patch and use vsed. --- srcpkgs/wireguard-tools/template | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/srcpkgs/wireguard-tools/template b/srcpkgs/wireguard-tools/template index fdff0618751..8a0f85eecb2 100644 --- a/srcpkgs/wireguard-tools/template +++ b/srcpkgs/wireguard-tools/template @@ -1,11 +1,13 @@ # Template file for 'wireguard-tools' pkgname=wireguard-tools version=1.0.20210424 -revision=1 +revision=2 build_wrksrc="src" build_style=gnu-makefile make_install_args="WITH_BASHCOMPLETION=yes WITH_WGQUICK=yes" depends="openresolv" +# FIXME: clang-analyzer should depend on perl +checkdepends="clang-analyzer perl" short_desc="Fast, modern, secure VPN tunnel - userland tools" maintainer="Leah Neukirchen " license="GPL-2.0-only" @@ -14,10 +16,13 @@ distfiles="https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-${vers checksum=b288b0c43871d919629d7e77846ef0b47f8eeaa9ebc9cedeee8233fc6cc376ad make_dirs="/etc/wireguard 0700 root root" -post_extract() { - sed -i 's/^CFLAGS /override &/' ${build_wrksrc}/Makefile +post_patch() { + vsed -i 's/^CFLAGS /override &/' Makefile } post_install() { vsv wireguard + + vmkdir usr/share/$pkgname/examples + vcopy ../contrib/* usr/share/$pkgname/examples }