svn commit: r458562 - in head/devel/gogs: . files
Kurt Jaeger
pi at FreeBSD.org
Tue Jan 9 19:41:38 UTC 2018
Author: pi
Date: Tue Jan 9 19:41:37 2018
New Revision: 458562
URL: https://svnweb.freebsd.org/changeset/ports/458562
Log:
devel/gogs: fix rc.d script status and file commit history pagination
PR: 224614
Submitted by: Dmitri Goutnik <dg at syrec.org> (maintainer), Douglas Thrift <douglas at douglasthrift.net>
Added:
head/devel/gogs/files/patch-routes_repo_commit.go (contents, props changed)
Modified:
head/devel/gogs/Makefile
head/devel/gogs/files/gogs-service.in
Modified: head/devel/gogs/Makefile
==============================================================================
--- head/devel/gogs/Makefile Tue Jan 9 19:16:16 2018 (r458561)
+++ head/devel/gogs/Makefile Tue Jan 9 19:41:37 2018 (r458562)
@@ -3,7 +3,7 @@
PORTNAME= gogs
DISTVERSIONPREFIX= v
DISTVERSION= 0.11.34
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel www
MAINTAINER= dg at syrec.org
Modified: head/devel/gogs/files/gogs-service.in
==============================================================================
--- head/devel/gogs/files/gogs-service.in Tue Jan 9 19:16:16 2018 (r458561)
+++ head/devel/gogs/files/gogs-service.in Tue Jan 9 19:41:37 2018 (r458562)
@@ -26,20 +26,17 @@ load_rc_config ${name}
: ${%%PORTNAME%%_enable="NO"}
: ${%%PORTNAME%%_config="%%ETCDIR%%/conf/app.ini"}
+logfile=/var/log/%%PORTNAME%%.log
+pidfile=/var/run/%%PORTNAME%%.pid
+command="/usr/bin/true"
+procname="/usr/sbin/daemon"
+
is_process_running() {
- local pidfile=$1
- [ -f $pidfile ] && procstat `cat $pidfile` >/dev/null 2>&1
+ [ -f $pidfile ] && procstat $(cat $pidfile) >/dev/null 2>&1
}
-stop_daemon() {
- # assume PID is also PGID (daemon(8) PID is always PGID)
- [ -f "$1" ] && kill -- -$(cat $1)
-}
-
%%PORTNAME%%_start() {
- local logfile=/var/log/%%PORTNAME%%.log
- local pidfile=/var/run/%%PORTNAME%%.pid
- if is_process_running $pidfile; then
+ if is_process_running; then
echo "%%PORTNAME%% is already running (pid=$(cat $pidfile))"
return 1
fi
@@ -49,7 +46,7 @@ stop_daemon() {
chmod 640 $logfile
cd %%PREFIX%%/libexec/%%PORTNAME%%
/usr/sbin/daemon -P $pidfile -u %%GOGS_USER%% %%PREFIX%%/libexec/%%PORTNAME%%/%%PORTNAME%% web --config ${%%PORTNAME%%_config} >>$logfile 2>&1
- if is_process_running $pidfile; then
+ if is_process_running; then
echo "started %%PORTNAME%% (pid=$(cat $pidfile))"
else
echo "failed to start %%PORTNAME%%"
@@ -57,15 +54,13 @@ stop_daemon() {
}
%%PORTNAME%%_stop() {
- local pidfile=/var/run/%%PORTNAME%%.pid
- if is_process_running $pidfile; then
- echo "stopping %%PORTNAME%% (pid=$(cat $pidfile))"
- stop_daemon $pidfile
+ if is_process_running; then
+ local pid=$(cat $pidfile)
+ echo "stopping %%PORTNAME%% (pid=$pid)"
+ kill -- -$pid
else
echo "%%PORTNAME%% isn't running"
fi
}
-
-command="/usr/bin/true"
run_rc_command "$1"
Added: head/devel/gogs/files/patch-routes_repo_commit.go
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/gogs/files/patch-routes_repo_commit.go Tue Jan 9 19:41:37 2018 (r458562)
@@ -0,0 +1,10 @@
+--- routes/repo/commit.go.orig 2017-12-31 13:07:52 UTC
++++ routes/repo/commit.go
+@@ -45,6 +44,7 @@ func RenderIssueLinks(oldCommits *list.L
+ func renderCommits(c *context.Context, filename string) {
+ c.Data["Title"] = c.Tr("repo.commits.commit_history") + " · " + c.Repo.Repository.FullName()
+ c.Data["PageIsCommits"] = true
++ c.Data["FileName"] = filename
+
+ page := c.QueryInt("page")
+ if page < 1 {
More information about the svn-ports-head
mailing list