[Midnightbsd-cvs] mports [20649] trunk/databases/redis: redis 3.0.5

[laffer1 at midnightbsd.org]

Revision: 20649
          http://svnweb.midnightbsd.org/mports/?rev=20649
Author:   laffer1
Date:     2015-11-04 19:52:54 -0500 (Wed, 04 Nov 2015)
Log Message:
-----------
redis 3.0.5

Modified Paths:
--------------
    trunk/databases/redis/Makefile
    trunk/databases/redis/distinfo
    trunk/databases/redis/pkg-plist

Added Paths:
-----------
    trunk/databases/redis/files/sentinel.in

Modified: trunk/databases/redis/Makefile
===================================================================
--- trunk/databases/redis/Makefile	2015-11-05 00:46:23 UTC (rev 20648)
+++ trunk/databases/redis/Makefile	2015-11-05 00:52:54 UTC (rev 20649)
@@ -1,7 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=	redis
-DISTVERSION=	3.0.3
+DISTVERSION=	3.0.5
 CATEGORIES=	databases
 MASTER_SITES=	http://download.redis.io/releases/
 
@@ -12,15 +12,23 @@
 
 USES=		execinfo
 
-OPTIONS_DEFINE=	TESTS
+OPTIONS_DEFINE=	TESTS TRIB
 OPTIONS_RADIO=	EXTLUA
 OPTIONS_RADIO_EXTLUA=	LUA LUAJIT
+OPTIONS_SUB=	yes
 LUA_DESC=	Use lang/lua instead of builtin lua
 LUAJIT_DESC=	Use lang/luajit instead of builtin lua
 TESTS_DESC=	Install lang/tcl for redis unit tests
+TRIB_DESC=	Install redis-trib.rb (lang/ruby req.)
 
 .include <bsd.mport.options.mk>
 
+.if ${PORT_OPTIONS:MTRIB}
+CATEGORIES+=	ruby
+USE_RUBY=	yes
+RUN_DEPENDS=	rubygem-redis>=2.2:${PORTSDIR}/databases/rubygem-redis
+.endif
+
 .if ${PORT_OPTIONS:MLUA}
 USES+=		lua:51
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-src-Makefile.lua
@@ -47,7 +55,7 @@
 
 USES+=		gmake
 MAKE_ENV=	"V=yo"
-USE_RC_SUBR=	redis
+USE_RC_SUBR=	redis sentinel
 BIN_FILES=	redis-benchmark redis-check-aof redis-check-dump \
 		redis-cli redis-sentinel redis-server
 
@@ -83,9 +91,12 @@
 		${WRKSRC}/redis.conf > ${WRKDIR}/redis.conf
 
 do-install:
-	${INSTALL_PROGRAM} ${BIN_FILES:C!^!${WRKSRC}/src/!} ${STAGEDIR}${PREFIX}/bin/
-	${INSTALL_DATA} ${WRKDIR}/redis.conf ${STAGEDIR}${PREFIX}/etc/redis.conf.sample
-	${INSTALL_DATA} ${WRKSRC}/sentinel.conf ${STAGEDIR}${PREFIX}/etc/sentinel.conf.sample
+	${INSTALL_PROGRAM} ${BIN_FILES:C!^!${WRKSRC}/src/!} ${PREFIX}/bin/
+.if ${PORT_OPTIONS:MTRIB}
+	${INSTALL_SCRIPT} ${WRKSRC}/src/redis-trib.rb ${PREFIX}/bin/
+.endif
+	${INSTALL_DATA} ${WRKDIR}/redis.conf ${PREFIX}/etc/redis.conf.sample
+	${INSTALL_DATA} ${WRKSRC}/sentinel.conf ${PREFIX}/etc/sentinel.conf.sample
 	${MKDIR} ${STAGEDIR}${REDIS_LOGDIR} \
 		${STAGEDIR}${REDIS_DBDIR} \
 		${STAGEDIR}${REDIS_RUNDIR}

Modified: trunk/databases/redis/distinfo
===================================================================
--- trunk/databases/redis/distinfo	2015-11-05 00:46:23 UTC (rev 20648)
+++ trunk/databases/redis/distinfo	2015-11-05 00:52:54 UTC (rev 20649)
@@ -1,2 +1,2 @@
-SHA256 (redis-3.0.3.tar.gz) = 1d08fa665b16d0950274dfbd47fbbcf3485e43e901021338640a0334666e9da5
-SIZE (redis-3.0.3.tar.gz) = 1360959
+SHA256 (redis-3.0.5.tar.gz) = 4c176826eee909fbdc63db1c15adc22aab42d758043829e556f4331e6a5bd480
+SIZE (redis-3.0.5.tar.gz) = 1366160

Added: trunk/databases/redis/files/sentinel.in
===================================================================
--- trunk/databases/redis/files/sentinel.in	                        (rev 0)
+++ trunk/databases/redis/files/sentinel.in	2015-11-05 00:52:54 UTC (rev 20649)
@@ -0,0 +1,42 @@
+#!/bin/sh
+#
+# $FreeBSD: head/databases/redis/files/sentinel.in 400428 2015-10-29 01:34:53Z osa $
+#
+
+# PROVIDE: sentinel
+# REQUIRE: LOGIN
+# BEFORE:  securelevel
+# KEYWORD: shutdown
+
+# Add the following line to /etc/rc.conf to enable `sentinel':
+#
+#sentinel_enable="YES"
+#
+
+. /etc/rc.subr
+
+name="sentinel"
+rcvar="${name}_enable"
+
+command="/usr/local/bin/redis-sentinel"
+pidfile="/var/run/redis/$name.pid"
+
+# read configuration and set defaults
+load_rc_config "$name"
+: ${sentinel_enable="NO"}
+: ${sentinel_user="redis"}
+: ${sentinel_config="/usr/local/etc/$name.conf"}
+
+command_args="${sentinel_config} --daemonize yes --pidfile ${pidfile}"
+required_files="${sentinel_config}"
+start_precmd="${name}_checks"
+restart_precmd="${name}_checks"
+
+sentinel_checks()
+{
+    if [ x`id -u ${sentinel_user}` != x`stat -f %u ${sentinel_config}` ]; then
+	err 1 "${sentinel_config} must be owned by user ${sentinel_user}"
+    fi
+}
+
+run_rc_command "$1"


Property changes on: trunk/databases/redis/files/sentinel.in
___________________________________________________________________
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
Modified: trunk/databases/redis/pkg-plist
===================================================================
--- trunk/databases/redis/pkg-plist	2015-11-05 00:46:23 UTC (rev 20648)
+++ trunk/databases/redis/pkg-plist	2015-11-05 00:52:54 UTC (rev 20649)
@@ -4,8 +4,9 @@
 bin/redis-cli
 bin/redis-sentinel
 bin/redis-server
+%%TRIB%%bin/redis-trib.rb
 @sample etc/redis.conf.sample
- at sample etc/sentinel.conf.sample
+ at sample(%%REDIS_USER%%,%%REDIS_GROUP%%,) etc/sentinel.conf.sample
 @dir(%%REDIS_USER%%,%%REDIS_GROUP%%,) %%REDIS_DBDIR%%
 @dir(%%REDIS_USER%%,%%REDIS_GROUP%%,) %%REDIS_LOGDIR%%
 @dir(%%REDIS_USER%%,%%REDIS_GROUP%%,) %%REDIS_RUNDIR%%