Update autogen to 5.18.10.

Switch from guile (1.8) to guile20.

Clean up some pkglint.

New in 5.18.10 - May 2016

* NUL terminate CGI definitions text

New in 5.18.9 April 2016

* When parsing CGI, do not allow spaces to be lost
* In producing usage text, check more rigorously that
  option "values" are really not flag characters.

New in 5.18.8 March 2016

* Ensure testing vars start as unset for testing
* happy new year & de-uglifications

New in 5.18.7 December 2015

* Guile 1.6 support was removed
* bootstrapping was made idempotent
* add --enable-static-autogen config option
* add (max-file-time) scheme function (max source file time)
* Allow MAN_PAGE_DATE to override using the date program in
  man page templates
* Enable byte-for-byte build reproducibility

7 files changed, 58 insertions, 54 deletions

diff --git a/devel/autogen/Makefile b/devel/autogen/Makefile
index 5b3968b3137..d1523756027 100644
--- a/devel/autogen/Makefile
+++ b/devel/autogen/Makefile
@@ -1,27 +1,25 @@
-# $NetBSD: Makefile,v 1.40 2016/07/09 06:38:04 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2016/07/16 20:00:14 wiz Exp $
 
-DISTNAME=	autogen-5.12
-PKGREVISION=	6
+DISTNAME=	autogen-5.18.10
 CATEGORIES=	devel
-#MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=autogen/}
-MASTER_SITES=	ftp://ftp.gnu.org/gnu/autogen/rel5.12/
-EXTRACT_SUFX=	.tar.bz2
+MASTER_SITES=	${MASTER_SITE_GNU:=autogen/rel${PKGVERSION_NOREV}/}
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	kristerw@NetBSD.org
-HOMEPAGE=	http://autogen.sourceforge.net/
+HOMEPAGE=	https://www.gnu.org/software/autogen/
 COMMENT=	The Automated Text and Program Generation Tool
 LICENSE=	gnu-gpl-v3
 
-USE_TOOLS+=		gmake gzip makeinfo perl:run
+USE_TOOLS+=		bash:run gmake gzip makeinfo perl:run pkg-config
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 INFO_FILES=		yes
 
-CONFIGURE_ENV+=	POSIX_SHELL=/bin/sh
-MAKE_ENV+=	PERL5=${PERL5} POSIX_CAT=${CAT}
+# embedded in some installed tools
+CONFIGURE_ENV+=	POSIX_SHELL=${PREFIX}/bin/bash
+CONFIG_SHELL=	${PREFIX}/bin/bash
+MAKE_ENV+=	PERL5=${PERL5}
 
-INSTALLATION_DIRS=	include/autoopts
-
-.include "../../lang/guile/buildlink3.mk"
+.include "../../lang/guile20/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/autogen/PLIST b/devel/autogen/PLIST
index 2c106247f89..b0b3e44934f 100644
--- a/devel/autogen/PLIST
+++ b/devel/autogen/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2011/07/08 11:44:02 drochner Exp $
+@comment $NetBSD: PLIST,v 1.15 2016/07/16 20:00:14 wiz Exp $
 bin/autogen
 bin/autoopts-config
 bin/columns
@@ -7,7 +7,9 @@ bin/xml2ag
 include/autoopts/options.h
 include/autoopts/usage-txt.h
 info/autogen.info
+lib/autogen/tpl-config.tlib
 lib/libopts.la
+lib/pkgconfig/autoopts.pc
 man/man1/autogen.1
 man/man1/autoopts-config.1
 man/man1/columns.1
@@ -21,8 +23,11 @@ man/man3/optionFindValue.3
 man/man3/optionFree.3
 man/man3/optionGetValue.3
 man/man3/optionLoadLine.3
+man/man3/optionMemberList.3
 man/man3/optionNextValue.3
 man/man3/optionOnlyUsage.3
+man/man3/optionPrintVersion.3
+man/man3/optionPrintVersionAndReturn.3
 man/man3/optionProcess.3
 man/man3/optionRestore.3
 man/man3/optionSaveFile.3
@@ -35,20 +40,25 @@ man/man3/streqvmap.3
 man/man3/strneqvcmp.3
 man/man3/strtransform.3
 share/aclocal/autoopts.m4
+share/autogen/Mdoc.pm
 share/autogen/aginfo.tpl
 share/autogen/aginfo3.tpl
 share/autogen/agman-cmd.tpl
+share/autogen/agman-file.tpl
 share/autogen/agman.tlib
 share/autogen/agman1.tpl
 share/autogen/agman3.tpl
 share/autogen/agmdoc-cmd.tpl
+share/autogen/agmdoc-file.tpl
 share/autogen/agpl.lic
 share/autogen/agtexi-cmd.tpl
+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
 share/autogen/fsm.tpl
@@ -56,25 +66,27 @@ share/autogen/getopt.tpl
 share/autogen/gpl.lic
 share/autogen/gplv2.lic
 share/autogen/lgpl.lic
-share/autogen/libopts-35.0.10.tar.gz
+share/autogen/lgplv2.lic
+share/autogen/libopts-41.1.16.tar.gz
 share/autogen/liboptschk.m4
-share/autogen/man2man
 share/autogen/man2mdoc
 share/autogen/man2texi
 share/autogen/mbsd.lic
 share/autogen/mdoc2man
-share/autogen/mdoc2mdoc
 share/autogen/mdoc2texi
 share/autogen/optcode.tlib
 share/autogen/opthead.tlib
 share/autogen/options.tpl
 share/autogen/optlib.tlib
 share/autogen/optmain.tlib
+share/autogen/perlopt.tpl
 share/autogen/rc-sample.tpl
 share/autogen/stdoptions.def
