svn commit: r385499 - in head/databases: redis redis-devel redis-devel/files redis/files

[Sergey A. Osokin]

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"