4 files changed, 124 insertions, 130 deletions

diff --git a/devel/gnu-automake/Makefile b/devel/gnu-automake/Makefile
index 418ec881efa0..554a1de1dba7 100644
--- a/devel/gnu-automake/Makefile
+++ b/devel/gnu-automake/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	automake
-PORTVERSION=	1.8.5
+PORTVERSION=	1.9.5
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	automake
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	gnu-
 DISTNAME=	automake-${PORTVERSION}
 
 MAINTAINER=	ade@FreeBSD.org
-COMMENT=	GNU Standards-compliant Makefile generator (version 1.8)
+COMMENT=	GNU Standards-compliant Makefile generator (GNU unmodified)
 
 BUILD_DEPENDS=	${LOCALBASE}/gnu-autotools/bin/autoconf:${PORTSDIR}/devel/gnu-autoconf
 RUN_DEPENDS=	${LOCALBASE}/gnu-autotools/bin/autoconf:${PORTSDIR}/devel/gnu-autoconf
@@ -29,9 +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}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \
+		--infodir=${PREFIX}/info
 
-post-install:
-	@${CAT} ${PKGMESSAGE}
+post-patch:
+	@(cd ${WRKSRC}/doc && ${RM} -f *.info*)
 
 .include <bsd.port.mk>
diff --git a/devel/gnu-automake/distinfo b/devel/gnu-automake/distinfo
index 480673fff84c..4633e89d4e17 100644
--- a/devel/gnu-automake/distinfo
+++ b/devel/gnu-automake/distinfo
@@ -1,2 +1,2 @@
-MD5 (automake-1.8.5.tar.bz2) = 0114aa6d7dc32112834b68105fb8d7e2
-SIZE (automake-1.8.5.tar.bz2) = 663182
+MD5 (automake-1.9.5.tar.bz2) = 3a534ad55d781861e1e92d3b8d898a9a
+SIZE (automake-1.9.5.tar.bz2) = 758119
diff --git a/devel/gnu-automake/pkg-message b/devel/gnu-automake/pkg-message
deleted file mode 100644
index 9c63de192b83..000000000000
--- a/devel/gnu-automake/pkg-message
+++ /dev/null
@@ -1,9 +0,0 @@
-
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!CAUTION!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-This port is specifically designed for developers that want to create
-cross-platform software distributions on FreeBSD.  This version of automake
-should _NEVER_ be used with the FreeBSD ports system as a replacement for the
-versioned copies of automake.
-
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!CAUTION!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
diff --git a/devel/gnu-automake/pkg-plist b/devel/gnu-automake/pkg-plist
index 82941ac8591b..402e4b43dc99 100644
--- a/devel/gnu-automake/pkg-plist
+++ b/devel/gnu-automake/pkg-plist
@@ -1,119 +1,121 @@
 bin/aclocal
-bin/aclocal-1.8
+bin/aclocal-1.9
 bin/automake
