pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Update devel/autoconf to 2.70
details: https://anonhg.NetBSD.org/pkgsrc/rev/d8b9210ea350
branches: trunk
changeset: 444083:d8b9210ea350
user: js <js%pkgsrc.org@localhost>
date: Sat Jan 02 20:38:56 2021 +0000
description:
Update devel/autoconf to 2.70
2.70 deprecates a lot of stuff, so expect more warnings, but generally things
seem to work fine, so updating to 2.70 shouldn't break much.
Also update mk/gnu-config/*, as per the comment in devel/autoconf/Makefile.
mk/gnu-config/missing is not actually part of autoconf, but of automake, which
I did not update - however, the file was quite out of date, so I took the
liberty to update that one with the latest automake.
The change log is too long to include in this commit, given how many years
there were between 2.69 and 2.70. Check the file ChangeLog after `make
extract`.
diffstat:
devel/autoconf/Makefile | 5 +-
devel/autoconf/PLIST | 9 +-
devel/autoconf/distinfo | 11 +-
devel/autoconf/patches/patch-aa | 16 -
mk/gnu-config/missing | 397 ++++++++++++++-------------------------
5 files changed, 154 insertions(+), 284 deletions(-)
diffs (truncated from 553 to 300 lines):
diff -r 90389ad52b2a -r d8b9210ea350 devel/autoconf/Makefile
--- a/devel/autoconf/Makefile Sat Jan 02 20:30:43 2021 +0000
+++ b/devel/autoconf/Makefile Sat Jan 02 20:38:56 2021 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.97 2020/08/31 18:07:16 wiz Exp $
+# $NetBSD: Makefile,v 1.98 2021/01/02 20:38:56 js Exp $
#
# When updating this package, please update mk/gnu-config/config.guess,
# mk/gnu-config/config.sub, and mk/gnu-config/missing as well.
-DISTNAME= autoconf-2.69
-PKGREVISION= 10
+DISTNAME= autoconf-2.70
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU:=autoconf/}
diff -r 90389ad52b2a -r d8b9210ea350 devel/autoconf/PLIST
--- a/devel/autoconf/PLIST Sat Jan 02 20:30:43 2021 +0000
+++ b/devel/autoconf/PLIST Sat Jan 02 20:38:56 2021 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2012/04/26 20:40:51 wiz Exp $
+@comment $NetBSD: PLIST,v 1.16 2021/01/02 20:38:56 js Exp $
bin/autoconf
bin/autoheader
bin/autom4te
@@ -14,12 +14,11 @@
man/man1/autoreconf.1
man/man1/autoscan.1
man/man1/autoupdate.1
-man/man1/config.guess.1
-man/man1/config.sub.1
man/man1/ifnames.1
share/autoconf/Autom4te/C4che.pm
share/autoconf/Autom4te/ChannelDefs.pm
share/autoconf/Autom4te/Channels.pm
+share/autoconf/Autom4te/Config.pm
share/autoconf/Autom4te/Configure_ac.pm
share/autoconf/Autom4te/FileUtils.pm
share/autoconf/Autom4te/General.pm
@@ -46,6 +45,7 @@
share/autoconf/autoconf/programs.m4
share/autoconf/autoconf/specific.m4
share/autoconf/autoconf/status.m4
+share/autoconf/autoconf/trailer.m4
share/autoconf/autoconf/types.m4
share/autoconf/autom4te.cfg
share/autoconf/autoscan/autoscan.list
@@ -53,6 +53,9 @@
share/autoconf/autotest/autotest.m4f
share/autoconf/autotest/general.m4
share/autoconf/autotest/specific.m4
+share/autoconf/build-aux/config.guess
+share/autoconf/build-aux/config.sub
+share/autoconf/build-aux/install-sh
share/autoconf/m4sugar/foreach.m4
share/autoconf/m4sugar/m4sh.m4
share/autoconf/m4sugar/m4sh.m4f
diff -r 90389ad52b2a -r d8b9210ea350 devel/autoconf/distinfo
--- a/devel/autoconf/distinfo Sat Jan 02 20:30:43 2021 +0000
+++ b/devel/autoconf/distinfo Sat Jan 02 20:38:56 2021 +0000
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.29 2015/11/03 03:27:15 agc Exp $
+$NetBSD: distinfo,v 1.30 2021/01/02 20:38:56 js Exp $
-SHA1 (autoconf-2.69.tar.gz) = 562471cbcb0dd0fa42a76665acf0dbb68479b78a
-RMD160 (autoconf-2.69.tar.gz) = 7b7d711535827826f32f5847095233e1e9925a29
-SHA512 (autoconf-2.69.tar.gz) = e34c7818bcde14d2cb13cdd293ed17d70740d4d1fd7c67a07b415491ef85d42f450d4fe5f8f80cc330bf75c40a62774c51a4336e06e8da07a4cbc49922d975ee
-Size (autoconf-2.69.tar.gz) = 1927468 bytes
-SHA1 (patch-aa) = 481aec3f9d8c4b523ff27db50fccf6d219f36ffe
+SHA1 (autoconf-2.70.tar.gz) = 890559932abf6181677eff03674fd7ad157dbc8f
+RMD160 (autoconf-2.70.tar.gz) = c2fa2477310d3290f3a4f4b90acb34b21c23601d
+SHA512 (autoconf-2.70.tar.gz) = 39bc9340d4c5fcf3d6c3842ac04ed90bf06216092023208fc29cf9fd491d43cd127873982eeb2a37cec8606b0b1ea4f7ab1b76350b334195f2120b064c620cc8
+Size (autoconf-2.70.tar.gz) = 2079248 bytes
SHA1 (patch-lib_autoconf_fortran.m4) = 4ac5fd71faf537b9839734a17da8d9890522252e
diff -r 90389ad52b2a -r d8b9210ea350 devel/autoconf/patches/patch-aa
--- a/devel/autoconf/patches/patch-aa Sat Jan 02 20:30:43 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.11 2010/07/29 15:49:36 joerg Exp $
-
-Do not fall through to the implicit prototype as it conflicts with
-stdlib.h.
-
---- lib/autoconf/functions.m4.orig 2010-07-29 15:21:52.000000000 +0000
-+++ lib/autoconf/functions.m4
-@@ -369,6 +369,8 @@ AC_CACHE_CHECK([for alloca], ac_cv_func_
- # ifdef _MSC_VER
- # include <malloc.h>
- # define alloca _alloca
-+# elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
-+# include <stdlib.h>
- # else
- # ifdef HAVE_ALLOCA_H
- # include <alloca.h>
diff -r 90389ad52b2a -r d8b9210ea350 mk/gnu-config/missing
--- a/mk/gnu-config/missing Sat Jan 02 20:30:43 2021 +0000
+++ b/mk/gnu-config/missing Sat Jan 02 20:38:56 2021 +0000
@@ -1,10 +1,10 @@
#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
+# Common wrapper for a few potentially missing GNU programs.
-scriptversion=2012-01-06.18; # UTC
+scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1996-2012 Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard%iro.umontreal.ca@localhost>, 1996.
+# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Originally written by Fran,cois Pinard <pinard%iro.umontreal.ca@localhost>, 1996.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -29,61 +29,33 @@
exit 1
fi
-run=:
-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
-
-# In the cases where this matters, 'missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
- configure_ac=configure.ac
-else
- configure_ac=configure.in
-fi
-
-msg="missing on your system"
+case $1 in
-case $1 in
---run)
- # Try to run requested program, and just exit if it succeeds.
- run=
- shift
- "$@" && exit 0
- # Exit code 63 means version mismatch. This often happens
- # when the user try to use an ancient version of a tool on
- # a file that requires a minimum version. In this case we
- # we should proceed has if the program had been absent, or
- # if --run hadn't been passed.
- if test $? = 63; then
- run=:
- msg="probably too old"
- fi
- ;;
+ --is-lightweight)
+ # Used by our autoconf macros to check whether the available missing
+ # script is modern enough.
+ exit 0
+ ;;
+
+ --run)
+ # Back-compat with the calling convention used by older automake.
+ shift
+ ;;
-h|--h|--he|--hel|--help)
echo "\
$0 [OPTION]... PROGRAM [ARGUMENT]...
-Handle 'PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
+Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
+to PROGRAM being missing or too old.
Options:
-h, --help display this help and exit
-v, --version output version information and exit
- --run try to run the given command, and emulate it if it fails
Supported PROGRAM values:
- aclocal touch file 'aclocal.m4'
- autoconf touch file 'configure'
- autoheader touch file 'config.h.in'
- autom4te touch the output file, or create a stub one
- automake touch all 'Makefile.in' files
- bison create 'y.tab.[ch]', if possible, from existing .[ch]
- flex create 'lex.yy.c', if possible, from existing .c
- help2man touch the output file
- lex create 'lex.yy.c', if possible, from existing .c
- makeinfo touch the output file
- yacc create 'y.tab.[ch]', if possible, from existing .[ch]
+ aclocal autoconf autoheader autom4te automake makeinfo
+ bison yacc flex lex help2man
Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
'g' are ignored when checking the name.
@@ -98,233 +70,146 @@
;;
-*)
- echo 1>&2 "$0: Unknown '$1' option"
+ echo 1>&2 "$0: unknown '$1' option"
echo 1>&2 "Try '$0 --help' for more information"
exit 1
;;
esac
-# normalize program name to check for.
-program=`echo "$1" | sed '
- s/^gnu-//; t
- s/^gnu//; t
- s/^g//; t'`
+# Run the given program, remember its exit status.
+"$@"; st=$?
-# Now exit if we have it, but it failed. Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program). This is about non-GNU programs, so use $1 not
-# $program.
-case $1 in
- lex*|yacc*)
- # Not GNU programs, they don't have --version.
- ;;
+# If it succeeded, we are done.
+test $st -eq 0 && exit 0
+
+# Also exit now if we it failed (or wasn't found), and '--version' was
+# passed; such an option is passed most likely to detect whether the
+# program is present and works.
+case $2 in --version|--help) exit $st;; esac
- *)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
- # Could not run --version or --help. This is probably someone
- # running '$TOOL --version' or '$TOOL --help' to check whether
- # $TOOL exists and not knowing $TOOL uses missing.
- exit 1
- fi
- ;;
-esac
+# Exit code 63 means version mismatch. This often happens when the user
+# tries to use an ancient version of a tool on a file that requires a
+# minimum version.
+if test $st -eq 63; then
+ msg="probably too old"
+elif test $st -eq 127; then
+ # Program was missing.
+ msg="missing on your system"
+else
+ # Program was found and executed, but failed. Give up.
+ exit $st
+fi
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case $program in
- aclocal*)
- echo 1>&2 "\
-WARNING: '$1' is $msg. You should only need it if
- you modified 'acinclude.m4' or '${configure_ac}'. You might want
- to install the Automake and Perl packages. Grab them from
- any GNU archive site."
- touch aclocal.m4
- ;;
-
- autoconf*)
- echo 1>&2 "\
-WARNING: '$1' is $msg. You should only need it if
- you modified '${configure_ac}'. You might want to install the
- Autoconf and GNU m4 packages. Grab them from any GNU
- archive site."
- touch configure
- ;;
+perl_URL=https://www.perl.org/
+flex_URL=https://github.com/westes/flex
+gnu_software_URL=https://www.gnu.org/software
- autoheader*)
- echo 1>&2 "\
-WARNING: '$1' is $msg. You should only need it if
- you modified 'acconfig.h' or '${configure_ac}'. You might want
- to install the Autoconf and GNU m4 packages. Grab them
- from any GNU archive site."
- files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
- test -z "$files" && files="config.h"
- touch_files=
- for f in $files; do
- case $f in
- *:*) touch_files="$touch_files "`echo "$f" |
- sed -e 's/^[^:]*://' -e 's/:.*//'`;;
- *) touch_files="$touch_files $f.in";;
- esac
- done
- touch $touch_files
Home |
Main Index |
Thread Index |
Old Index