Thu Nov 10 21:12:54 2022 UTC ()
gitea: use find(1) in a more portable way

Verified on NetBSD, Linux (Debian 10.13), and macOS (all amd64).

No changes to the package observed, so no revision bump.


(khorben)
diff -r1.32 -r1.33 pkgsrc/www/gitea/distinfo
diff -r1.3 -r1.4 pkgsrc/www/gitea/patches/patch-Makefile
cvs diff -r1.32 -r1.33 pkgsrc/www/gitea/distinfo (expand / switch to unified diff)

--- pkgsrc/www/gitea/distinfo 2022/11/09 23:26:15 1.32
+++ pkgsrc/www/gitea/distinfo 2022/11/10 21:12:54 1.33
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.32 2022/11/09 23:26:15 khorben Exp $ 1$NetBSD: distinfo,v 1.33 2022/11/10 21:12:54 khorben Exp $
2 2
3BLAKE2s (bazil.org_fuse_@v_v0.0.0-20180421153158-65cc252bf669.mod) = ff8095283662ae2d2a1968bf429516c54586b1a6c4dc744657162e6781aa8ece 3BLAKE2s (bazil.org_fuse_@v_v0.0.0-20180421153158-65cc252bf669.mod) = ff8095283662ae2d2a1968bf429516c54586b1a6c4dc744657162e6781aa8ece
4SHA512 (bazil.org_fuse_@v_v0.0.0-20180421153158-65cc252bf669.mod) = 7b3ef87f98485bb9ec325680f57d43a9bd76e90bdcfb1e798458f28f7d3addf91dbb6a07b654749468860981413ad2267df2d5f3535c85579e9f79d9328d355c 4SHA512 (bazil.org_fuse_@v_v0.0.0-20180421153158-65cc252bf669.mod) = 7b3ef87f98485bb9ec325680f57d43a9bd76e90bdcfb1e798458f28f7d3addf91dbb6a07b654749468860981413ad2267df2d5f3535c85579e9f79d9328d355c
5Size (bazil.org_fuse_@v_v0.0.0-20180421153158-65cc252bf669.mod) = 22 bytes 5Size (bazil.org_fuse_@v_v0.0.0-20180421153158-65cc252bf669.mod) = 22 bytes
6BLAKE2s (bazil.org_fuse_@v_v0.0.0-20180421153158-65cc252bf669.zip) = 08f3301897c1268320fe2a55ffc47ce9920d58f52703956a20e111a8a1bbf15d 6BLAKE2s (bazil.org_fuse_@v_v0.0.0-20180421153158-65cc252bf669.zip) = 08f3301897c1268320fe2a55ffc47ce9920d58f52703956a20e111a8a1bbf15d
7SHA512 (bazil.org_fuse_@v_v0.0.0-20180421153158-65cc252bf669.zip) = 785a166a0b658958784508e790b83fbffe772713fb6225e837c6f62149f09f93b1a013999becd8074d7d66a26b7cc237f7fccc66a436257ac8a222fe011ae316 7SHA512 (bazil.org_fuse_@v_v0.0.0-20180421153158-65cc252bf669.zip) = 785a166a0b658958784508e790b83fbffe772713fb6225e837c6f62149f09f93b1a013999becd8074d7d66a26b7cc237f7fccc66a436257ac8a222fe011ae316
8Size (bazil.org_fuse_@v_v0.0.0-20180421153158-65cc252bf669.zip) = 220785 bytes 8Size (bazil.org_fuse_@v_v0.0.0-20180421153158-65cc252bf669.zip) = 220785 bytes
9BLAKE2s (bitbucket.org_creachadair_shell_@v_v0.0.6.mod) = 20710555bdaa0dc4f2a804598d4e0b73e8d92f98b8948bf55547f0f3983dfbc1 9BLAKE2s (bitbucket.org_creachadair_shell_@v_v0.0.6.mod) = 20710555bdaa0dc4f2a804598d4e0b73e8d92f98b8948bf55547f0f3983dfbc1
10SHA512 (bitbucket.org_creachadair_shell_@v_v0.0.6.mod) = eb5c512e9be3b38de69c2708418456ce71dc4285f64abb5e5bea738375576ea1d9ac2f4bd46163af34e7a7f7ae554ca3439a8122e2dbbeedc60221865bbfc2b4 10SHA512 (bitbucket.org_creachadair_shell_@v_v0.0.6.mod) = eb5c512e9be3b38de69c2708418456ce71dc4285f64abb5e5bea738375576ea1d9ac2f4bd46163af34e7a7f7ae554ca3439a8122e2dbbeedc60221865bbfc2b4
11Size (bitbucket.org_creachadair_shell_@v_v0.0.6.mod) = 48 bytes 11Size (bitbucket.org_creachadair_shell_@v_v0.0.6.mod) = 48 bytes
12BLAKE2s (bitbucket.org_creachadair_shell_@v_v0.0.6.zip) = 1cda58dec80d71558ef256847468ded5a67fd9a59001a6f7757b2f7b40a3e95d 12BLAKE2s (bitbucket.org_creachadair_shell_@v_v0.0.6.zip) = 1cda58dec80d71558ef256847468ded5a67fd9a59001a6f7757b2f7b40a3e95d
13SHA512 (bitbucket.org_creachadair_shell_@v_v0.0.6.zip) = 3ccba880b7c2a17dd0c05992d5645b4d17573516cfb23c77e3359df5a689d9ade85b5a2cceeab2224c0fb9ebbd1d64f34c15aadcff32d55cd43eea83564efb7b 13SHA512 (bitbucket.org_creachadair_shell_@v_v0.0.6.zip) = 3ccba880b7c2a17dd0c05992d5645b4d17573516cfb23c77e3359df5a689d9ade85b5a2cceeab2224c0fb9ebbd1d64f34c15aadcff32d55cd43eea83564efb7b
14Size (bitbucket.org_creachadair_shell_@v_v0.0.6.zip) = 8344 bytes 14Size (bitbucket.org_creachadair_shell_@v_v0.0.6.zip) = 8344 bytes
@@ -8039,14 +8039,14 @@ SHA512 (xorm.io_builder_@v_v0.3.10.mod)  @@ -8039,14 +8039,14 @@ SHA512 (xorm.io_builder_@v_v0.3.10.mod)
8039Size (xorm.io_builder_@v_v0.3.10.mod) = 142 bytes 8039Size (xorm.io_builder_@v_v0.3.10.mod) = 142 bytes
8040BLAKE2s (xorm.io_builder_@v_v0.3.10.zip) = c58a76188197c046f12b91ab634569fc6ffcec7b3c75a43265537821a601e2ec 8040BLAKE2s (xorm.io_builder_@v_v0.3.10.zip) = c58a76188197c046f12b91ab634569fc6ffcec7b3c75a43265537821a601e2ec
8041SHA512 (xorm.io_builder_@v_v0.3.10.zip) = bad8c64c6e670e2c60d71ea39783aa7b15de98b824f49b3cb58a0613f31c3091afa8b6ae33f913c85419e5bd69234847b56eefe78488b998f5843e8b13ad675f 8041SHA512 (xorm.io_builder_@v_v0.3.10.zip) = bad8c64c6e670e2c60d71ea39783aa7b15de98b824f49b3cb58a0613f31c3091afa8b6ae33f913c85419e5bd69234847b56eefe78488b998f5843e8b13ad675f
8042Size (xorm.io_builder_@v_v0.3.10.zip) = 45996 bytes 8042Size (xorm.io_builder_@v_v0.3.10.zip) = 45996 bytes
8043BLAKE2s (xorm.io_builder_@v_v0.3.9.mod) = 09569512073e083895d4412fccaa6328afe2759fefa24094f6d1abe95fd62429 8043BLAKE2s (xorm.io_builder_@v_v0.3.9.mod) = 09569512073e083895d4412fccaa6328afe2759fefa24094f6d1abe95fd62429
8044SHA512 (xorm.io_builder_@v_v0.3.9.mod) = 63614abda612e7a8de67e1e94e1620ef0ff397191f667b17c757874fc932f819f8f620a59a3bd35fbe55cad1f8be5b0d1f8529fad3a782f4da9200e05d55a7ab 8044SHA512 (xorm.io_builder_@v_v0.3.9.mod) = 63614abda612e7a8de67e1e94e1620ef0ff397191f667b17c757874fc932f819f8f620a59a3bd35fbe55cad1f8be5b0d1f8529fad3a782f4da9200e05d55a7ab
8045Size (xorm.io_builder_@v_v0.3.9.mod) = 142 bytes 8045Size (xorm.io_builder_@v_v0.3.9.mod) = 142 bytes
8046BLAKE2s (xorm.io_xorm_@v_v1.2.5.mod) = 9272b5b100bfd84edd7175f71055071599f9decd8abf2352bd2604815a72ef57 8046BLAKE2s (xorm.io_xorm_@v_v1.2.5.mod) = 9272b5b100bfd84edd7175f71055071599f9decd8abf2352bd2604815a72ef57
8047SHA512 (xorm.io_xorm_@v_v1.2.5.mod) = 75a2f3d4e4de8f898c0d074518ca8bb860dea639c643b630cb907436e046efe48d565430d52d43c16d29403f3a53dd45593816aacc15a245b60ae12dcdefb82b 8047SHA512 (xorm.io_xorm_@v_v1.2.5.mod) = 75a2f3d4e4de8f898c0d074518ca8bb860dea639c643b630cb907436e046efe48d565430d52d43c16d29403f3a53dd45593816aacc15a245b60ae12dcdefb82b
8048Size (xorm.io_xorm_@v_v1.2.5.mod) = 486 bytes 8048Size (xorm.io_xorm_@v_v1.2.5.mod) = 486 bytes
8049BLAKE2s (xorm.io_xorm_@v_v1.2.5.zip) = 03755a7c8b10da3dd1ab496969dbf0e54a528749fed1d3bdaeb26237235ff0a7 8049BLAKE2s (xorm.io_xorm_@v_v1.2.5.zip) = 03755a7c8b10da3dd1ab496969dbf0e54a528749fed1d3bdaeb26237235ff0a7
8050SHA512 (xorm.io_xorm_@v_v1.2.5.zip) = e136f8c50d41c46b83cb17b82e6865967105f404a886d93834793c13fa4c9e0ef6c841e9eed19ba5fecf068670650b01a1648303614ed97ff2d046992479d357 8050SHA512 (xorm.io_xorm_@v_v1.2.5.zip) = e136f8c50d41c46b83cb17b82e6865967105f404a886d93834793c13fa4c9e0ef6c841e9eed19ba5fecf068670650b01a1648303614ed97ff2d046992479d357
8051Size (xorm.io_xorm_@v_v1.2.5.zip) = 307259 bytes 8051Size (xorm.io_xorm_@v_v1.2.5.zip) = 307259 bytes
8052SHA1 (patch-Makefile) = e412ed02de0c2b4e7ea711b829168551bf6f8839 8052SHA1 (patch-Makefile) = 289ec07884b772dac8f79dfd89b498c55df9cf83
cvs diff -r1.3 -r1.4 pkgsrc/www/gitea/patches/patch-Makefile (expand / switch to unified diff)

