diff options
author | ade <ade@FreeBSD.org> | 2011-04-12 03:54:35 +0800 |
---|---|---|
committer | ade <ade@FreeBSD.org> | 2011-04-12 03:54:35 +0800 |
commit | efd0dd922d2e5cd332f1aee5fdf6810814e7f400 (patch) | |
tree | e271fb9ea44573beae8c29a58a911ee2aa3b3448 /devel/gmake/files | |
parent | 97b1c095bb1886b4b943dd0175183d8d02a3fbb7 (diff) | |
download | freebsd-ports-gnome-efd0dd922d2e5cd332f1aee5fdf6810814e7f400.tar.gz freebsd-ports-gnome-efd0dd922d2e5cd332f1aee5fdf6810814e7f400.tar.zst freebsd-ports-gnome-efd0dd922d2e5cd332f1aee5fdf6810814e7f400.zip |
Update to GNU make 3.82 after numerous -exp runs.
Diffstat (limited to 'devel/gmake/files')
-rw-r--r-- | devel/gmake/files/patch-ab | 15 | ||||
-rw-r--r-- | devel/gmake/files/patch-make.h | 12 | ||||
-rw-r--r-- | devel/gmake/files/patch-read.c | 52 |
3 files changed, 56 insertions, 23 deletions
diff --git a/devel/gmake/files/patch-ab b/devel/gmake/files/patch-ab index 4d7d9551e18b..f4bcc7661b0c 100644 --- a/devel/gmake/files/patch-ab +++ b/devel/gmake/files/patch-ab @@ -1,14 +1,7 @@ ---- doc/make.texi.orig Mon Oct 7 22:57:59 2002 -+++ doc/make.texi Mon Oct 7 22:58:03 2002 -@@ -25,9 +25,9 @@ - @c Combine the program and concept indices: - @syncodeindex pg cp - --@dircategory GNU Packages -+@dircategory Programming & development tools +--- doc/make.texi.orig 2010-07-19 02:10:54.000000000 -0500 ++++ doc/make.texi 2011-03-02 17:01:58.000000000 -0600 +@@ -54,3 +54,3 @@ @direntry -* Make: (make). Remake files automatically. -+* GNU make: (make). Remake files automatically. ++* GNU Make: (make). Remake files automatically. @end direntry - - @ifinfo diff --git a/devel/gmake/files/patch-make.h b/devel/gmake/files/patch-make.h deleted file mode 100644 index 28a63d2eb076..000000000000 --- a/devel/gmake/files/patch-make.h +++ /dev/null @@ -1,12 +0,0 @@ ---- make.h.orig Wed Sep 11 18:55:44 2002 -+++ make.h Mon Oct 21 22:05:11 2002 -@@ -33,7 +33,7 @@ - # ifdef _AIX - #pragma alloca - # else --# ifndef alloca /* predefined by HP cc +Olibcalls */ -+# if !defined (alloca) && !defined (__FreeBSD__) /* predefined by HP cc +Olibcalls, part of stdlib.h on FreeBSD */ - char *alloca (); - # endif - # endif - diff --git a/devel/gmake/files/patch-read.c b/devel/gmake/files/patch-read.c new file mode 100644 index 000000000000..4ca91c48663c --- /dev/null +++ b/devel/gmake/files/patch-read.c @@ -0,0 +1,52 @@ +Add a fix for bug #30612 (http://savannah.gnu.org/bugs/index.php?30612) +from GNU make's CVS repository (revision 1.194). + +Taken from pkgsrc repository: devel/gmake/patches/patch-ah + +--- read.c.orig 2010-07-13 01:20:42.000000000 +0000 ++++ read.c +@@ -3028,7 +3028,7 @@ parse_file_seq (char **stringp, unsigned + { + /* 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 @@ parse_file_seq (char **stringp, unsigned + 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,10 @@ parse_file_seq (char **stringp, unsigned + 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) |