back out recent gmake 4.2 update due to mozilla products fallout

ok wiz@

4 files changed, 59 insertions, 7 deletions

diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile
index 6dcf446b44c..1e7f251c4b8 100644
--- a/devel/gmake/Makefile
+++ b/devel/gmake/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.96 2016/05/27 08:13:22 khorben Exp $
+# $NetBSD: Makefile,v 1.97 2016/05/31 06:53:13 tnn Exp $
 
-DISTNAME=	make-4.2
+DISTNAME=	make-4.1
 PKGNAME=	g${DISTNAME}
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=make/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/gmake/distinfo b/devel/gmake/distinfo
index 5babd8b7699..af82889a46f 100644
--- a/devel/gmake/distinfo
+++ b/devel/gmake/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.27 2016/05/23 16:50:58 wiz Exp $
+$NetBSD: distinfo,v 1.28 2016/05/31 06:53:13 tnn Exp $
 
-SHA1 (make-4.2.tar.bz2) = d78b84a219b4c16593544f541dff7eb765ce3d74
-RMD160 (make-4.2.tar.bz2) = 606bc7508a2b7313d0dafb18a1992c4d12782dc7
-SHA512 (make-4.2.tar.bz2) = 2e8668a130dadc9885a67d80032bf5554c6456741153f3224a4f0eb17ac268b22f062f9e4d66aedda4d1c926494c0b493fe5e941fb5d28ead6adbdf2f09d9128
-Size (make-4.2.tar.bz2) = 1400539 bytes
+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 (patch-af) = 8ff060ecba9d664044eabd98741253881d8c9bbe
+SHA1 (patch-main.c) = 6674cc95ce702c06b8214963bcb43bde3919be4f
+SHA1 (patch-makeint.h) = edfb71f3b41bf3bc4c66d948e3001b5502add6c3
 SHA1 (patch-pa) = 2c0168db7afec3da98b30392290e5b9464ea7b5e
diff --git a/devel/gmake/patches/patch-main.c b/devel/gmake/patches/patch-main.c
new file mode 100644
index 00000000000..f79ca164d59
--- /dev/null
+++ b/devel/gmake/patches/patch-main.c
@@ -0,0 +1,30 @@
+$NetBSD: patch-main.c,v 1.3 2016/05/31 06:53:13 tnn 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
new file mode 100644
index 00000000000..72d4193376a
--- /dev/null
+++ b/devel/gmake/patches/patch-makeint.h
@@ -0,0 +1,19 @@
+$NetBSD: patch-makeint.h,v 1.3 2016/05/31 06:53:13 tnn Exp $
+
+* [SV 43434] Handle NULL returns from ttyname().
+
+--- makeint.h.orig	2014-10-05 16:24:51.000000000 +0000
++++ makeint.h
+@@ -424,10 +424,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
+ 
+