diff options
| author | Sergey A. Osokin <osa@FreeBSD.org> | 2012-08-02 19:07:27 +0000 |
|---|---|---|
| committer | Sergey A. Osokin <osa@FreeBSD.org> | 2012-08-02 19:07:27 +0000 |
| commit | 522fb4b9b52a047148aaebf1b09dd7b2e09707fc (patch) | |
| tree | 4feeb16ae92d0277185d61028334dbdd162dcfe6 /databases/redis-devel | |
| parent | 1983f961b1b785f91b0dbd54a7be073fbda9ecb9 (diff) | |
| download | ports-522fb4b9b52a047148aaebf1b09dd7b2e09707fc.tar.gz ports-522fb4b9b52a047148aaebf1b09dd7b2e09707fc.zip | |
Notes
Diffstat (limited to 'databases/redis-devel')
| -rw-r--r-- | databases/redis-devel/Makefile | 5 | ||||
| -rw-r--r-- | databases/redis-devel/distinfo | 4 | ||||
| -rw-r--r-- | databases/redis-devel/files/patch-src::Makefile | 20 |
3 files changed, 10 insertions, 19 deletions
diff --git a/databases/redis-devel/Makefile b/databases/redis-devel/Makefile index 7b4161ba727c..3d049f370b3f 100644 --- a/databases/redis-devel/Makefile +++ b/databases/redis-devel/Makefile @@ -6,7 +6,7 @@ # PORTNAME= redis -DISTVERSION= 2.6.0-rc5 +DISTVERSION= 2.6.0-rc6 CATEGORIES= databases MASTER_SITES= GOOGLE_CODE PKGNAMESUFFIX= -devel @@ -14,9 +14,10 @@ PKGNAMESUFFIX= -devel MAINTAINER= osa@FreeBSD.org COMMENT= A persistent key-value database with built-in net interface -LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo +LIB_DEPENDS= execinfo:${PORTSDIR}/devel/libexecinfo CFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lm -lexecinfo CONFLICTS?= redis-2.4.* diff --git a/databases/redis-devel/distinfo b/databases/redis-devel/distinfo index 8b866d5ae939..738fe5d63ff1 100644 --- a/databases/redis-devel/distinfo +++ b/databases/redis-devel/distinfo @@ -1,2 +1,2 @@ -SHA256 (redis-2.6.0-rc5.tar.gz) = f6252f13d1e0542a7f3797ff9da517c0dea6855b74490ddc625ca288c8473e9f -SIZE (redis-2.6.0-rc5.tar.gz) = 965683 +SHA256 (redis-2.6.0-rc6.tar.gz) = 0bc49799cc644bd849ca2a85d073fda6fd5e29a469969213a912e1e227000961 +SIZE (redis-2.6.0-rc6.tar.gz) = 967845 diff --git a/databases/redis-devel/files/patch-src::Makefile b/databases/redis-devel/files/patch-src::Makefile index b7386ebfa344..9641f2e4115f 100644 --- a/databases/redis-devel/files/patch-src::Makefile +++ b/databases/redis-devel/files/patch-src::Makefile @@ -1,26 +1,16 @@ ---- src/Makefile.orig 2012-06-15 15:44:17.000000000 +0400 -+++ src/Makefile 2012-07-02 04:11:38.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') - OPTIMIZATION?=-O2 --DEPENDENCY_TARGETS=hiredis linenoise lua -+DEPENDENCY_TARGETS=hiredis linenoise lua - - # Default settings - STD= -std=c99 -pedantic -@@ -50,6 +50,10 @@ +--- 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= -pthread -L$(PREFIX)/lib -+ FINAL_LIBS= -lm -lexecinfo ++ FINAL_LDFLAGS= $(LDFLAGS) else FINAL_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) FINAL_LDFLAGS= $(LDFLAGS) $(REDIS_LDFLAGS) -g -rdynamic -ggdb -@@ -79,7 +83,7 @@ +@@ -79,7 +82,7 @@ REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS) REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS) |