Attachment 126582 Details for Bug 170326 – redis-2.4.16.patch

[patch] redis-2.4.16.patch

redis-2.4.16.patch (text/plain), 2.25 KB, created by koobs on 2012-08-02 14:30:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: koobs

Created: 2012-08-02 14:30:10 UTC

Size: 2.25 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/databases/redis/Makefile ./Makefile
>--- /usr/ports/databases/redis/Makefile	2012-07-20 03:29:30.000000000 +1000
>+++ ./Makefile	2012-08-02 22:03:57.000000000 +1000
>@@ -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 -ruN --exclude=CVS /usr/ports/databases/redis/distinfo ./distinfo
>--- /usr/ports/databases/redis/distinfo	2012-06-23 05:28:45.000000000 +1000
>+++ ./distinfo	2012-08-02 19:17:21.000000000 +1000
>@@ -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 -ruN --exclude=CVS /usr/ports/databases/redis/files/patch-deps::hiredis::Makefile ./files/patch-deps::hiredis::Makefile
>--- /usr/ports/databases/redis/files/patch-deps::hiredis::Makefile	2012-02-25 00:04:14.000000000 +1100
>+++ ./files/patch-deps::hiredis::Makefile	2012-08-02 19:41:59.000000000 +1000
>@@ -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 -ruN --exclude=CVS /usr/ports/databases/redis/files/patch-src::Makefile ./files/patch-src::Makefile
>--- /usr/ports/databases/redis/files/patch-src::Makefile	2012-05-28 17:23:16.000000000 +1000
>+++ ./files/patch-src::Makefile	2012-08-02 19:35:46.000000000 +1000
>@@ -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

Actions: View | Diff

Attachments on bug 170326: 126582