From ace54de85cedaa3933bd59a81c71d6d883ad4812 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Fri, 22 Oct 2010 11:19:16 +0200
Subject: [PATCH] make: add two patches from archlinux, bumprev.

---
 srcpkgs/make/patches/bug30612.patch      | 66 ++++++++++++++++++++++++
 srcpkgs/make/patches/bug30612.patch.args |  1 +
 srcpkgs/make/patches/bug30723.patch      | 12 +++++
 srcpkgs/make/patches/bug30723.patch.args |  1 +
 srcpkgs/make/template                    |  1 +
 5 files changed, 81 insertions(+)
 create mode 100644 srcpkgs/make/patches/bug30612.patch
 create mode 100644 srcpkgs/make/patches/bug30612.patch.args
 create mode 100644 srcpkgs/make/patches/bug30723.patch
 create mode 100644 srcpkgs/make/patches/bug30723.patch.args

diff --git a/srcpkgs/make/patches/bug30612.patch b/srcpkgs/make/patches/bug30612.patch
new file mode 100644
index 00000000000..fb843bcd974
--- /dev/null
+++ b/srcpkgs/make/patches/bug30612.patch
@@ -0,0 +1,66 @@
+diff -Naur make-3.82-orig/main.c make-3.82-fix30612//main.c
+--- make-3.82-orig/main.c	2010-07-19 17:10:53.000000000 +1000
++++ make-3.82-fix30612//main.c	2010-09-23 23:33:37.908855839 +1000
+@@ -1,3 +1,4 @@
++
+ /* Argument parsing and main program of GNU Make.
+ Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
+ 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+@@ -1138,7 +1139,7 @@
+      a macro and some compilers (MSVC) don't like conditionals in macros.  */
+   {
+     const char *features = "target-specific order-only second-expansion"
+-                           " else-if shortest-stem undefine"
++                           " else-if shortest-stem undefine oneshell"
+ #ifndef NO_ARCHIVES
+                            " archives"
+ #endif
+diff -Naur make-3.82-orig/read.c make-3.82-fix30612//read.c
+--- make-3.82-orig/read.c	2010-07-13 11:20:42.000000000 +1000
++++ make-3.82-fix30612//read.c	2010-09-23 23:30:58.018855839 +1000
+@@ -3028,7 +3028,7 @@
+             {
+               /* This looks like the first element in an open archive group.
+                  A valid group MUST have ')' as the last character.  */
+-              const char *e = p + nlen;
++              const char *e = p;
+               do
+                 {
+                   e = next_token (e);
+@@ -3084,19 +3084,19 @@
+          Go to the next item in the string.  */
+       if (flags & PARSEFS_NOGLOB)
+         {
+-          NEWELT (concat (2, prefix, tp));
++          NEWELT (concat (2, prefix, tmpbuf));
+           continue;
+         }
+ 
+       /* If we get here we know we're doing glob expansion.
+          TP is a string in tmpbuf.  NLEN is no longer used.
+          We may need to do more work: after this NAME will be set.  */
+-      name = tp;
++      name = tmpbuf;
+ 
+       /* Expand tilde if applicable.  */
+-      if (tp[0] == '~')
++      if (tmpbuf[0] == '~')
+ 	{
+-	  tildep = tilde_expand (tp);
++	  tildep = tilde_expand (tmpbuf);
+ 	  if (tildep != 0)
+             name = tildep;
+ 	}
+@@ -3152,7 +3152,11 @@
+             else
+               {
+                 /* We got a chain of items.  Attach them.  */
+-                (*newp)->next = found;
++                if (*newp)
++                  (*newp)->next = found;
++                else
++                  *newp = found;
++
+ 
+                 /* Find and set the new end.  Massage names if necessary.  */
+                 while (1)
diff --git a/srcpkgs/make/patches/bug30612.patch.args b/srcpkgs/make/patches/bug30612.patch.args
new file mode 100644
index 00000000000..2eba1cb3c5c
--- /dev/null
+++ b/srcpkgs/make/patches/bug30612.patch.args
@@ -0,0 +1 @@
+-Np1
diff --git a/srcpkgs/make/patches/bug30723.patch b/srcpkgs/make/patches/bug30723.patch
new file mode 100644
index 00000000000..84e7ebe7a5f
--- /dev/null
+++ b/srcpkgs/make/patches/bug30723.patch
@@ -0,0 +1,12 @@
+diff -Naur make-3.82-orig/main.c make-3.82-fix30723//main.c
+--- make-3.82-orig/main.c	2010-07-19 17:10:53.000000000 +1000
++++ make-3.82-fix30723//main.c	2010-09-23 23:34:10.932188592 +1000
+@@ -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))
diff --git a/srcpkgs/make/patches/bug30723.patch.args b/srcpkgs/make/patches/bug30723.patch.args
new file mode 100644
index 00000000000..2eba1cb3c5c
--- /dev/null
+++ b/srcpkgs/make/patches/bug30723.patch.args
@@ -0,0 +1 @@
+-Np1
diff --git a/srcpkgs/make/template b/srcpkgs/make/template
index c3429c16c16..0008b20c5c5 100644
--- a/srcpkgs/make/template
+++ b/srcpkgs/make/template
@@ -1,6 +1,7 @@
 # Template build file for 'make'
 pkgname=make
 version=3.82
+revision=1
 distfiles="http://ftp.gnu.org/pub/gnu/make/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 short_desc="The GNU make system"