[Gsrc-commit] trunk r6855: make 4.3

[Carl Hansen]

------------------------------------------------------------
revno: 6855
revision-id: address@hidden-20200120031822-orwto8oa9ck98vxg
parent: address@hidden-20200118204632-d03sp1a25qof9kf8
committer: address@hidden
branch nick: trunk
timestamp: Sun 2020-01-19 19:18:22 -0800
message:
  make 4.3
removed:
  pkg/gnu/make/files/            files-20190506205733-qmbsn44k3mmuqaid-1
  pkg/gnu/make/files/make4.21.patch 
make4.21.patch-20190506205733-qmbsn44k3mmuqaid-2
  pkg/gnualpha/make/             make-20191029190234-jmo96imq3031d2yw-1
  pkg/gnualpha/make/Makefile     makefile-20191029190234-jmo96imq3031d2yw-4
  pkg/gnualpha/make/config.mk    config.mk-20191029190234-jmo96imq3031d2yw-2
  pkg/gnualpha/make/gpg-keyring  gpgkeyring-20191029190234-jmo96imq3031d2yw-3
  pkg/gnualpha/make/sha256sums   sha256sums-20191029190234-jmo96imq3031d2yw-5
modified:
  pkg/gnu/make/Makefile          makefile-20160617014725-uokjfnggs70iry9h-1315
  pkg/gnu/make/sha256sums        sha256sums-20160617014725-uokjfnggs70iry9h-1320
  pkg/other/wildmidi/Makefile    makefile-20170325002156-32apgsccpux6q0zk-3

=== modified file 'pkg/gnu/make/Makefile'
--- a/pkg/gnu/make/Makefile     2019-05-06 20:58:42 +0000
+++ b/pkg/gnu/make/Makefile     2020-01-20 03:18:22 +0000
@@ -1,4 +1,5 @@
 # Copyright © 2013, 2014, 2016 Brandon Invergo <address@hidden>
+# Copyright © 2020 Carl Hansen <address@hidden>
 #
 # This file is part of GSRC, the GNU Source Release Collection.
 # http://www.gnu.org/software/gsrc
@@ -21,7 +22,7 @@
 
 NAME = Make
 GARNAME = make
-GARVERSION = 4.2.1
+GARVERSION = 4.3
 HOME_URL = http://www.gnu.org/software/make/
 DESCRIPTION = Remake files automatically
 define BLURB
@@ -38,13 +39,13 @@
 
 # patch file for alloca bug
 # now build correctly. 2019
-PATCHFILES = make4.21.patch
-PATCHOPTS = -p1
+#PATCHFILES = make4.21.patch
+#PATCHOPTS = -p1
 
 MASTER_SITES = $(MASTER_GNU)
 MASTER_SUBDIR = $(GARNAME)/
-DISTFILES = $(DISTNAME).tar.bz2
-SIGFILES = $(DISTNAME).tar.bz2.sig
+DISTFILES = $(DISTNAME).tar.lz
+SIGFILES = $(DISTNAME).tar.lz.sig
 
 BUILDDEPS =
 LIBDEPS =
@@ -55,10 +56,10 @@
 include ../../../gar/gar.lib/info.mk
 include config.mk
 
-post-patch: 
-       touch $(WORKSRC)/aclocal.m4
-       touch $(WORKSRC)/Makefile.in
-       touch $(WORKSRC)/configure
+#post-patch: 
+#      touch $(WORKSRC)/aclocal.m4
+#      touch $(WORKSRC)/Makefile.in
+#      touch $(WORKSRC)/configure
 
 
 

