Index: head/www/gitea/Makefile =================================================================== --- head/www/gitea/Makefile (revision 540696) +++ head/www/gitea/Makefile (revision 540697) @@ -1,81 +1,80 @@ # $FreeBSD$ PORTNAME= gitea DISTVERSIONPREFIX= v -DISTVERSION= 1.11.6 -PORTREVISION= 1 +DISTVERSION= 1.11.8 CATEGORIES= www MASTER_SITES= https://github.com/go-gitea/gitea/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/ DISTNAME= gitea-src-${DISTVERSION} NO_WRKSUBDIR= yes MAINTAINER= stb@lassitu.de COMMENT= Compact self-hosted Git service LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= git:devel/git USES= gmake go:no_targets USE_RC_SUBR= gitea SUB_FILES+= app.ini.sample SUB_LIST+= GITUSER=${USERS} USERS= git GROUPS= git OPTIONS_DEFINE= BINDATA GIT_LFS PAM SQLITE OPTIONS_DEFAULT= GIT_LFS PAM SQLITE OPTIONS_SUB= yes BINDATA_DESC= Build a single monolithic binary, with all assets included GIT_LFS_DESC= Support for Git Large File Storage (LFS) PAM_DESC= Enable support for PAM BINDATA_VARS= GO_TAGS+=bindata GIT_LFS_RUN_DEPENDS= git-lfs:devel/git-lfs PAM_VARS= GO_TAGS+=pam SQLITE_VARS= GO_TAGS+="sqlite sqlite_unlock_notify" .include .if ${OPSYS} == FreeBSD DAEMONARGS= -S -l \$${gitea_facility} -s \$${gitea_priority} -T \$${name} .else DAEMONARGS= -f .endif 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_ENV= LDFLAGS="${LDFLAGS} ${EXTRA_LDFLAGS}" MAKE_ARGS= GOPATH=${WRKDIR} TAGS="${GO_TAGS}" ALL_TARGET= backend MAKE_JOBS_UNSAFE= yes post-patch: ${ECHO_CMD} ${DISTVERSION} >${WRKSRC}/VERSION # Too lazy to figure out why go install won't work. do-install: # Go binary is statically linked and cannot be stripped, so use # INSTALL_SCRIPT. ${INSTALL_SCRIPT} ${WRKSRC}/gitea ${STAGEDIR}${PREFIX}/sbin @${MKDIR} ${STAGEDIR}${ETCDIR}/conf ${INSTALL_DATA} ${WRKDIR}/app.ini.sample ${STAGEDIR}${ETCDIR}/conf/app.ini.sample ${INSTALL_DATA} ${WRKSRC}/custom/conf/app.ini.sample ${STAGEDIR}${ETCDIR}/conf/app.ini.defaults @${MKDIR} ${STAGEDIR}${DESTDIR}/var/db/${PORTNAME} @${MKDIR} ${STAGEDIR}${DESTDIR}/var/log/${PORTNAME} @${MKDIR} ${STAGEDIR}${DESTDIR}/var/run/${PORTNAME} do-install-BINDATA-off: cd ${WRKSRC} && ${COPYTREE_SHARE} "options public templates" ${STAGEDIR}${DATADIR} .include Index: head/www/gitea/distinfo =================================================================== --- head/www/gitea/distinfo (revision 540696) +++ head/www/gitea/distinfo (revision 540697) @@ -1,3 +1,3 @@ -TIMESTAMP = 1590915922 -SHA256 (gitea-src-1.11.6.tar.gz) = 1ac3880df7f38e411376c284959d8f5e1e1d9137ac423fe20d1e02ac5cc1de86 -SIZE (gitea-src-1.11.6.tar.gz) = 68915319 +TIMESTAMP = 1593337278 +SHA256 (gitea-src-1.11.8.tar.gz) = f4f965bd8f7da9320b6693c249eab07ff8baf5ef81649fd9025133f91391bab8 +SIZE (gitea-src-1.11.8.tar.gz) = 68927493 Index: head/www/gitea/files/patch-templates_repo_wiki_view.tmpl =================================================================== --- head/www/gitea/files/patch-templates_repo_wiki_view.tmpl (revision 540696) +++ head/www/gitea/files/patch-templates_repo_wiki_view.tmpl (nonexistent) @@ -1,11 +0,0 @@ ---- templates/repo/wiki/view.tmpl.orig 2020-04-29 07:06:03 UTC -+++ templates/repo/wiki/view.tmpl -@@ -45,7 +45,7 @@ - {{else if and (not $.DisableSSH) (or $.IsSigned $.ExposeAnonSSH)}} - - {{end}} -- {{if or ((not $.DisableHTTP) (and (not $.DisableSSH) (or $.IsSigned $.ExposeAnonSSH)))}} -+ {{if or (not $.DisableHTTP) (and (not $.DisableSSH) (or $.IsSigned $.ExposeAnonSSH))}} - Property changes on: head/www/gitea/files/patch-templates_repo_wiki_view.tmpl ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/gitea/files/patch-Makefile =================================================================== --- head/www/gitea/files/patch-Makefile (revision 540696) +++ head/www/gitea/files/patch-Makefile (nonexistent) @@ -1,20 +0,0 @@ ---- 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 | 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/"; \ Property changes on: head/www/gitea/files/patch-Makefile ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property