Update to 1.10

3 files changed, 128 insertions, 122 deletions

diff --git a/devel/gnu-automake/Makefile b/devel/gnu-automake/Makefile
index d8acd87..8af0355 100644
--- a/devel/gnu-automake/Makefile
+++ b/devel/gnu-automake/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	automake
-PORTVERSION=	1.9.6
+PORTVERSION=	1.10
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	automake
@@ -29,8 +29,10 @@ NO_MTREE=	yes
 CONFIGURE_ENV=	AUTOCONF=${LOCALBASE}/gnu-autotools/bin/autoconf \
 		AUTOHEADER=${LOCALBASE}/gnu-autotools/bin/autoheader \
 		MAKEINFO="makeinfo --no-split"
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \
-		--infodir=${PREFIX}/info
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ARGS=	--infodir=${PREFIX}/info --mandir=${PREFIX}/man
+
+PLIST_SUB=	VERSION=1.10
 
 post-patch:
 	@(cd ${WRKSRC}/doc && ${RM} -f *.info*)
diff --git a/devel/gnu-automake/distinfo b/devel/gnu-automake/distinfo
index 739f498..01eab3d 100644
--- a/devel/gnu-automake/distinfo
+++ b/devel/gnu-automake/distinfo
@@ -1,3 +1,3 @@
-MD5 (automake-1.9.6.tar.bz2) = c11b8100bb311492d8220378fd8bf9e0
-SHA256 (automake-1.9.6.tar.bz2) = 8eccaa98e1863d10e4a5f861d8e2ec349a23e88cb12ad10f6b6f79022ad2bb8d
-SIZE (automake-1.9.6.tar.bz2) = 765505
+MD5 (automake-1.10.tar.bz2) = 0e2e0f757f9e1e89b66033905860fded
+SHA256 (automake-1.10.tar.bz2) = 2efebda5dd64fd52599a19564041d63dcaba68fafacc0080ffa6e8f0df8da697
+SIZE (automake-1.10.tar.bz2) = 893866
diff --git a/devel/gnu-automake/pkg-plist b/devel/gnu-automake/pkg-plist
index 402e4b4..f77ebbe 100644
--- a/devel/gnu-automake/pkg-plist
+++ b/devel/gnu-automake/pkg-plist
@@ -1,121 +1,125 @@
 bin/aclocal
-bin/aclocal-1.9
+bin/aclocal-%%VERSION%%
 bin/automake
