svn commit: r307130 - in head/databases: redis redis-devel

[Sergey A. Osokin]

Author: osa
Date: Wed Nov  7 11:56:05 2012
New Revision: 307130
URL: http://svnweb.freebsd.org/changeset/ports/307130

Log:
  Update from 2.6.2 to 2.6.3.
  
  Feature safe:	yes
  
  <ChangeLog>
  
  * [BUGFIX]   Fixed 32 bit build on Linux systems.
  * [BUGFIX]   MONITOR and CLIENT LIST: propertly display unix socket clients.
  * [IMPROVED] redis-cli inline help updated.
  * [IMPROVED] Marginally more robust AOF child handling.
  * [IMPROVED] Fixed a few typos in comments.
  
  </ChangeLog>

Modified:
  head/databases/redis-devel/Makefile
  head/databases/redis-devel/distinfo
  head/databases/redis-devel/pkg-plist
  head/databases/redis/Makefile
  head/databases/redis/distinfo
  head/databases/redis/pkg-plist

Modified: head/databases/redis-devel/Makefile
==============================================================================
--- head/databases/redis-devel/Makefile	Wed Nov  7 10:53:21 2012	(r307129)
+++ head/databases/redis-devel/Makefile	Wed Nov  7 11:56:05 2012	(r307130)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	redis
-DISTVERSION=	2.6.2
+DISTVERSION=	2.6.3
 CATEGORIES=	databases
 MASTER_SITES=	GOOGLE_CODE
 PKGNAMESUFFIX=	-devel
@@ -32,7 +32,7 @@ USE_GMAKE=	yes
 MAKE_ENV=	"V=yo"
 USE_RC_SUBR=	redis
 BIN_FILES=	redis-benchmark redis-check-aof redis-check-dump \
-		redis-cli redis-server
+		redis-cli redis-sentinel redis-server
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
@@ -63,6 +63,7 @@ post-build:
 do-install:
 	${INSTALL_PROGRAM} ${BIN_FILES:C!^!${WRKSRC}/src/!} ${PREFIX}/bin/
 	${INSTALL_DATA} ${WRKDIR}/redis.conf ${PREFIX}/etc/redis.conf.sample
+	${INSTALL_DATA} ${WRKSRC}/sentinel.conf ${PREFIX}/etc/sentinel.conf.sample
 
 post-install:
 .for d in ${REDIS_LOGDIR} ${REDIS_RUNDIR} ${REDIS_DBDIR}

Modified: head/databases/redis-devel/distinfo
==============================================================================
--- head/databases/redis-devel/distinfo	Wed Nov  7 10:53:21 2012	(r307129)
+++ head/databases/redis-devel/distinfo	Wed Nov  7 11:56:05 2012	(r307130)
@@ -1,2 +1,2 @@
-SHA256 (redis-2.6.2.tar.gz) = b3b2e74ec8a13337e5e17cc24b0fecf5d612d6a0835d99bd1e337b391f20a46d
-SIZE (redis-2.6.2.tar.gz) = 1000600
+SHA256 (redis-2.6.3.tar.gz) = 4a6c7d32a3bb96900b13b64837e5921a6be011eee25c0ac7a8efe167b82f9af4
+SIZE (redis-2.6.3.tar.gz) = 1000954

Modified: head/databases/redis-devel/pkg-plist
==============================================================================
--- head/databases/redis-devel/pkg-plist	Wed Nov  7 10:53:21 2012	(r307129)
+++ head/databases/redis-devel/pkg-plist	Wed Nov  7 11:56:05 2012	(r307130)
@@ -2,9 +2,11 @@ bin/redis-benchmark
 bin/redis-check-aof
 bin/redis-check-dump
 bin/redis-cli
+bin/redis-sentinel
 bin/redis-server
 @unexec (cmp -s %D/etc/redis.conf %D/etc/redis.conf.sample && rm -f %D/etc/redis.conf) || true
 etc/redis.conf.sample
+etc/sentinel.conf.sample
 @exec [ -f %B/redis.conf ] || cp %B/%f %B/redis.conf
 @exec [ -d %%REDIS_DBDIR%% ] || mkdir -p %%REDIS_DBDIR%%
 @exec chown %%REDIS_USER%%:%%REDIS_GROUP%% %%REDIS_DBDIR%%

Modified: head/databases/redis/Makefile
==============================================================================
--- head/databases/redis/Makefile	Wed Nov  7 10:53:21 2012	(r307129)
+++ head/databases/redis/Makefile	Wed Nov  7 11:56:05 2012	(r307130)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	redis
-DISTVERSION=	2.6.2
-PORTREVISION=	1
+DISTVERSION=	2.6.3
 CATEGORIES=	databases
 MASTER_SITES=	GOOGLE_CODE
 
@@ -32,7 +31,7 @@ USE_GMAKE=	yes
 MAKE_ENV=	"V=yo"
 USE_RC_SUBR=	redis
 BIN_FILES=	redis-benchmark redis-check-aof redis-check-dump \
-		redis-cli redis-server
+		redis-cli redis-sentinel redis-server
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
@@ -63,6 +62,7 @@ post-build:
 do-install:
 	${INSTALL_PROGRAM} ${BIN_FILES:C!^!${WRKSRC}/src/!} ${PREFIX}/bin/
 	${INSTALL_DATA} ${WRKDIR}/redis.conf ${PREFIX}/etc/redis.conf.sample
+	${INSTALL_DATA} ${WRKSRC}/sentinel.conf ${PREFIX}/etc/sentinel.conf.sample
 
 post-install:
 .for d in ${REDIS_LOGDIR} ${REDIS_RUNDIR} ${REDIS_DBDIR}

Modified: head/databases/redis/distinfo
==============================================================================
--- head/databases/redis/distinfo	Wed Nov  7 10:53:21 2012	(r307129)
+++ head/databases/redis/distinfo	Wed Nov  7 11:56:05 2012	(r307130)
@@ -1,2 +1,2 @@
-SHA256 (redis-2.6.2.tar.gz) = b3b2e74ec8a13337e5e17cc24b0fecf5d612d6a0835d99bd1e337b391f20a46d
-SIZE (redis-2.6.2.tar.gz) = 1000600
+SHA256 (redis-2.6.3.tar.gz) = 4a6c7d32a3bb96900b13b64837e5921a6be011eee25c0ac7a8efe167b82f9af4
+SIZE (redis-2.6.3.tar.gz) = 1000954

Modified: head/databases/redis/pkg-plist
==============================================================================
--- head/databases/redis/pkg-plist	Wed Nov  7 10:53:21 2012	(r307129)
+++ head/databases/redis/pkg-plist	Wed Nov  7 11:56:05 2012	(r307130)
@@ -2,9 +2,11 @@ bin/redis-benchmark
 bin/redis-check-aof
 bin/redis-check-dump
 bin/redis-cli
+bin/redis-sentinel
 bin/redis-server
 @unexec (cmp -s %D/etc/redis.conf %D/etc/redis.conf.sample && rm -f %D/etc/redis.conf) || true
 etc/redis.conf.sample
+etc/sentinel.conf.sample
 @exec [ -f %B/redis.conf ] || cp %B/%f %B/redis.conf
 @exec [ -d %%REDIS_DBDIR%% ] || mkdir -p %%REDIS_DBDIR%%
 @exec chown %%REDIS_USER%%:%%REDIS_GROUP%% %%REDIS_DBDIR%%