Date: Thu, 28 Nov 2013 17:53:32 +0000 (UTC) From: "Sergey A. Osokin" <osa@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r335116 - in head/databases/redis: . files Message-ID: <201311281753.rASHrWau039071@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: osa Date: Thu Nov 28 17:53:32 2013 New Revision: 335116 URL: http://svnweb.freebsd.org/changeset/ports/335116 Log: Upgrade from 2.6.16 to 2.8.0. Changelist: https://raw.github.com/antirez/redis/2.8/00-RELEASENOTES Modified: head/databases/redis/Makefile head/databases/redis/distinfo head/databases/redis/files/extra-patch-src-Makefile.lua head/databases/redis/files/extra-patch-src-Makefile.luajit head/databases/redis/files/patch-redis.conf head/databases/redis/files/patch-src-Makefile head/databases/redis/files/patch-src-mkreleasehdr.sh Modified: head/databases/redis/Makefile ============================================================================== --- head/databases/redis/Makefile Thu Nov 28 17:52:42 2013 (r335115) +++ head/databases/redis/Makefile Thu Nov 28 17:53:32 2013 (r335116) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= redis -DISTVERSION= 2.6.16 +DISTVERSION= 2.8.0 CATEGORIES= databases MASTER_SITES= http://download.redis.io/releases/ @@ -16,12 +16,12 @@ LIB_DEPENDS= execinfo:${PORTSDIR}/devel/ OPTIONS_DEFINE= TESTS OPTIONS_RADIO= EXTLUA OPTIONS_RADIO_EXTLUA= LUA LUAJIT - 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 NO_STAGE= yes + .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MLUA} @@ -45,7 +45,7 @@ USE_TCL_BUILD= yes CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lm -lexecinfo -CONFLICTS?= redis-devel-2.6.* +CONFLICTS?= redis-devel-2.* USE_GMAKE= yes MAKE_ENV= "V=yo" Modified: head/databases/redis/distinfo ============================================================================== --- head/databases/redis/distinfo Thu Nov 28 17:52:42 2013 (r335115) +++ head/databases/redis/distinfo Thu Nov 28 17:53:32 2013 (r335116) @@ -1,2 +1,2 @@ -SHA256 (redis-2.6.16.tar.gz) = 81490918dcf82d124b36e48b0a9911bfba3f13abba04d8c89820324eff7df03a -SIZE (redis-2.6.16.tar.gz) = 999579 +SHA256 (redis-2.8.0.tar.gz) = 6250071f47ed086f0a39f551923f61f9e9240085e07a61c7f1408372545b59c9 +SIZE (redis-2.8.0.tar.gz) = 1044786 Modified: head/databases/redis/files/extra-patch-src-Makefile.lua ============================================================================== --- head/databases/redis/files/extra-patch-src-Makefile.lua Thu Nov 28 17:52:42 2013 (r335115) +++ head/databases/redis/files/extra-patch-src-Makefile.lua Thu Nov 28 17:53:32 2013 (r335116) @@ -1,5 +1,5 @@ ---- src/Makefile.orig 2012-12-25 23:11:28.000000000 +0400 -+++ src/Makefile 2012-12-25 23:13:53.000000000 +0400 +--- src/Makefile.orig 2013-08-13 15:52:22.000000000 +0400 ++++ src/Makefile 2013-08-13 15:54:55.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') @@ -8,18 +8,18 @@ +DEPENDENCY_TARGETS=hiredis linenoise # Default settings - STD= -std=c99 -pedantic -@@ -61,7 +61,7 @@ - endif - - # Include paths to dependencies --FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src -+FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise - - ifeq ($(MALLOC),tcmalloc) - FINAL_CFLAGS+= -DUSE_TCMALLOC -@@ -79,6 +79,9 @@ - FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a -ldl + STD=-std=c99 -pedantic +@@ -49,7 +49,7 @@ + # Override default settings if possible + -include .make-settings + +-FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) ++FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) + FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG) + FINAL_LIBS=-lm + DEBUG=-g -ggdb +@@ -85,6 +85,9 @@ + FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a -ldl endif +FINAL_CFLAGS+= -I${PREFIX}/include/lua51 @@ -28,15 +28,15 @@ REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS) REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS) REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL) -@@ -103,6 +106,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 migrate.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o +@@ -105,6 +108,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 migrate.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 +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 - REDIS_BENCHMARK_NAME= redis-benchmark -@@ -157,7 +161,7 @@ + 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 + REDIS_BENCHMARK_NAME=redis-benchmark +@@ -159,7 +163,7 @@ # redis-server $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ) Modified: head/databases/redis/files/extra-patch-src-Makefile.luajit ============================================================================== --- head/databases/redis/files/extra-patch-src-Makefile.luajit Thu Nov 28 17:52:42 2013 (r335115) +++ head/databases/redis/files/extra-patch-src-Makefile.luajit Thu Nov 28 17:53:32 2013 (r335116) @@ -1,5 +1,5 @@ ---- src/Makefile.orig 2012-12-25 23:11:28.000000000 +0400 -+++ src/Makefile 2012-12-25 23:13:53.000000000 +0400 +--- src/Makefile.orig 2013-08-13 15:52:22.000000000 +0400 ++++ src/Makefile 2013-08-13 15:54:55.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') @@ -8,18 +8,18 @@ +DEPENDENCY_TARGETS=hiredis linenoise # Default settings - STD= -std=c99 -pedantic -@@ -61,7 +61,7 @@ - endif - - # Include paths to dependencies --FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src -+FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise - - ifeq ($(MALLOC),tcmalloc) - FINAL_CFLAGS+= -DUSE_TCMALLOC -@@ -79,6 +79,9 @@ - FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a -ldl + STD=-std=c99 -pedantic +@@ -49,7 +49,7 @@ + # Override default settings if possible + -include .make-settings + +-FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) ++FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) + FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG) + FINAL_LIBS=-lm + DEBUG=-g -ggdb +@@ -85,6 +85,9 @@ + FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a -ldl endif +FINAL_CFLAGS+= -I${PREFIX}/include/luajit-2.0 @@ -28,15 +28,15 @@ REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS) REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS) REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL) -@@ -103,6 +106,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 migrate.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o +@@ -105,6 +108,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 migrate.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 +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 - REDIS_BENCHMARK_NAME= redis-benchmark -@@ -157,7 +161,7 @@ + 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 + REDIS_BENCHMARK_NAME=redis-benchmark +@@ -159,7 +163,7 @@ # redis-server $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ) Modified: head/databases/redis/files/patch-redis.conf ============================================================================== --- head/databases/redis/files/patch-redis.conf Thu Nov 28 17:52:42 2013 (r335115) +++ head/databases/redis/files/patch-redis.conf Thu Nov 28 17:53:32 2013 (r335116) @@ -1,5 +1,5 @@ ---- redis.conf.orig 2010-07-02 16:00:49.000000000 +0400 -+++ redis.conf 2010-07-02 16:01:46.000000000 +0400 +--- redis.conf.orig 2013-08-13 15:40:42.000000000 +0400 ++++ redis.conf 2013-08-13 15:42:50.000000000 +0400 @@ -14,11 +14,11 @@ # By default Redis does not run as a daemon. Use 'yes' if you need it. @@ -12,19 +12,19 @@ -pidfile /var/run/redis.pid +pidfile %%REDIS_RUNDIR%%/redis.pid - # Accept connections on the specified port, default is 6379 - port 6379 -@@ -42,7 +42,7 @@ - # Specify the log file name. Also 'stdout' can be used to force + # Accept connections on the specified port, default is 6379. + # If port 0 is specified Redis will not listen on a TCP socket. +@@ -71,7 +71,7 @@ + # Specify the log file name. Also the emptry string can be used to force # Redis to log on the standard output. Note that if you use standard # output for logging but daemonize, logs will be sent to /dev/null --logfile stdout +-logfile "" +logfile %%REDIS_LOGDIR%%/redis.log - # Set the number of databases. The default database is DB 0, you can select - # a different one on a per-connection basis using SELECT <dbid> where -@@ -86,7 +86,7 @@ - # Also the Append Only File will be created inside this directory. + # To enable logging to the system logger, just set 'syslog-enabled' to yes, + # and optionally update the other syslog parameters to suit your needs. +@@ -155,7 +155,7 @@ + # The Append Only File will also be created inside this directory. # # Note that you must specify a directory here, not a file name. -dir ./ Modified: head/databases/redis/files/patch-src-Makefile ============================================================================== --- head/databases/redis/files/patch-src-Makefile Thu Nov 28 17:52:42 2013 (r335115) +++ head/databases/redis/files/patch-src-Makefile Thu Nov 28 17:53:32 2013 (r335116) @@ -1,21 +1,30 @@ ---- src/Makefile.orig 2012-08-01 14:06:03.000000000 +0400 -+++ src/Makefile 2012-08-02 22:24:01.000000000 +0400 -@@ -50,6 +50,9 @@ - FINAL_LDFLAGS= $(LDFLAGS) $(REDIS_LDFLAGS) -g -ggdb - FINAL_LIBS= -ldl -lnsl -lsocket -lm -lpthread - DEBUG= -g -ggdb -+else ifeq ($(uname_S),FreeBSD) -+ FINAL_CFLAGS?= $(CFLAGS) $(REDIS_CFLAGS) -I${PREFIX}/include -+ FINAL_LDFLAGS= $(LDFLAGS) - else - FINAL_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) - FINAL_LDFLAGS= $(LDFLAGS) $(REDIS_LDFLAGS) -g -rdynamic -ggdb -@@ -79,7 +82,7 @@ - REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS) - REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS) +--- src/Makefile.orig 2013-07-30 22:20:02.000000000 +0400 ++++ src/Makefile 2013-08-13 22:36:30.000000000 +0400 +@@ -22,7 +22,7 @@ + WARN=-Wall + OPT=$(OPTIMIZATION) -PREFIX?=/usr/local -+PREFIX:=${PREFIX} - INSTALL_BIN= $(PREFIX)/bin - INSTALL= cp -pf ++PREFIX:=$(PREFIX) + INSTALL_BIN=$(PREFIX)/bin + INSTALL=install + +@@ -52,14 +52,15 @@ + FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) + FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG) + FINAL_LIBS=-lm +-DEBUG=-g -ggdb ++#DEBUG=-g -ggdb + ifeq ($(uname_S),SunOS) + INSTALL=cp -pf + FINAL_CFLAGS+= -D__EXTENSIONS__ -D_XPG6 + FINAL_LIBS+= -ldl -lnsl -lsocket -lpthread +-else ifeq ($(uname_S),Darwin) +- ++else ifeq ($(uname_S),FreeBSD) ++ FINAL_CFLAGS?= $(CFLAGS) $(REDIS_CFLAGS) -I${PREFIX}/include ++ FINAL_LDFLAGS= $(LDFLAGS) + else + FINAL_LDFLAGS+= -rdynamic + FINAL_LIBS+= -pthread Modified: head/databases/redis/files/patch-src-mkreleasehdr.sh ============================================================================== --- head/databases/redis/files/patch-src-mkreleasehdr.sh Thu Nov 28 17:52:42 2013 (r335115) +++ head/databases/redis/files/patch-src-mkreleasehdr.sh Thu Nov 28 17:53:32 2013 (r335116) @@ -1,11 +1,11 @@ ---- src/mkreleasehdr.sh.orig 2013-03-12 22:27:27.000000000 +0400 -+++ src/mkreleasehdr.sh 2013-03-12 22:27:37.000000000 +0400 +--- src/mkreleasehdr.sh.orig 2013-08-13 15:39:40.000000000 +0400 ++++ src/mkreleasehdr.sh 2013-08-13 15:39:55.000000000 +0400 @@ -1,6 +1,6 @@ #!/bin/sh -GIT_SHA1=`(git show-ref --head --hash=8 2> /dev/null || echo 00000000) | head -n1` -GIT_DIRTY=`git diff --no-ext-diff 2> /dev/null | wc -l` +GIT_SHA1="00000000" +GIT_DIRTY="0" + BUILD_ID=`uname -n`"-"`date +%s` test -f release.h || touch release.h (cat release.h | grep SHA1 | grep $GIT_SHA1) && \ - (cat release.h | grep DIRTY | grep $GIT_DIRTY) && exit 0 # Already up-to-date
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311281753.rASHrWau039071>