From owner-svn-ports-all@FreeBSD.ORG Wed May 6 01:24:15 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6713626E; Wed, 6 May 2015 01:24:15 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 4865B173F; Wed, 6 May 2015 01:24:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t461OFWN040765; Wed, 6 May 2015 01:24:15 GMT (envelope-from osa@FreeBSD.org) Received: (from osa@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t461OEZD040759; Wed, 6 May 2015 01:24:14 GMT (envelope-from osa@FreeBSD.org) Message-Id: <201505060124.t461OEZD040759@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: osa set sender to osa@FreeBSD.org using -f From: "Sergey A. Osokin" Date: Wed, 6 May 2015 01:24:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r385499 - in head/databases: redis redis-devel redis-devel/files redis/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 May 2015 01:24:15 -0000 Author: osa Date: Wed May 6 01:24:13 2015 New Revision: 385499 URL: https://svnweb.freebsd.org/changeset/ports/385499 Log: Fix rc.d script for allow to specify the config path in rc.conf. Bump PORTREVISION. PR: 199607 Modified: head/databases/redis-devel/Makefile head/databases/redis-devel/files/redis.in head/databases/redis/Makefile head/databases/redis/files/redis.in Modified: head/databases/redis-devel/Makefile ============================================================================== --- head/databases/redis-devel/Makefile Wed May 6 01:12:27 2015 (r385498) +++ head/databases/redis-devel/Makefile Wed May 6 01:24:13 2015 (r385499) @@ -3,6 +3,7 @@ PORTNAME= redis DISTVERSION= 3.0.1 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= http://download.redis.io/releases/ PKGNAMESUFFIX= -devel Modified: head/databases/redis-devel/files/redis.in ============================================================================== --- head/databases/redis-devel/files/redis.in Wed May 6 01:12:27 2015 (r385498) +++ head/databases/redis-devel/files/redis.in Wed May 6 01:24:13 2015 (r385499) @@ -21,14 +21,14 @@ rcvar="${name}_enable" extra_commands="reload" command="%%PREFIX%%/bin/redis-server" -config_file="%%PREFIX%%/etc/$name.conf" -command_args="${config_file}" pidfile="%%REDIS_RUNDIR%%/$name.pid" -required_files="${config_file}" # read configuration and set defaults load_rc_config "$name" : ${redis_enable="NO"} : ${redis_user="%%REDIS_USER%%"} +: ${redis_config="%%PREFIX%%/etc/$name.conf"} +command_args="${redis_config}" +required_files="${redis_config}" run_rc_command "$1" Modified: head/databases/redis/Makefile ============================================================================== --- head/databases/redis/Makefile Wed May 6 01:12:27 2015 (r385498) +++ head/databases/redis/Makefile Wed May 6 01:24:13 2015 (r385499) @@ -3,6 +3,7 @@ PORTNAME= redis DISTVERSION= 3.0.1 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= http://download.redis.io/releases/ Modified: head/databases/redis/files/redis.in ============================================================================== --- head/databases/redis/files/redis.in Wed May 6 01:12:27 2015 (r385498) +++ head/databases/redis/files/redis.in Wed May 6 01:24:13 2015 (r385499) @@ -21,14 +21,14 @@ rcvar="${name}_enable" extra_commands="reload" command="%%PREFIX%%/bin/redis-server" -config_file="%%PREFIX%%/etc/$name.conf" -command_args="${config_file}" pidfile="%%REDIS_RUNDIR%%/$name.pid" -required_files="${config_file}" # read configuration and set defaults load_rc_config "$name" : ${redis_enable="NO"} : ${redis_user="%%REDIS_USER%%"} +: ${redis_config="%%PREFIX%%/etc/$name.conf"} +command_args="${redis_config}" +required_files="${redis_config}" run_rc_command "$1"