svn commit: r367788 - in head/databases/redis-devel: . files

Tue Sep 9 22:38:01 UTC 2014

Author: osa
Date: Tue Sep  9 22:38:00 2014
New Revision: 367788
URL: http://svnweb.freebsd.org/changeset/ports/367788
QAT: https://qat.redports.org/buildarchive/r367788/

Log:
  Upgrade from 3.0.0-beta6 to 3.0.0-beta8.
  
  <ChangeLog>
  
  --[ Redis 3.0.0 Beta 8 (version 2.9.57) ] Release date: 29 jul 2014
  
  This is the 8th beta of Redis 3.0.0.
  
  >> General changes
  
  * [FIX] Solaris compilation issues. (Matt Stancliff, Salvatore Sanfilippo)
  * [FIX] Allow shared integer objects if maxmemory policy is not LRU based.
          (Salvatore Sanfilippo)
  * [FIX] PFSELFTEST: less false positives. (Salvatore Sanfilippo)
  * [FIX] Fail SYNC if background save child aborted due to a signal. (Yossi
          Gottlieb)
  
  * [NEW] Latency framework backported from unstable branch. (Salvatore
          Sanfilippo)
  * [NEW] AOF rewrite improved for latency. (Salvatore Sanfilippo)
  * [NEW] Pub/Sub PING. (Salvatore Sanfilippo)
  * [NEW] Much faster ZUNIONSTORE. (Kyle Hubert, Salvatore Sanfilippo)
  * [NEW] Faster ll2string() implementation. (Salvatore Sanfilippo)
  
  >> Cluster changes
  
  * [FIX] CLUSTER RESET: Flush slave dataset on reset. (Salvatore Sanfilippo)
  * [FIX] Replica migration: don't migrate to masters that never had slaves
          in the past, but only to masters that remained orphaned after
          failure events. (Salvatore Sanfilippo)
  
  * [NEW] redis-trib: allow to reshard in non-interactive way. (Salvatore
          Sanfilippo)
  * [NEW] Cluster test: unit 04, check consistency during resharding. (Salvatore
          Sanfilippo)
  * [NEW] Cluster test: unit 05, slave selection. (Salvatore Sanfilippo)
  * [NEW] Cluster test: unit 06, slaves with stale data can't failover. (Salvatore
          Sanfilippo)
  * [NEW] Cluster test: unit 07, replicas migration. (Salvatore Sanfilippo)
  
  >> Sentinel changes
  
  * No Sentinel changes in this release.
  
  --[ Redis 3.0.0 Beta 7 (version 2.9.56) ] Release date: 30 jun 2014
  
  This is the 7th beta of Redis 3.0.0.
  
  >> General changes
  
  * [FIX] Scripting fixes backported from unstable, see Redis 2.8.12 changelog
          for more info. (Salvatore Sanfilippo)
  * [FIX] Cancel SHUTDOWN if initial AOF is being written. (Matt Stancliff)
  
  * [NEW] New command: COMMAND, for commands introspection (Matt Stancliff &
          Salvatore Sanfilippo)
  * [NEW] hiredis: Update to latest version. (Matt Stancliff)
  * [NEW] Jemalloc updated to 3.6.0. (Salvatore Sanfilippo)
  
  >> Cluster changes
  
  * [FIX] Cluster: clear NOADDR flag when updating node address.
          (Salvatore Sanfilippo)
  
  * [NEW] New CLUSTER SLOTS command to simplify Cluster clients operations.
          (Matt Stancliff)
  * [NEW] More Cluster tests. (Salvatore Sanfilippo)
  * [NEW] Log when failover authorization are granted / denied.
          (Salvatore Sanfilippo)
  
  >> Sentinel changes
  
  * [FIX] A few Sentinel bugs fixed and improvements, see Redis 2.8.12
          changelog for more info.  (Salvatore Sanfilippo & Matt Stancliff)
  * [NEW] New Sentinel-Client handshake protocol, ROLE command, CLIENT KILL,
          all backported to 3.0 branch. (Salvatore Sanfilippo)
  
  </ChangeLog>

Modified:
  head/databases/redis-devel/Makefile
  head/databases/redis-devel/distinfo
  head/databases/redis-devel/files/extra-patch-src-Makefile.lua
  head/databases/redis-devel/files/extra-patch-src-Makefile.luajit
  head/databases/redis-devel/files/patch-deps-hiredis-Makefile

Modified: head/databases/redis-devel/Makefile
==============================================================================

--- head/databases/redis-devel/Makefile	Tue Sep  9 22:19:46 2014	(r367787)
+++ head/databases/redis-devel/Makefile	Tue Sep  9 22:38:00 2014	(r367788)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	redis
-DISTVERSION=	3.0.0-beta6
+DISTVERSION=	3.0.0-beta8
 CATEGORIES=	databases
 MASTER_SITES=	https://github.com/antirez/redis/archive/
 PKGNAMESUFFIX=	-devel
@@ -31,13 +31,14 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVER
 .if ${PORT_OPTIONS:MLUA}
 USES+=		lua:51
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-src-Makefile.lua
-CFLAGS+=	-fPIC
-LDFLAGS+=	-Wl,-E
 .endif
 
 .if ${PORT_OPTIONS:MLUAJIT}
 LIB_DEPENDS+=	libluajit-5.1.so:${PORTSDIR}/lang/luajit
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-src-Makefile.luajit
+.endif
+
+.if ${PORT_OPTIONS:MLUA} || ${PORT_OPTIONS:MLUAJIT}
 CFLAGS+=	-fPIC
 LDFLAGS+=	-Wl,-E
 .endif

