svn commit: r306540 - in head/databases/redis: . files
Sergey A. Osokin
osa at FreeBSD.org
Sun Oct 28 08:39:18 UTC 2012
Author: osa
Date: Sun Oct 28 08:39:17 2012
New Revision: 306540
URL: http://svn.freebsd.org/changeset/ports/306540
Log:
Update from 2.4.17 to latest stable version 2.6.2.
Feature safe: yes
Added:
head/databases/redis/files/patch-deps::Makefile (contents, props changed)
Deleted:
head/databases/redis/files/patch-deps::linenoise::Makefile
head/databases/redis/files/patch-src::redis.c
Modified:
head/databases/redis/Makefile
head/databases/redis/distinfo
head/databases/redis/files/patch-deps::hiredis::Makefile
head/databases/redis/files/patch-src::Makefile
head/databases/redis/files/redis.in
Modified: head/databases/redis/Makefile
==============================================================================
--- head/databases/redis/Makefile Sun Oct 28 06:41:48 2012 (r306539)
+++ head/databases/redis/Makefile Sun Oct 28 08:39:17 2012 (r306540)
@@ -1,12 +1,8 @@
-# New ports collection makefile for: redis
-# Date created: 03 Jul 2009
-# Whom: Sergey Skvortsov <skv at protey.ru>
-#
+# Created by: Sergey Skvortsov <skv at protey.ru>
# $FreeBSD$
-#
PORTNAME= redis
-PORTVERSION= 2.4.17
+DISTVERSION= 2.6.2
CATEGORIES= databases
MASTER_SITES= GOOGLE_CODE
@@ -17,6 +13,15 @@ LICENSE= BSD
LIB_DEPENDS= execinfo:${PORTSDIR}/devel/libexecinfo
+OPTIONS_DEFINE= TESTS
+TESTS_DESC= Install lang/tcl for redis unit tests
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MTESTS}
+USE_TCL_BUILD= yes
+.endif
+
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lm -lexecinfo
@@ -63,4 +68,9 @@ post-install:
[ -d ${d} ] || ${MKDIR} ${d} && ${CHOWN} ${USERS}:${GROUPS} ${d}
.endfor
+test: build
+ @cd ${WRKSRC} && ${TCLSH} tests/test_helper.tcl
+
+regression-test: test
+
.include <bsd.port.mk>
Modified: head/databases/redis/distinfo
==============================================================================
--- head/databases/redis/distinfo Sun Oct 28 06:41:48 2012 (r306539)
+++ head/databases/redis/distinfo Sun Oct 28 08:39:17 2012 (r306540)
@@ -1,2 +1,2 @@
-SHA256 (redis-2.4.17.tar.gz) = 3fae7c47ef84886ff65073593c91586bb675babaf702eb6f3b37855ab3066ebd
-SIZE (redis-2.4.17.tar.gz) = 656155
+SHA256 (redis-2.6.2.tar.gz) = b3b2e74ec8a13337e5e17cc24b0fecf5d612d6a0835d99bd1e337b391f20a46d
+SIZE (redis-2.6.2.tar.gz) = 1000600
Added: head/databases/redis/files/patch-deps::Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/redis/files/patch-deps::Makefile Sun Oct 28 08:39:17 2012 (r306540)
@@ -0,0 +1,17 @@
+--- deps/Makefile.orig 2012-07-02 04:18:07.000000000 +0400
++++ deps/Makefile 2012-07-02 04:18:56.000000000 +0400
+@@ -58,12 +58,12 @@
+ LUA_CFLAGS= -D__C99FEATURES__=1
+ endif
+
+-LUA_CFLAGS+= -O2 -Wall -DLUA_ANSI $(CFLAGS)
++LUA_CFLAGS+= -Wall -DLUA_ANSI $(CFLAGS)
+ LUA_LDFLAGS+= $(LDFLAGS)
+
+ lua: .make-prerequisites
+ @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
+- cd lua/src && $(MAKE) all CFLAGS="$(LUA_CFLAGS)" MYLDFLAGS="$(LUA_LDFLAGS)"
++ cd lua/src && $(MAKE) all CC="$(CC)" CFLAGS="$(LUA_CFLAGS)" MYLDFLAGS="$(LUA_LDFLAGS)"
+
+ .PHONY: lua
+
Modified: head/databases/redis/files/patch-deps::hiredis::Makefile
==============================================================================
--- head/databases/redis/files/patch-deps::hiredis::Makefile Sun Oct 28 06:41:48 2012 (r306539)
+++ head/databases/redis/files/patch-deps::hiredis::Makefile Sun Oct 28 08:39:17 2012 (r306540)
@@ -20,8 +20,8 @@
endif
+ifeq ($(uname_S),FreeBSD)
+ CFLAGS?=$(CFLAGS)
-+ CCLINK?=$(PTHREAD_LIBS)
-+ LDFLAGS?=$(LDFLAGS)
++ CCLINK?=-pthread
++ LDFLAGS?=-L. -Wl,-rpath,.
+ DYLIBNAME?=libhiredis.so
+ DYLIB_MAKE_CMD?=$(CC) -o ${DYLIBNAME} ${OBJ}
+ STLIBNAME?=libhiredis.a
Modified: head/databases/redis/files/patch-src::Makefile
==============================================================================
--- head/databases/redis/files/patch-src::Makefile Sun Oct 28 06:41:48 2012 (r306539)
+++ head/databases/redis/files/patch-src::Makefile Sun Oct 28 08:39:17 2012 (r306540)
@@ -1,24 +1,21 @@
---- src/Makefile.orig 2012-05-28 11:14:39.000000000 +0400
-+++ src/Makefile 2012-05-28 11:15:45.000000000 +0400
-@@ -28,6 +28,9 @@
- CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -Wall -W -D__EXTENSIONS__ -D_XPG6
- CCLINK?=-ldl -lnsl -lsocket -lm -lpthread
- DEBUG?=-g -ggdb
+--- 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)
-+ CFLAGS?= $(CFLAGS)
-+ CCLINK?= $(LDFLAGS)
++ FINAL_CFLAGS?= $(CFLAGS) $(REDIS_CFLAGS) -I${PREFIX}/include
++ FINAL_LDFLAGS= $(LDFLAGS)
else
- CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -Wall -W $(ARCH) $(PROF)
- CCLINK?=-lm -pthread
-@@ -52,9 +55,9 @@
- ALLOC_FLAGS=-DUSE_JEMALLOC -I../deps/jemalloc/include
- endif
-
--CCOPT= $(CFLAGS) $(ARCH) $(PROF)
-+CCOPT= $(CFLAGS) $(PROF)
+ 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)
-PREFIX?=/usr/local
-+PREFIX:= ${PREFIX}
++PREFIX:=${PREFIX}
INSTALL_BIN= $(PREFIX)/bin
INSTALL= cp -pf
Modified: head/databases/redis/files/redis.in
==============================================================================
--- head/databases/redis/files/redis.in Sun Oct 28 06:41:48 2012 (r306539)
+++ head/databases/redis/files/redis.in Sun Oct 28 08:39:17 2012 (r306540)
@@ -16,7 +16,7 @@
. /etc/rc.subr
name="redis"
-rcvar=redis_enable
+rcvar=`set_rcvar`
extra_commands="reload"
More information about the svn-ports-all
mailing list