diff options
| author | Sergey A. Osokin <osa@FreeBSD.org> | 2012-08-02 18:20:11 +0000 |
|---|---|---|
| committer | Sergey A. Osokin <osa@FreeBSD.org> | 2012-08-02 18:20:11 +0000 |
| commit | 1983f961b1b785f91b0dbd54a7be073fbda9ecb9 (patch) | |
| tree | a01a2b04c030023e430a812160ca0c010c53c332 | |
| parent | Update to new upstream release v1.42.5. (diff) | |
Update from 2.4.15 to 2.4.16.
Submitted by: Kubilay Kocak aka koobs dot freebsd at gmail dot com
Tests: https://redports.org/buildarchive/20120802120704-7005/
PR: 170326
Notes
Notes:
svn path=/head/; revision=301867
| -rw-r--r-- | databases/redis/Makefile | 7 | ||||
| -rw-r--r-- | databases/redis/distinfo | 4 | ||||
| -rw-r--r-- | databases/redis/files/patch-deps::hiredis::Makefile | 4 | ||||
| -rw-r--r-- | databases/redis/files/patch-src::Makefile | 2 |
4 files changed, 10 insertions, 7 deletions
diff --git a/databases/redis/Makefile b/databases/redis/Makefile index c8c5697d9435..986622ea1a58 100644 --- a/databases/redis/Makefile +++ b/databases/redis/Makefile @@ -6,16 +6,19 @@ # PORTNAME= redis -PORTVERSION= 2.4.15 +PORTVERSION= 2.4.16 CATEGORIES= databases MASTER_SITES= GOOGLE_CODE MAINTAINER= osa@FreeBSD.org COMMENT= A persistent key-value database with built-in net interface -LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo +LICENSE= BSD + +LIB_DEPENDS= execinfo:${PORTSDIR}/devel/libexecinfo CFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lm -lexecinfo CONFLICTS?= redis-devel-2.6.* diff --git a/databases/redis/distinfo b/databases/redis/distinfo index 0a3eac3789e6..1f4475120bde 100644 --- a/databases/redis/distinfo +++ b/databases/redis/distinfo @@ -1,2 +1,2 @@ -SHA256 (redis-2.4.15.tar.gz) = 2e5467079aa130d9e968dd7b35411940f012d322bf68d287c7af6f4d40e393c4 -SIZE (redis-2.4.15.tar.gz) = 653949 +SHA256 (redis-2.4.16.tar.gz) = d35cc89d73aa1ff05af5f1380a4411c828979b3b446f5caf8b5720225b38e15b +SIZE (redis-2.4.16.tar.gz) = 649908 diff --git a/databases/redis/files/patch-deps::hiredis::Makefile b/databases/redis/files/patch-deps::hiredis::Makefile index b0cfcd406885..92197663ac82 100644 --- a/databases/redis/files/patch-deps::hiredis::Makefile +++ b/databases/redis/files/patch-deps::hiredis::Makefile @@ -20,8 +20,8 @@ endif +ifeq ($(uname_S),FreeBSD) + CFLAGS?=$(CFLAGS) -+ CCLINK?=-pthread -+ LDFLAGS?=-L. -Wl,-rpath,. ++ CCLINK?=$(PTHREAD_LIBS) ++ LDFLAGS?=$(LDFLAGS) + DYLIBNAME?=libhiredis.so + DYLIB_MAKE_CMD?=$(CC) -o ${DYLIBNAME} ${OBJ} + STLIBNAME?=libhiredis.a diff --git a/databases/redis/files/patch-src::Makefile b/databases/redis/files/patch-src::Makefile index fe18bb78aaba..1d51eecd7743 100644 --- a/databases/redis/files/patch-src::Makefile +++ b/databases/redis/files/patch-src::Makefile @@ -6,7 +6,7 @@ DEBUG?=-g -ggdb +else ifeq ($(uname_S),FreeBSD) + CFLAGS?= $(CFLAGS) -+ CCLINK?= -pthread -lm -L$(PREFIX)/lib -lexecinfo ++ CCLINK?= $(LDFLAGS) else CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -Wall -W $(ARCH) $(PROF) CCLINK?=-lm -pthread |