From 7970a5fde955a28bf45f5c8a1acae53192493bc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Thu, 18 Feb 2021 23:25:27 -0300 Subject: [PATCH 1/5] gucci: fix checksum. Upstream force pushed the same tag, so checksum for the tarball changed. Only changes were timestamps for files and some small differences in their .travis.yml file, which doesn't affect the build. --- srcpkgs/gucci/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gucci/template b/srcpkgs/gucci/template index fb10a6ca866..fd3f94cdf7e 100644 --- a/srcpkgs/gucci/template +++ b/srcpkgs/gucci/template @@ -10,7 +10,7 @@ maintainer="Leah Neukirchen " license="MIT" homepage="https://github.com/noqcks/gucci" distfiles="https://github.com/noqcks/gucci/archive/${version}.tar.gz" -checksum=7ce8967cb83eddb8db6878a9f00a96996f7503fb0a5ee01fa9e1947d2444ead8 +checksum=50d9d513fff97128bbd92685af5b244cbc1453e79010fb2b1aea51c84d478855 post_install() { vlicense LICENSE From c95fc0a3d0a27f2e5e3664a818eb2d4ed4c3d970 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Thu, 18 Feb 2021 23:57:10 -0300 Subject: [PATCH 2/5] hydroxide: set correct go_import_path and use go_package. --- srcpkgs/hydroxide/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/hydroxide/template b/srcpkgs/hydroxide/template index 86cc09417aa..b3011181386 100644 --- a/srcpkgs/hydroxide/template +++ b/srcpkgs/hydroxide/template @@ -3,8 +3,8 @@ pkgname=hydroxide version=0.2.17 revision=1 build_style=go -go_import_path=github.com/emersion/hydroxide/cmd/hydroxide -hostmakedepends="git" +go_import_path=github.com/emersion/hydroxide +go_package=$go_import_path/cmd/hydroxide short_desc="Third-party, open-source ProtonMail CardDAV, IMAP and SMTP bridge" maintainer="DirectorX " license="MIT" From ac3f4baef812ef7f4c6ae9769326c271b9d27481 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Thu, 18 Feb 2021 23:59:56 -0300 Subject: [PATCH 3/5] ipfs-cluster: clean up unnecessary hostmakedepends At least gx-go seems to have been forgotten in commit 31effcb4a1a21b4b0e209ba2618365ef17c0cc41, which removed the commands using gx from pre_build. --- srcpkgs/ipfs-cluster/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/ipfs-cluster/template b/srcpkgs/ipfs-cluster/template index 281a5d1239e..27e6d6aad94 100644 --- a/srcpkgs/ipfs-cluster/template +++ b/srcpkgs/ipfs-cluster/template @@ -5,7 +5,6 @@ revision=1 build_style=go go_import_path="github.com/ipfs/ipfs-cluster" go_package="${go_import_path}/cmd/ipfs-cluster-ctl ${go_import_path}/cmd/ipfs-cluster-service" -hostmakedepends="git wget gx-go" depends="go-ipfs" short_desc="Collective pinning and composition for IPFS" maintainer="Toyam Cox " From 53f48c16f5a19d07f527c5d802cf7ae5ac017eba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Fri, 19 Feb 2021 00:22:05 -0300 Subject: [PATCH 4/5] miniflux: use correct go_import_path. Also use ChangeLog from master and fix homepage. --- srcpkgs/miniflux/template | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/srcpkgs/miniflux/template b/srcpkgs/miniflux/template index aa50315ece7..0bef52b6dc3 100644 --- a/srcpkgs/miniflux/template +++ b/srcpkgs/miniflux/template @@ -1,18 +1,16 @@ # Template file for 'miniflux' pkgname=miniflux version=2.0.27 -revision=1 +revision=2 wrksrc="v2-${version}" build_style=go -go_import_path="github.com/miniflux/miniflux" -go_package="miniflux.app" -hostmakedepends="git" +go_import_path="miniflux.app" short_desc="Minimalist and opinionated feed reader written in Go" maintainer="Frank Steinborn " license="Apache-2.0" homepage="https://miniflux.app" -changelog="https://raw.githubusercontent.com/miniflux/miniflux/${version}/ChangeLog" -distfiles="https://github.com/miniflux/miniflux/archive/${version}.tar.gz" +changelog="https://raw.githubusercontent.com/miniflux/v2/master/ChangeLog" +distfiles="https://github.com/miniflux/v2/archive/${version}.tar.gz" checksum=ec6696b1cf41ef50b76d02d1179838e03d9c3bcb3dce48febe2b5f4ecc450473 system_accounts="_miniflux" From c0c4abf3126646505bd0563be397d95034126a67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Thu, 18 Feb 2021 19:16:24 -0300 Subject: [PATCH 5/5] srcpkgs/: most Go packages shouldn't have git in hostmakedepends. Depending on git for building can sometimes happen due to issue #27690, where instead of using the unpacked tarball, Go clones the package's repository itself, since the tarball we provided doesn't contain the go_import_path we pass to it in the command line. Since we should require as few dependencies as possible, and this measure can help catch issues of building the wrong version of a Go package, we remove git from hostmakedepends where possible. Also fix small discrepancies in homepage, expand some variables and fix some inconsequential typos. --- srcpkgs/NetAuth-ldap/template | 1 - srcpkgs/NetAuth-localizer/template | 1 - srcpkgs/NetAuth-nsscache/template | 1 - srcpkgs/NetAuth-pam-helper/template | 1 - srcpkgs/NetKeys/template | 1 - srcpkgs/PopCorn/template | 2 +- srcpkgs/TerraState/template | 1 - srcpkgs/aerc/template | 2 +- srcpkgs/antibody/template | 3 +-- srcpkgs/browserpass/template | 1 - srcpkgs/caddy/template | 2 +- srcpkgs/cdetect/template | 1 - srcpkgs/chezmoi/template | 3 +-- srcpkgs/chroma/template | 1 - srcpkgs/clipman/template | 1 - srcpkgs/consul-template/template | 3 +-- srcpkgs/consul/template | 5 ++--- srcpkgs/coredns/template | 2 +- srcpkgs/crane/template | 3 +-- srcpkgs/croc/template | 1 - srcpkgs/dht-node/template | 1 - srcpkgs/dive/template | 1 - srcpkgs/dlayer/template | 1 - srcpkgs/elfinfo/template | 1 - srcpkgs/ensure-access/template | 1 - srcpkgs/exercism/template | 1 - srcpkgs/flint/template | 3 +-- srcpkgs/forego/template | 3 +-- srcpkgs/fzf/template | 1 - srcpkgs/gendesk/template | 3 +-- srcpkgs/ghq/template | 1 - srcpkgs/git-lfs/template | 4 ++-- srcpkgs/gitbatch/template | 1 - srcpkgs/gitea/template | 2 +- srcpkgs/glide/template | 1 - srcpkgs/glider/template | 1 - srcpkgs/go-ipfs/template | 6 +++--- srcpkgs/go-review/template | 1 - srcpkgs/gogs/template | 1 - srcpkgs/gomatrix/template | 1 - srcpkgs/gotop/template | 1 - srcpkgs/gotty/template | 1 - srcpkgs/gucci/template | 1 - srcpkgs/gx-go/template | 1 - srcpkgs/gx/template | 1 - srcpkgs/hcloud/template | 1 - srcpkgs/hey/template | 1 - srcpkgs/hooktftp/template | 1 - srcpkgs/hugo/template | 5 ++--- srcpkgs/jid/template | 1 - srcpkgs/jj/template | 1 - srcpkgs/joker/template | 1 - srcpkgs/jump/template | 1 - srcpkgs/keybase/template | 1 - srcpkgs/lazygit/template | 1 - srcpkgs/lego/template | 5 ++--- srcpkgs/licensechecker/template | 1 + srcpkgs/lxd/template | 2 +- srcpkgs/massren/template | 4 ++-- srcpkgs/micro/template | 3 +-- srcpkgs/minio/template | 1 - srcpkgs/mmark/template | 1 - 62 files changed, 28 insertions(+), 79 deletions(-) diff --git a/srcpkgs/NetAuth-ldap/template b/srcpkgs/NetAuth-ldap/template index 425ccf49079..c3b11bd6e39 100644 --- a/srcpkgs/NetAuth-ldap/template +++ b/srcpkgs/NetAuth-ldap/template @@ -6,7 +6,6 @@ wrksrc=ldap-$version build_style=go go_import_path=github.com/netauth/ldap go_ldflags="-X github.com/netauth/ldap/internal/buildinfo.Version=${version}" -hostmakedepends="git" short_desc="LDAP Proxy for NetAuth" maintainer="Michael Aldridge " license="MIT" diff --git a/srcpkgs/NetAuth-localizer/template b/srcpkgs/NetAuth-localizer/template index 4c97fb966b0..0b8a17fc178 100644 --- a/srcpkgs/NetAuth-localizer/template +++ b/srcpkgs/NetAuth-localizer/template @@ -6,7 +6,6 @@ wrksrc=localizer-$version build_style=go go_import_path=github.com/netauth/localizer go_package=${go_import_path}/cmd/localize -hostmakedepends="git" depends="snooze" short_desc="Make NetAuth accounts local in Linux" maintainer="Michael Aldridge " diff --git a/srcpkgs/NetAuth-nsscache/template b/srcpkgs/NetAuth-nsscache/template index a8aabcd5964..b67749be2f8 100644 --- a/srcpkgs/NetAuth-nsscache/template +++ b/srcpkgs/NetAuth-nsscache/template @@ -5,7 +5,6 @@ revision=1 wrksrc="nsscache-$version" build_style=go go_import_path="github.com/netauth/nsscache" -hostmakedepends="git" short_desc="NetAuth nsscache implementation" maintainer="Michael Aldridge " license="MIT" diff --git a/srcpkgs/NetAuth-pam-helper/template b/srcpkgs/NetAuth-pam-helper/template index 80f362a228e..c8c467d795e 100644 --- a/srcpkgs/NetAuth-pam-helper/template +++ b/srcpkgs/NetAuth-pam-helper/template @@ -5,7 +5,6 @@ revision=1 wrksrc=pam-helper-$version build_style=go go_import_path="github.com/netauth/pam-helper" -hostmakedepends="git" short_desc="A helper executable to use with pam_exec" maintainer="Michael Aldridge " license="MIT" diff --git a/srcpkgs/NetKeys/template b/srcpkgs/NetKeys/template index 950d26850c4..2ed06b5d127 100644 --- a/srcpkgs/NetKeys/template +++ b/srcpkgs/NetKeys/template @@ -5,7 +5,6 @@ revision=1 wrksrc=netkeys-$version build_style=go go_import_path="github.com/netauth/netkeys" -hostmakedepends="git" short_desc="Key retrieval daemon for NetAuth" maintainer="Michael Aldridge " license="MIT" diff --git a/srcpkgs/PopCorn/template b/srcpkgs/PopCorn/template index da4bfa9deac..a3cd3893b2b 100644 --- a/srcpkgs/PopCorn/template +++ b/srcpkgs/PopCorn/template @@ -8,7 +8,7 @@ go_package="${go_import_path}/cmd/popcorn ${go_import_path}/cmd/popcornctl ${go_import_path}/cmd/statrepo ${go_import_path}/cmd/pqueryd" -hostmakedepends="git gcc-go-tools" +hostmakedepends="gcc-go-tools" depends="snooze" short_desc="Package statistics system" maintainer="Michael Aldridge " diff --git a/srcpkgs/TerraState/template b/srcpkgs/TerraState/template index b4a7b9e6097..599058a6bfa 100644 --- a/srcpkgs/TerraState/template +++ b/srcpkgs/TerraState/template @@ -7,7 +7,6 @@ make_dirs="/var/lib/terrastate 0750 _terrastate _terrastate" build_style=go go_import_path="github.com/the-maldridge/terrastate" go_package="${go_import_path}/cmd/terrastate" -hostmakedepends="git" short_desc="Remote state for Terraform" maintainer="Michael Aldridge " license="MIT" diff --git a/srcpkgs/aerc/template b/srcpkgs/aerc/template index 08c81ef0d4e..d5ee785e3b2 100644 --- a/srcpkgs/aerc/template +++ b/srcpkgs/aerc/template @@ -3,7 +3,7 @@ pkgname=aerc version=0.5.2 revision=1 build_style=go -hostmakedepends="scdoc git" +hostmakedepends="scdoc" makedepends="libnotmuch-devel" short_desc="Terminal email client" maintainer="shtayerc " diff --git a/srcpkgs/antibody/template b/srcpkgs/antibody/template index 7071501830c..df466c33a9c 100644 --- a/srcpkgs/antibody/template +++ b/srcpkgs/antibody/template @@ -4,12 +4,11 @@ version=6.1.1 revision=1 build_style=go go_import_path=github.com/getantibody/antibody -hostmakedepends="git" 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/browserpass/template b/srcpkgs/browserpass/template index b6426a24975..63537def3f4 100644 --- a/srcpkgs/browserpass/template +++ b/srcpkgs/browserpass/template @@ -5,7 +5,6 @@ revision=1 wrksrc="browserpass-native-${version}" build_style=go go_import_path=github.com/browserpass/browserpass-native -hostmakedepends="git" short_desc="Browser extension for pass" maintainer="John " license="MIT" diff --git a/srcpkgs/caddy/template b/srcpkgs/caddy/template index dbae7057566..c1a2aad2a26 100644 --- a/srcpkgs/caddy/template +++ b/srcpkgs/caddy/template @@ -3,9 +3,9 @@ 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" short_desc="Fast, cross-platform HTTP/2 web server with automatic HTTPS" maintainer="Dominic Monroe " license="Apache-2.0" diff --git a/srcpkgs/cdetect/template b/srcpkgs/cdetect/template index b02df3a496e..e859340a9cb 100644 --- a/srcpkgs/cdetect/template +++ b/srcpkgs/cdetect/template @@ -4,7 +4,6 @@ version=0.5.4 revision=1 build_style=go go_import_path=github.com/xyproto/cdetect -hostmakedepends="git" short_desc="Detects the compiler (and version) used to compile an ELF binary" maintainer="Orphaned " license="MIT" diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template index 5c6d47e5abc..b361ec8b4cf 100644 --- a/srcpkgs/chezmoi/template +++ b/srcpkgs/chezmoi/template @@ -7,12 +7,11 @@ go_import_path="github.com/twpayne/chezmoi" go_build_tags="noembeddocs noupgrade" go_ldflags="-X main.version=${version} -X main.commit=v${version} -X main.builtBy=xbps -X github.com/twpayne/chezmoi/cmd.DocsDir=/usr/share/doc/chezmoi" -hostmakedepends="git" 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/chroma/template b/srcpkgs/chroma/template index 8215a0ac027..38bcbe9c735 100644 --- a/srcpkgs/chroma/template +++ b/srcpkgs/chroma/template @@ -6,7 +6,6 @@ build_style=go go_import_path="github.com/alecthomas/${pkgname}" go_package="${go_import_path}/cmd/chroma" go_ldflags="-X main.version=${version} -X main.date=$(date +%Y.%m.%d)" -hostmakedepends="git" short_desc="General purpose syntax highlighter" maintainer="Daniel Lewan " license="MIT" diff --git a/srcpkgs/clipman/template b/srcpkgs/clipman/template index a48999a5004..697655d014f 100644 --- a/srcpkgs/clipman/template +++ b/srcpkgs/clipman/template @@ -4,7 +4,6 @@ version=1.5.2 revision=1 build_style=go go_import_path=github.com/yory8/clipman -hostmakedepends="git" depends="wl-clipboard" short_desc="Simple clipboard manager for Wayland" maintainer="travankor " diff --git a/srcpkgs/consul-template/template b/srcpkgs/consul-template/template index 3d490804ba2..874ba30a996 100644 --- a/srcpkgs/consul-template/template +++ b/srcpkgs/consul-template/template @@ -3,8 +3,7 @@ pkgname=consul-template version=0.25.1 revision=1 build_style=go -go_import_path="github.com/hashicorp/$pkgname" -hostmakedepends="git" +go_import_path="github.com/hashicorp/consul-template" short_desc="Template rendering, notifier, and supervisor for Consul and Vault data" maintainer="Noel Cower " license="MPL-2.0" diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template index e55c4d587fd..9cca1e79827 100644 --- a/srcpkgs/consul/template +++ b/srcpkgs/consul/template @@ -3,18 +3,17 @@ 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 # force default non-vendor behavior. go_mod_mode=default -hostmakedepends="git" short_desc="Distributed solution to connect and configure applications" maintainer="iaroki " license="MPL-2.0" homepage="https://www.consul.io/" -distfiles="https://${go_import_path}/archive/v${version}.tar.gz" +distfiles="https://github.com/hashicorp/consul/archive/v${version}.tar.gz" checksum=77d1dfa93da66ccb222049bd892e46f8ddb11516589311fbdc24bd658d64b372 post_install() { diff --git a/srcpkgs/coredns/template b/srcpkgs/coredns/template index ebd7f2ce2af..15793229e0e 100644 --- a/srcpkgs/coredns/template +++ b/srcpkgs/coredns/template @@ -4,7 +4,7 @@ version=1.7.1 revision=1 build_style=go go_import_path=github.com/coredns/coredns -hostmakedepends="git make mmark" +hostmakedepends="make mmark" short_desc="CoreDNS is a DNS server that chains plugins" maintainer="Noel Cower " license="Apache-2.0" diff --git a/srcpkgs/crane/template b/srcpkgs/crane/template index 0a19c2a68a8..5a304a9faf7 100644 --- a/srcpkgs/crane/template +++ b/srcpkgs/crane/template @@ -3,12 +3,11 @@ pkgname=crane version=3.6.0 revision=1 build_style=go -hostmakedepends="git" 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/croc/template b/srcpkgs/croc/template index 1844acf62e9..acd54bf63b7 100644 --- a/srcpkgs/croc/template +++ b/srcpkgs/croc/template @@ -4,7 +4,6 @@ version=8.6.7 revision=1 build_style=go go_import_path=github.com/schollz/croc/v${version%%.*} -hostmakedepends="git" short_desc="Easily and securely send things from one computer to another" maintainer="Benjamín Albiñana " license="MIT" diff --git a/srcpkgs/dht-node/template b/srcpkgs/dht-node/template index 7ae65c38731..981cad27b9e 100644 --- a/srcpkgs/dht-node/template +++ b/srcpkgs/dht-node/template @@ -5,7 +5,6 @@ revision=3 build_style=go go_import_path="github.com/ipfs/dht-node" go_build_tags="netgo" -hostmakedepends="git" short_desc="IPFS dht node" maintainer="lemmi " license="MIT" diff --git a/srcpkgs/dive/template b/srcpkgs/dive/template index 9144579660a..488801ff9bb 100644 --- a/srcpkgs/dive/template +++ b/srcpkgs/dive/template @@ -4,7 +4,6 @@ version=0.9.2 revision=1 build_style=go go_import_path="github.com/wagoodman/dive" -hostmakedepends="git" short_desc="Container image exploration tool" maintainer="Cameron Nemo " license="MIT" diff --git a/srcpkgs/dlayer/template b/srcpkgs/dlayer/template index e754ee8e676..ac5b0a9fd9d 100644 --- a/srcpkgs/dlayer/template +++ b/srcpkgs/dlayer/template @@ -4,7 +4,6 @@ version=0.2.4 revision=1 build_style=go go_import_path=github.com/orisano/dlayer -hostmakedepends="git" short_desc="Dlayer is a docker layer analyzer" maintainer="Mate GABRI " license="MIT" diff --git a/srcpkgs/elfinfo/template b/srcpkgs/elfinfo/template index 189d842b001..b354ced06d8 100644 --- a/srcpkgs/elfinfo/template +++ b/srcpkgs/elfinfo/template @@ -4,7 +4,6 @@ version=1.1.0 revision=1 build_style=go go_import_path=github.com/xyproto/elfinfo -hostmakedepends="git" short_desc="Emit basic information about an ELF file" maintainer="Alexander F. Rødseth " license="MIT" diff --git a/srcpkgs/ensure-access/template b/srcpkgs/ensure-access/template index b5187c8bb4f..9d3abe47630 100644 --- a/srcpkgs/ensure-access/template +++ b/srcpkgs/ensure-access/template @@ -4,7 +4,6 @@ version=0.1.0 revision=1 build_style=go go_import_path=github.com/Noah-Huppert/ensure-access -hostmakedepends="git" short_desc="Tool which ensures permissions exists for files and directories" maintainer="Noah Huppert " license="MIT" diff --git a/srcpkgs/exercism/template b/srcpkgs/exercism/template index eb696027500..5869f87dbce 100644 --- a/srcpkgs/exercism/template +++ b/srcpkgs/exercism/template @@ -6,7 +6,6 @@ wrksrc="cli-${version}" build_style=go go_import_path="github.com/exercism/cli" go_package="${go_import_path}/exercism" -hostmakedepends="git" short_desc="Command line tool for exercism.io" maintainer="SolitudeSF " license="MIT" diff --git a/srcpkgs/flint/template b/srcpkgs/flint/template index 1b8ae9d964c..a04ca9e022d 100644 --- a/srcpkgs/flint/template +++ b/srcpkgs/flint/template @@ -3,12 +3,11 @@ pkgname=flint version=0.1.0 revision=9 build_style=go -hostmakedepends="git" 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 6f239f15efc..ff43b86fd7c 100644 --- a/srcpkgs/forego/template +++ b/srcpkgs/forego/template @@ -3,11 +3,10 @@ pkgname=forego version=20180216151118 revision=5 build_style=go -hostmakedepends="git mercurial" 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/fzf/template b/srcpkgs/fzf/template index b0b841a7a6a..eb02c545f5e 100644 --- a/srcpkgs/fzf/template +++ b/srcpkgs/fzf/template @@ -4,7 +4,6 @@ version=0.25.1 revision=1 build_style=go go_import_path="github.com/junegunn/fzf" -hostmakedepends="git" makedepends="ncurses-devel" short_desc="Command-line fuzzy finder" maintainer="Leah Neukirchen " diff --git a/srcpkgs/gendesk/template b/srcpkgs/gendesk/template index 1c2d600d23d..3ba71439b59 100644 --- a/srcpkgs/gendesk/template +++ b/srcpkgs/gendesk/template @@ -5,12 +5,11 @@ revision=1 build_style=go go_import_path=github.com/xyproto/gendesk go_mod_mode=default -hostmakedepends="git" 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/ghq/template b/srcpkgs/ghq/template index 029cc3fbf9f..3ede66246fd 100644 --- a/srcpkgs/ghq/template +++ b/srcpkgs/ghq/template @@ -5,7 +5,6 @@ revision=1 build_style=go go_import_path=github.com/x-motemen/ghq go_package="$go_import_path" -hostmakedepends="git" depends="git" short_desc="Remote repository management made easy" maintainer="Dominic Monroe " diff --git a/srcpkgs/git-lfs/template b/srcpkgs/git-lfs/template index 588d7fe9aa3..4a603a6bd5d 100644 --- a/srcpkgs/git-lfs/template +++ b/srcpkgs/git-lfs/template @@ -4,12 +4,12 @@ version=2.12.1 revision=1 build_style=go go_import_path="github.com/git-lfs/git-lfs" -hostmakedepends="git ruby-ronn" +hostmakedepends="ruby-ronn" 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/gitbatch/template b/srcpkgs/gitbatch/template index 4464729f2b8..df26ed89b19 100644 --- a/srcpkgs/gitbatch/template +++ b/srcpkgs/gitbatch/template @@ -4,7 +4,6 @@ version=0.5.0 revision=1 build_style=go go_import_path=github.com/isacikgoz/gitbatch -hostmakedepends="git" short_desc="Command line tool to manage your git repositories in one place" maintainer="0x0f0f0f " license="MIT" diff --git a/srcpkgs/gitea/template b/srcpkgs/gitea/template index ed6d4e9ce10..250488c99fd 100644 --- a/srcpkgs/gitea/template +++ b/srcpkgs/gitea/template @@ -23,7 +23,7 @@ go_ldflags=" -X main.Version=${version}" # rather not use SQLite3 for some reason. It is also potentially # more resiliant to corrupted writes. go_build_tags="bindata sqlite pam tidb" -hostmakedepends="go-bindata git" +hostmakedepends="go-bindata" makedepends="sqlite-devel pam-devel" depends="git bash" short_desc="Git with a cup of Tea" diff --git a/srcpkgs/glide/template b/srcpkgs/glide/template index 635084f7098..15948753606 100644 --- a/srcpkgs/glide/template +++ b/srcpkgs/glide/template @@ -4,7 +4,6 @@ version=0.13.3 revision=1 build_style=go go_import_path="github.com/Masterminds/glide" -hostmakedepends="git" depends="go git" short_desc="Vendor package management for golang" maintainer="ananteris " diff --git a/srcpkgs/glider/template b/srcpkgs/glider/template index e132cfda4b7..36282560269 100644 --- a/srcpkgs/glider/template +++ b/srcpkgs/glider/template @@ -4,7 +4,6 @@ version=0.13.0 revision=1 build_style=go go_import_path=github.com/nadoo/glider -hostmakedepends="git" short_desc="Forward proxy with multiple protocols support" maintainer="whoami " license="GPL-3.0-or-later" diff --git a/srcpkgs/go-ipfs/template b/srcpkgs/go-ipfs/template index 4f0a7e98403..088a5d520ab 100644 --- a/srcpkgs/go-ipfs/template +++ b/srcpkgs/go-ipfs/template @@ -3,16 +3,15 @@ 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" short_desc="Global versioned P2P merkle DAG file system" 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" @@ -20,6 +19,7 @@ make_dirs="/var/lib/ipfs 0700 _ipfs _ipfs" _ipfs_homedir="/var/lib/ipfs" pre_build() { + # XXX: try to use buildmode=pie instead if [ "$CROSS_BUILD" ]; then export CGO_ENABLED=0 fi diff --git a/srcpkgs/go-review/template b/srcpkgs/go-review/template index b352545bedb..907a214d401 100644 --- a/srcpkgs/go-review/template +++ b/srcpkgs/go-review/template @@ -5,7 +5,6 @@ revision=1 build_style=go go_import_path="github.com/heppu/go-review" go_package="${go_import_path}/cmd/${pkgname}" -hostmakedepends="git" short_desc="Publish reports from different Go linters as gerrit reviews" maintainer="Renato Aguiar " license="MIT" diff --git a/srcpkgs/gogs/template b/srcpkgs/gogs/template index 3dc6ebdb674..616e33c1c89 100644 --- a/srcpkgs/gogs/template +++ b/srcpkgs/gogs/template @@ -5,7 +5,6 @@ revision=1 build_style=go go_import_path=gogs.io/gogs go_build_tags="sqlite pam cert" -hostmakedepends="git curl" makedepends="pam-devel" depends="git" short_desc="Self-hosted Git Service in Go" diff --git a/srcpkgs/gomatrix/template b/srcpkgs/gomatrix/template index fae7a4343ed..eb9d6e7beda 100644 --- a/srcpkgs/gomatrix/template +++ b/srcpkgs/gomatrix/template @@ -4,7 +4,6 @@ version=101.0.0 revision=1 build_style=go go_import_path=github.com/GeertJohan/gomatrix -hostmakedepends="git" short_desc="Terminal Matrix display in golang" maintainer="Alex Childs " license="BSD-2-Clause" diff --git a/srcpkgs/gotop/template b/srcpkgs/gotop/template index 3566a8d9a78..1b744987057 100644 --- a/srcpkgs/gotop/template +++ b/srcpkgs/gotop/template @@ -6,7 +6,6 @@ build_style=go go_ldflags="-X main.Version=v${version}" go_import_path="github.com/xxxserxxx/gotop/v4" go_package="$go_import_path/cmd/gotop" -hostmakedepends="git" short_desc="Terminal based graphical activity monitor" maintainer="SolitudeSF " license="MIT" diff --git a/srcpkgs/gotty/template b/srcpkgs/gotty/template index 0e5d268e992..58fc0572197 100644 --- a/srcpkgs/gotty/template +++ b/srcpkgs/gotty/template @@ -4,7 +4,6 @@ version=1.0.1 revision=8 build_style=go go_import_path="github.com/yudai/gotty" -hostmakedepends="git" short_desc="Share your terminal as a web application" maintainer="Diogo Leal " license="MIT" diff --git a/srcpkgs/gucci/template b/srcpkgs/gucci/template index fd3f94cdf7e..78d69033db7 100644 --- a/srcpkgs/gucci/template +++ b/srcpkgs/gucci/template @@ -4,7 +4,6 @@ version=1.2.4 revision=1 build_style=go go_import_path="github.com/noqcks/gucci" -hostmakedepends="git" short_desc="Simple CLI templating tool written in Go" maintainer="Leah Neukirchen " license="MIT" diff --git a/srcpkgs/gx-go/template b/srcpkgs/gx-go/template index b06ced23433..9294a2f143f 100644 --- a/srcpkgs/gx-go/template +++ b/srcpkgs/gx-go/template @@ -4,7 +4,6 @@ version=1.9.0 revision=1 build_style=go go_import_path="github.com/whyrusleeping/gx-go" -hostmakedepends="git" depends="gx" short_desc="A subtool for the gx package manager for packages written in go" maintainer="lemmi " diff --git a/srcpkgs/gx/template b/srcpkgs/gx/template index ff3ea0267c8..7414b6bab10 100644 --- a/srcpkgs/gx/template +++ b/srcpkgs/gx/template @@ -4,7 +4,6 @@ version=0.14.3 revision=1 build_style=go go_import_path="github.com/whyrusleeping/gx" -hostmakedepends="git" short_desc="Language-agnostic, universal package manager around IPFS" maintainer="lemmi " license="MIT" diff --git a/srcpkgs/hcloud/template b/srcpkgs/hcloud/template index 8a7aecc2504..628dbf69a14 100644 --- a/srcpkgs/hcloud/template +++ b/srcpkgs/hcloud/template @@ -7,7 +7,6 @@ build_style=go go_import_path=github.com/hetznercloud/cli go_package=github.com/hetznercloud/cli/cmd/hcloud go_ldflags="-X github.com/hetznercloud/cli.Version=${version}" -hostmakedepends="git" short_desc="Command-line interface for Hetzner Cloud" maintainer="Gerardo Di Iorio " license="MIT" diff --git a/srcpkgs/hey/template b/srcpkgs/hey/template index 84954e36b76..52427108dc6 100644 --- a/srcpkgs/hey/template +++ b/srcpkgs/hey/template @@ -4,7 +4,6 @@ version=0.1.4 revision=1 build_style=go go_import_path=github.com/rakyll/hey -hostmakedepends="git" short_desc="HTTP load generator" maintainer="Orphaned " license="Apache-2.0" diff --git a/srcpkgs/hooktftp/template b/srcpkgs/hooktftp/template index 2cba14aec60..d9482c378c7 100644 --- a/srcpkgs/hooktftp/template +++ b/srcpkgs/hooktftp/template @@ -5,7 +5,6 @@ revision=1 build_style=go go_import_path="github.com/tftp-go-team/hooktftp" go_package="github.com/tftp-go-team/hooktftp/cmd/hooktftp" -hostmakedepends="git" short_desc="Hook based tftp server" maintainer="Toyam Cox " license="MIT" diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template index 9b4818c6467..e1f8d14e91e 100644 --- a/srcpkgs/hugo/template +++ b/srcpkgs/hugo/template @@ -3,15 +3,14 @@ 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)" 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/jid/template b/srcpkgs/jid/template index abce00a8353..52055ab9f9e 100644 --- a/srcpkgs/jid/template +++ b/srcpkgs/jid/template @@ -5,7 +5,6 @@ revision=1 build_style=go go_import_path=github.com/simeji/jid go_package=github.com/simeji/jid/cmd/jid -hostmakedepends="git" short_desc="Drill down JSON interactively by using filtering queries" maintainer="Orphaned " license="MIT" diff --git a/srcpkgs/jj/template b/srcpkgs/jj/template index c05dc5e436d..d421418f96e 100644 --- a/srcpkgs/jj/template +++ b/srcpkgs/jj/template @@ -5,7 +5,6 @@ revision=1 build_style=go go_import_path="github.com/tidwall/jj" go_package="${go_import_path}/cmd/jj" -hostmakedepends="git" short_desc="JSON Stream Editor" maintainer="SolitudeSF " license="MIT" diff --git a/srcpkgs/joker/template b/srcpkgs/joker/template index a66fffbab25..2682f33a5df 100644 --- a/srcpkgs/joker/template +++ b/srcpkgs/joker/template @@ -4,7 +4,6 @@ version=0.14.1 revision=1 build_style=go go_import_path=github.com/candid82/joker -hostmakedepends="git" short_desc="Interpreted dialect of Clojure written in Go and Clojure(Script) linter" maintainer="Dominic Monroe " license="EPL-1.0" diff --git a/srcpkgs/jump/template b/srcpkgs/jump/template index 1995b839290..15a171e4300 100644 --- a/srcpkgs/jump/template +++ b/srcpkgs/jump/template @@ -4,7 +4,6 @@ version=0.30.1 revision=1 build_style=go go_import_path=github.com/gsamokovarov/jump -hostmakedepends="git" short_desc="Fuzzy directory jumper that learns your habits" maintainer="Arthur Weagel " license="MIT" diff --git a/srcpkgs/keybase/template b/srcpkgs/keybase/template index 8fc5882b513..29674992c56 100644 --- a/srcpkgs/keybase/template +++ b/srcpkgs/keybase/template @@ -10,7 +10,6 @@ ${go_import_path}/go/kbfs/kbfsfuse ${go_import_path}/go/kbfs/kbfsgit/git-remote-keybase ${go_import_path}/go/kbfs/kbfstool ${go_import_path}/go/kbfs/redirector" go_build_tags="production" -hostmakedepends="git" depends="gnupg2" short_desc="Client for keybase.io" maintainer="Toyam Cox " diff --git a/srcpkgs/lazygit/template b/srcpkgs/lazygit/template index fe368000d02..1798760a299 100644 --- a/srcpkgs/lazygit/template +++ b/srcpkgs/lazygit/template @@ -4,7 +4,6 @@ version=0.24.2 revision=1 build_style=go go_import_path=github.com/jesseduffield/lazygit -hostmakedepends="git" depends="git" short_desc="Simple terminal UI for git commands" maintainer="Nathan Owens " diff --git a/srcpkgs/lego/template b/srcpkgs/lego/template index a71ffb026e3..fce664e3539 100644 --- a/srcpkgs/lego/template +++ b/srcpkgs/lego/template @@ -3,9 +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}" -hostmakedepends="git" +go_import_path="github.com/go-acme/lego/v4" +go_package="${go_import_path}/cmd/lego" short_desc="Let's Encrypt client and ACME library written in Go" maintainer="Anachron " license="MIT" diff --git a/srcpkgs/licensechecker/template b/srcpkgs/licensechecker/template index ec09ba9751f..910c7c74472 100644 --- a/srcpkgs/licensechecker/template +++ b/srcpkgs/licensechecker/template @@ -5,6 +5,7 @@ revision=5 wrksrc="lc-${version}" build_style=go go_import_path=github.com/boyter/lc +# XXX: next update should move to modules, so remove hostmakedepends hostmakedepends="git" short_desc="Identify software licenses used on a source tree" maintainer="Orphaned " diff --git a/srcpkgs/lxd/template b/srcpkgs/lxd/template index 57121aa3554..e3a3819ab50 100644 --- a/srcpkgs/lxd/template +++ b/srcpkgs/lxd/template @@ -7,7 +7,7 @@ go_import_path=github.com/lxc/lxd go_build_tags=libsqlite3 go_package="${go_import_path}/lxd ${go_import_path}/lxc ${go_import_path}/lxd-p2c ${go_import_path}/fuidshift" -hostmakedepends="pkg-config git" +hostmakedepends="pkg-config" makedepends="lxc-devel acl-devel dqlite-devel eudev-libudev-devel" depends="lxc acl acl-progs rsync squashfs-tools xz dnsmasq iptables" short_desc="Next generation system container manager" diff --git a/srcpkgs/massren/template b/srcpkgs/massren/template index db3941c7170..d3f4250b2ec 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 27b87e22b7f..d4dbd041a88 100644 --- a/srcpkgs/micro/template +++ b/srcpkgs/micro/template @@ -6,9 +6,8 @@ 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" maintainer="Diogo Leal " license="MIT" diff --git a/srcpkgs/minio/template b/srcpkgs/minio/template index bc78bbf6b84..37396015ea6 100644 --- a/srcpkgs/minio/template +++ b/srcpkgs/minio/template @@ -7,7 +7,6 @@ wrksrc=${pkgname}-RELEASE.${_version} build_style=go go_import_path="github.com/minio/minio" conf_files="/etc/default/minio /etc/minio/config.json" -hostmakedepends="git" short_desc="Object storage server compatible with Amazon S3" maintainer="Gerardo Di Iorio " license="Apache-2.0" diff --git a/srcpkgs/mmark/template b/srcpkgs/mmark/template index 0c6bb341dd5..b8c3b2ee7be 100644 --- a/srcpkgs/mmark/template +++ b/srcpkgs/mmark/template @@ -4,7 +4,6 @@ version=2.2.10 revision=1 build_style=go go_import_path=github.com/mmarkdown/mmark -hostmakedepends="git" short_desc="Powerful markdown processor geared towards the IETF" maintainer="Robert Lowry " license="BSD-2-Clause"