-bin/automake-1.9
-share/aclocal-1.9/amversion.m4
-share/aclocal-1.9/as.m4
-share/aclocal-1.9/auxdir.m4
-share/aclocal-1.9/ccstdc.m4
-share/aclocal-1.9/cond.m4
-share/aclocal-1.9/depend.m4
-share/aclocal-1.9/depout.m4
-share/aclocal-1.9/dmalloc.m4
-share/aclocal-1.9/gcj.m4
-share/aclocal-1.9/header.m4
-share/aclocal-1.9/init.m4
-share/aclocal-1.9/install-sh.m4
-share/aclocal-1.9/lead-dot.m4
-share/aclocal-1.9/lex.m4
-share/aclocal-1.9/lispdir.m4
-share/aclocal-1.9/maintainer.m4
-share/aclocal-1.9/make.m4
-share/aclocal-1.9/minuso.m4
-share/aclocal-1.9/missing.m4
-share/aclocal-1.9/mkdirp.m4
-share/aclocal-1.9/multi.m4
-share/aclocal-1.9/obsol-gt.m4
-share/aclocal-1.9/obsol-lt.m4
-share/aclocal-1.9/obsolete.m4
-share/aclocal-1.9/options.m4
-share/aclocal-1.9/protos.m4
-share/aclocal-1.9/python.m4
-share/aclocal-1.9/regex.m4
-share/aclocal-1.9/runlog.m4
-share/aclocal-1.9/sanity.m4
-share/aclocal-1.9/strip.m4
-share/aclocal-1.9/tar.m4
-share/automake-1.9/Automake/ChannelDefs.pm
-share/automake-1.9/Automake/Channels.pm
-share/automake-1.9/Automake/Condition.pm
-share/automake-1.9/Automake/Config.pm
-share/automake-1.9/Automake/Configure_ac.pm
-share/automake-1.9/Automake/DisjConditions.pm
-share/automake-1.9/Automake/FileUtils.pm
-share/automake-1.9/Automake/General.pm
-share/automake-1.9/Automake/Item.pm
-share/automake-1.9/Automake/ItemDef.pm
-share/automake-1.9/Automake/Location.pm
-share/automake-1.9/Automake/Options.pm
-share/automake-1.9/Automake/Rule.pm
-share/automake-1.9/Automake/RuleDef.pm
-share/automake-1.9/Automake/Struct.pm
-share/automake-1.9/Automake/VarDef.pm
-share/automake-1.9/Automake/Variable.pm
-share/automake-1.9/Automake/Version.pm
-share/automake-1.9/Automake/Wrap.pm
-share/automake-1.9/Automake/XFile.pm
-share/automake-1.9/COPYING
-share/automake-1.9/INSTALL
-share/automake-1.9/acinstall
-share/automake-1.9/am/ansi2knr.am
-share/automake-1.9/am/check.am
-share/automake-1.9/am/clean-hdr.am
-share/automake-1.9/am/clean.am
-share/automake-1.9/am/compile.am
-share/automake-1.9/am/configure.am
-share/automake-1.9/am/data.am
-share/automake-1.9/am/dejagnu.am
-share/automake-1.9/am/depend.am
-share/automake-1.9/am/depend2.am
-share/automake-1.9/am/distdir.am
-share/automake-1.9/am/footer.am
-share/automake-1.9/am/header-vars.am
-share/automake-1.9/am/header.am
-share/automake-1.9/am/inst-vars.am
-share/automake-1.9/am/install.am
-share/automake-1.9/am/java.am
-share/automake-1.9/am/lang-compile.am
-share/automake-1.9/am/lex.am
-share/automake-1.9/am/library.am
-share/automake-1.9/am/libs.am
-share/automake-1.9/am/libtool.am
-share/automake-1.9/am/lisp.am
-share/automake-1.9/am/ltlib.am
-share/automake-1.9/am/ltlibrary.am
-share/automake-1.9/am/mans-vars.am
-share/automake-1.9/am/mans.am
-share/automake-1.9/am/multilib.am
-share/automake-1.9/am/program.am
-share/automake-1.9/am/progs.am
-share/automake-1.9/am/python.am
-share/automake-1.9/am/remake-hdr.am
-share/automake-1.9/am/scripts.am
-share/automake-1.9/am/subdirs.am
-share/automake-1.9/am/tags.am
-share/automake-1.9/am/texi-vers.am
-share/automake-1.9/am/texibuild.am
-share/automake-1.9/am/texinfos.am
-share/automake-1.9/am/yacc.am
-share/automake-1.9/ansi2knr.1
-share/automake-1.9/ansi2knr.c
-share/automake-1.9/compile
-share/automake-1.9/config-ml.in
-share/automake-1.9/config.guess
-share/automake-1.9/config.sub
-share/automake-1.9/depcomp
-share/automake-1.9/elisp-comp
-share/automake-1.9/install-sh
-share/automake-1.9/mdate-sh
-share/automake-1.9/missing
-share/automake-1.9/mkinstalldirs
-share/automake-1.9/py-compile
-share/automake-1.9/symlink-tree
-share/automake-1.9/texinfo.tex
-share/automake-1.9/ylwrap
-@dirrm share/automake-1.9/am
-@dirrm share/automake-1.9/Automake
-@dirrm share/automake-1.9
-@dirrm share/aclocal-1.9
+bin/automake-%%VERSION%%
+share/aclocal-%%VERSION%%/amversion.m4
+share/aclocal-%%VERSION%%/as.m4
+share/aclocal-%%VERSION%%/auxdir.m4
+share/aclocal-%%VERSION%%/ccstdc.m4
+share/aclocal-%%VERSION%%/cond.m4
+share/aclocal-%%VERSION%%/depend.m4
+share/aclocal-%%VERSION%%/depout.m4
+share/aclocal-%%VERSION%%/dmalloc.m4
+share/aclocal-%%VERSION%%/gcj.m4
+share/aclocal-%%VERSION%%/header.m4
+share/aclocal-%%VERSION%%/init.m4
+share/aclocal-%%VERSION%%/install-sh.m4
+share/aclocal-%%VERSION%%/lead-dot.m4
+share/aclocal-%%VERSION%%/lex.m4
+share/aclocal-%%VERSION%%/lispdir.m4
+share/aclocal-%%VERSION%%/maintainer.m4
+share/aclocal-%%VERSION%%/make.m4
+share/aclocal-%%VERSION%%/minuso.m4
+share/aclocal-%%VERSION%%/missing.m4
+share/aclocal-%%VERSION%%/mkdirp.m4
+share/aclocal-%%VERSION%%/multi.m4
+share/aclocal-%%VERSION%%/obsol-gt.m4
+share/aclocal-%%VERSION%%/obsol-lt.m4
+share/aclocal-%%VERSION%%/obsolete.m4
+share/aclocal-%%VERSION%%/options.m4
+share/aclocal-%%VERSION%%/protos.m4
+share/aclocal-%%VERSION%%/python.m4
+share/aclocal-%%VERSION%%/regex.m4
+share/aclocal-%%VERSION%%/runlog.m4
+share/aclocal-%%VERSION%%/sanity.m4
+share/aclocal-%%VERSION%%/strip.m4
+share/aclocal-%%VERSION%%/substnot.m4
+share/aclocal-%%VERSION%%/tar.m4
+share/aclocal-%%VERSION%%/upc.m4
+share/automake-%%VERSION%%/Automake/ChannelDefs.pm
+share/automake-%%VERSION%%/Automake/Channels.pm
+share/automake-%%VERSION%%/Automake/Condition.pm
+share/automake-%%VERSION%%/Automake/Config.pm
+share/automake-%%VERSION%%/Automake/Configure_ac.pm
+share/automake-%%VERSION%%/Automake/DisjConditions.pm
+share/automake-%%VERSION%%/Automake/FileUtils.pm
+share/automake-%%VERSION%%/Automake/General.pm
+share/automake-%%VERSION%%/Automake/Item.pm
+share/automake-%%VERSION%%/Automake/ItemDef.pm
+share/automake-%%VERSION%%/Automake/Location.pm
+share/automake-%%VERSION%%/Automake/Options.pm
+share/automake-%%VERSION%%/Automake/Rule.pm
+share/automake-%%VERSION%%/Automake/RuleDef.pm
+share/automake-%%VERSION%%/Automake/Struct.pm
+share/automake-%%VERSION%%/Automake/VarDef.pm
+share/automake-%%VERSION%%/Automake/Variable.pm
+share/automake-%%VERSION%%/Automake/Version.pm
+share/automake-%%VERSION%%/Automake/Wrap.pm
+share/automake-%%VERSION%%/Automake/XFile.pm
+share/automake-%%VERSION%%/COPYING
+share/automake-%%VERSION%%/INSTALL
+share/automake-%%VERSION%%/acinstall
+share/automake-%%VERSION%%/am/ansi2knr.am
+share/automake-%%VERSION%%/am/check.am
+share/automake-%%VERSION%%/am/clean-hdr.am
+share/automake-%%VERSION%%/am/clean.am
+share/automake-%%VERSION%%/am/compile.am
+share/automake-%%VERSION%%/am/configure.am
+share/automake-%%VERSION%%/am/data.am
+share/automake-%%VERSION%%/am/dejagnu.am
+share/automake-%%VERSION%%/am/depend.am
+share/automake-%%VERSION%%/am/depend2.am
+share/automake-%%VERSION%%/am/distdir.am
+share/automake-%%VERSION%%/am/footer.am
+share/automake-%%VERSION%%/am/header-vars.am
+share/automake-%%VERSION%%/am/header.am
+share/automake-%%VERSION%%/am/inst-vars.am
+share/automake-%%VERSION%%/am/install.am
+share/automake-%%VERSION%%/am/java.am
+share/automake-%%VERSION%%/am/lang-compile.am
+share/automake-%%VERSION%%/am/lex.am
+share/automake-%%VERSION%%/am/library.am
+share/automake-%%VERSION%%/am/libs.am
+share/automake-%%VERSION%%/am/libtool.am
+share/automake-%%VERSION%%/am/lisp.am
+share/automake-%%VERSION%%/am/ltlib.am
+share/automake-%%VERSION%%/am/ltlibrary.am
+share/automake-%%VERSION%%/am/mans-vars.am
+share/automake-%%VERSION%%/am/mans.am
+share/automake-%%VERSION%%/am/multilib.am
+share/automake-%%VERSION%%/am/program.am
+share/automake-%%VERSION%%/am/progs.am
+share/automake-%%VERSION%%/am/python.am
+share/automake-%%VERSION%%/am/remake-hdr.am
+share/automake-%%VERSION%%/am/scripts.am
+share/automake-%%VERSION%%/am/subdirs.am
+share/automake-%%VERSION%%/am/tags.am
+share/automake-%%VERSION%%/am/texi-vers.am
+share/automake-%%VERSION%%/am/texibuild.am
+share/automake-%%VERSION%%/am/texinfos.am
+share/automake-%%VERSION%%/am/yacc.am
+share/automake-%%VERSION%%/ansi2knr.1
+share/automake-%%VERSION%%/ansi2knr.c
+share/automake-%%VERSION%%/compile
+share/automake-%%VERSION%%/config-ml.in
+share/automake-%%VERSION%%/config.guess
+share/automake-%%VERSION%%/config.sub
+share/automake-%%VERSION%%/depcomp
+share/automake-%%VERSION%%/elisp-comp
+share/automake-%%VERSION%%/install-sh
+share/automake-%%VERSION%%/mdate-sh
+share/automake-%%VERSION%%/missing
+share/automake-%%VERSION%%/mkinstalldirs
+share/automake-%%VERSION%%/py-compile
+share/automake-%%VERSION%%/symlink-tree
+share/automake-%%VERSION%%/texinfo.tex
+share/automake-%%VERSION%%/ylwrap
+share/doc/automake/amhello-1.0.tar.gz
+@dirrm share/doc/automake
+@dirrm share/automake-%%VERSION%%/am
+@dirrm share/automake-%%VERSION%%/Automake
+@dirrm share/automake-%%VERSION%%
+@dirrm share/aclocal-%%VERSION%%
 @unexec /bin/rmdir %D/share/aclocal 2>/dev/null || /usr/bin/true
 @unexec /bin/rmdir %D/share 2>/dev/null || /usr/bin/true
 @unexec /bin/rmdir %D/lib 2>/dev/null || /usr/bin/true