=== removed directory 'pkg/gnu/make/files'
=== removed file 'pkg/gnu/make/files/make4.21.patch'
--- a/pkg/gnu/make/files/make4.21.patch 2019-05-06 20:58:42 +0000
+++ b/pkg/gnu/make/files/make4.21.patch 1970-01-01 00:00:00 +0000
@@ -1,123 +0,0 @@
-Apply this patch to the results of unpacking a make 4.2.1 tarball,
-then run the following commands:
-
-    touch aclocal.m4
-    touch Makefile.in
-    touch configure
-
-Now you should be able to reconfigure and rebuild.
-
-
-
---- a/configure.ac     2016-06-06 08:27:31.000000000 -0400
-+++ b/configure.ac     2019-05-04 14:24:17.102496612 -0400
-@@ -399,10 +399,9 @@
- #include <glob.h>
- #include <fnmatch.h>
- 
--#define GLOB_INTERFACE_VERSION 1
- #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1
- # include <gnu-versions.h>
--# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION
-+# if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2
-    gnu glob
- # endif
- #endif],
---- a/dir.c    2016-05-31 03:17:26.000000000 -0400
-+++ b/dir.c    2019-05-04 14:24:11.134431911 -0400
-@@ -407,6 +407,7 @@
-     const char *name;           /* Name of the file.  */
-     size_t length;
-     short impossible;           /* This file is impossible.  */
-+    unsigned char type;
-   };
- 
- static unsigned long
-@@ -731,6 +732,9 @@
- #else
-           df->name = strcache_add_len (d->d_name, len);
- #endif
-+#ifdef _DIRENT_HAVE_D_TYPE
-+          df->type = d->d_type;
-+#endif
-           df->length = len;
-           df->impossible = 0;
-           hash_insert_at (&dir->dirfiles, df, dirfile_slot);
-@@ -1242,7 +1246,7 @@
-           d->d_namlen = len - 1;
- #endif
- #ifdef _DIRENT_HAVE_D_TYPE
--          d->d_type = DT_UNKNOWN;
-+          d->d_type = df->type;
- #endif
-           memcpy (d->d_name, df->name, len);
-           return d;
-@@ -1299,15 +1303,40 @@
- }
- #endif
- 
-+/* Similarly for lstat.  */
-+#if !defined(lstat) && !defined(WINDOWS32) || defined(VMS)
-+# ifndef VMS
-+#  ifndef HAVE_SYS_STAT_H
-+int lstat (const char *path, struct stat *sbuf);
-+#  endif
-+# else
-+    /* We are done with the fake lstat.  Go back to the real lstat */
-+#   ifdef lstat
-+#     undef lstat
-+#   endif
-+# endif
-+# define local_lstat lstat
-+#elif defined(WINDOWS32)
-+/* Windows doesn't support lstat().  */
-+# define local_lstat local_stat
-+#else
-+static int
-+local_lstat (const char *path, struct stat *buf)
-+{
-+  int e;
-+  EINTRLOOP (e, lstat (path, buf));
-+  return e;
-+}
-+#endif
-+
- void
- dir_setup_glob (glob_t *gl)
- {
-   gl->gl_opendir = open_dirstream;
-   gl->gl_readdir = read_dirstream;
-   gl->gl_closedir = free;
-+  gl->gl_lstat = local_lstat;
-   gl->gl_stat = local_stat;
--  /* We don't bother setting gl_lstat, since glob never calls it.
--     The slot is only there for compatibility with 4.4 BSD.  */
- }
- 
- void
---- a/tests/run_make_tests.pl
-+++ b/tests/run_make_tests.pl
-@@ -58,6 +58,9 @@ if ($^O eq 'VMS')
-   *CORE::GLOBAL::rmdir = \&vms_rmdir;
- }
- 
-+use FindBin;
-+use lib "$FindBin::Bin";
-+
- require "test_driver.pl";
- require "config-flags.pm";
- 
---- a/configure        2016-06-10 19:03:21.000000000 -0400
-+++ b/configure        2019-05-04 14:33:03.212667798 -0400
-@@ -11481,10 +11481,9 @@
- #include <glob.h>
- #include <fnmatch.h>
- 
--#define GLOB_INTERFACE_VERSION 1
- #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1
- # include <gnu-versions.h>
--# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION
-+# if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2
-    gnu glob
- # endif
- #endif