Modified: head/databases/redis-devel/distinfo
==============================================================================
--- head/databases/redis-devel/distinfo	Tue Sep  9 22:19:46 2014	(r367787)
+++ head/databases/redis-devel/distinfo	Tue Sep  9 22:38:00 2014	(r367788)
@@ -1,2 +1,2 @@
-SHA256 (redis/3.0.0-beta6.tar.gz) = c516f52d80ffb1a3fb4b3553568bfc9344bc1f8b888252ed798c89efba15b1fd
-SIZE (redis/3.0.0-beta6.tar.gz) = 1192581
+SHA256 (redis/3.0.0-beta8.tar.gz) = b84d1624873c4f20ed7504932233b2b91584b6a0c4383c25034e8710c5ea16cd
+SIZE (redis/3.0.0-beta8.tar.gz) = 1327483

Modified: head/databases/redis-devel/files/extra-patch-src-Makefile.lua
==============================================================================
--- head/databases/redis-devel/files/extra-patch-src-Makefile.lua	Tue Sep  9 22:19:46 2014	(r367787)
+++ head/databases/redis-devel/files/extra-patch-src-Makefile.lua	Tue Sep  9 22:38:00 2014	(r367788)
@@ -31,7 +31,7 @@
 @@ -108,6 +111,7 @@
  REDIS_SERVER_NAME=redis-server
  REDIS_SENTINEL_NAME=redis-sentinel
- REDIS_SERVER_OBJ=adlist.o ae.o anet.o dict.o redis.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o
+ REDIS_SERVER_OBJ=adlist.o ae.o anet.o dict.o redis.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o
 +REDIS_SERVER_OBJ+=lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o
  REDIS_CLI_NAME=redis-cli
  REDIS_CLI_OBJ=anet.o sds.o adlist.o redis-cli.o zmalloc.o release.o anet.o ae.o crc64.o

Modified: head/databases/redis-devel/files/extra-patch-src-Makefile.luajit
==============================================================================
--- head/databases/redis-devel/files/extra-patch-src-Makefile.luajit	Tue Sep  9 22:19:46 2014	(r367787)
+++ head/databases/redis-devel/files/extra-patch-src-Makefile.luajit	Tue Sep  9 22:38:00 2014	(r367788)
@@ -1,5 +1,5 @@
---- src/Makefile.orig	2014-05-26 20:06:48.000000000 +0400
-+++ src/Makefile	2014-06-02 00:16:02.000000000 +0400
+--- src/Makefile.orig	2014-07-29 12:17:48.000000000 +0400
++++ src/Makefile	2014-09-10 02:30:38.000000000 +0400
 @@ -15,7 +15,7 @@
  release_hdr := $(shell sh -c './mkreleasehdr.sh')
  uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
@@ -31,7 +31,7 @@
 @@ -108,6 +111,7 @@
  REDIS_SERVER_NAME=redis-server
  REDIS_SENTINEL_NAME=redis-sentinel
- REDIS_SERVER_OBJ=adlist.o ae.o anet.o dict.o redis.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o
+ REDIS_SERVER_OBJ=adlist.o ae.o anet.o dict.o redis.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o
 +REDIS_SERVER_OBJ+=lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o
  REDIS_CLI_NAME=redis-cli
  REDIS_CLI_OBJ=anet.o sds.o adlist.o redis-cli.o zmalloc.o release.o anet.o ae.o crc64.o

Modified: head/databases/redis-devel/files/patch-deps-hiredis-Makefile
==============================================================================
--- head/databases/redis-devel/files/patch-deps-hiredis-Makefile	Tue Sep  9 22:19:46 2014	(r367787)
+++ head/databases/redis-devel/files/patch-deps-hiredis-Makefile	Tue Sep  9 22:38:00 2014	(r367788)
@@ -1,6 +1,6 @@
---- deps/hiredis/Makefile.orig	2012-02-22 17:23:43.000000000 +0400
-+++ deps/hiredis/Makefile	2012-02-24 16:46:44.000000000 +0400
-@@ -12,10 +12,10 @@
+--- deps/hiredis/Makefile.orig	2014-07-29 12:17:48.000000000 +0400
++++ deps/hiredis/Makefile	2014-09-10 02:32:25.000000000 +0400
+@@ -25,10 +25,10 @@
  
  # Fallback to gcc when $CC is not in $PATH.
  CC:=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
@@ -14,7 +14,7 @@
  REAL_LDFLAGS=$(LDFLAGS) $(ARCH)
  
  DYLIBSUFFIX=so
-@@ -34,6 +34,15 @@
+@@ -47,6 +47,15 @@
    DYLIB_MAKE_CMD=$(CC) -G -o $(DYLIBNAME) -h $(DYLIB_MINOR_NAME) $(LDFLAGS)
    INSTALL= cp -r
  endif
@@ -30,12 +30,12 @@
  ifeq ($(uname_S),Darwin)
    DYLIBSUFFIX=dylib
    DYLIB_MINOR_NAME=$(LIBNAME).$(HIREDIS_MAJOR).$(HIREDIS_MINOR).$(DYLIBSUFFIX)
-@@ -104,7 +113,7 @@
+@@ -124,7 +133,7 @@
  	$(CC) -MM *.c
  
  # Installation related variables and target
 -PREFIX?=/usr/local
 +PREFIX?=${PREFIX}
- INCLUDE_PATH?=include/hiredis
- LIBRARY_PATH?=lib
- INSTALL_INCLUDE_PATH= $(PREFIX)/$(INCLUDE_PATH)
+ INSTALL_INCLUDE_PATH= $(PREFIX)/include/hiredis
+ INSTALL_LIBRARY_PATH= $(PREFIX)/lib
+ 
