diff options
Diffstat (limited to 'databases/redis-devel')
| -rw-r--r-- | databases/redis-devel/Makefile | 11 | ||||
| -rw-r--r-- | databases/redis-devel/distinfo | 4 | ||||
| -rw-r--r-- | databases/redis-devel/files/patch-src-Makefile | 6 | ||||
| -rw-r--r-- | databases/redis-devel/files/patch-src-config.h | 10 |
4 files changed, 13 insertions, 18 deletions
diff --git a/databases/redis-devel/Makefile b/databases/redis-devel/Makefile index 8b389e40d1b1..6c93e2946634 100644 --- a/databases/redis-devel/Makefile +++ b/databases/redis-devel/Makefile @@ -2,12 +2,10 @@ # $FreeBSD$ PORTNAME= redis -DISTVERSION= 3.0.0-rc4 +DISTVERSION= 3.0.0 CATEGORIES= databases -MASTER_SITES= https://github.com/antirez/redis/archive/ +MASTER_SITES= http://download.redis.io/releases/ PKGNAMESUFFIX= -devel -DISTNAME= ${DISTVERSION} -DIST_SUBDIR= ${PORTNAME} MAINTAINER= osa@FreeBSD.org COMMENT= Persistent key-value database with built-in net interface @@ -23,9 +21,6 @@ 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 -FETCH_ARGS= -Fpr -WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} - .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MLUA} @@ -50,7 +45,7 @@ USES+= tcl:build CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -lpthread -lm -lexecinfo -CONFLICTS?= redis-2.* +CONFLICTS?= redis-3.* USES+= gmake MAKE_ENV= "V=yo" diff --git a/databases/redis-devel/distinfo b/databases/redis-devel/distinfo index f9cda5ed8704..e052b7605a05 100644 --- a/databases/redis-devel/distinfo +++ b/databases/redis-devel/distinfo @@ -1,2 +1,2 @@ -SHA256 (redis/3.0.0-rc4.tar.gz) = 1787b7fd57ec019e84691e881e81a8d8b67cf0d2457bd484d4da8c6eaca4a731 -SIZE (redis/3.0.0-rc4.tar.gz) = 1365919 +SHA256 (redis-3.0.0.tar.gz) = 654c95c6236692dcb916fccba9a34d0877cc91338c8b6a372511e6eb080e34bf +SIZE (redis-3.0.0.tar.gz) = 1358081 diff --git a/databases/redis-devel/files/patch-src-Makefile b/databases/redis-devel/files/patch-src-Makefile index fd370cbcddd5..bfbe89b2d241 100644 --- a/databases/redis-devel/files/patch-src-Makefile +++ b/databases/redis-devel/files/patch-src-Makefile @@ -1,5 +1,5 @@ ---- src/Makefile.orig 2014-10-11 01:09:55.000000000 +0400 -+++ src/Makefile 2014-10-11 01:12:53.000000000 +0400 +--- src/Makefile.orig 2015-04-01 17:01:44.000000000 +0300 ++++ src/Makefile 2015-04-07 21:30:22.464962000 +0300 @@ -22,7 +22,7 @@ WARN=-Wall -W OPT=$(OPTIMIZATION) @@ -24,7 +24,7 @@ +ifeq ($(uname_S),FreeBSD) + # FreeBSD + FINAL_CFLAGS?= $(CFLAGS) $(REDIS_CFLAGS) -I${PREFIX}/include -+ FINAL_LDFLAGS= $(LDFLAGS) ++ FINAL_LDFLAGS= $(LDFLAGS) -pthread +else ifeq ($(uname_S),AIX) # AIX diff --git a/databases/redis-devel/files/patch-src-config.h b/databases/redis-devel/files/patch-src-config.h index 2225d63d9d36..23666a862b96 100644 --- a/databases/redis-devel/files/patch-src-config.h +++ b/databases/redis-devel/files/patch-src-config.h @@ -1,11 +1,11 @@ ---- src/config.h.orig 2013-02-11 21:47:44.000000000 +0400 -+++ src/config.h 2013-02-11 21:50:10.000000000 +0400 -@@ -54,7 +54,7 @@ +--- src/config.h.orig 2015-04-07 21:24:36.634829000 +0300 ++++ src/config.h 2015-04-07 21:24:53.388849000 +0300 +@@ -62,7 +62,7 @@ #endif /* Test for backtrace() */ --#if defined(__APPLE__) || defined(__linux__) -+#if defined(__APPLE__) || defined(__linux__) || defined(__FreeBSD__) +-#if defined(__APPLE__) || (defined(__linux__) && defined(__GLIBC__)) ++#if defined(__APPLE__) || (defined(__linux__) && defined(__GLIBC__)) || defined(__FreeBSD__) #define HAVE_BACKTRACE 1 #endif |