Index: branches/2020Q2/www/gitea/Makefile
===================================================================
--- branches/2020Q2/www/gitea/Makefile	(revision 533983)
+++ branches/2020Q2/www/gitea/Makefile	(revision 533984)
@@ -1,79 +1,81 @@
 # $FreeBSD$
 
 PORTNAME=	gitea
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.11.3
+DISTVERSION=	1.11.4
+PORTREVISION=	1
 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 \
-		git-lfs:devel/git-lfs
+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 PAM SQLITE
-OPTIONS_DEFAULT=	PAM SQLITE
+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 <bsd.port.options.mk>
 
 .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 <bsd.port.mk>
Index: branches/2020Q2/www/gitea/distinfo
===================================================================
--- branches/2020Q2/www/gitea/distinfo	(revision 533983)
+++ branches/2020Q2/www/gitea/distinfo	(revision 533984)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1584565552
-SHA256 (gitea-src-1.11.3.tar.gz) = 5d0b31295788cc81d9f0033d00e509b6798ffeef0b603c4e1360e1762f3b11ec
-SIZE (gitea-src-1.11.3.tar.gz) = 69382786
+TIMESTAMP = 1586790205
+SHA256 (gitea-src-1.11.4.tar.gz) = ee643516bf201296a4ef8cc0d782cddbbd894be2012be1d5fb5746801b9b66a2
+SIZE (gitea-src-1.11.4.tar.gz) = 68915569
Index: branches/2020Q2/www/gitea/files/patch-templates_repo_wiki_view.tmpl
===================================================================
--- branches/2020Q2/www/gitea/files/patch-templates_repo_wiki_view.tmpl	(nonexistent)
+++ branches/2020Q2/www/gitea/files/patch-templates_repo_wiki_view.tmpl	(revision 533984)
@@ -0,0 +1,11 @@
+--- 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)}}
+ 						<input id="repo-clone-url" value="{{$.WikiCloneLink.SSH}}" readonly>
+ 					{{end}}
+-					{{if or ((not $.DisableHTTP) (and (not $.DisableSSH) (or $.IsSigned $.ExposeAnonSSH)))}}
++					{{if or (not $.DisableHTTP) (and (not $.DisableSSH) (or $.IsSigned $.ExposeAnonSSH))}}
+ 						<button class="ui basic icon button poping up clipboard" id="clipboard-btn" data-original="{{.i18n.Tr "repo.copy_link"}}" data-success="{{.i18n.Tr "repo.copy_link_success"}}" data-error="{{.i18n.Tr "repo.copy_link_error"}}" data-content="{{.i18n.Tr "repo.copy_link"}}" data-variation="inverted tiny" data-clipboard-target="#repo-clone-url">
+ 							<i class="octicon octicon-clippy"></i>
+ 						</button>

Property changes on: branches/2020Q2/www/gitea/files/patch-templates_repo_wiki_view.tmpl
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2020Q2/www/gitea/pkg-message
===================================================================
--- branches/2020Q2/www/gitea/pkg-message	(revision 533983)
+++ branches/2020Q2/www/gitea/pkg-message	(revision 533984)
@@ -1,11 +1,12 @@
 [
 { type: install
+  maximum_version: 1.7.6
   message: <<EOM
 When upgrading from Gitea 1.7 or earlier, Gitea requires the addition of
 another secret to the config file in order to start up.  Either manually add
 JWT_SECRET to the ${PREFIX}/etc/gitea/conf/app.ini config file (see
 app.ini.sample), or allow Gitea to make the change for you by making the
 config file writable to the git user.
 EOM
 }
 ]
Index: branches/2020Q2
===================================================================
--- branches/2020Q2	(revision 533983)
+++ branches/2020Q2	(revision 533984)

Property changes on: branches/2020Q2
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r531612-531613,533935