git: 6d7128cf49a0 - 2021Q3 - www/gitea: Update to 1.14.6

[Adam Weinberger]

The branch 2021Q3 has been updated by adamw:

URL: https://cgit.FreeBSD.org/ports/commit/?id=6d7128cf49a0ce2069f6cd12dd61b5ac12d030fa

commit 6d7128cf49a0ce2069f6cd12dd61b5ac12d030fa
Author:     Stefan Bethke <stb at lassitu.de>
AuthorDate: 2021-08-20 18:32:41 +0000
Commit:     Adam Weinberger <adamw at FreeBSD.org>
CommitDate: 2021-08-20 18:40:08 +0000

    www/gitea: Update to 1.14.6
    
    PR:             257973
    Security:       https://blog.gitea.io/2021/08/gitea-1.14.6-is-released/
    (cherry picked from commit 7553ad1a0e8ec971a95bab5de433d81fd94adf4d)
---
 www/gitea/Makefile       | 6 +-----
 www/gitea/distinfo       | 6 +++---
 www/gitea/files/gitea.in | 6 ++++++
 www/gitea/pkg-plist      | 5 -----
 4 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/www/gitea/Makefile b/www/gitea/Makefile
index ee59d814685c..d5c0103dbae8 100644
--- a/www/gitea/Makefile
+++ b/www/gitea/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	gitea
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.14.5
+DISTVERSION=	1.14.6
 CATEGORIES=	www
 MASTER_SITES=	https://github.com/go-gitea/gitea/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/
 DISTNAME=	gitea-src-${DISTVERSION}
@@ -68,10 +68,6 @@ do-install:
 	${INSTALL_DATA} ${WRKDIR}/app.ini.sample ${STAGEDIR}${ETCDIR}/conf/app.ini.sample
 	${INSTALL_DATA} ${WRKSRC}/custom/conf/app.example.ini ${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}
 
diff --git a/www/gitea/distinfo b/www/gitea/distinfo
index c584b1fc3b9d..159f898661ae 100644
--- a/www/gitea/distinfo
+++ b/www/gitea/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1626589021
-SHA256 (gitea-src-1.14.5.tar.gz) = f27c0b5697bfe488d726a3b5efd94df3407fdd61942f72ca33c396761fdb60e1
-SIZE (gitea-src-1.14.5.tar.gz) = 117880790
+TIMESTAMP = 1629474979
+SHA256 (gitea-src-1.14.6.tar.gz) = 208a0e26569f303e8a83c65d7b72dca0af7b3ca2e6a8e50c40dde798882a7b5a
+SIZE (gitea-src-1.14.6.tar.gz) = 117871468
diff --git a/www/gitea/files/gitea.in b/www/gitea/files/gitea.in
index 8354dfb4d4df..5e75ad5d5143 100644
--- a/www/gitea/files/gitea.in
+++ b/www/gitea/files/gitea.in
@@ -31,6 +31,12 @@ pidfile="/var/run/${name}.pid"
 start_cmd="${name}_start"
 
 gitea_start() {
+	for d in /var/db/gitea /var/log/gitea; do
+		if [ ! -e "$d" ]; then
+			mkdir "$d"
+			chown ${gitea_user} "$d"
+		fi
+	done
 	/usr/sbin/daemon %%DAEMONARGS%% \
 		-u ${gitea_user} -p ${pidfile} \
 		/usr/bin/env -i \
diff --git a/www/gitea/pkg-plist b/www/gitea/pkg-plist
index 99e637f4616b..209e1c8e372c 100644
--- a/www/gitea/pkg-plist
+++ b/www/gitea/pkg-plist
@@ -1,8 +1,3 @@
 @sample %%ETCDIR%%/conf/app.ini.sample
 %%ETCDIR%%/conf/app.ini.defaults
 sbin/gitea
- at owner git
- at group git
- at dir /var/db/gitea
- at dir /var/log/gitea
- at dir /var/run/gitea