cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

maintenance update to 4.2.1; successfully tested in a bulk build

Browse Source
This commit is contained in:
naddy 2016-06-25 19:47:11 +00:00
parent 771e43701f
commit d242d88d1d
8 changed files with 23 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
devel/gmake/Makefile
View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.55 2016/04/05 19:16:20 naddy Exp $
# $OpenBSD: Makefile,v 1.56 2016/06/25 19:47:11 naddy Exp $
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

4
devel/gmake/distinfo
View File

@ -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

10
devel/gmake/patches/patch-Makefile_in
View File

@ -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
$OpenBSD: patch-Makefile_in,v 1.4 2016/06/25 19:47:11 naddy Exp $
--- 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@ \

8
devel/gmake/patches/patch-doc_make_texi
View File

@ -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.''
$OpenBSD: patch-doc_make_texi,v 1.5 2016/06/25 19:47:11 naddy Exp $
--- 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

31
devel/gmake/patches/patch-main_c
View File

@ -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. */

8
devel/gmake/patches/patch-make_1
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-make_1,v 1.2 2013/10/30 23:08:56 brad Exp $
$OpenBSD: patch-make_1,v 1.3 2016/06/25 19:47:11 naddy Exp $
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

20
devel/gmake/patches/patch-makeint_h
View File

@ -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

12
devel/gmake/patches/patch-tests_scripts_features_archives
View File

@ -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!
$OpenBSD: patch-tests_scripts_features_archives,v 1.2 2016/06/25 19:47:11 naddy Exp $
--- 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') {