Update GNU make to 4.2.1.

Version 4.2.1 (10 Jun 2016)

A complete list of bugs fixed in this version is available here:

http://sv.gnu.org/bugs/index.php?group=make&report_id=111&fix_release_id=107&set=custom

This release is a bug-fix release.


Version 4.2 (22 May 2016)

A complete list of bugs fixed in this version is available here:

http://sv.gnu.org/bugs/index.php?group=make&report_id=111&fix_release_id=106&set=custom

* New variable: $(.SHELLSTATUS) is set to the exit status of the last != or
  $(shell ...) function invoked in this instance of make.  This will be "0" if
  successful or not "0" if not successful.  The variable value is unset if no
  != or $(shell ...) function has been invoked.

* The $(file ...) function can now read from a file with $(file <FILE).
  The function is expanded to the contents of the file.  The contents are
  expanded verbatim except that the final newline, if any, is stripped.

* The makefile line numbers shown by GNU make now point directly to the
  specific line in the recipe where the failure or warning occurred.
  Sample changes suggested by Brian Vandenberg <phantall@gmail.com>

* The interface to GNU make's "jobserver" is stable as documented in the
  manual, for tools which may want to access it.

  WARNING: Backward-incompatibility! The internal-only command line option
  --jobserver-fds has been renamed for publishing, to --jobserver-auth.

* The amount of parallelism can be determined by querying MAKEFLAGS, even when
  the job server is enabled (previously MAKEFLAGS would always contain only
  "-j", with no number, when job server was enabled).

4 files changed, 13 insertions, 59 deletions

diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile
index 9cf03141190..7a7f43ae1de 100644
--- a/devel/gmake/Makefile
+++ b/devel/gmake/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.104 2018/04/30 01:47:30 minskim Exp $
+# $NetBSD: Makefile,v 1.105 2018/07/04 09:42:56 bsiegert Exp $
 
-DISTNAME=	make-4.1
+DISTNAME=	make-4.2.1
 PKGNAME=	g${DISTNAME}
-PKGREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=make/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/gmake/distinfo b/devel/gmake/distinfo
index 540de379ceb..625b126a523 100644
--- a/devel/gmake/distinfo
+++ b/devel/gmake/distinfo
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.34 2018/04/30 01:47:30 minskim Exp $
+$NetBSD: distinfo,v 1.35 2018/07/04 09:42:56 bsiegert Exp $
 
-SHA1 (make-4.1.tar.bz2) = 0d701882fd6fd61a9652cb8d866ad7fc7de54d58
-RMD160 (make-4.1.tar.bz2) = 0f322d6c28867ea817f7d02c57e635c8ef556909
-SHA512 (make-4.1.tar.bz2) = 3fcaf06660b7a5019937b81ee69fe54cdfe0a24d66286fc5cc6a34fa996d76dfe6fd5bc49ee59b727ae2b24ddca261ada0fdb5873ba2b38dcc63647ad3cdb193
-Size (make-4.1.tar.bz2) = 1327342 bytes
+SHA1 (make-4.2.1.tar.bz2) = 7d9d11eb36cfb752da1fb11bb3e521d2a3cc8830
+RMD160 (make-4.2.1.tar.bz2) = 7cf74e2fd9764ffeb48f40a49077099874ad8a54
+SHA512 (make-4.2.1.tar.bz2) = 9cf00869a2f938492554f71d8cb288b5b009b3bd0489ef164f2c8f6532fc37db5c7e20af1dea288536e7c9710ee0bc6e1ddcdfc4928a8540e6e43661741825b8
+Size (make-4.2.1.tar.bz2) = 1407126 bytes
 SHA1 (patch-af) = 8ff060ecba9d664044eabd98741253881d8c9bbe
 SHA1 (patch-configure) = e3122c5c1bbe59ec4c233f42feb6d7952a1e1215
 SHA1 (patch-configure.ac) = 7d22c8f5e5d349687885f55120fa2f7c1251e399
 SHA1 (patch-dir.c) = 1616d8e26c0761c8734063806fa581ae8884b4e8
-SHA1 (patch-main.c) = 6674cc95ce702c06b8214963bcb43bde3919be4f
-SHA1 (patch-makeint.h) = d4508002620ca35d2661c1b6f8ae0ed3b4771fb1
+SHA1 (patch-makeint.h) = cb5f0889d84874a16fc10bc6f91e18c2277194cc
 SHA1 (patch-pa) = 2c0168db7afec3da98b30392290e5b9464ea7b5e
