Update GNU make to 4.2.1.
I'll put this into a bulk build.
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/gmake/Makefile,v
retrieving revision 1.55
diff -u -p -r1.55 Makefile
--- Makefile 5 Apr 2016 19:16:20 -0000 1.55
+++ Makefile 24 Jun 2016 19:52:15 -0000
@@ -2,9 +2,8 @@
COMMENT= GNU make
-DISTNAME= make-4.1
+DISTNAME= make-4.2.1
PKGNAME= g${DISTNAME}
-REVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU:=make/}
EXTRACT_SUFX= .tar.bz2
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/gmake/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo 26 Nov 2014 20:01:23 -0000 1.8
+++ distinfo 24 Jun 2016 19:52:15 -0000
@@ -1,2 +1,2 @@
-SHA256 (make-4.1.tar.bz2) = C8dhM4llDuaiRVS1JXKicvc1YWT9LEEysLzxMSPk/KU=
-SIZE (make-4.1.tar.bz2) = 1327342
+SHA256 (make-4.2.1.tar.bz2) = 1uJivzYBtC0rHk74MQAp4dzyAIPFRGtLeqZwgf3/xYk=
+SIZE (make-4.2.1.tar.bz2) = 1407126
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/devel/gmake/patches/patch-Makefile_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-Makefile_in
--- patches/patch-Makefile_in 26 Nov 2014 20:01:23 -0000 1.3
+++ patches/patch-Makefile_in 24 Jun 2016 19:52:15 -0000
@@ -1,9 +1,9 @@
$OpenBSD: patch-Makefile_in,v 1.3 2014/11/26 20:01:23 naddy Exp $
---- Makefile.in.orig Sun Oct 5 18:25:22 2014
-+++ Makefile.in Tue Nov 25 02:42:23 2014
-@@ -462,7 +462,7 @@ EXTRA_make_SOURCES = vmsjobs.c remote-stub.c remote-cs
+--- Makefile.in.orig Sat Jun 11 01:03:22 2016
++++ Makefile.in Fri Jun 24 18:19:09 2016
+@@ -481,7 +481,7 @@ EXTRA_make_SOURCES = vmsjobs.c remote-stub.c remote-cs
noinst_HEADERS = commands.h dep.h filedef.h job.h makeint.h rule.h variable.h
\
- debug.h getopt.h gettext.h hash.h output.h
+ debug.h getopt.h gettext.h hash.h output.h os.h
-make_LDADD = @LIBOBJS@ @ALLOCA@ $(GLOBLIB) @GETLOADAVG_LIBS@ @LIBINTL@ \
+make_LDADD = @LIBOBJS@ @ALLOCA@ $(GLOBLIB) @GETLOADAVG_LIBS@ @LTLIBINTL@ \
Index: patches/patch-doc_make_texi
===================================================================
RCS file: /cvs/ports/devel/gmake/patches/patch-doc_make_texi,v
retrieving revision 1.4
diff -u -p -r1.4 patch-doc_make_texi
--- patches/patch-doc_make_texi 30 Oct 2013 23:08:56 -0000 1.4
+++ patches/patch-doc_make_texi 24 Jun 2016 19:52:15 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-doc_make_texi,v 1.4 2013/10/30 23:08:56 brad Exp $
---- doc/make.texi.orig Wed Oct 9 00:22:40 2013
-+++ doc/make.texi Wed Oct 9 18:11:41 2013
-@@ -51,7 +51,7 @@ developing GNU and promoting software freedom.''
+--- doc/make.texi.orig Sat May 21 23:34:49 2016
++++ doc/make.texi Fri Jun 24 18:19:09 2016
+@@ -52,7 +52,7 @@ developing GNU and promoting software freedom.''
@dircategory Software development
@direntry
Index: patches/patch-main_c
===================================================================
RCS file: patches/patch-main_c
diff -N patches/patch-main_c
--- patches/patch-main_c 2 Dec 2014 23:20:20 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,31 +0,0 @@
-$OpenBSD: patch-main_c,v 1.3 2014/12/02 23:20:20 naddy Exp $
-
-Handle NULL returns from ttyname().
-http://git.savannah.gnu.org/cgit/make.git/commit/?id=292da6f6867b75a5af7ddbb639a1feae022f438f
-
---- main.c.orig Sun Oct 5 18:24:51 2014
-+++ main.c Wed Dec 3 00:12:50 2014
-@@ -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. */
Index: patches/patch-make_1
===================================================================
RCS file: /cvs/ports/devel/gmake/patches/patch-make_1,v
retrieving revision 1.2
diff -u -p -r1.2 patch-make_1
--- patches/patch-make_1 30 Oct 2013 23:08:56 -0000 1.2
+++ patches/patch-make_1 24 Jun 2016 19:52:15 -0000
@@ -3,10 +3,10 @@ $OpenBSD: patch-make_1,v 1.2 2013/10/30
Since we install GNU make as gmake replace make with gmake in the
manpage where it makes sense.
---- make.1.orig Sat Oct 5 19:12:18 2013
-+++ make.1 Wed Oct 9 19:13:17 2013
+--- make.1.orig Sun Feb 28 18:51:00 2016
++++ make.1 Fri Jun 24 18:19:09 2016
@@ -1,13 +1,13 @@
--.TH MAKE 1 "03 March 2012" "GNU" "User Commands"
+-.TH MAKE 1 "28 February 2016" "GNU" "User Commands"
+.TH GMAKE 1 "03 March 2012" "GNU" "User Commands"
.SH NAME
-make \- GNU make utility to maintain groups of programs
Index: patches/patch-makeint_h
===================================================================
RCS file: patches/patch-makeint_h
diff -N patches/patch-makeint_h
--- patches/patch-makeint_h 2 Dec 2014 23:20:20 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-$OpenBSD: patch-makeint_h,v 1.1 2014/12/02 23:20:20 naddy Exp $
-
-Handle NULL returns from ttyname().
-http://git.savannah.gnu.org/cgit/make.git/commit/?id=292da6f6867b75a5af7ddbb639a1feae022f438f
-
---- makeint.h.orig Sun Oct 5 18:24:51 2014
-+++ makeint.h Wed Dec 3 00:12:50 2014
-@@ -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
-
-
Index: patches/patch-tests_scripts_features_archives
===================================================================
RCS file: /cvs/ports/devel/gmake/patches/patch-tests_scripts_features_archives,v
retrieving revision 1.1
diff -u -p -r1.1 patch-tests_scripts_features_archives
--- patches/patch-tests_scripts_features_archives 26 Nov 2014 20:01:23
-0000 1.1
+++ patches/patch-tests_scripts_features_archives 24 Jun 2016 19:52:15
-0000
@@ -1,12 +1,12 @@
$OpenBSD: patch-tests_scripts_features_archives,v 1.1 2014/11/26 20:01:23
naddy Exp $
---- tests/scripts/features/archives.orig Sun Oct 5 18:24:51 2014
-+++ tests/scripts/features/archives Tue Nov 25 18:40:08 2014
-@@ -83,7 +83,7 @@ run_make_test(q!
+--- tests/scripts/features/archives.orig Mon Feb 29 07:31:16 2016
++++ tests/scripts/features/archives Fri Jun 24 18:19:09 2016
+@@ -183,7 +183,7 @@ $mk_string = q!
DIR = artest
vpath % $(DIR)
default: lib(foo)
-(%): %.vhd ; @cd $(DIR) && touch $(*F) && $(AR) $(ARFLAGS) $@ $(*F)
>/dev/null 2>&1 && rm $(*F)
+(%): %.vhd ; @cd $(DIR) && echo foo >$(*F) && $(AR) $(ARFLAGS) $@ $(*F)
>/dev/null 2>&1 && rm $(*F)
.PHONY: default
- !,
- '', "");
+ !;
+ if ($port_type eq 'VMS-DCL') {
--
Christian "naddy" Weisgerber [email protected]
