From owner-svn-ports-all@FreeBSD.ORG Tue Aug 13 17:39:59 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 329316C0; Tue, 13 Aug 2013 17:39:59 +0000 (UTC) (envelope-from osa@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1E78B2860; Tue, 13 Aug 2013 17:39:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7DHdwZD014570; Tue, 13 Aug 2013 17:39:58 GMT (envelope-from osa@svn.freebsd.org) Received: (from osa@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7DHdvsY014562; Tue, 13 Aug 2013 17:39:57 GMT (envelope-from osa@svn.freebsd.org) Message-Id: <201308131739.r7DHdvsY014562@svn.freebsd.org> From: "Sergey A. Osokin" Date: Tue, 13 Aug 2013 17:39:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r324677 - in head/databases/redis-devel: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Aug 2013 17:39:59 -0000 Author: osa Date: Tue Aug 13 17:39:57 2013 New Revision: 324677 URL: http://svnweb.freebsd.org/changeset/ports/324677 Log: Update from 2.6.14 to 2.8.0-rc2. Changes: https://raw.github.com/antirez/redis/2.8/00-RELEASENOTES Modified: head/databases/redis-devel/Makefile head/databases/redis-devel/distinfo head/databases/redis-devel/files/extra-patch-src-Makefile head/databases/redis-devel/files/patch-redis.conf head/databases/redis-devel/files/patch-src-Makefile head/databases/redis-devel/files/patch-src-mkreleasehdr.sh Modified: head/databases/redis-devel/Makefile ============================================================================== --- head/databases/redis-devel/Makefile Tue Aug 13 17:19:51 2013 (r324676) +++ head/databases/redis-devel/Makefile Tue Aug 13 17:39:57 2013 (r324677) @@ -2,9 +2,9 @@ # $FreeBSD$ PORTNAME= redis -DISTVERSION= 2.6.14 +DISTVERSION= 2.8.0-rc2 CATEGORIES= databases -MASTER_SITES= GOOGLE_CODE +MASTER_SITES= http://download.redis.io/releases/ PKGNAMESUFFIX= -devel MAINTAINER= osa@FreeBSD.org Modified: head/databases/redis-devel/distinfo ============================================================================== --- head/databases/redis-devel/distinfo Tue Aug 13 17:19:51 2013 (r324676) +++ head/databases/redis-devel/distinfo Tue Aug 13 17:39:57 2013 (r324677) @@ -1,2 +1,2 @@ -SHA256 (redis-2.6.14.tar.gz) = fdf61c693e5c4908b4bb44c428d4a2b7568f05566c144c58fdf19c5cb12a9caf -SIZE (redis-2.6.14.tar.gz) = 995036 +SHA256 (redis-2.8.0-rc2.tar.gz) = 7a3abcd79e33faef35b699ea5b8870d052aa38c86253f7b16fc8cb40abd5b69b +SIZE (redis-2.8.0-rc2.tar.gz) = 1031289 Modified: head/databases/redis-devel/files/extra-patch-src-Makefile ============================================================================== --- head/databases/redis-devel/files/extra-patch-src-Makefile Tue Aug 13 17:19:51 2013 (r324676) +++ head/databases/redis-devel/files/extra-patch-src-Makefile Tue Aug 13 17:39:57 2013 (r324677) @@ -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-devel/files/patch-redis.conf ============================================================================== --- head/databases/redis-devel/files/patch-redis.conf Tue Aug 13 17:19:51 2013 (r324676) +++ head/databases/redis-devel/files/patch-redis.conf Tue Aug 13 17:39:57 2013 (r324677) @@ -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 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-devel/files/patch-src-Makefile ============================================================================== --- head/databases/redis-devel/files/patch-src-Makefile Tue Aug 13 17:19:51 2013 (r324676) +++ head/databases/redis-devel/files/patch-src-Makefile Tue Aug 13 17:39:57 2013 (r324677) @@ -1,21 +1,23 @@ ---- 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-08-13 15:32:55.000000000 +0400 ++++ src/Makefile 2013-08-13 15:35:00.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 +@@ -58,8 +58,9 @@ + 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-devel/files/patch-src-mkreleasehdr.sh ============================================================================== --- head/databases/redis-devel/files/patch-src-mkreleasehdr.sh Tue Aug 13 17:19:51 2013 (r324676) +++ head/databases/redis-devel/files/patch-src-mkreleasehdr.sh Tue Aug 13 17:39:57 2013 (r324677) @@ -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