From owner-svn-ports-head@FreeBSD.ORG  Wed Sep 17 15:56:18 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id DA221BB3;
 Wed, 17 Sep 2014 15:56:18 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C586EFB6;
 Wed, 17 Sep 2014 15:56:18 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8HFuIoq024419;
 Wed, 17 Sep 2014 15:56:18 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8HFuIkx024418;
 Wed, 17 Sep 2014 15:56:18 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201409171556.s8HFuIkx024418@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Wed, 17 Sep 2014 15:56:18 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r368392 - head/databases/redis/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 17 Sep 2014 15:56:19 -0000

Author: bdrewery
Date: Wed Sep 17 15:56:18 2014
New Revision: 368392
URL: http://svnweb.freebsd.org/changeset/ports/368392
QAT: https://qat.redports.org/buildarchive/r368392/

Log:
  - Fix build on 8.x which does not have TCP_KEEPIDLE
  
  Approved by:	maintainer

Added:
  head/databases/redis/files/patch-deps-hiredis-net.c   (contents, props changed)

Added: head/databases/redis/files/patch-deps-hiredis-net.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/redis/files/patch-deps-hiredis-net.c	Wed Sep 17 15:56:18 2014	(r368392)
@@ -0,0 +1,12 @@
+--- deps/hiredis/net.c.orig	2014-09-12 09:16:58.000000000 -0500
++++ deps/hiredis/net.c	2014-09-16 19:45:20.339820576 -0500
+@@ -138,7 +138,8 @@ int redisKeepAlive(redisContext *c, int 
+         return REDIS_ERR;
+     }
+ #else
+-#ifndef __sun
++#if !defined(__sun) && defined(TCP_KEEPIDLE) && defined(TCP_KEEPINTVL) && \
++    defined(TCP_KEEPCNT)
+     val = interval;
+     if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)) < 0) {
+         __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));