Attachment 120237 Details for Bug 163004 – file.diff

[patch] file.diff

file.diff (text/plain), 2.24 KB, created by Grzegorz Blach on 2011-12-01 22:00:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Grzegorz Blach

Created: 2011-12-01 22:00:31 UTC

Size: 2.24 KB

patch

obsolete

>diff -ruN databases/redis/Makefile databases/redis/Makefile
>--- databases/redis/Makefile	2011-11-30 13:46:19.000000000 +0100
>+++ databases/redis/Makefile	2011-12-01 20:56:38.166112312 +0100
>@@ -7,7 +7,7 @@
> 
> PORTNAME=	redis
> PORTVERSION=	2.4.4
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	databases
> MASTER_SITES=	GOOGLE_CODE
> 
>@@ -48,6 +48,13 @@
> 	REDIS_DBDIR=${REDIS_DBDIR} \
> 	REDIS_RUNDIR=${REDIS_RUNDIR}
> 
>+.include <bsd.port.pre.mk>
>+
>+post-patch:
>+.if ${ARCH} == amd64
>+	@${PATCH} -d ${WRKSRC} < files/extra-patch-src::redis.c
>+.endif
>+
> post-build:
> 	${SED} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
> 		${WRKSRC}/redis.conf > ${WRKDIR}/redis.conf
>@@ -61,4 +68,4 @@
> 	[ -d ${d} ] || ${MKDIR} ${d} && ${CHOWN} ${USERS}:${GROUPS} ${d}
> .endfor
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>diff -ruN databases/redis/files/extra-patch-src::redis.c databases/redis/files/extra-patch-src::redis.c
>--- databases/redis/files/extra-patch-src::redis.c	1970-01-01 01:00:00.000000000 +0100
>+++ databases/redis/files/extra-patch-src::redis.c	2011-12-01 20:43:08.132116792 +0100
>@@ -0,0 +1,11 @@
>+--- src/redis.c.orig	2011-11-30 16:29:38.000000000 +0400
>++++ src/redis.c	2011-11-30 16:29:59.000000000 +0400
>+@@ -1685,7 +1685,7 @@
>+ #ifdef HAVE_BACKTRACE
>+ static void *getMcontextEip(ucontext_t *uc) {
>+ #if defined(__FreeBSD__)
>+-    return (void*) uc->uc_mcontext.mc_eip;
>++    return (void*) uc->uc_mcontext.mc_rip;
>+ #elif defined(__dietlibc__)
>+     return (void*) uc->uc_mcontext.eip;
>+ #elif defined(__APPLE__) && !defined(MAC_OS_X_VERSION_10_6)
>diff -ruN databases/redis/files/patch-src::redis.c databases/redis/files/patch-src::redis.c
>--- databases/redis/files/patch-src::redis.c	2011-11-30 13:46:19.000000000 +0100
>+++ databases/redis/files/patch-src::redis.c	1970-01-01 01:00:00.000000000 +0100
>@@ -1,11 +0,0 @@
>---- src/redis.c.orig	2011-11-30 16:29:38.000000000 +0400
>-+++ src/redis.c	2011-11-30 16:29:59.000000000 +0400
>-@@ -1685,7 +1685,7 @@
>- #ifdef HAVE_BACKTRACE
>- static void *getMcontextEip(ucontext_t *uc) {
>- #if defined(__FreeBSD__)
>--    return (void*) uc->uc_mcontext.mc_eip;
>-+    return (void*) uc->uc_mcontext.mc_rip;
>- #elif defined(__dietlibc__)
>-     return (void*) uc->uc_mcontext.eip;
>- #elif defined(__APPLE__) && !defined(MAC_OS_X_VERSION_10_6)

Actions: View | Diff

Attachments on bug 163004: 120237