From owner-svn-ports-head@FreeBSD.ORG  Fri Nov  1 18:26:01 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 9BA2FAB0;
 Fri,  1 Nov 2013 18:26:01 +0000 (UTC)
 (envelope-from freebsd.contact@marino.st)
Received: from shepard.synsport.net (mail.synsport.com [208.69.230.148])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 722BE2F05;
 Fri,  1 Nov 2013 18:26:00 +0000 (UTC)
Received: from [192.168.0.22] (unknown [130.255.26.50])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by shepard.synsport.net (Postfix) with ESMTP id 10F7143552;
 Fri,  1 Nov 2013 13:25:43 -0500 (CDT)
Message-ID: <5273F214.3040406@marino.st>
Date: Fri, 01 Nov 2013 19:25:24 +0100
From: John Marino <freebsd.contact@marino.st>
User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64;
 rv:17.0) Gecko/20130509 Thunderbird/17.0.6
MIME-Version: 1.0
To: "Jason E. Hale" <jhale@freebsd.org>
Subject: Re: svn commit: r332099 - head/devel/cssc/files
References: <201310301246.r9UCkiWu069471@svn.freebsd.org>
 <5271A160.8050309@marino.st> <5272FBC0.2050306@marino.st>
 <5558324.uLoFuByiHu@mocha.verizon.net>
In-Reply-To: <5558324.uLoFuByiHu@mocha.verizon.net>
X-Enigmail-Version: 1.6
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org,
 ports-committers@freebsd.org
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: marino@freebsd.org
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: Fri, 01 Nov 2013 18:26:01 -0000

On 11/1/2013 18:55, Jason E. Hale wrote:
> On Friday, November 01, 2013 01:54:24 John Marino wrote:
>>
>> Well, the maintainer patch does NOT contain <unistd.h>, contrary to what
>> you said earlier so now it's broken again with gcc47+.
>>
>> Can you please retrieve the contents of my patch and integrate it into
>> the maintainer patch?
>>
> I'm not sure why it would break.  The following is in the patched file:
> 
> #elif defined(__FreeBSD__)
> #define GTEST_OS_FREEBSD 1
> #define GTEST_USE_OWN_TR1_TUPLE 1
> #endif  // __CYGWIN__
> 
> #if GTEST_OS_CYGWIN || GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_SYMBIAN || \
>     GTEST_OS_SOLARIS || GTEST_OS_AIX || GTEST_OS_FREEBSD
> 

Well, because __FreeBSD__ isn't defined on DragonFly.  The first line
needs to append "|| defined(__DragonFly__)" in order to define
GTEST_OS_FREEBSD to include those headers.

Thanks - sorry I didn't look at the file in its entirety, only the patch.
John