From b8c5e59acdd938e426edde6fcce2b95ebbd88af3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Fri, 19 Feb 2021 00:55:24 -0300 Subject: [PATCH] srcpkgs/: clean up Go packages. Fix small typos, expand some variables, leave comments for updates. --- srcpkgs/antibody/template | 2 +- srcpkgs/caddy/template | 1 + srcpkgs/chezmoi/template | 2 +- srcpkgs/consul-template/template | 2 +- srcpkgs/consul/template | 2 +- srcpkgs/crane/template | 2 +- srcpkgs/dep/template | 2 +- srcpkgs/docker-gen/template | 2 +- srcpkgs/flint/template | 2 +- srcpkgs/forego/template | 2 +- srcpkgs/gendesk/template | 2 +- srcpkgs/git-lfs/template | 2 +- srcpkgs/gkill/template | 2 +- srcpkgs/glock/template | 2 +- srcpkgs/go-ipfs/template | 4 ++-- srcpkgs/hugo/template | 4 ++-- srcpkgs/lego/template | 4 ++-- srcpkgs/massren/template | 4 ++-- srcpkgs/micro/template | 2 +- srcpkgs/nomad/template | 4 ++-- srcpkgs/peco/template | 2 +- srcpkgs/sift/template | 2 +- srcpkgs/tag/template | 4 ++-- srcpkgs/terragrunt/template | 2 +- srcpkgs/vault/template | 4 ++-- srcpkgs/webcat/template | 2 +- srcpkgs/websocketd/template | 2 +- 27 files changed, 34 insertions(+), 33 deletions(-) diff --git a/srcpkgs/antibody/template b/srcpkgs/antibody/template index 7071501830..cb109f0b18 100644 --- a/srcpkgs/antibody/template +++ b/srcpkgs/antibody/template @@ -9,7 +9,7 @@ short_desc="Fast and lightweight shell plugin manager" maintainer="SolitudeSF " license="MIT" homepage="https://getantibody.github.io/" -distfiles="https://${go_import_path}/archive/v${version}.tar.gz" +distfiles="https://github.com/getantibody/antibody/archive/v${version}.tar.gz" checksum=87bced5fba8cf5d587ea803d33dda72e8bcbd4e4c9991a9b40b2de4babbfc24f post_install() { diff --git a/srcpkgs/caddy/template b/srcpkgs/caddy/template index dbae705756..6fe986419c 100644 --- a/srcpkgs/caddy/template +++ b/srcpkgs/caddy/template @@ -3,6 +3,7 @@ pkgname=caddy version=1.0.5 revision=1 build_style=go +# XXX: use caddy/v2 when updating go_import_path=github.com/caddyserver/caddy go_package="${go_import_path}/caddy" hostmakedepends="git" diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template index 5c6d47e5ab..64326d00b1 100644 --- a/srcpkgs/chezmoi/template +++ b/srcpkgs/chezmoi/template @@ -12,7 +12,7 @@ short_desc="Manage your dotfiles across multiple machines, securely" maintainer="Abigail G " license="MIT" homepage="https://chezmoi.io/" -distfiles="https://github.com/twpayne/${pkgname}/archive/v${version}.tar.gz" +distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz" checksum=23515591028202aaf7af908e38972f156ee08022f535bc74aaa9244b82da2fa1 post_install() { diff --git a/srcpkgs/consul-template/template b/srcpkgs/consul-template/template index 3d490804ba..00cd77f341 100644 --- a/srcpkgs/consul-template/template +++ b/srcpkgs/consul-template/template @@ -3,7 +3,7 @@ pkgname=consul-template version=0.25.1 revision=1 build_style=go -go_import_path="github.com/hashicorp/$pkgname" +go_import_path="github.com/hashicorp/consul-template" hostmakedepends="git" short_desc="Template rendering, notifier, and supervisor for Consul and Vault data" maintainer="Noel Cower " diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template index e55c4d587f..b6fd558b9c 100644 --- a/srcpkgs/consul/template +++ b/srcpkgs/consul/template @@ -3,7 +3,7 @@ pkgname=consul version=1.8.4 revision=1 build_style=go -go_import_path="github.com/hashicorp/${pkgname}" +go_import_path="github.com/hashicorp/consul" _git_commit=9ea1a204d832cfd4d8c5cba9df56876a526a4531 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit} -X ${go_import_path}/version.GitDescribe=v${version}" # consul has a vendor directory, but relies on replace statements in go.mod, so diff --git a/srcpkgs/crane/template b/srcpkgs/crane/template index 0a19c2a68a..edb04e896a 100644 --- a/srcpkgs/crane/template +++ b/srcpkgs/crane/template @@ -8,7 +8,7 @@ short_desc="Lift containers with ease" maintainer="Andrea Brancaleoni " license="MIT" go_import_path="github.com/michaelsauter/crane" -homepage="https://${go_import_path}" +homepage="https://github.com/michaelsauter/crane" distfiles="${homepage}/archive/v${version}.tar.gz" checksum=00f202783ae2ef3a2d0e02fba0454defe53e823b4c99e2e3b5af734dc870906e diff --git a/srcpkgs/dep/template b/srcpkgs/dep/template index f2a886bc66..79cce54105 100644 --- a/srcpkgs/dep/template +++ b/srcpkgs/dep/template @@ -11,7 +11,7 @@ depends="git go" short_desc="Go dependency management tool" maintainer="Andrea Brancaleoni " license="BSD-3-Clause" -homepage="https://${go_import_path}" +homepage="https://github.com/golang/dep" distfiles="${homepage}/archive/v${version}.tar.gz" checksum=929c8f759838f98323211ba408a831ea80d93b75beda8584b6d950f393a3298a diff --git a/srcpkgs/docker-gen/template b/srcpkgs/docker-gen/template index 9256fde323..8a1ab6c338 100644 --- a/srcpkgs/docker-gen/template +++ b/srcpkgs/docker-gen/template @@ -9,7 +9,7 @@ go_import_path="github.com/jwilder/docker-gen" go_package="${go_import_path}/cmd/docker-gen" maintainer="Andrea Brancaleoni " license="MIT" -homepage="https://$go_import_path" +homepage="https://github.com/jwilder/docker-gen" distfiles="$homepage/archive/$version.tar.gz" checksum=7951b63684e4ace9eab4f87f0c5625648f8add2559fa7779fabdb141a8a83908 diff --git a/srcpkgs/flint/template b/srcpkgs/flint/template index 1b8ae9d964..9a6b0d8c0a 100644 --- a/srcpkgs/flint/template +++ b/srcpkgs/flint/template @@ -8,7 +8,7 @@ short_desc="Check your project for common sources of contributor friction" maintainer="Andrea Brancaleoni " license="MIT" go_import_path="github.com/pengwynn/flint" -homepage="https://${go_import_path}" +homepage="https://github.com/pengwynn/flint" distfiles="${homepage}/archive/v${version}.tar.gz" checksum=ec865ec5cad191c7fc9c7c6d5007754372696a708825627383913367f3ef8b7f diff --git a/srcpkgs/forego/template b/srcpkgs/forego/template index 6f239f15ef..315153aef0 100644 --- a/srcpkgs/forego/template +++ b/srcpkgs/forego/template @@ -8,6 +8,6 @@ short_desc="A process supervisor in Go" maintainer="Andrea Brancaleoni " license="Apache-2.0" go_import_path="github.com/ddollar/forego" -homepage="https://$go_import_path" +homepage="https://github.com/ddollar/forego" distfiles="$homepage/archive/$version.tar.gz" checksum=23119550cc0e45191495823aebe28b42291db6de89932442326340042359b43d diff --git a/srcpkgs/gendesk/template b/srcpkgs/gendesk/template index 1c2d600d23..51904d9d14 100644 --- a/srcpkgs/gendesk/template +++ b/srcpkgs/gendesk/template @@ -10,7 +10,7 @@ short_desc="Utility to generate .desktop files and download icons" maintainer="Benjamín Albiñana " license="MIT" homepage="http://roboticoverlords.org/gendesk/" -distfiles="https://github.com/xyproto/${pkgname}/archive/${version}.tar.gz +distfiles="https://github.com/xyproto/gendesk/archive/${version}.tar.gz http://roboticoverlords.org/images/default.png" checksum="924606ca1c15a140b70f363c4a0ac46fb3ad4d05bc39db400d0b0e41dd4456bb 4d96eded48e536d02e35727c36dc20844c2e44654e81baf78e10aee4eb48e837" diff --git a/srcpkgs/git-lfs/template b/srcpkgs/git-lfs/template index 588d7fe9aa..81f99bef21 100644 --- a/srcpkgs/git-lfs/template +++ b/srcpkgs/git-lfs/template @@ -9,7 +9,7 @@ short_desc="Git extension for versioning large files" maintainer="Michael Aldridge " license="MIT" homepage="https://git-lfs.github.com/" -distfiles="https://github.com/git-lfs/${pkgname}/archive/v${version}.tar.gz" +distfiles="https://github.com/git-lfs/git-lfs/archive/v${version}.tar.gz" checksum=2b2e70f1233f7efe9a010771510391a07527ec7c0af721ecf8edabac5d60f62b post_build() { diff --git a/srcpkgs/gkill/template b/srcpkgs/gkill/template index f2b9ae64a2..6c9d5adafa 100644 --- a/srcpkgs/gkill/template +++ b/srcpkgs/gkill/template @@ -8,7 +8,7 @@ short_desc="Easy Process Killer" maintainer="Andrea Brancaleoni " license="MIT" go_import_path="github.com/heppu/gkill" -homepage="https://$go_import_path" +homepage="https://github.com/heppu/gkill" distfiles="$homepage/archive/v$version.tar.gz" checksum=aee86f1e18a88ecd3024c6deb3dbd6a2e385961ad8365046dc2b64596bdbb84b diff --git a/srcpkgs/glock/template b/srcpkgs/glock/template index 6cd6cc4c5d..3d5eb4ea73 100644 --- a/srcpkgs/glock/template +++ b/srcpkgs/glock/template @@ -11,6 +11,6 @@ go_import_path="github.com/robfig/glock" go_package="${go_import_path}" maintainer="Andrea Brancaleoni " license="Public Domain" -homepage="https://$go_import_path" +homepage="https://github.com/robfig/glock" distfiles="$homepage/archive/$_commit.tar.gz" checksum=b8fea16ccdfa4a927a8590753d44ca5bb610561f3b9e09cc1e501ef5c9351dc9 diff --git a/srcpkgs/go-ipfs/template b/srcpkgs/go-ipfs/template index 4f0a7e9840..321d701559 100644 --- a/srcpkgs/go-ipfs/template +++ b/srcpkgs/go-ipfs/template @@ -3,7 +3,7 @@ pkgname=go-ipfs version=0.7.0 revision=2 build_style=go -go_import_path="github.com/ipfs/${pkgname}" +go_import_path="github.com/ipfs/go-ipfs" go_package="${go_import_path}/cmd/ipfs" hostmakedepends="git" depends="fs-repo-migrations>=1.6.4" @@ -12,7 +12,7 @@ maintainer="Christopher Brannon " license="MIT, Apache-2.0" homepage="https://ipfs.io" changelog="https://github.com/ipfs/go-ipfs/blob/master/CHANGELOG.md" -distfiles="https://${go_import_path}/archive/v${version}.tar.gz" +distfiles="https://github.com/ipfs/go-ipfs/archive/v${version}.tar.gz" checksum=152986ebb30657ab706bee708fbe929114f5e8c39fbe602e3bbec93fe74c9123 system_accounts="_ipfs" diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template index 9b4818c646..8abec86a97 100644 --- a/srcpkgs/hugo/template +++ b/srcpkgs/hugo/template @@ -3,7 +3,7 @@ pkgname=hugo version=0.80.0 revision=1 build_style=go -go_import_path="github.com/gohugoio/${pkgname}" +go_import_path="github.com/gohugoio/hugo" go_build_tags="$(vopt_if extended extended)" hostmakedepends="git" depends="$(vopt_if pygments python-Pygments)" @@ -11,7 +11,7 @@ short_desc="Fast & Modern Static Website Engine" maintainer="Andrea Brancaleoni " license="Apache-2.0" homepage="https://gohugo.io" -distfiles="https://${go_import_path}/archive/v${version}.tar.gz" +distfiles="https://github.com/gohugoio/hugo/archive/v${version}.tar.gz" checksum=4ddcd6ebea21e5fd4067db4a481ab7810e34496d5991a3520169c8f5ee1d38bb build_options="pygments extended" diff --git a/srcpkgs/lego/template b/srcpkgs/lego/template index a71ffb026e..573dbdf943 100644 --- a/srcpkgs/lego/template +++ b/srcpkgs/lego/template @@ -3,8 +3,8 @@ pkgname=lego version=4.0.1 revision=1 build_style=go -go_import_path="github.com/go-acme/${pkgname}/v4" -go_package="${go_import_path}/cmd/${pkgname}" +go_import_path="github.com/go-acme/lego/v4" +go_package="${go_import_path}/cmd/lego" hostmakedepends="git" short_desc="Let's Encrypt client and ACME library written in Go" maintainer="Anachron " diff --git a/srcpkgs/massren/template b/srcpkgs/massren/template index db3941c717..d3f4250b2e 100644 --- a/srcpkgs/massren/template +++ b/srcpkgs/massren/template @@ -7,8 +7,8 @@ hostmakedepends="git" short_desc="Massive renamer from command line" maintainer="Andrea Brancaleoni " license="MIT" -go_import_path="github.com/laurent22/${pkgname}" -homepage="https://${go_import_path}" +go_import_path="github.com/laurent22/massren" +homepage="https://github.com/laurent22/massren" distfiles="$homepage/archive/v$version.tar.gz" checksum=7a728d96a9e627c3609d147db64bba60ced33c407c75e9512147a5c83ba94f56 diff --git a/srcpkgs/micro/template b/srcpkgs/micro/template index 27b87e22b7..c0a2842eb8 100644 --- a/srcpkgs/micro/template +++ b/srcpkgs/micro/template @@ -6,7 +6,7 @@ build_style=go go_import_path="github.com/zyedidia/micro/v2" go_package="${go_import_path}/cmd/micro" go_ldflags="-X github.com/zyedidia/micro/v2/internal/util.Version=${version}" -# Adding CompuileDate is bad reproducibility and adding CommitHash +# Adding CompileDate is bad for reproducibility and adding CommitHash # is redundant as we use a tag to build the package. hostmakedepends="git" short_desc="Modern and intuitive terminal-based text editor" diff --git a/srcpkgs/nomad/template b/srcpkgs/nomad/template index 9ed33f12a0..ddaf4f6b78 100644 --- a/srcpkgs/nomad/template +++ b/srcpkgs/nomad/template @@ -3,7 +3,7 @@ pkgname=nomad version=1.0.1 revision=1 build_style=go -go_import_path="github.com/hashicorp/${pkgname}" +go_import_path="github.com/hashicorp/nomad" go_build_tags="ui release" _git_commit=a480eed0815c54612856d9115a34bb1d1a773e8c go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit}" @@ -12,7 +12,7 @@ short_desc="Cluster scheduler designed to easily integrate into existing workflo maintainer="Michael Aldridge " license="MPL-2.0" homepage="https://www.nomadproject.io/" -distfiles="https://${go_import_path}/archive/v${version}.tar.gz" +distfiles="https://github.com/hashicorp/nomad/archive/v${version}.tar.gz" checksum=1dca9ebb1636fc8ef005d9c6eed8cf10fbfc3d7c9ff7307606454142d858f419 patch_args="-Np1" diff --git a/srcpkgs/peco/template b/srcpkgs/peco/template index 44c50774ed..182c2e5ecd 100644 --- a/srcpkgs/peco/template +++ b/srcpkgs/peco/template @@ -10,7 +10,7 @@ short_desc="Simplistic interactive filtering tool" maintainer="Leah Neukirchen " license="MIT" homepage="https://github.com/peco/peco" -distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz" +distfiles="https://github.com/peco/peco/archive/v${version}.tar.gz" checksum=90d87503265c12f8583f5c6bc19c83eba7a2e15219a6339d5041628aa48c4705 post_install() { diff --git a/srcpkgs/sift/template b/srcpkgs/sift/template index adf4b95b79..22a9698bf4 100644 --- a/srcpkgs/sift/template +++ b/srcpkgs/sift/template @@ -8,6 +8,6 @@ short_desc="A fast and powerful open source alternative to grep" maintainer="Andrea Brancaleoni " license="GPL-3" go_import_path="github.com/svent/sift" -homepage="https://$go_import_path" +homepage="https://github.com/svent/sift" distfiles="$homepage/archive/v$version.tar.gz" checksum=bbbd5c472c36b78896cd7ae673749d3943621a6d5523d47973ed2fc6800ae4c8 diff --git a/srcpkgs/tag/template b/srcpkgs/tag/template index 1363f7118a..7cd64a2e24 100644 --- a/srcpkgs/tag/template +++ b/srcpkgs/tag/template @@ -4,12 +4,12 @@ version=1.4.0 revision=7 build_style=go hostmakedepends="git mercurial" -go_import_path="github.com/aykamko/${pkgname}" +go_import_path="github.com/aykamko/tag" short_desc="Instantly jump to your ag matches" maintainer="Andrea Brancaleoni " license="MIT" homepage="https://github.com/aykamko/tag" -distfiles="https://${go_import_path}/archive/v${version}.tar.gz" +distfiles="${homepage}/archive/v${version}.tar.gz" checksum=d3a02466e600634cf0ffff9ad8c5f70eba97e44758edf35cc4efbda9cbfdff9a post_install() { diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template index f907bacb02..f8fb232a5c 100644 --- a/srcpkgs/terragrunt/template +++ b/srcpkgs/terragrunt/template @@ -3,7 +3,7 @@ pkgname=terragrunt version=0.28.4 revision=1 build_style=go -go_import_path="github.com/gruntwork-io/$pkgname" +go_import_path="github.com/gruntwork-io/terragrunt" hostmakedepends="git" depends="terraform" short_desc="Thin wrapper for Terraform that provides extra tools" diff --git a/srcpkgs/vault/template b/srcpkgs/vault/template index edfa5c95a9..85fc439ba9 100644 --- a/srcpkgs/vault/template +++ b/srcpkgs/vault/template @@ -3,7 +3,7 @@ pkgname=vault version=1.6.1 revision=1 build_style=go -go_import_path="github.com/hashicorp/${pkgname}" +go_import_path="github.com/hashicorp/vault" go_build_tags="release" _git_commit=6d2db3f033e02e70202bef9ec896360062b88b03 go_ldflags="-X ${go_import_path}/sdk/version.GitCommit=${_git_commit}" @@ -12,7 +12,7 @@ short_desc="Manage Secrets and Protect Sensitive Data" maintainer="Michael Aldridge " license="MPL-2.0" homepage="https://www.vaultproject.io/" -distfiles="https://github.com/hashicorp/${pkgname}/archive/v${version}.tar.gz" +distfiles="https://github.com/hashicorp/vault/archive/v${version}.tar.gz" checksum=fb5d96e682a48bfd421b13cdfffd710da0238dbded1988aab822dd5aae75b4c4 system_accounts="_vault" make_dirs="/var/lib/vault 0700 _vault _vault diff --git a/srcpkgs/webcat/template b/srcpkgs/webcat/template index c1cb0b678a..5d6c459dd9 100644 --- a/srcpkgs/webcat/template +++ b/srcpkgs/webcat/template @@ -9,5 +9,5 @@ short_desc="WebSocket Netcat" maintainer="Andrea Brancaleoni " license="GPL-3" homepage="https://github.com/thypon/webcat" -distfiles="https://github.com/thypon/${pkgname}/archive/v${version}.tar.gz" +distfiles="https://github.com/thypon/webcat/archive/v${version}.tar.gz" checksum=5b3be1cb8deb08f144d674a0bf23f97a692ebb601666d3a38df6e80b2e68d0b7 diff --git a/srcpkgs/websocketd/template b/srcpkgs/websocketd/template index e0eba0cdb5..80857258f3 100644 --- a/srcpkgs/websocketd/template +++ b/srcpkgs/websocketd/template @@ -8,6 +8,6 @@ short_desc="Turn any program that uses STDIN/STDOUT into a WebSocket server" maintainer="Andrea Brancaleoni " license="BSD" go_import_path="github.com/joewalnes/websocketd" -homepage="https://$go_import_path" +homepage="https://github.com/joewalnes/websocketd" distfiles="$homepage/archive/v$version.tar.gz" checksum=6b8fe0fad586d794e002340ee597059b2cfc734ba7579933263aef4743138fe5