From owner-svn-ports-head@freebsd.org Sun Oct 29 07:55:34 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EEC82E5CBBA; Sun, 29 Oct 2017 07:55:34 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BC62670299; Sun, 29 Oct 2017 07:55:34 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9T7tXMT034776; Sun, 29 Oct 2017 07:55:33 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9T7tXW3034774; Sun, 29 Oct 2017 07:55:33 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201710290755.v9T7tXW3034774@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Sun, 29 Oct 2017 07:55:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r453097 - in head/www/gitea: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: in head/www/gitea: . files X-SVN-Commit-Revision: 453097 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Oct 2017 07:55:35 -0000 Author: tobik Date: Sun Oct 29 07:55:33 2017 New Revision: 453097 URL: https://svnweb.freebsd.org/changeset/ports/453097 Log: www/gitea: Fix rc script on FreeBSD 10.x/11.0 On FreeBSD 10.x/11.0 daemon(8) doesn't have -s,-l,-t, so starting gitea would fail. We partially revert the change from r453018 and use the old behavior on these versions and don't log stdout/stderr to syslog. PR: 223283 Approved by: stb@lassitu.de (maintainer) Modified: head/www/gitea/Makefile head/www/gitea/files/gitea.in Modified: head/www/gitea/Makefile ============================================================================== --- head/www/gitea/Makefile Sun Oct 29 07:46:31 2017 (r453096) +++ head/www/gitea/Makefile Sun Oct 29 07:55:33 2017 (r453097) @@ -4,6 +4,7 @@ PORTNAME= gitea PORTVERSION= 1.2.2 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= www MAINTAINER= stb@lassitu.de @@ -32,13 +33,22 @@ GROUPS= git OPTIONS_DEFINE= CERT PAM SQLITE CERT_DESC= Automatic creation of self-signed certificates PAM_DESC= Authentication using PAM -SQLITE= Add SQLite as database backend OPTIONS_DEFAULT= ${OPTIONS_DEFINE} CERT_VARS= GO_TAGS+=cert PAM_VARS= GO_TAGS+=pam SQLITE_VARS= GO_TAGS+=sqlite + +.include + +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1100513 +DAEMONARGS= -S -l \$${gitea_facility} -s \$${gitea_priority} -t \$${name} +.else +DAEMONARGS= -f +.endif + +SUB_LIST+= DAEMONARGS="${DAEMONARGS}" post-patch: # Gitea releases don't supply the release version number; the Modified: head/www/gitea/files/gitea.in ============================================================================== --- head/www/gitea/files/gitea.in Sun Oct 29 07:46:31 2017 (r453096) +++ head/www/gitea/files/gitea.in Sun Oct 29 07:55:33 2017 (r453097) @@ -32,8 +32,8 @@ pidfile="/var/run/${name}.pid" start_cmd="${name}_start" gitea_start() { - /usr/sbin/daemon -l ${gitea_facility} -s ${gitea_priority} \ - -u ${gitea_user} -p ${pidfile} -t "${command}" \ + /usr/sbin/daemon %%DAEMONARGS%% \ + -u ${gitea_user} -p ${pidfile} \ /usr/bin/env -i \ "GITEA_WORK_DIR=${gitea_shared}" \ "GITEA_CUSTOM=%%PREFIX%%/etc/${name}" \