diff --git a/devel/automake/1.16/Makefile b/devel/automake/1.16/Makefile index 86c3b551f72..32bb2c8f404 100644 --- a/devel/automake/1.16/Makefile +++ b/devel/automake/1.16/Makefile @@ -1,7 +1,7 @@ -# $OpenBSD: Makefile,v 1.2 2020/04/05 09:24:51 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.3 2020/12/17 07:49:55 ajacoutot Exp $ VERSION= 1.16 -DISTNAME= automake-${VERSION}.2 +DISTNAME= automake-${VERSION}.3 PKGSPEC= automake->=${VERSION},<1.17 EXTRACT_SUFX= .tar.xz diff --git a/devel/automake/1.16/distinfo b/devel/automake/1.16/distinfo index fb4f014cbca..bc26cf1509c 100644 --- a/devel/automake/1.16/distinfo +++ b/devel/automake/1.16/distinfo @@ -1,2 +1,2 @@ -SHA256 (automake-1.16.2.tar.xz) = zMRZ3j1xDgZqueEtLxGb0WSgjJNByiS6Ismtqhee7dA= -SIZE (automake-1.16.2.tar.xz) = 1545912 +SHA256 (automake-1.16.3.tar.xz) = /yv3ZWxNHG/do7i+uyHwkVOnNry6FpqvZeqyX6ETvzo= +SIZE (automake-1.16.3.tar.xz) = 1590708 diff --git a/devel/automake/1.16/patches/patch-Makefile_in b/devel/automake/1.16/patches/patch-Makefile_in index c1ffdd227b5..f54550957f3 100644 --- a/devel/automake/1.16/patches/patch-Makefile_in +++ b/devel/automake/1.16/patches/patch-Makefile_in @@ -1,11 +1,11 @@ -$OpenBSD: patch-Makefile_in,v 1.2 2020/04/05 09:24:51 ajacoutot Exp $ +$OpenBSD: patch-Makefile_in,v 1.3 2020/12/17 07:49:55 ajacoutot Exp $ Fix parallel build. Taken from FreeBSD. Index: Makefile.in --- Makefile.in.orig +++ Makefile.in -@@ -3695,9 +3695,9 @@ doc/aclocal.1 doc/automake.1: +@@ -3744,9 +3744,9 @@ doc/aclocal.1 doc/automake.1: && echo ".so man1/$$f-$(APIVERSION).1" > $@ doc/aclocal-$(APIVERSION).1: $(aclocal_script) lib/Automake/Config.pm @@ -14,6 +14,6 @@ Index: Makefile.in doc/automake-$(APIVERSION).1: $(automake_script) lib/Automake/Config.pm - $(update_mans) automake-$(APIVERSION) + $(update_mans) $(automake_script) - - # We depend on configure.ac so that we regenerate the tarball - # whenever the Automake version changes. + .PHONY: checklinkx + checklinkx: + $(checklinkx) $(chlx_args) $(chlx_excludes) $(chlx_file) diff --git a/devel/automake/1.16/patches/patch-bin_automake_in b/devel/automake/1.16/patches/patch-bin_automake_in index eabee25c0af..2aab016b088 100644 --- a/devel/automake/1.16/patches/patch-bin_automake_in +++ b/devel/automake/1.16/patches/patch-bin_automake_in @@ -1,8 +1,9 @@ -$OpenBSD: patch-bin_automake_in,v 1.2 2020/04/05 09:24:51 ajacoutot Exp $ +$OpenBSD: patch-bin_automake_in,v 1.3 2020/12/17 07:49:55 ajacoutot Exp $ + Index: bin/automake.in --- bin/automake.in.orig +++ bin/automake.in -@@ -5240,6 +5240,7 @@ sub scan_autoconf_traces +@@ -5246,6 +5246,7 @@ sub scan_autoconf_traces _LT_AC_TAGCONFIG => 0, m4_include => 1, m4_sinclude => 1, @@ -10,7 +11,7 @@ Index: bin/automake.in sinclude => 1, ); -@@ -5263,6 +5264,7 @@ sub scan_autoconf_traces +@@ -5274,6 +5275,7 @@ sub scan_autoconf_traces my ($here, $depth, @args) = split (/::/); $where = new Automake::Location $here; my $macro = $args[0]; diff --git a/devel/automake/1.16/patches/patch-doc_automake_texi b/devel/automake/1.16/patches/patch-doc_automake_texi index a13b8a5715c..58090c064de 100644 --- a/devel/automake/1.16/patches/patch-doc_automake_texi +++ b/devel/automake/1.16/patches/patch-doc_automake_texi @@ -1,6 +1,8 @@ -$OpenBSD: patch-doc_automake_texi,v 1.1.1.1 2018/09/24 09:45:35 ajacoutot Exp $ ---- doc/automake.texi.orig Wed Dec 31 08:26:32 2014 -+++ doc/automake.texi Tue Jan 6 19:56:40 2015 +$OpenBSD: patch-doc_automake_texi,v 1.2 2020/12/17 07:49:55 ajacoutot Exp $ + +Index: doc/automake.texi +--- doc/automake.texi.orig ++++ doc/automake.texi @@ -1,7 +1,8 @@ \input texinfo @c -*-texinfo-*- @c %**start of header