Index: head/devel/gogs/Makefile =================================================================== --- head/devel/gogs/Makefile (revision 458561) +++ head/devel/gogs/Makefile (revision 458562) @@ -1,79 +1,79 @@ # $FreeBSD$ PORTNAME= gogs DISTVERSIONPREFIX= v DISTVERSION= 0.11.34 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel www MAINTAINER= dg@syrec.org COMMENT= Painless self-hosted Git service LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= go:lang/go RUN_DEPENDS= git:devel/git USE_GITHUB= yes GH_ACCOUNT= gogits GH_SUBDIR= src/github.com/${GH_ACCOUNT}/${PORTNAME} OPTIONS_DEFINE= DOCS USERS= git GROUPS= git GOGS_DBDIR?= /var/db/gogs GOGS_LOGDIR?= /var/log/gogs PORTNAME_FANCY= Gogs SUB_FILES= gogs \ gogs-service \ gogs-rm-data \ pkg-message SUB_LIST= PORTNAME=${PORTNAME} \ PORTNAME_FANCY=${PORTNAME_FANCY} \ GOGS_USER=${USERS} \ GOGS_DBDIR=${GOGS_DBDIR} \ GOGS_LOGDIR=${GOGS_LOGDIR} PLIST_SUB= GOGS_USER=${USERS} \ GOGS_GROUP=${GROUPS} \ GOGS_DBDIR=${GOGS_DBDIR} \ GOGS_LOGDIR=${GOGS_LOGDIR} PORTDOCS= README.md post-patch: @${REINPLACE_CMD} \ -e '/^# \!\!\!/d' \ -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|^ROOT_PATH =$$|ROOT_PATH = ${GOGS_LOGDIR}|' \ -e 's|^DB_TYPE = mysql$$|DB_TYPE = sqlite3|' \ ${WRKSRC}/conf/app.ini do-build: @(cd ${WRKSRC}/${GH_SUBDIR} && \ ${SETENV} GOPATH=${WRKSRC} go build -tags "sqlite pam cert" -p ${MAKE_JOBS_NUMBER} -o ${PORTNAME}) do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/libexec/${PORTNAME} ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}/ ${INSTALL_SCRIPT} ${WRKDIR}/gogs ${STAGEDIR}${PREFIX}/bin/ ${INSTALL_SCRIPT} ${WRKDIR}/gogs-rm-data ${STAGEDIR}${PREFIX}/bin/ ${INSTALL_SCRIPT} ${WRKDIR}/gogs-service ${STAGEDIR}${PREFIX}/etc/rc.d/gogs @(cd ${WRKSRC} && ${COPYTREE_SHARE} "conf public templates" ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}) @${MKDIR} ${STAGEDIR}${ETCDIR}/conf @${MKDIR} ${STAGEDIR}${ETCDIR}/https ${INSTALL_DATA} ${WRKSRC}/conf/app.ini ${STAGEDIR}${ETCDIR}/conf/app.ini.sample @${RLN} ${STAGEDIR}${ETCDIR} ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}/custom @${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 @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include Index: head/devel/gogs/files/gogs-service.in =================================================================== --- head/devel/gogs/files/gogs-service.in (revision 458561) +++ head/devel/gogs/files/gogs-service.in (revision 458562) @@ -1,71 +1,66 @@ #!/bin/sh # # $FreeBSD$ # # Copyright (C) 2015 by Yuri Victorovich. All rights reserved. # PROVIDE: %%PORTNAME%% # REQUIRE: LOGIN # KEYWORD: shutdown # # Add the following line to /etc/rc.conf to enable %%PORTNAME%%: # #%%PORTNAME%%_enable="YES" . /etc/rc.subr name="%%PORTNAME%%" rcvar=%%PORTNAME%%_enable start_cmd="%%PORTNAME%%_start" stop_cmd="%%PORTNAME%%_stop" 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 export USER=%%GOGS_USER%% export HOME=$(echo ~%%GOGS_USER%%) touch $logfile 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%%" fi } %%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" Index: head/devel/gogs/files/patch-routes_repo_commit.go =================================================================== --- head/devel/gogs/files/patch-routes_repo_commit.go (nonexistent) +++ head/devel/gogs/files/patch-routes_repo_commit.go (revision 458562) @@ -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 { Property changes on: head/devel/gogs/files/patch-routes_repo_commit.go ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property