Index: branches/2020Q1/www/gitea/files/patch-Makefile
===================================================================
--- branches/2020Q1/www/gitea/files/patch-Makefile	(revision 528732)
+++ branches/2020Q1/www/gitea/files/patch-Makefile	(revision 528733)
@@ -1,20 +1,20 @@
 --- Makefile.orig	2020-03-06 17:18:36.000000000 +0000
 +++ Makefile	2020-03-18 20:56:00.588102000 +0000
 @@ -123,7 +123,7 @@
  
  .PHONY: go-check
  go-check:
 -	$(eval GO_VERSION := $(shell printf "%03d%03d%03d" $(shell go version | grep -Eo '[0-9]+\.?[0-9]+?\.?[0-9]?[[:space:]]' | tr '.' ' ');))
-+	$(eval GO_VERSION := $(shell printf "%03d%03d%03d" $(shell go version | bsdgrep -Eo 'go[0-9\.]+' | tr -d go | tr '.' ' ');))
++	$(eval GO_VERSION := $(shell printf "%03d%03d%03d" $(shell go version | grep -Eo 'go[0-9\.]+' | tr -d go | tr '.' ' ');))
  	@if [ "$(GO_VERSION)" -lt "001011000" ]; then \
  		echo "Gitea requires Go 1.11.0 or greater to build. You can get it at https://golang.org/dl/"; \
  		exit 1; \
 @@ -138,7 +138,7 @@
  
  .PHONY: node-check
  node-check:
 -	$(eval NODE_VERSION := $(shell printf "%03d%03d%03d" $(shell node -v | grep -Eo '[0-9]+\.?[0-9]+?\.?[0-9]?' | tr '.' ' ');))
 +	$(eval NODE_VERSION := $(shell printf "%03d%03d%03d" $(shell node -v | grep -Eo '[0-9]+\.?[0-9]+\.?[0-9]+' | tr '.' ' ');))
  	$(eval NPM_MISSING := $(shell hash npm > /dev/null 2>&1 || echo 1))
  	@if [ "$(NODE_VERSION)" -lt "010000000" -o "$(NPM_MISSING)" = "1" ]; then \
  		echo "Gitea requires Node.js 10.0.0 or greater and npm to build. You can get it at https://nodejs.org/en/download/"; \
Index: branches/2020Q1
===================================================================
--- branches/2020Q1	(revision 528732)
+++ branches/2020Q1	(revision 528733)

Property changes on: branches/2020Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r528732