=== modified file 'pkg/gnu/make/sha256sums'
--- a/pkg/gnu/make/sha256sums   2019-05-06 20:58:42 +0000
+++ b/pkg/gnu/make/sha256sums   2020-01-20 03:18:22 +0000
@@ -1,3 +1,2 @@
-d6e262bf3601b42d2b1e4ef8310029e1dcf20083c5446b4b7aa67081fdffc589  
download/make-4.2.1.tar.bz2
-c3edd087313f377a96c69b42384a236f4fac9392a2dd818423d96f992955bfbf  
download/make4.21.patch
-477291e48cffea35e8048956b2fcde35a8169017b65b710f4f58fa776cff270a  
download/make-4.2.1.tar.bz2.sig
+de1a441c4edf952521db30bfca80baae86a0ff1acd0a00402999344f04c45e82  
download/make-4.3.tar.lz
+183f259bc2da1745eb086d17863f61303b100b07e1d8026601904f029bcd717d  
download/make-4.3.tar.lz.sig

=== removed directory 'pkg/gnualpha/make'
=== removed file 'pkg/gnualpha/make/Makefile'
--- a/pkg/gnualpha/make/Makefile        2020-01-04 05:09:15 +0000
+++ b/pkg/gnualpha/make/Makefile        1970-01-01 00:00:00 +0000
@@ -1,47 +0,0 @@
-# Copyright ©2019,2020 Carl Hansen <address@hidden>
-#
-# This file is part of GSRC, the GNU Source Release Collection.
-# http://www.gnu.org/software/gsrc
-#
-# GSRC is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# GSRC is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
-# License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GSRC.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Send bug reports and comments about GSRC problems to address@hidden
-#
-#
-
-NAME = make
-GARNAME = make
-GARVERSION = 4.2.93
-HOME_URL = http://www.gnu.org/software/make/
-DESCRIPTION =  make util, coming version
-define BLURB
-endef
-
-######################################################################
-
-MASTER_SITES = $(MASTER_GNU_ALPHA)
-MASTER_SUBDIR = $(GARNAME)/
-DISTFILES = $(DISTNAME).tar.lz
-SIGFILES  = $(DISTNAME).tar.lz.sig
-
-BUILDDEPS = 
-LIBDEPS = 
-
-######################################################################
-
-include ../../../gar/gar.lib/auto.mk
-include ../../../gar/gar.lib/info.mk
-include config.mk
-
-

=== removed file 'pkg/gnualpha/make/config.mk'
--- a/pkg/gnualpha/make/config.mk       2019-10-29 19:16:06 +0000
+++ b/pkg/gnualpha/make/config.mk       1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-## Configuration options
-
-CONFIGURE_OPTS ?= 
-BUILD_OPTS ?=

=== removed file 'pkg/gnualpha/make/gpg-keyring'
Binary files a/pkg/gnualpha/make/gpg-keyring    2019-10-29 19:16:06 +0000 and 
b/pkg/gnualpha/make/gpg-keyring   1970-01-01 00:00:00 +0000 differ
=== removed file 'pkg/gnualpha/make/sha256sums'
--- a/pkg/gnualpha/make/sha256sums      2020-01-04 05:09:15 +0000
+++ b/pkg/gnualpha/make/sha256sums      1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-4860f116524cd2b3cd87c688867cf3fb1fd663512ece9142e774f8c374b7ce63  
download/make-4.2.93.tar.lz
-d1727d85720e9562dc60ad95465b015f1e6629b703b18e99607ba500ed42956c  
download/make-4.2.93.tar.lz.sig

=== modified file 'pkg/other/wildmidi/Makefile'
--- a/pkg/other/wildmidi/Makefile       2017-03-25 00:22:30 +0000
+++ b/pkg/other/wildmidi/Makefile       2020-01-20 03:18:22 +0000
@@ -1,6 +1,7 @@
 # Copyright © 2016, 2017 Carl Hansen <address@hidden>
 #
-# This file is part of GSRC.
+# This file is part of GSRC, the GNU Source Release Collection.
+# http://www.gnu.org/software/gsrc
 #
 # BioSRC is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -14,6 +15,9 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with GSRC.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+# Send bug reports and comments about GSRC problems to address@hidden
 
 NAME = WildMIDI
 GARNAME = wildmidi
@@ -24,7 +28,7 @@
 WildMIDI is a simple software midi player which has a core softsynth 
 library that can be used with other applications.
 endef
-LICENSE = Version: 0.4.1 Licenses: GPLv3+ and LGPLv3
+LICENSE = GPLv3+ and LGPLv3
 
 ######################################################################