From owner-svn-ports-head@FreeBSD.ORG  Thu Sep  5 07:00:08 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 3C8B8DEB;
 Thu,  5 Sep 2013 07:00:08 +0000 (UTC)
 (envelope-from mandree@FreeBSD.org)
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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2A4172FD3;
 Thu,  5 Sep 2013 07:00:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r857081N000327;
 Thu, 5 Sep 2013 07:00:08 GMT (envelope-from mandree@svn.freebsd.org)
Received: (from mandree@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r85708jD000326;
 Thu, 5 Sep 2013 07:00:08 GMT (envelope-from mandree@svn.freebsd.org)
Message-Id: <201309050700.r85708jD000326@svn.freebsd.org>
From: Matthias Andree <mandree@FreeBSD.org>
Date: Thu, 5 Sep 2013 07:00:08 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r326359 - head/sysutils/busybox/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.14
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: Thu, 05 Sep 2013 07:00:08 -0000

Author: mandree
Date: Thu Sep  5 07:00:07 2013
New Revision: 326359
URL: http://svnweb.freebsd.org/changeset/ports/326359

Log:
  Attempt to fix 10-CURRENT build failure involving strchrnul.

Modified:
  head/sysutils/busybox/files/patch-include__platform.h

Modified: head/sysutils/busybox/files/patch-include__platform.h
==============================================================================
--- head/sysutils/busybox/files/patch-include__platform.h	Thu Sep  5 06:44:46 2013	(r326358)
+++ head/sysutils/busybox/files/patch-include__platform.h	Thu Sep  5 07:00:07 2013	(r326359)
@@ -1,6 +1,6 @@
---- ./include/platform.h.orig	2013-01-14 05:19:43.000000000 +0100
-+++ ./include/platform.h	2013-01-21 21:26:34.000000000 +0100
-@@ -433,6 +433,15 @@
+--- ./include/platform.h.orig	2013-06-29 17:00:01.000000000 +0200
++++ ./include/platform.h	2013-09-05 08:58:27.000000000 +0200
+@@ -433,6 +433,18 @@
  
  #if defined(__FreeBSD__)
  # undef HAVE_STRCHRNUL
@@ -12,6 +12,9 @@
 +			     stpncpy(), strnlen(), wcsnlen(),
 +			     wcscasecmp(), and wcsncasecmp() in 800067 */
 +#  endif
++#  if __FreeBSD_version >= 1000029
++#   define HAVE_STRCHRNUL 1 /* added short before 1000029 */
++#  endif
 +# endif
  #endif