Index: devel/gogs/Makefile
===================================================================
--- devel/gogs/Makefile	(revision 455581)
+++ devel/gogs/Makefile	(working copy)
@@ -3,6 +3,7 @@
 PORTNAME=	gogs
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.11.34
+PORTREVISION=	1
 CATEGORIES=	devel www
 
 MAINTAINER=	dg@syrec.org
@@ -20,8 +21,8 @@
 
 OPTIONS_DEFINE=	DOCS
 
-USERS=		gogs
-GROUPS=		gogs
+USERS=		git
+GROUPS=		git
 
 GOGS_DBDIR?=	/var/db/gogs
 GOGS_LOGDIR?=	/var/log/gogs
@@ -46,8 +47,9 @@
 
 post-patch:
 	@${REINPLACE_CMD} -i '' \
+		-e 's|^RUN_USER = git$$|RUN_USER = ${USERS}|' \
+		-e 's|^RUN_MODE = dev$$|RUN_MODE = prod|' \
 		-e 's|^ROOT =$$|ROOT = ${GOGS_DBDIR}/repositories|' \
-		-e 's|^RUN_USER = git$$|RUN_USER = ${USERS}|' \
 		-e 's|^DB_TYPE = mysql$$|DB_TYPE = sqlite3|' \
 		${WRKSRC}/conf/app.ini
 
@@ -65,7 +67,7 @@
 	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}/custom/conf
 	${INSTALL_DATA} ${WRKSRC}/conf/app.ini ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}/custom/conf/
 	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}/custom/https
-	@${MKDIR} ${STAGEDIR}${GOGS_DBDIR}/data ${STAGEDIR}${GOGS_DBDIR}/repositories ${STAGEDIR}${GOGS_DBDIR}/home
+	@${MKDIR} ${STAGEDIR}${GOGS_DBDIR}/data ${STAGEDIR}${GOGS_DBDIR}/repositories
 	@${LN} -sf ${GOGS_DBDIR}/data ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/data
 	@${MKDIR} ${STAGEDIR}${GOGS_LOGDIR}
 	@${LN} -sf ${GOGS_LOGDIR} ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/log
Index: devel/gogs/files/gogs-rm-data.in
===================================================================
--- devel/gogs/files/gogs-rm-data.in	(revision 455581)
+++ devel/gogs/files/gogs-rm-data.in	(working copy)
@@ -17,5 +17,4 @@
   esac
 done
 
-rm -rf %%GOGS_DBDIR%%/*/* %%GOGS_DBDIR%%/*/.ssh \
-    %%GOGS_LOGDIR%%/* /var/log/gogs.log
+rm -rf %%GOGS_DBDIR%%/*/* %%GOGS_LOGDIR%%/* /var/log/gogs.log
Index: devel/gogs/pkg-plist
===================================================================
--- devel/gogs/pkg-plist	(revision 455581)
+++ devel/gogs/pkg-plist	(working copy)
@@ -1722,7 +1722,6 @@
 @dir(%%GOGS_USER%%,%%GOGS_GROUP%%,750) libexec/gogs/custom/conf
 @dir(%%GOGS_USER%%,%%GOGS_GROUP%%,750) libexec/gogs/custom/https
 @dir(%%GOGS_USER%%,%%GOGS_GROUP%%,750) %%GOGS_DBDIR%%/data
-@dir(%%GOGS_USER%%,%%GOGS_GROUP%%,750) %%GOGS_DBDIR%%/home
 @dir(%%GOGS_USER%%,%%GOGS_GROUP%%,750) %%GOGS_DBDIR%%/repositories
 @dir(%%GOGS_USER%%,%%GOGS_GROUP%%,750) %%GOGS_DBDIR%%
 @dir(%%GOGS_USER%%,%%GOGS_GROUP%%,750) %%GOGS_LOGDIR%%
Index: UPDATING
===================================================================
--- UPDATING	(revision 455581)
+++ UPDATING	(working copy)
@@ -5,6 +5,19 @@
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20171205:
+  AFFECTS: users of devel/gogs
+  AUTHOR: dg@syrec.org
+
+  Gogs user has been changed to "git". Users should update ownership of
+  the existing Gogs directories with
+
+  # chown -R git:git /var/db/gogs
+  # chown -R git:git /var/log/gogs
+
+  and either move or merge the contents of /var/db/gogs/home/.ssh with
+  /usr/local/git/.ssh.  After migration, /var/db/gogs/home can be removed.
+
 20171203:
   AFFECTS: users of sysutils/dsbmd
   AUTHOR: mk@freeshell.de