diff --git a/devel/gmake/patches/patch-main.c b/devel/gmake/patches/patch-main.c
deleted file mode 100644
index 664886f74ed..00000000000
--- a/devel/gmake/patches/patch-main.c
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-main.c,v 1.6 2016/09/08 22:46:58 joerg Exp $
-
-* [SV 43434] Handle NULL returns from ttyname().
-
---- main.c.orig	2014-10-05 16:24:51.000000000 +0000
-+++ main.c
-@@ -1401,13 +1401,18 @@ main (int argc, char **argv, char **envp
- #ifdef HAVE_ISATTY
-     if (isatty (fileno (stdout)))
-       if (! lookup_variable (STRING_SIZE_TUPLE ("MAKE_TERMOUT")))
--        define_variable_cname ("MAKE_TERMOUT", TTYNAME (fileno (stdout)),
--                               o_default, 0)->export = v_export;
--
-+        {
-+          const char *tty = TTYNAME (fileno (stdout));
-+          define_variable_cname ("MAKE_TERMOUT", tty ? tty : DEFAULT_TTYNAME,
-+                                 o_default, 0)->export = v_export;
-+        }
-     if (isatty (fileno (stderr)))
-       if (! lookup_variable (STRING_SIZE_TUPLE ("MAKE_TERMERR")))
--        define_variable_cname ("MAKE_TERMERR", TTYNAME (fileno (stderr)),
--                               o_default, 0)->export = v_export;
-+        {
-+          const char *tty = TTYNAME (fileno (stderr));
-+          define_variable_cname ("MAKE_TERMERR", tty ? tty : DEFAULT_TTYNAME,
-+                                 o_default, 0)->export = v_export;
-+        }
- #endif
- 
-   /* Reset in case the switches changed our minds.  */
diff --git a/devel/gmake/patches/patch-makeint.h b/devel/gmake/patches/patch-makeint.h
index 821807adbb4..ef2c2ceb218 100644
--- a/devel/gmake/patches/patch-makeint.h
+++ b/devel/gmake/patches/patch-makeint.h
@@ -1,14 +1,13 @@
-$NetBSD: patch-makeint.h,v 1.6 2016/12/17 14:14:06 joerg Exp $
+$NetBSD: patch-makeint.h,v 1.7 2018/07/04 09:42:56 bsiegert Exp $
 
-* [SV 43434] Handle NULL returns from ttyname().
 * Do not override stack limits by default.
   It can dramatically increase the memory use of multi-threaded programs.
 
---- makeint.h.orig	2014-10-05 16:24:51.000000000 +0000
+--- makeint.h.orig	2016-05-21 20:22:32.000000000 +0000
 +++ makeint.h
-@@ -408,9 +408,6 @@ extern int unixy_shell;
- 
- #define STOP_SET(_v,_m) ANY_SET (stopchar_map[(unsigned char)(_v)],(_m))
+@@ -442,9 +442,6 @@ extern int unixy_shell;
+ #define NEXT_TOKEN(s)   while (ISSPACE (*(s))) ++(s)
+ #define END_OF_TOKEN(s) while (! STOP_SET (*(s), MAP_SPACE|MAP_NUL)) ++(s)
  
 -#if defined(HAVE_SYS_RESOURCE_H) && defined(HAVE_GETRLIMIT) && defined(HAVE_SETRLIMIT)
 -# define SET_STACK_SIZE
@@ -16,16 +15,3 @@ $NetBSD: patch-makeint.h,v 1.6 2016/12/17 14:14:06 joerg Exp $
  #ifdef SET_STACK_SIZE
  # include <sys/resource.h>
  extern struct rlimit stack_limit;
-@@ -424,10 +421,11 @@ extern struct rlimit stack_limit;
- /* The number of bytes needed to represent the largest integer as a string.  */
- #define INTSTR_LENGTH         CSTRLEN ("18446744073709551616")
- 
-+#define DEFAULT_TTYNAME "true"
- #ifdef HAVE_TTYNAME
- # define TTYNAME(_f) ttyname (_f)
- #else
--# define TTYNAME(_f) "true"
-+# define TTYNAME(_f) DEFAULT_TTYNAME
- #endif
- 
-