--- pkgsrc/www/gitea/patches/patch-Makefile 2022/02/16 16:06:21 1.3
+++ pkgsrc/www/gitea/patches/patch-Makefile 2022/11/10 21:12:54 1.4
@@ -1,15 +1,25 @@ @@ -1,15 +1,25 @@
1$NetBSD: patch-Makefile,v 1.3 2022/02/16 16:06:21 tm Exp $ 1$NetBSD: patch-Makefile,v 1.4 2022/11/10 21:12:54 khorben Exp $
2 2
3Exclude LDFLAGS, this is not C. 3Exclude LDFLAGS, this is not C.
 4Use find(1) in a more portable way.
4 5
5--- Makefile.orig 2022-02-06 12:35:24.000000000 +0000 6--- Makefile.orig 2022-07-12 18:26:27.000000000 +0000
6+++ Makefile 7+++ Makefile
7@@ -88,7 +88,7 @@ else 8@@ -95,7 +95,7 @@ else
8 endif 9 endif
9 endif 10 endif
10  11
11-LDFLAGS := $(LDFLAGS) -X "main.MakeVersion=$(MAKE_VERSION)" -X "main.Version=$(GITEA_VERSION)" -X "main.Tags=$(TAGS)" 12-LDFLAGS := $(LDFLAGS) -X "main.MakeVersion=$(MAKE_VERSION)" -X "main.Version=$(GITEA_VERSION)" -X "main.Tags=$(TAGS)"
12+LDFLAGS := -X "main.MakeVersion=$(MAKE_VERSION)" -X "main.Version=$(GITEA_VERSION)" -X "main.Tags=$(TAGS)" 13+LDFLAGS := -X "main.MakeVersion=$(MAKE_VERSION)" -X "main.Version=$(GITEA_VERSION)" -X "main.Tags=$(TAGS)"
13  14
14 LINUX_ARCHS ?= linux/amd64,linux/386,linux/arm-5,linux/arm-6,linux/arm64 15 LINUX_ARCHS ?= linux/amd64,linux/386,linux/arm-5,linux/arm-6,linux/arm64
15  16
 17@@ -126,7 +126,7 @@ TAR_EXCLUDES := .git data indexers queue
 18 GO_DIRS := cmd integrations models modules routers build services tools
 19
 20 GO_SOURCES := $(wildcard *.go)
 21-GO_SOURCES += $(shell find $(GO_DIRS) -type f -name "*.go" -not -path modules/options/bindata.go -not -path modules/public/bindata.go -not -path modules/templates/bindata.go)
 22+GO_SOURCES += $(shell find $(GO_DIRS) -type f -name "*.go" -and ! -path modules/options/bindata.go -and ! -path modules/public/bindata.go -and ! -path modules/templates/bindata.go)
 23
 24 ifeq ($(filter $(TAGS_SPLIT),bindata),bindata)
 25 GO_SOURCES += $(BINDATA_DEST)