From owner-svn-ports-head@FreeBSD.ORG  Mon Oct  6 22:48:59 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.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 381B7BC6;
 Mon,  6 Oct 2014 22:48:59 +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 25613789;
 Mon,  6 Oct 2014 22:48:59 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s96MmxK8058339;
 Mon, 6 Oct 2014 22:48:59 GMT (envelope-from osa@FreeBSD.org)
Received: (from osa@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s96MmxFE058338;
 Mon, 6 Oct 2014 22:48:59 GMT (envelope-from osa@FreeBSD.org)
Message-Id: <201410062248.s96MmxFE058338@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: osa set sender to osa@FreeBSD.org
 using -f
From: "Sergey A. Osokin" <osa@FreeBSD.org>
Date: Mon, 6 Oct 2014 22:48:58 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r370239 - head/databases/redis-devel/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: Mon, 06 Oct 2014 22:48:59 -0000

Author: osa
Date: Mon Oct  6 22:48:58 2014
New Revision: 370239
URL: https://svnweb.freebsd.org/changeset/ports/370239
QAT: https://qat.redports.org/buildarchive/r370239/

Log:
  Attempt to fix build on 8.x.

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

Added: head/databases/redis-devel/files/patch-deps-hiredis-net.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/redis-devel/files/patch-deps-hiredis-net.c	Mon Oct  6 22:48:58 2014	(r370239)
@@ -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));