diff --git a/srcpkgs/make/patches b/srcpkgs/make/patches new file mode 120000 index 00000000000..341e87859ae --- /dev/null +++ b/srcpkgs/make/patches @@ -0,0 +1 @@ +../chroot-make/patches \ No newline at end of file diff --git a/srcpkgs/make/patches/bug30612.patch b/srcpkgs/make/patches/bug30612.patch deleted file mode 100644 index fb843bcd974..00000000000 --- a/srcpkgs/make/patches/bug30612.patch +++ /dev/null @@ -1,66 +0,0 @@ -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 deleted file mode 100644 index 2eba1cb3c5c..00000000000 --- a/srcpkgs/make/patches/bug30612.patch.args +++ /dev/null @@ -1 +0,0 @@ --Np1 diff --git a/srcpkgs/make/patches/bug30723.patch b/srcpkgs/make/patches/bug30723.patch deleted file mode 100644 index 84e7ebe7a5f..00000000000 --- a/srcpkgs/make/patches/bug30723.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index 2eba1cb3c5c..00000000000 --- a/srcpkgs/make/patches/bug30723.patch.args +++ /dev/null @@ -1 +0,0 @@ --Np1 diff --git a/srcpkgs/make/template b/srcpkgs/make/template index ae7f64dbe86..9aa84863a2a 100644 --- a/srcpkgs/make/template +++ b/srcpkgs/make/template @@ -1,14 +1,15 @@ # Template build file for 'make' pkgname=make version=3.82 -revision=2 -distfiles="http://ftp.gnu.org/pub/gnu/make/$pkgname-$version.tar.bz2" +revision=3 build_style=gnu-configure short_desc="The GNU make system" maintainer="Juan RP " +homepage="http://www.gnu.org/software/make" +license="GPL-3" +distfiles="http://ftp.gnu.org/pub/gnu/make/$pkgname-$version.tar.bz2" checksum=e2c1a73f179c40c71e2fe8abf8a8a0688b8499538512984da4a76958d0402966 long_desc=" GNU Make is a program that determines which pieces of a large program need to be recompiled and issues the commands to recompile them, when necessary." -