autogen: update to 5.18.16

There's no entry in the NEWS file apart from mentioning that
autotools have been refreshed and that it works with guile 2.2.x
which is coincidentally the reason for updating this package.
lang/guile20 just kept segfaulting during install for me.

8 files changed, 82 insertions, 28 deletions

diff --git a/devel/autogen/Makefile b/devel/autogen/Makefile
index 458dfbdd7dd..eddd29cfad0 100644
--- a/devel/autogen/Makefile
+++ b/devel/autogen/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.48 2020/06/02 08:23:34 adam Exp $
+# $NetBSD: Makefile,v 1.49 2020/08/17 08:43:07 tnn Exp $
 
-DISTNAME=	autogen-5.18.10
-PKGREVISION=	6
+DISTNAME=	autogen-5.18.16
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=autogen/rel${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=	.tar.xz
@@ -21,7 +20,11 @@ CONFIG_SHELL=	${TOOLS_PATH.bash}
 CONFIGURE_ENV+=	POSIX_SHELL=${CONFIG_SHELL:Q}
 MAKE_ENV+=	PERL5=${PERL5}
 
+# XXX
+CONFIGURE_ARGS+=	--disable-dependency-tracking
+BUILDLINK_TRANSFORM+=	rm:-Werror
+
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../lang/guile20/buildlink3.mk"
+.include "../../lang/guile22/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/autogen/PLIST b/devel/autogen/PLIST
index b0b3e44934f..01a3cbf318f 100644
--- a/devel/autogen/PLIST
+++ b/devel/autogen/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2016/07/16 20:00:14 wiz Exp $
+@comment $NetBSD: PLIST,v 1.16 2020/08/17 08:43:07 tnn Exp $
 bin/autogen
 bin/autoopts-config
 bin/columns
@@ -56,8 +56,6 @@ share/autogen/agtexi-file.tpl
 share/autogen/autoopts.m4
 share/autogen/bits.tpl
 share/autogen/cmd-doc.tlib
-share/autogen/confmacs.tlib
-share/autogen/conftest.tpl
 share/autogen/def2pot.tpl
 share/autogen/fsm-macro.tlib
 share/autogen/fsm-trans.tlib
@@ -67,7 +65,7 @@ share/autogen/gpl.lic
 share/autogen/gplv2.lic
 share/autogen/lgpl.lic
 share/autogen/lgplv2.lic
-share/autogen/libopts-41.1.16.tar.gz
+share/autogen/libopts-42.1.17.tar.gz
 share/autogen/liboptschk.m4
 share/autogen/man2mdoc
 share/autogen/man2texi
diff --git a/devel/autogen/distinfo b/devel/autogen/distinfo
index 3c6f416f92d..7f275fb880f 100644
--- a/devel/autogen/distinfo
+++ b/devel/autogen/distinfo
@@ -1,10 +1,13 @@
-$NetBSD: distinfo,v 1.15 2016/07/16 20:00:14 wiz Exp $
+$NetBSD: distinfo,v 1.16 2020/08/17 08:43:07 tnn Exp $
 
-SHA1 (autogen-5.18.10.tar.xz) = ca867cd8a065f40cc390230db463a62bd0e2da4b
-RMD160 (autogen-5.18.10.tar.xz) = ffd55c154b1cb88e7b29d1a65976dfc1032efed2
-SHA512 (autogen-5.18.10.tar.xz) = cfb06566aebe2aa833f2a032c513aa1d57a803eee82f03d6f6fe3806a0f570d5dbf8331015d2afde89a3d4e4c967b6a367d3e2820addb3ff6a5ac6d481a058be
-Size (autogen-5.18.10.tar.xz) = 1017960 bytes
-SHA1 (patch-ad) = 37ed9a3fc8c450f9a556258988c5642836a0c936
+SHA1 (autogen-5.18.16.tar.xz) = f854764cb34f6f0b9f620c2d149d09b845c2d1e2
+RMD160 (autogen-5.18.16.tar.xz) = 789d4932f1704508cedf3bee6718778cfb587175
+SHA512 (autogen-5.18.16.tar.xz) = 5f12c982dbe27873f5649a96049bf019ff183c90cc0c8a9196556b0ca02e72940cd422f6d6601f68cc7d8763b1124f2765c3b1a6335fc92ba07f84b03d2a53a1
+Size (autogen-5.18.16.tar.xz) = 1046276 bytes
 SHA1 (patch-ae) = 7249600bfc3cdcafdf55a100db775e9d1a9403f0
+SHA1 (patch-agen5_Makefile.in) = 154fe94b21d5189fa94cffbf5e2543cf90a97cc2
 SHA1 (patch-agen5_fmemopen.c) = 1cc126824f6a07fb9be080f8d143a6f2353bea78
 SHA1 (patch-autoopts_mk-tpl-config.sh) = 9c5b1012efeed5db73a4cade08d6a53f410adae2
+SHA1 (patch-columns_Makefile.in) = a1da38b3a0a24ac300a4a7baea968642e449efd2
+SHA1 (patch-config_config.rpath) = 791aa6bbe52c681b5461205c2341ce015d638ecf
+SHA1 (patch-getdefs_Makefile.in) = c16060d8d69d7c04c9a35ed94af705a39060f8ba
diff --git a/devel/autogen/patches/patch-ad b/devel/autogen/patches/patch-ad
deleted file mode 100644
index 1313177a49a..00000000000
--- a/devel/autogen/patches/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2016/07/16 20:00:14 wiz Exp $
-
-Allow passing in POSIX_SHELL from environment to avoid paths to tools/ dir.
-
---- configure.orig	2011-05-06 14:06:58.000000000 +0000
-+++ configure
-@@ -13518,6 +13518,7 @@ $as_echo "$ac_cv_path_SED" >&6; }
- 
-   while :
-   do
-+      test -x "$POSIX_SHELL" && break
-       POSIX_SHELL=`which bash`
-       test -x "$POSIX_SHELL" && break
-       POSIX_SHELL=`which dash`
diff --git a/devel/autogen/patches/patch-agen5_Makefile.in b/devel/autogen/patches/patch-agen5_Makefile.in
new file mode 100644
index 00000000000..f1a7a00e319
--- /dev/null
+++ b/devel/autogen/patches/patch-agen5_Makefile.in
@@ -0,0 +1,16 @@
+$NetBSD: patch-agen5_Makefile.in,v 1.1 2020/08/17 08:43:07 tnn Exp $
+
+This is completely bogus. These binaries do get installed in ${PREFIX}/bin.
+Building them with -no-install leaks WRKDIR rpath references.
+
+--- agen5/Makefile.in.orig	2018-08-26 17:45:20.000000000 +0000
++++ agen5/Makefile.in
+@@ -482,7 +482,7 @@ SNV_LIB = $(top_builddir)/snprintfv/libs
+ nodist_autogen_SOURCES = ag.c
+ autogen_SOURCES = $(gen_csrc)
+ autogen_LDADD = $(LO_LIB) $(SNV_LIB) $(GUILE_LIBS)
+-autogen_LDFLAGS = $(DYNAMIC_AG) $(AG_STATIC_AUTOGEN) -no-install
++autogen_LDFLAGS = $(DYNAMIC_AG) $(AG_STATIC_AUTOGEN)
+ autogen_CFLAGS = $(GUILE_CFLAGS)
+ stamp_script = $(srcdir)/mk-stamps.sh
+ AM_YFLAGS = -d
diff --git a/devel/autogen/patches/patch-columns_Makefile.in b/devel/autogen/patches/patch-columns_Makefile.in
new file mode 100644
index 00000000000..5b8f976b479
--- /dev/null
+++ b/devel/autogen/patches/patch-columns_Makefile.in
@@ -0,0 +1,16 @@
+$NetBSD: patch-columns_Makefile.in,v 1.1 2020/08/17 08:43:07 tnn Exp $
+
+This is completely bogus. These binaries do get installed in ${PREFIX}/bin.
+Building them with -no-install leaks WRKDIR rpath references.
+
+--- columns/Makefile.in.orig	2018-08-26 17:44:45.000000000 +0000
++++ columns/Makefile.in
+@@ -389,7 +389,7 @@ target_vendor = @target_vendor@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-columns_LDFLAGS = -no-install
++columns_LDFLAGS =
+ csrc = opts.h columns.c opts.c
+ nodist_columns_SOURCES = cols.c
+ LO_LIB = $(top_builddir)/autoopts/libopts.la
diff --git a/devel/autogen/patches/patch-config_config.rpath b/devel/autogen/patches/patch-config_config.rpath
new file mode 100644
index 00000000000..b6ddb5274d8
--- /dev/null
+++ b/devel/autogen/patches/patch-config_config.rpath
@@ -0,0 +1,16 @@
+$NetBSD: patch-config_config.rpath,v 1.1 2020/08/17 08:43:07 tnn Exp $
+
+Don't leak WRKDIR references.
+pkgsrc wrappers don't like space separated linker flags.
+
+--- config/config.rpath.orig	2018-07-28 15:23:15.000000000 +0000
++++ config/config.rpath
+@@ -173,7 +173,7 @@ if test "$with_gnu_ld" = yes; then
+   # here allows them to be overridden if necessary.
+   # Unlike libtool, we use -rpath here, not --rpath, since the documented
+   # option of GNU ld is called -rpath, not --rpath.
+-  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++  hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+   case "$host_os" in
+     aix[3-9]*)
+       # On AIX/PPC, the GNU linker is very broken
diff --git a/devel/autogen/patches/patch-getdefs_Makefile.in b/devel/autogen/patches/patch-getdefs_Makefile.in
new file mode 100644
index 00000000000..67ce100eaa1
--- /dev/null
+++ b/devel/autogen/patches/patch-getdefs_Makefile.in
@@ -0,0 +1,16 @@
+$NetBSD: patch-getdefs_Makefile.in,v 1.1 2020/08/17 08:43:07 tnn Exp $
+
+This is completely bogus. These binaries do get installed in ${PREFIX}/bin.
+Building them with -no-install leaks WRKDIR rpath references.
+
+--- getdefs/Makefile.in.orig	2018-08-26 17:44:45.000000000 +0000
++++ getdefs/Makefile.in
+@@ -434,7 +434,7 @@ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ TARG = getdefs
+-getdefs_LDFLAGS = -no-install
++getdefs_LDFLAGS =
+ gdsrcs = getdefs.h proto.h gdemit.c gdinit.c getdefs.c
+ getdefs_SOURCES = proto.h
+ BUILT_SOURCES = gd.c