From owner-svn-ports-head@freebsd.org  Fri Feb 16 22:05:08 2018
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2F5F9F16AAF;
 Fri, 16 Feb 2018 22:05:08 +0000 (UTC) (envelope-from dch@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id D794374E92;
 Fri, 16 Feb 2018 22:05:07 +0000 (UTC) (envelope-from dch@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D27DE13940;
 Fri, 16 Feb 2018 22:05:07 +0000 (UTC) (envelope-from dch@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1GM57XH059761;
 Fri, 16 Feb 2018 22:05:07 GMT (envelope-from dch@FreeBSD.org)
Received: (from dch@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1GM57Jc059759;
 Fri, 16 Feb 2018 22:05:07 GMT (envelope-from dch@FreeBSD.org)
Message-Id: <201802162205.w1GM57Jc059759@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dch set sender to dch@FreeBSD.org
 using -f
From: Dave Cottlehuber <dch@FreeBSD.org>
Date: Fri, 16 Feb 2018 22:05:07 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r462066 - in head/databases/kyototycoon: . files
X-SVN-Group: ports-head
X-SVN-Commit-Author: dch
X-SVN-Commit-Paths: in head/databases/kyototycoon: . files
X-SVN-Commit-Revision: 462066
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.25
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Feb 2018 22:05:08 -0000

Author: dch
Date: Fri Feb 16 22:05:07 2018
New Revision: 462066
URL: https://svnweb.freebsd.org/changeset/ports/462066

Log:
  databases/kyototycoon: set pidfile before usage
  
  the current rc.d script uses the pidfile variable before its
  defined. This breaks the daemon script.
  
  Approved by:	jrm (mentor), sunpoet
  MFH:		2018Q1
  Sponsored by:	https://iwantmyname.com/
  Differential Revision:	https://reviews.freebsd.org/D13580

Modified:
  head/databases/kyototycoon/Makefile
  head/databases/kyototycoon/files/kyototycoon.in

Modified: head/databases/kyototycoon/Makefile
==============================================================================
--- head/databases/kyototycoon/Makefile	Fri Feb 16 20:59:38 2018	(r462065)
+++ head/databases/kyototycoon/Makefile	Fri Feb 16 22:05:07 2018	(r462066)
@@ -3,7 +3,7 @@
 
 PORTNAME=	kyototycoon
 PORTVERSION=	0.9.56
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	databases
 MASTER_SITES=	http://fallabs.com/${PORTNAME}/pkg/ \
 		LOCAL/sunpoet

Modified: head/databases/kyototycoon/files/kyototycoon.in
==============================================================================
--- head/databases/kyototycoon/files/kyototycoon.in	Fri Feb 16 20:59:38 2018	(r462065)
+++ head/databases/kyototycoon/files/kyototycoon.in	Fri Feb 16 22:05:07 2018	(r462066)
@@ -34,6 +34,8 @@ load_rc_config $name
 : ${kyototycoon_sid="1"}
 : ${kyototycoon_opts:=" -li"}
 
+pidfile="%%KYOTOTYCOON_PIDFILE%%"
+
 command="/usr/sbin/daemon"
 command_args="-f -c -r -t ${name} -P ${pidfile} \
     %%PREFIX%%/bin/ktserver \
@@ -42,7 +44,6 @@ command_args="-f -c -r -t ${name} -P ${pidfile} \
     -log ${kyototycoon_log} \
     -sid ${kyototycoon_sid} \
     ${kyototycoon_opts}"
-pidfile="%%KYOTOTYCOON_PIDFILE%%"
 
 required_dirs="${kyototycoon_dbdir}/snapshots ${kyototycoon_dbdir}/updates"
 required_files="${kyototycoon_log}"