Update autogen to 5.18.4.

Switch to guile2, because autogen is used by anjuta. And some components in
the GNOME stack use guile2 already.

5 files changed, 81 insertions, 83 deletions

diff --git a/devel/autogen/Makefile b/devel/autogen/Makefile
index 197dbe9c078d..ce9d965a5b35 100644
--- a/devel/autogen/Makefile
+++ b/devel/autogen/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	autogen
-PORTVERSION=	5.12
-PORTREVISION=	4
+PORTVERSION=	5.18.4
 CATEGORIES=	devel
 MASTER_SITES=	GNU
 MASTER_SITE_SUBDIR=	${PORTNAME}/rel${PORTVERSION}
@@ -13,12 +12,14 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The Automated Program Generator
 
 BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
-LIB_DEPENDS=	libguile.so:${PORTSDIR}/lang/guile
+LIB_DEPENDS=	libguile-2.0.so:${PORTSDIR}/lang/guile2
 
-USES=		gmake libtool pathfix shebangfix tar:bzip2
+USES=		gmake libtool pathfix perl5 pkgconfig shebangfix tar:xz
+USE_PERL5=	build
 USE_GNOME=	libxml2
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-libguile=yes --with-libxml2=yes --datadir=${PREFIX}/share
+CONFIGURE_ARGS=	--with-libguile=yes --with-libxml2=yes \
+		--datadir=${PREFIX}/share
 USE_LDCONFIG=	yes
 SHEBANG_FILES=	autoopts/tpl/*.pl
 
diff --git a/devel/autogen/distinfo b/devel/autogen/distinfo
index 495afcf853ea..81b06c19faa3 100644
--- a/devel/autogen/distinfo
+++ b/devel/autogen/distinfo
@@ -1,2 +1,2 @@
-SHA256 (autogen-5.12.tar.bz2) = 40a1bfb7deabda0104e6043ac30921c920ebab635490f56116862aed8d49ee41
-SIZE (autogen-5.12.tar.bz2) = 1059162
+SHA256 (autogen-5.18.4.tar.xz) = 7fbaff0c25035aee5b96913de2c83d9a5cc973b8dc08d6b7489ecbcfd72eb84b
+SIZE (autogen-5.18.4.tar.xz) = 1017936
diff --git a/devel/autogen/files/patch-autoopts-Makefile.in b/devel/autogen/files/patch-autoopts-Makefile.in
deleted file mode 100644
index 8dba9e4b9a30..000000000000
--- a/devel/autogen/files/patch-autoopts-Makefile.in
+++ /dev/null
@@ -1,48 +0,0 @@
---- autoopts/Makefile.in.orig	2011-09-28 18:24:36.000000000 +0800
-+++ autoopts/Makefile.in	2011-09-28 18:27:15.000000000 +0800
-@@ -377,7 +377,7 @@
- 
- SRC = $(HDRS) $(CSRC) $(GENSRC)
- DEF_FILES = genshell.def $(srcdir)/funcs.def
--pkgconfigdir = $(prefix)/libdata/pkgconfig
-+pkgconfigdir = $(prefix)/libdata
- CLEANFILES = tmp-* libopts.c
- DISTCLEANFILES = $(GENMAN) $(GENTEXI) *-stamp
- MAINTAINERCLEANFILES = $(GENHDRS) $(GENSRC) $(GENSCRIPTS)
-@@ -650,27 +650,27 @@
- 	cd "$(DESTDIR)$(m4datadir)" && rm -f $$files
- install-nobase_dataDATA: $(nobase_data_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(datadir)" || $(MKDIR_P) "$(DESTDIR)$(datadir)"
--	@list='$(nobase_data_DATA)'; test -n "$(datadir)" || list=; \
-+	test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
-+	@list='$(nobase_data_DATA)'; test -n "$(pkgconfigdir)" || list=; \
- 	$(am__nobase_list) | while read dir files; do \
- 	  xfiles=; for file in $$files; do \
- 	    if test -f "$$file"; then xfiles="$$xfiles $$file"; \
- 	    else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
- 	  test -z "$$xfiles" || { \
- 	    test "x$$dir" = x. || { \
--	      echo "$(MKDIR_P) '$(DESTDIR)$(datadir)/$$dir'"; \
--	      $(MKDIR_P) "$(DESTDIR)$(datadir)/$$dir"; }; \
--	    echo " $(INSTALL_DATA) $$xfiles '$(DESTDIR)$(datadir)/$$dir'"; \
--	    $(INSTALL_DATA) $$xfiles "$(DESTDIR)$(datadir)/$$dir" || exit $$?; }; \
-+	      echo "$(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)/$$dir'"; \
-+	      $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)/$$dir"; }; \
-+	    echo " $(INSTALL_DATA) $$xfiles '$(DESTDIR)$(pkgconfigdir)/$$dir'"; \
-+	    $(INSTALL_DATA) $$xfiles "$(DESTDIR)$(pkgconfigdir)/$$dir" || exit $$?; }; \
- 	done
- 
- uninstall-nobase_dataDATA:
- 	@$(NORMAL_UNINSTALL)
--	@list='$(nobase_data_DATA)'; test -n "$(datadir)" || list=; \
-+	@list='$(nobase_data_DATA)'; test -n "$(pkgconfigdir)" || list=; \
- 	$(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \
- 	test -n "$$files" || exit 0; \
--	echo " ( cd '$(DESTDIR)$(datadir)' && rm -f" $$files ")"; \
--	cd "$(DESTDIR)$(datadir)" && rm -f $$files
-+	echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \
-+	cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files
- install-nodist_pkgdataDATA: $(nodist_pkgdata_DATA)
- 	@$(NORMAL_INSTALL)
- 	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
diff --git a/devel/autogen/files/patch-autoopts_Makefile.in b/devel/autogen/files/patch-autoopts_Makefile.in
new file mode 100644
index 000000000000..2a8e91c30320
--- /dev/null
+++ b/devel/autogen/files/patch-autoopts_Makefile.in
@@ -0,0 +1,31 @@
+--- autoopts/Makefile.in.orig	2015-01-17 12:42:01.387596573 +0100
++++ autoopts/Makefile.in	2015-01-17 12:45:19.424582917 +0100
+@@ -792,10 +792,10 @@
+ 	dir='$(DESTDIR)$(m4datadir)'; $(am__uninstall_files_from_dir)
+ install-nobase_dataDATA: $(nobase_data_DATA)
+ 	@$(NORMAL_INSTALL)
+-	@list='$(nobase_data_DATA)'; test -n "$(datadir)" || list=; \
++	@list='$(nobase_data_DATA)'; test -n "$(prefix)/libdata" || list=; \
+ 	if test -n "$$list"; then \
+-	  echo " $(MKDIR_P) '$(DESTDIR)$(datadir)'"; \
+-	  $(MKDIR_P) "$(DESTDIR)$(datadir)" || exit 1; \
++	  echo " $(MKDIR_P) '$(DESTDIR)$(prefix)/libdata'"; \
++	  $(MKDIR_P) "$(DESTDIR)$(prefix)/libdata" || exit 1; \
+ 	fi; \
+ 	$(am__nobase_list) | while read dir files; do \
+ 	  xfiles=; for file in $$files; do \
+@@ -803,10 +803,10 @@
+ 	    else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
+ 	  test -z "$$xfiles" || { \
+ 	    test "x$$dir" = x. || { \
+-	      echo " $(MKDIR_P) '$(DESTDIR)$(datadir)/$$dir'"; \
+-	      $(MKDIR_P) "$(DESTDIR)$(datadir)/$$dir"; }; \
+-	    echo " $(INSTALL_DATA) $$xfiles '$(DESTDIR)$(datadir)/$$dir'"; \
+-	    $(INSTALL_DATA) $$xfiles "$(DESTDIR)$(datadir)/$$dir" || exit $$?; }; \
++	      echo " $(MKDIR_P) '$(DESTDIR)$(prefix)/libdata/$$dir'"; \
++	      $(MKDIR_P) "$(DESTDIR)$(prefix)/libdata/$$dir"; }; \
++	    echo " $(INSTALL_DATA) $$xfiles '$(DESTDIR)$(prefix)/libdata/$$dir'"; \
++	    $(INSTALL_DATA) $$xfiles "$(DESTDIR)$(prefix)/libdata/$$dir" || exit $$?; }; \
+ 	done
+ 
+ uninstall-nobase_dataDATA:
diff --git a/devel/autogen/pkg-plist b/devel/autogen/pkg-plist
index 090d3a7816bc..545c5f1e7ea7 100644
--- a/devel/autogen/pkg-plist
+++ b/devel/autogen/pkg-plist
@@ -8,23 +8,57 @@ include/autoopts/usage-txt.h
 lib/libopts.a
 lib/libopts.so
 lib/libopts.so.25
-lib/libopts.so.25.10.0
+lib/libopts.so.25.16.0
 libdata/pkgconfig/autoopts.pc
+man/man1/autogen.1.gz
+man/man1/autoopts-config.1.gz
+man/man1/columns.1.gz
+man/man1/getdefs.1.gz
+man/man1/xml2ag.1.gz
+man/man3/ao_string_tokenize.3.gz
+man/man3/configFileLoad.3.gz
+man/man3/optionFileLoad.3.gz
+man/man3/optionFindNextValue.3.gz
+man/man3/optionFindValue.3.gz
+man/man3/optionFree.3.gz
+man/man3/optionGetValue.3.gz
+man/man3/optionLoadLine.3.gz
+man/man3/optionMemberList.3.gz
+man/man3/optionNextValue.3.gz
+man/man3/optionOnlyUsage.3.gz
+man/man3/optionPrintVersion.3.gz
+man/man3/optionPrintVersionAndReturn.3.gz
+man/man3/optionProcess.3.gz
+man/man3/optionRestore.3.gz
+man/man3/optionSaveFile.3.gz
+man/man3/optionSaveState.3.gz
+man/man3/optionUnloadNested.3.gz
+man/man3/optionVersion.3.gz
+man/man3/strequate.3.gz
+man/man3/streqvcmp.3.gz
+man/man3/streqvmap.3.gz
+man/man3/strneqvcmp.3.gz
+man/man3/strtransform.3.gz
 share/aclocal/autoopts.m4
+%%DATADIR%%/Mdoc.pm
 %%DATADIR%%/aginfo.tpl
 %%DATADIR%%/aginfo3.tpl
 %%DATADIR%%/agman-cmd.tpl
+%%DATADIR%%/agman-file.tpl
 %%DATADIR%%/agman.tlib
 %%DATADIR%%/agman1.tpl
 %%DATADIR%%/agman3.tpl
 %%DATADIR%%/agmdoc-cmd.tpl
+%%DATADIR%%/agmdoc-file.tpl
 %%DATADIR%%/agpl.lic
 %%DATADIR%%/agtexi-cmd.tpl
+%%DATADIR%%/agtexi-file.tpl
 %%DATADIR%%/autoopts.m4
 %%DATADIR%%/bits.tpl
 %%DATADIR%%/cmd-doc.tlib
 %%DATADIR%%/confmacs.tlib
 %%DATADIR%%/conftest.tpl
+%%DATADIR%%/def2pot.tpl
 %%DATADIR%%/fsm-macro.tlib
 %%DATADIR%%/fsm-trans.tlib
 %%DATADIR%%/fsm.tpl
@@ -32,7 +66,8 @@ share/aclocal/autoopts.m4
 %%DATADIR%%/gpl.lic
 %%DATADIR%%/gplv2.lic
 %%DATADIR%%/lgpl.lic
-%%DATADIR%%/libopts-35.0.10.tar.gz
+%%DATADIR%%/lgplv2.lic
+%%DATADIR%%/libopts-41.0.16.tar.gz
 %%DATADIR%%/liboptschk.m4
 %%DATADIR%%/man2man
 %%DATADIR%%/man2mdoc
@@ -46,36 +81,15 @@ share/aclocal/autoopts.m4
 %%DATADIR%%/options.tpl
 %%DATADIR%%/optlib.tlib
 %%DATADIR%%/optmain.tlib
+%%DATADIR%%/perlopt.tpl
 %%DATADIR%%/rc-sample.tpl
 %%DATADIR%%/stdoptions.def
+%%DATADIR%%/str2enum.tpl
+%%DATADIR%%/str2init.tlib
+%%DATADIR%%/str2mask.tpl
+%%DATADIR%%/strings.tpl
 %%DATADIR%%/texi2man
 %%DATADIR%%/texi2mdoc
 %%DATADIR%%/texi2texi
 %%DATADIR%%/tpl-config.tlib
 %%DATADIR%%/usage.tlib
-man/man1/autogen.1.gz
-man/man1/autoopts-config.1.gz
-man/man1/columns.1.gz
-man/man1/getdefs.1.gz
-man/man1/xml2ag.1.gz
-man/man3/ao_string_tokenize.3.gz
-man/man3/configFileLoad.3.gz
-man/man3/optionFileLoad.3.gz
-man/man3/optionFindNextValue.3.gz
-man/man3/optionFindValue.3.gz
-man/man3/optionFree.3.gz
-man/man3/optionGetValue.3.gz
-man/man3/optionLoadLine.3.gz
-man/man3/optionNextValue.3.gz
-man/man3/optionOnlyUsage.3.gz
-man/man3/optionProcess.3.gz
-man/man3/optionRestore.3.gz
-man/man3/optionSaveFile.3.gz
-man/man3/optionSaveState.3.gz
-man/man3/optionUnloadNested.3.gz
-man/man3/optionVersion.3.gz
-man/man3/strequate.3.gz
-man/man3/streqvcmp.3.gz
-man/man3/streqvmap.3.gz
-man/man3/strneqvcmp.3.gz
-man/man3/strtransform.3.gz