View | Details | Raw Unified | Return to bug 244898 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-2 / +4 lines)
Lines 2-8 Link Here
2
2
3
PORTNAME=	gitea
3
PORTNAME=	gitea
4
DISTVERSIONPREFIX=	v
4
DISTVERSIONPREFIX=	v
5
DISTVERSION=	1.11.2
5
DISTVERSION=	1.11.3
6
CATEGORIES=	www
6
CATEGORIES=	www
7
MASTER_SITES=	https://github.com/go-gitea/gitea/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/
7
MASTER_SITES=	https://github.com/go-gitea/gitea/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/
8
DISTNAME=	gitea-src-${DISTVERSION}
8
DISTNAME=	gitea-src-${DISTVERSION}
Lines 47-57 Link Here
47
47
48
SUB_LIST+=	DAEMONARGS="${DAEMONARGS}"
48
SUB_LIST+=	DAEMONARGS="${DAEMONARGS}"
49
49
50
SSP_UNSAFE=	true
50
# use sane defaults for path, overriden with actual PREFIX in start script
51
# use sane defaults for path, overriden with actual PREFIX in start script
51
EXTRA_LDFLAGS=	-X code.gitea.io/gitea/modules/setting.CustomPath=${PREFIX}/etc/gitea
52
EXTRA_LDFLAGS=	-X code.gitea.io/gitea/modules/setting.CustomPath=${PREFIX}/etc/gitea
52
EXTRA_LDFLAGS+=	-X code.gitea.io/gitea/modules/setting.AppWorkPath=${PREFIX}/share/gitea
53
EXTRA_LDFLAGS+=	-X code.gitea.io/gitea/modules/setting.AppWorkPath=${PREFIX}/share/gitea
53
# Default LDFLAGS are incompatible with build
54
# Default LDFLAGS are incompatible with build
54
MAKE_ARGS=	GOPATH=${WRKDIR} TAGS="${GO_TAGS}" LDFLAGS="${EXTRA_LDFLAGS}"
55
MAKE_ENV=	LDFLAGS="${LDFLAGS} ${EXTRA_LDFLAGS}"
56
MAKE_ARGS=	GOPATH=${WRKDIR} TAGS="${GO_TAGS}"
55
ALL_TARGET=	backend
57
ALL_TARGET=	backend
56
MAKE_JOBS_UNSAFE=	yes
58
MAKE_JOBS_UNSAFE=	yes
57
59
(-)distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1583582463
1
TIMESTAMP = 1584565552
2
SHA256 (gitea-src-1.11.2.tar.gz) = 777ad27929809811e17e2d0a539d2a47163e382473cefa680debcb0777aa2cba
2
SHA256 (gitea-src-1.11.3.tar.gz) = 5d0b31295788cc81d9f0033d00e509b6798ffeef0b603c4e1360e1762f3b11ec
3
SIZE (gitea-src-1.11.2.tar.gz) = 69381797
3
SIZE (gitea-src-1.11.3.tar.gz) = 69382786
(-)files/patch-Makefile (+20 lines)
Line 0 Link Here
1
--- Makefile.orig	2020-03-06 17:18:36.000000000 +0000
2
+++ Makefile	2020-03-18 20:56:00.588102000 +0000
3
@@ -123,7 +123,7 @@
4
 
5
 .PHONY: go-check
6
 go-check:
7
-	$(eval GO_VERSION := $(shell printf "%03d%03d%03d" $(shell go version | grep -Eo '[0-9]+\.?[0-9]+?\.?[0-9]?[[:space:]]' | tr '.' ' ');))
8
+	$(eval GO_VERSION := $(shell printf "%03d%03d%03d" $(shell go version | grep -Eo '[0-9]+\.?[0-9]+\.?[0-9]+' | tr '.' ' ');))
9
 	@if [ "$(GO_VERSION)" -lt "001011000" ]; then \
10
 		echo "Gitea requires Go 1.11.0 or greater to build. You can get it at https://golang.org/dl/"; \
11
 		exit 1; \
12
@@ -138,7 +138,7 @@
13
 
14
 .PHONY: node-check
15
 node-check:
16
-	$(eval NODE_VERSION := $(shell printf "%03d%03d%03d" $(shell node -v | grep -Eo '[0-9]+\.?[0-9]+?\.?[0-9]?' | tr '.' ' ');))
17
+	$(eval NODE_VERSION := $(shell printf "%03d%03d%03d" $(shell node -v | grep -Eo '[0-9]+\.?[0-9]+\.?[0-9]+' | tr '.' ' ');))
18
 	$(eval NPM_MISSING := $(shell hash npm > /dev/null 2>&1 || echo 1))
19
 	@if [ "$(NODE_VERSION)" -lt "010000000" -o "$(NPM_MISSING)" = "1" ]; then \
20
 		echo "Gitea requires Node.js 10.0.0 or greater and npm to build. You can get it at https://nodejs.org/en/download/"; \

Return to bug 244898