4 files changed, 86 insertions, 23 deletions
diff --git a/devel/autogen/Makefile b/devel/autogen/Makefile
index b4a55cb3e326..b50e2902e04c 100644
--- a/devel/autogen/Makefile
+++ b/devel/autogen/Makefile
@@ -7,17 +7,16 @@
 #
 
 PORTNAME=	autogen
-PORTVERSION=	5.9.7
-PORTREVISION=	1
+PORTVERSION=	5.12
 CATEGORIES=	devel
-MASTER_SITES=	SF/${PORTNAME}/AutoGen/AutoGen%20${PORTVERSION} \
-		${MASTER_SITE_GNU:S/$/:gnu/}
-
+MASTER_SITES=	GNU
+MASTER_SITE_SUBDIR=	${PORTNAME}/rel${PORTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:DEFAULT,gnu
 
 MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	The Automated Program Generator
 
+BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
 LIB_DEPENDS=	guile.21:${PORTSDIR}/lang/guile
 
 USE_BZIP2=	yes
diff --git a/devel/autogen/distinfo b/devel/autogen/distinfo
index 8225c2f16970..495afcf853ea 100644
--- a/devel/autogen/distinfo
+++ b/devel/autogen/distinfo
@@ -1,2 +1,2 @@
-SHA256 (autogen-5.9.7.tar.bz2) = d9284446b08f7a9cdd0ad359d29b6c2eb6c79cf67865168ccdf7613237bbd41e
-SIZE (autogen-5.9.7.tar.bz2) = 1019339
+SHA256 (autogen-5.12.tar.bz2) = 40a1bfb7deabda0104e6043ac30921c920ebab635490f56116862aed8d49ee41
+SIZE (autogen-5.12.tar.bz2) = 1059162
diff --git a/devel/autogen/files/patch-autoopts-Makefile.in b/devel/autogen/files/patch-autoopts-Makefile.in
new file mode 100644
index 000000000000..8dba9e4b9a30
--- /dev/null
+++ b/devel/autogen/files/patch-autoopts-Makefile.in
@@ -0,0 +1,48 @@
+--- 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/pkg-plist b/devel/autogen/pkg-plist
index 2a540f82483e..8cf126efa902 100644
--- a/devel/autogen/pkg-plist
+++ b/devel/autogen/pkg-plist
@@ -5,37 +5,53 @@ bin/getdefs
 bin/xml2ag
 include/autoopts/options.h
 include/autoopts/usage-txt.h
-lib/libguileopts.a
-lib/libguileopts.la
-lib/libguileopts.so
-lib/libguileopts.so.0
 lib/libopts.a
 lib/libopts.la
 lib/libopts.so
-lib/libopts.so.32
+lib/libopts.so.35
 libdata/pkgconfig/autoopts.pc
 share/aclocal/autoopts.m4
-share/aclocal/liboptschk.m4
 %%DATADIR%%/aginfo.tpl
 %%DATADIR%%/aginfo3.tpl
-%%DATADIR%%/agman-lib.tpl
+%%DATADIR%%/agman-cmd.tpl
+%%DATADIR%%/agman.tlib
 %%DATADIR%%/agman1.tpl
 %%DATADIR%%/agman3.tpl
+%%DATADIR%%/agmdoc-cmd.tpl
+%%DATADIR%%/agpl.lic
+%%DATADIR%%/agtexi-cmd.tpl
 %%DATADIR%%/autoopts.m4
-%%DATADIR%%/confmacs.tpl
+%%DATADIR%%/bits.tpl
+%%DATADIR%%/cmd-doc.tlib
+%%DATADIR%%/confmacs.tlib
 %%DATADIR%%/conftest.tpl
-%%DATADIR%%/fsm-macro.tpl
-%%DATADIR%%/fsm-trans.tpl
+%%DATADIR%%/fsm-macro.tlib
+%%DATADIR%%/fsm-trans.tlib
 %%DATADIR%%/fsm.tpl
 %%DATADIR%%/getopt.tpl
-%%DATADIR%%/libopts-32.0.7.tar.gz
-%%DATADIR%%/optcode.tpl
-%%DATADIR%%/opthead.tpl
+%%DATADIR%%/gpl.lic
+%%DATADIR%%/gplv2.lic
+%%DATADIR%%/lgpl.lic
+%%DATADIR%%/libopts-35.0.10.tar.gz
+%%DATADIR%%/liboptschk.m4
+%%DATADIR%%/man2man
+%%DATADIR%%/man2mdoc
+%%DATADIR%%/man2texi
+%%DATADIR%%/mbsd.lic
+%%DATADIR%%/mdoc2man
+%%DATADIR%%/mdoc2mdoc
+%%DATADIR%%/mdoc2texi
+%%DATADIR%%/optcode.tlib
+%%DATADIR%%/opthead.tlib
 %%DATADIR%%/options.tpl
-%%DATADIR%%/optlib.tpl
-%%DATADIR%%/optmain.tpl
+%%DATADIR%%/optlib.tlib
+%%DATADIR%%/optmain.tlib
 %%DATADIR%%/rc-sample.tpl
 %%DATADIR%%/stdoptions.def
-%%DATADIR%%/usage.tpl
+%%DATADIR%%/texi2man
+%%DATADIR%%/texi2mdoc
+%%DATADIR%%/texi2texi
+%%DATADIR%%/tpl-config.tlib
+%%DATADIR%%/usage.tlib
 @dirrm %%DATADIR%%
 @dirrm include/autoopts