From owner-svn-ports-all@FreeBSD.ORG  Wed Jan 29 18:21:18 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@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 A6576907;
 Wed, 29 Jan 2014 18:21: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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 92F5716DD;
 Wed, 29 Jan 2014 18:21:18 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0TILIvv081413;
 Wed, 29 Jan 2014 18:21:18 GMT (envelope-from ade@svn.freebsd.org)
Received: (from ade@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0TILIqh081412;
 Wed, 29 Jan 2014 18:21:18 GMT (envelope-from ade@svn.freebsd.org)
Message-Id: <201401291821.s0TILIqh081412@svn.freebsd.org>
From: Ade Lovett <ade@FreeBSD.org>
Date: Wed, 29 Jan 2014 18:21:18 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r341768 - head/devel/gmake/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.17
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: Wed, 29 Jan 2014 18:21:18 -0000

Author: ade
Date: Wed Jan 29 18:21:18 2014
New Revision: 341768
URL: http://svnweb.freebsd.org/changeset/ports/341768
QAT: https://qat.redports.org/buildarchive/r341768/

Log:
  Address a reasonably obscure issue with automatic restarting and
  MAKEFLAGS.  No PORTREVISION bump in this case since the confusion
  and mass hysteria is simply not worth it.
  
  PR:		185636
  Submitted by:	Julien Charbon <jcharbon@verisign.com>

Added:
  head/devel/gmake/files/patch-main.c   (contents, props changed)

Added: head/devel/gmake/files/patch-main.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/gmake/files/patch-main.c	Wed Jan 29 18:21:18 2014	(r341768)
@@ -0,0 +1,17 @@
+When gmake automatically restart itself because one of its includes is updated,
+the "MAKEFLAGS" environment variable is no more honoured.
+
+http://savannah.gnu.org/bugs/?30723
+
+diff -rU3 -N make-3.82.orig/main.c make-3.82/main.c
+--- main.c.orig	2010-07-19 07:10:53.000000000 +0000
++++ main.c	2014-01-10 10:55:32.000000000 +0000
+@@ -2093,7 +2093,7 @@
+             const char *pv = define_makeflags (1, 1);
+             char *p = alloca (sizeof ("MAKEFLAGS=") + strlen (pv) + 1);
+             sprintf (p, "MAKEFLAGS=%s", pv);
+-            putenv (p);
++            putenv (allocated_variable_expand (p));
+           }
+ 
+ 	  if (ISDB (DB_BASIC))