2 files changed, 49 insertions, 2 deletions
diff --git a/www/shiori/Makefile b/www/shiori/Makefile
index a8bafe630a2e..b70a02b7be85 100644
--- a/www/shiori/Makefile
+++ b/www/shiori/Makefile
@@ -10,11 +10,23 @@ WWW=		https://github.com/go-shiori/shiori
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		go:1.22,modules
+USES=		go:1.23,modules
+USE_RC_SUBR=	${PORTNAME}
 
 GO_MODULE=	github.com/go-shiori/shiori
 
-PLIST_FILES=	bin/${PORTNAME}
+SUB_LIST=	USER=${USERS:[1]} \
+		HOMEDIR=${SHIORI_HOMEDIR}
+
+USERS=		${SHIORI_USER}
+GROUPS=		${SHIORI_GROUP}
+
+PLIST_FILES=	bin/${PORTNAME} \
+		"@dir(${SHIORI_USER},${SHIORI_GROUP},0700) ${SHIORI_HOMEDIR}"
+
+SHIORI_HOMEDIR=	/var/db/${SHIORI_USER}
+SHIORI_USER=	${PORTNAME}
+SHIORI_GROUP=	${SHIORI_USER}
 
 BUILD_DATE=	%FT%T
 
@@ -27,4 +39,7 @@ post-patch:
 		${WRKSRC}/main.go \
 		${WRKSRC}/internal/model/main.go
 
+post-install:
+	@${MKDIR} ${STAGEDIR}${SHIORI_HOMEDIR}
+
 .include <bsd.port.mk>
diff --git a/www/shiori/files/shiori.in b/www/shiori/files/shiori.in
new file mode 100644
index 000000000000..4237867a73e7
--- /dev/null
+++ b/www/shiori/files/shiori.in
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+# PROVIDE: shiori
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+#
+# Configuration settings for shiori in /etc/rc.conf
+#
+# shiori_enable (bool):    Enable shiori. (default=NO)
+# shiori_log (str):        Log output. (default=/var/log/shiori.log)
+# shiori_runas (str):      User to run shiori as. (default=%%USER%%)
+#
+
+. /etc/rc.subr
+
+name="shiori"
+desc="Simple bookmark manager built with Go"
+rcvar="${name}_enable"
+
+load_rc_config $name
+
+: ${shiori_enable:="NO"}
+: ${shiori_log:="/var/log/shiori.log"}
+: ${shiori_runas:="%%USER%%"}
+: ${shiori_datadir:="%%HOMEDIR%%"}
+
+pidfile="/var/run/${name}.pid"
+procname="%%LOCALBASE%%/bin/${name}"
+command="/usr/sbin/daemon"
+command_args="-c -u '${shiori_runas}' -p '${pidfile}' -t '${desc}' -o '${shiori_log}' '${procname}' server --storage-directory '${shiori_datadir}' ${shiori_args}"
+
+run_rc_command "$1"