summaryrefslogtreecommitdiff
path: root/databases/redis-devel/files/patch-deps-hiredis-Makefile
diff options
context:
space:
mode:
authorSergey A. Osokin <osa@FreeBSD.org>2014-09-09 22:38:00 +0000
committerSergey A. Osokin <osa@FreeBSD.org>2014-09-09 22:38:00 +0000
commit6b13c621a1c04b7c359765d6cc07f9645651937d (patch)
tree82eb07ae9cd1946524d2180a68a54b47e7fbd38e /databases/redis-devel/files/patch-deps-hiredis-Makefile
parentRemove unstaged lang/ezm3 and three cvsup* ports as casualties (diff)
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>
Diffstat (limited to 'databases/redis-devel/files/patch-deps-hiredis-Makefile')
-rw-r--r--databases/redis-devel/files/patch-deps-hiredis-Makefile16
1 files changed, 8 insertions, 8 deletions
diff --git a/databases/redis-devel/files/patch-deps-hiredis-Makefile b/databases/redis-devel/files/patch-deps-hiredis-Makefile
index b0cfcd406885..fdfc1cb4d4f8 100644
--- a/databases/redis-devel/files/patch-deps-hiredis-Makefile
+++ b/databases/redis-devel/files/patch-deps-hiredis-Makefile
@@ -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
+