-bin/automake-1.8
-share/aclocal-1.8/amversion.m4
-share/aclocal-1.8/as.m4
-share/aclocal-1.8/auxdir.m4
-share/aclocal-1.8/ccstdc.m4
-share/aclocal-1.8/cond.m4
-share/aclocal-1.8/depend.m4
-share/aclocal-1.8/depout.m4
-share/aclocal-1.8/dmalloc.m4
-share/aclocal-1.8/gcj.m4
-share/aclocal-1.8/header.m4
-share/aclocal-1.8/init.m4
-share/aclocal-1.8/install-sh.m4
-share/aclocal-1.8/lead-dot.m4
-share/aclocal-1.8/lex.m4
-share/aclocal-1.8/lispdir.m4
-share/aclocal-1.8/maintainer.m4
-share/aclocal-1.8/make.m4
-share/aclocal-1.8/minuso.m4
-share/aclocal-1.8/missing.m4
-share/aclocal-1.8/mkdirp.m4
-share/aclocal-1.8/multi.m4
-share/aclocal-1.8/obsol-gt.m4
-share/aclocal-1.8/obsol-lt.m4
-share/aclocal-1.8/obsolete.m4
-share/aclocal-1.8/options.m4
-share/aclocal-1.8/protos.m4
-share/aclocal-1.8/python.m4
-share/aclocal-1.8/regex.m4
-share/aclocal-1.8/runlog.m4
-share/aclocal-1.8/sanity.m4
-share/aclocal-1.8/strip.m4
-share/automake-1.8/Automake/ChannelDefs.pm
-share/automake-1.8/Automake/Channels.pm
-share/automake-1.8/Automake/Condition.pm
-share/automake-1.8/Automake/Config.pm
-share/automake-1.8/Automake/Configure_ac.pm
-share/automake-1.8/Automake/DisjConditions.pm
-share/automake-1.8/Automake/FileUtils.pm
-share/automake-1.8/Automake/General.pm
-share/automake-1.8/Automake/Item.pm
-share/automake-1.8/Automake/ItemDef.pm
-share/automake-1.8/Automake/Location.pm
-share/automake-1.8/Automake/Options.pm
-share/automake-1.8/Automake/Rule.pm
-share/automake-1.8/Automake/RuleDef.pm
-share/automake-1.8/Automake/Struct.pm
-share/automake-1.8/Automake/VarDef.pm
-share/automake-1.8/Automake/Variable.pm
-share/automake-1.8/Automake/Version.pm
-share/automake-1.8/Automake/Wrap.pm
-share/automake-1.8/Automake/XFile.pm
-share/automake-1.8/COPYING
-share/automake-1.8/INSTALL
-share/automake-1.8/acinstall
-share/automake-1.8/am/ansi2knr.am
-share/automake-1.8/am/check.am
-share/automake-1.8/am/clean-hdr.am
-share/automake-1.8/am/clean.am
-share/automake-1.8/am/compile.am
-share/automake-1.8/am/configure.am
-share/automake-1.8/am/data.am
-share/automake-1.8/am/dejagnu.am
-share/automake-1.8/am/depend.am
-share/automake-1.8/am/depend2.am
-share/automake-1.8/am/distdir.am
-share/automake-1.8/am/footer.am
-share/automake-1.8/am/header-vars.am
-share/automake-1.8/am/header.am
-share/automake-1.8/am/install.am
-share/automake-1.8/am/java.am
-share/automake-1.8/am/lang-compile.am
-share/automake-1.8/am/lex.am
-share/automake-1.8/am/library.am
-share/automake-1.8/am/libs.am
-share/automake-1.8/am/libtool.am
-share/automake-1.8/am/lisp.am
-share/automake-1.8/am/ltlib.am
-share/automake-1.8/am/ltlibrary.am
-share/automake-1.8/am/mans-vars.am
-share/automake-1.8/am/mans.am
-share/automake-1.8/am/multilib.am
-share/automake-1.8/am/program.am
-share/automake-1.8/am/progs.am
-share/automake-1.8/am/python.am
-share/automake-1.8/am/remake-hdr.am
-share/automake-1.8/am/scripts.am
-share/automake-1.8/am/subdirs.am
-share/automake-1.8/am/tags.am
-share/automake-1.8/am/texi-vers.am
-share/automake-1.8/am/texibuild.am
-share/automake-1.8/am/texinfos.am
-share/automake-1.8/am/yacc.am
-share/automake-1.8/ansi2knr.1
-share/automake-1.8/ansi2knr.c
-share/automake-1.8/compile
-share/automake-1.8/config-ml.in
-share/automake-1.8/config.guess
-share/automake-1.8/config.sub
-share/automake-1.8/depcomp
-share/automake-1.8/elisp-comp
-share/automake-1.8/install-sh
-share/automake-1.8/mdate-sh
-share/automake-1.8/missing
-share/automake-1.8/mkinstalldirs
-share/automake-1.8/py-compile
-share/automake-1.8/symlink-tree
-share/automake-1.8/texinfo.tex
-share/automake-1.8/ylwrap
-@dirrm share/automake-1.8/am
-@dirrm share/automake-1.8/Automake
-@dirrm share/automake-1.8
-@dirrm share/aclocal-1.8
+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
 @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