From owner-svn-ports-all@freebsd.org  Sat Jul  4 12:28:10 2015
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id C7D5D9A8B;
 Sat,  4 Jul 2015 12:28:10 +0000 (UTC)
 (envelope-from antoine@FreeBSD.org)
Received: from repo.freebsd.org (repo.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 B794B1ADC;
 Sat,  4 Jul 2015 12:28:10 +0000 (UTC)
 (envelope-from antoine@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t64CSA7I077147;
 Sat, 4 Jul 2015 12:28:10 GMT (envelope-from antoine@FreeBSD.org)
Received: (from antoine@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t64CSAYf077146;
 Sat, 4 Jul 2015 12:28:10 GMT (envelope-from antoine@FreeBSD.org)
Message-Id: <201507041228.t64CSAYf077146@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: antoine set sender to
 antoine@FreeBSD.org using -f
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Sat, 4 Jul 2015 12:28:10 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r391303 - head/math/R/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-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 04 Jul 2015 12:28:10 -0000

Author: antoine
Date: Sat Jul  4 12:28:09 2015
New Revision: 391303
URL: https://svnweb.freebsd.org/changeset/ports/391303

Log:
  Fix build with texinfo 6.0
  
  Reported by:	pkg-fallout

Modified:
  head/math/R/files/patch-configure

Modified: head/math/R/files/patch-configure
==============================================================================
--- head/math/R/files/patch-configure	Sat Jul  4 10:19:38 2015	(r391302)
+++ head/math/R/files/patch-configure	Sat Jul  4 12:28:09 2015	(r391303)
@@ -1,12 +1,22 @@
-#extra linker flags for threaded tk
---- configure.orig	2009-06-03 19:08:21.000000000 -0400
-+++ configure	2009-06-03 19:48:48.000000000 -0400
-@@ -43400,7 +43400,7 @@
+# Recognize makeinfo from texinfo 6.0
+# Extra linker flags for threaded tk
+--- configure.orig	2013-09-17 22:06:13 UTC
++++ configure
+@@ -5181,7 +5181,7 @@ if ${r_cv_prog_makeinfo_v4+:} false; the
+   $as_echo_n "(cached) " >&6
+ else
+   makeinfo_version=`${MAKEINFO} --version | \
+-  grep "^makeinfo" | sed 's/[^)]*) \(.*\)/\1/'`
++  grep -E "^(makeinfo|texi2any)" | sed 's/[^)]*) \(.*\)/\1/'`
+ makeinfo_version_maj=`echo ${makeinfo_version} | cut -f1 -d.`
+ makeinfo_version_min=`echo ${makeinfo_version} | \
+   cut -f2 -d. | tr -dc '0123456789.' `
+@@ -32742,7 +32742,7 @@ fi
      ## Part 2.  Try finding the tk library.
      if test -n "${TK_CONFIG}"; then
        . ${TK_CONFIG}
 -      TCLTK_LIBS="${TCLTK_LIBS} ${TK_LIB_SPEC} ${TK_XLIBSW}"
 +      TCLTK_LIBS="${TCLTK_LIBS} ${TK_LIB_SPEC} ${TK_XLIBSW} ${TCL_LD_FLAGS}"
      else
- 
- { echo "$as_me:$LINENO: checking for Tk_Init in -ltk" >&5
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Tk_Init in -ltk" >&5
+ $as_echo_n "checking for Tk_Init in -ltk... " >&6; }