Index: branches/2020Q4/www/gitea/Makefile
===================================================================
--- branches/2020Q4/www/gitea/Makefile	(revision 556059)
+++ branches/2020Q4/www/gitea/Makefile	(revision 556060)
@@ -1,78 +1,78 @@
 # $FreeBSD$
 
 PORTNAME=	gitea
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.12.4
+DISTVERSION=	1.12.6
 CATEGORIES=	www
 MASTER_SITES=	https://github.com/go-gitea/gitea/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/
 DISTNAME=	gitea-src-${DISTVERSION}
 
 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
 NO_WRKSUBDIR=	yes
 PORTDATA=	*
 
 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 <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
 # 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/2020Q4/www/gitea/distinfo
===================================================================
--- branches/2020Q4/www/gitea/distinfo	(revision 556059)
+++ branches/2020Q4/www/gitea/distinfo	(revision 556060)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1599301009
-SHA256 (gitea-src-1.12.4.tar.gz) = 6c209b8e955ff3a9cc210323ee719e93cc43176754147a4ddccc421f1cafe37f
-SIZE (gitea-src-1.12.4.tar.gz) = 135170598
+TIMESTAMP = 1605981563
+SHA256 (gitea-src-1.12.6.tar.gz) = 98486d15c58b52177e58af300e1ac6afa46f2f85f61b8d96eacbbf73ccf1191e
+SIZE (gitea-src-1.12.6.tar.gz) = 135134376
Index: branches/2020Q4
===================================================================
--- branches/2020Q4	(revision 556059)
+++ branches/2020Q4	(revision 556060)

Property changes on: branches/2020Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r552525,556058