Date: Thu, 19 Mar 2020 16:16:35 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r528729 - in head/www/gitea: . files Message-ID: <202003191616.02JGGZso005803@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Thu Mar 19 16:16:35 2020 New Revision: 528729 URL: https://svnweb.freebsd.org/changeset/ports/528729 Log: gitea: Update to 1.11.3 This release fixes three bugs. Release notes: https://blog.gitea.io/2020/03/gitea-1.11.3-and-1.10.6-released/ Also fix LDFLAGS so that the version number (among other things) is built into the binary correctly, and make the regexp used in the Makefile work with bsdgrep (both thanks to adamw). Will MFH due to bsdgrep build failure and stopwatch panic fix. PR: 244898 Submitted by: maintainer MFH: 2020Q1 Added: head/www/gitea/files/patch-Makefile (contents, props changed) Modified: head/www/gitea/Makefile head/www/gitea/distinfo Modified: head/www/gitea/Makefile ============================================================================== --- head/www/gitea/Makefile Thu Mar 19 15:25:41 2020 (r528728) +++ head/www/gitea/Makefile Thu Mar 19 16:16:35 2020 (r528729) @@ -2,7 +2,7 @@ PORTNAME= gitea DISTVERSIONPREFIX= v -DISTVERSION= 1.11.2 +DISTVERSION= 1.11.3 CATEGORIES= www MASTER_SITES= https://github.com/go-gitea/gitea/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/ DISTNAME= gitea-src-${DISTVERSION} @@ -47,11 +47,13 @@ DAEMONARGS= -f SUB_LIST+= DAEMONARGS="${DAEMONARGS}" +SSP_UNSAFE= true # use sane defaults for path, overriden with actual PREFIX in start script EXTRA_LDFLAGS= -X code.gitea.io/gitea/modules/setting.CustomPath=${PREFIX}/etc/gitea EXTRA_LDFLAGS+= -X code.gitea.io/gitea/modules/setting.AppWorkPath=${PREFIX}/share/gitea # Default LDFLAGS are incompatible with build -MAKE_ARGS= GOPATH=${WRKDIR} TAGS="${GO_TAGS}" LDFLAGS="${EXTRA_LDFLAGS}" +MAKE_ENV= LDFLAGS="${LDFLAGS} ${EXTRA_LDFLAGS}" +MAKE_ARGS= GOPATH=${WRKDIR} TAGS="${GO_TAGS}" ALL_TARGET= backend MAKE_JOBS_UNSAFE= yes Modified: head/www/gitea/distinfo ============================================================================== --- head/www/gitea/distinfo Thu Mar 19 15:25:41 2020 (r528728) +++ head/www/gitea/distinfo Thu Mar 19 16:16:35 2020 (r528729) @@ -1,3 +1,3 @@ -TIMESTAMP = 1583582463 -SHA256 (gitea-src-1.11.2.tar.gz) = 777ad27929809811e17e2d0a539d2a47163e382473cefa680debcb0777aa2cba -SIZE (gitea-src-1.11.2.tar.gz) = 69381797 +TIMESTAMP = 1584565552 +SHA256 (gitea-src-1.11.3.tar.gz) = 5d0b31295788cc81d9f0033d00e509b6798ffeef0b603c4e1360e1762f3b11ec +SIZE (gitea-src-1.11.3.tar.gz) = 69382786 Added: head/www/gitea/files/patch-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/gitea/files/patch-Makefile Thu Mar 19 16:16:35 2020 (r528729) @@ -0,0 +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 '.' ' ');)) + @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/"; \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202003191616.02JGGZso005803>