From 69f903759a994ca53d4e65f97ca7eb15c56f8d8f Mon Sep 17 00:00:00 2001
From: "Sergey A. Osokin" <osa@FreeBSD.org>
Date: Sun, 13 Feb 2011 12:25:02 +0000
Subject: Update from 2.0.4 (after repocopy to databases/redis2) to latest
 release candidate 2.2.rc4.

Add CONFLICTS with redis-2.0.
Add NO_LATEST_LINK, should be removed after 2.2 release.
---
 databases/redis/files/patch-src::Makefile | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 databases/redis/files/patch-src::Makefile

(limited to 'databases/redis/files/patch-src::Makefile')

diff --git a/databases/redis/files/patch-src::Makefile b/databases/redis/files/patch-src::Makefile
new file mode 100644
index 000000000000..21674a4798b2
--- /dev/null
+++ b/databases/redis/files/patch-src::Makefile
@@ -0,0 +1,24 @@
+--- src/Makefile.orig	2010-12-24 09:29:14.000000000 +0300
++++ src/Makefile	2010-12-24 09:31:51.000000000 +0300
+@@ -9,6 +9,9 @@
+   CFLAGS?= -std=c99 -pedantic $(OPTIMIZATION) -Wall -W -D__EXTENSIONS__ -D_XPG6
+   CCLINK?= -ldl -lnsl -lsocket -lm -lpthread
+   DEBUG?= -g -ggdb 
++else ifeq ($(uname_S),FreeBSD)
++  CFLAGS?= $(CFLAGS)
++  CCLINK?= -pthread -lm
+ else
+   CFLAGS?= -std=c99 -pedantic $(OPTIMIZATION) -Wall -W $(ARCH) $(PROF)
+   CCLINK?= -lm -pthread
+@@ -19,9 +22,9 @@
+   CCLINK+= -ltcmalloc
+   CFLAGS+= -DUSE_TCMALLOC
+ endif
+-CCOPT= $(CFLAGS) $(CCLINK) $(ARCH) $(PROF)
++CCOPT= $(CFLAGS) $(CCLINK) $(PROF)
+ 
+-PREFIX= /usr/local
++PREFIX?= $(PREFIX)
+ INSTALL_BIN= $(PREFIX)/bin
+ INSTALL= cp -p
+ 
-- 
cgit v1.2.3