+share/autogen/str2enum.tpl
+share/autogen/str2init.tlib
+share/autogen/str2mask.tpl
+share/autogen/strings.tpl
 share/autogen/texi2man
 share/autogen/texi2mdoc
-share/autogen/texi2texi
 share/autogen/tpl-config.tlib
 share/autogen/usage.tlib
-share/pkgconfig/autoopts.pc
diff --git a/devel/autogen/distinfo b/devel/autogen/distinfo
index 62d758e5730..3c6f416f92d 100644
--- a/devel/autogen/distinfo
+++ b/devel/autogen/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.14 2015/11/03 03:27:15 agc Exp $
+$NetBSD: distinfo,v 1.15 2016/07/16 20:00:14 wiz Exp $
 
-SHA1 (autogen-5.12.tar.bz2) = 3212cf32da9ba2866e1566e78dac3867ee247ac2
-RMD160 (autogen-5.12.tar.bz2) = b00ab61cf0b47fb53039fa680071382c34b51f65
-SHA512 (autogen-5.12.tar.bz2) = 35652dd9da7472ec1da3a2efd165507e75d362d92a293a6f788933e8e203ee91e04c1a51ba2c02a14b32c538e7dfae1c0ddfee16d83dfd7574afc0289cdf9b8c
-Size (autogen-5.12.tar.bz2) = 1059162 bytes
-SHA1 (patch-ab) = 095ad72ef6ac6b1f3677a9898d8788c5ff60f4e0
-SHA1 (patch-ac) = 2a37cc72d2affbb8d99d3d23d0e6782a013cfec4
-SHA1 (patch-ad) = 3bb19c5e15768335bf5ae11be3803b2587298fa3
+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 (patch-ae) = 7249600bfc3cdcafdf55a100db775e9d1a9403f0
-SHA1 (patch-agen5_fmemopen.c) = 849e330a2e4661e2e0097995952ba01fc2972b5d
+SHA1 (patch-agen5_fmemopen.c) = 1cc126824f6a07fb9be080f8d143a6f2353bea78
+SHA1 (patch-autoopts_mk-tpl-config.sh) = 9c5b1012efeed5db73a4cade08d6a53f410adae2
diff --git a/devel/autogen/patches/patch-ac b/devel/autogen/patches/patch-ac
deleted file mode 100644
index e234b7226cb..00000000000
--- a/devel/autogen/patches/patch-ac
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2011/07/08 11:44:02 drochner Exp $
-
-fmt(1) options portability: width=75 should be default
-
---- autoopts/tpl/optcode.tlib.orig	2011-05-03 21:08:02.000000000 +0000
-+++ autoopts/tpl/optcode.tlib
-@@ -171,7 +171,7 @@ ELSE  =][=
-     "#define zLicenseDescrip zCopyright\n"
-     (begin
-      (set! ext-text (string-append (shell (string-append
--           "fmt -w 75 <<_EOF_\n" ext-text "\n_EOF_" )) "\n" ))
-+           "fmt <<_EOF_\n" ext-text "\n_EOF_" )) "\n" ))
- 
-      (sprintf "static char const zLicenseDescrip[%d] =\n%s;\n"
-              (+ (string-length ext-text) 1)
-@@ -448,7 +448,7 @@ s/^@item *$/\
- /[=
- 
- (define patch-text-sed
--  (sprintf "sed %s <<\\_EODetail_ | fmt -w 75\n"
-+  (sprintf "sed %s <<\\_EODetail_ | fmt\n"
-     (raw-shell-str (out-pop #t)) ) )
- 
- (define patch-text (lambda (t-name)
diff --git a/devel/autogen/patches/patch-ad b/devel/autogen/patches/patch-ad
index 36445f17b89..1313177a49a 100644
--- a/devel/autogen/patches/patch-ad
+++ b/devel/autogen/patches/patch-ad
@@ -1,4 +1,6 @@
-$NetBSD: patch-ad,v 1.3 2011/07/08 11:44:02 drochner Exp $
+$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
diff --git a/devel/autogen/patches/patch-agen5_fmemopen.c b/devel/autogen/patches/patch-agen5_fmemopen.c
index 7bc89aa24d2..1940bed4598 100644
--- a/devel/autogen/patches/patch-agen5_fmemopen.c
+++ b/devel/autogen/patches/patch-agen5_fmemopen.c
@@ -1,4 +1,6 @@
-$NetBSD: patch-agen5_fmemopen.c,v 1.1 2012/03/14 22:51:14 wiz Exp $
+$NetBSD: patch-agen5_fmemopen.c,v 1.2 2016/07/16 20:00:14 wiz Exp $
+
+NetBSD portability fix.
 
 --- agen5/fmemopen.c.orig	2011-06-26 14:39:38.000000000 +0000
 +++ agen5/fmemopen.c
diff --git a/devel/autogen/patches/patch-autoopts_mk-tpl-config.sh b/devel/autogen/patches/patch-autoopts_mk-tpl-config.sh
new file mode 100644
index 00000000000..76c9b185ca3
--- /dev/null
+++ b/devel/autogen/patches/patch-autoopts_mk-tpl-config.sh
@@ -0,0 +1,15 @@
+$NetBSD: patch-autoopts_mk-tpl-config.sh,v 1.1 2016/07/16 20:00:14 wiz Exp $
+
+Allow passing in perl path, to avoid reference to tools/ dir.
+
+--- autoopts/mk-tpl-config.sh.orig	2015-08-08 23:12:01.000000000 +0000
++++ autoopts/mk-tpl-config.sh
+@@ -98,7 +98,7 @@ fix_scripts() {
+         st=`sed 1q $f`
+ 
+         case "$st" in
+-        *perl ) echo '#!' `which perl`
++        *perl ) echo '#!' ${PERL5}
+                  sed 1d $f
+                  ;;
+