Update to 1.9.5, cursing a few more gratuitous changes

6 files changed, 26 insertions, 26 deletions

diff --git a/devel/automake110/Makefile b/devel/automake110/Makefile
index b612c9870439..bfc38c2daad1 100644
--- a/devel/automake110/Makefile
+++ b/devel/automake110/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	automake
-PORTVERSION=	1.9.4
+PORTVERSION=	1.9.5
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	automake
@@ -24,7 +24,8 @@ USE_BZIP2=	yes
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	AUTOCONF=autoconf259 AUTOHEADER=autoheader259 MAKEINFO=makeinfo
-CONFIGURE_ARGS=	--program-suffix=${BUILD_VERSION}
+CONFIGURE_ARGS=	--program-suffix=${BUILD_VERSION} \
+		--infodir=${PREFIX}/info
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_REINPLACE=	yes
 INFO=		automake${BUILD_VERSION}
diff --git a/devel/automake110/distinfo b/devel/automake110/distinfo
index b4b48cfaf44a..4633e89d4e17 100644
--- a/devel/automake110/distinfo
+++ b/devel/automake110/distinfo
@@ -1,2 +1,2 @@
-MD5 (automake-1.9.4.tar.bz2) = 1b3a680fc5e046b275dd2456426f8a9e
-SIZE (automake-1.9.4.tar.bz2) = 751849
+MD5 (automake-1.9.5.tar.bz2) = 3a534ad55d781861e1e92d3b8d898a9a
+SIZE (automake-1.9.5.tar.bz2) = 758119
diff --git a/devel/automake110/files/patch-configure b/devel/automake110/files/patch-configure
index 5e520b19e19f..39b78eec5d87 100644
--- a/devel/automake110/files/patch-configure
+++ b/devel/automake110/files/patch-configure
@@ -1,11 +1,10 @@
---- configure.orig	Sat Dec 18 10:22:42 2004
-+++ configure	Mon Dec 27 22:40:24 2004
-@@ -508,3 +508,3 @@
- ac_unique_file="automake.in"
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os am_AUTOCONF INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar APIVERSION pkgvdatadir PERL TEX LN MODIFICATION_DELAY GREP EGREP FGREP LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os am_AUTOCONF INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar APIVERSION APIPVERSION pkgvdatadir PERL TEX LN MODIFICATION_DELAY GREP EGREP FGREP LIBOBJS LTLIBOBJS'
- ac_subst_files=''
-@@ -1974,6 +1974,6 @@
+--- configure.orig	Sat Feb 12 15:01:31 2005
++++ configure	Fri Feb 25 19:21:28 2005
+@@ -603,2 +603,3 @@
+ APIVERSION
++APIPVERSION
+ pkgvdatadir
+@@ -2130,6 +2131,6 @@
  APIVERSION=`echo "$VERSION" | sed -e 's/^\([0-9]*\.[0-9]*[a-z]*\).*$/\1/'`
 -
 +APIPVERSION=`echo "$VERSION" | sed -e 's/^\([0-9]*\)\.\([0-9]*[a-z]*\).*$/\1\2/'`
@@ -14,7 +13,7 @@
 -pkgvdatadir="\${datadir}/$PACKAGE-$APIVERSION"
 +pkgvdatadir="\${datadir}/automake${APIPVERSION}"
  
-@@ -3176,2 +3176,3 @@
+@@ -3289,2 +3290,3 @@
  s,@APIVERSION@,$APIVERSION,;t t
 +s,@APIPVERSION@,$APIPVERSION,;t t
  s,@pkgvdatadir@,$pkgvdatadir,;t t
diff --git a/devel/automake19/Makefile b/devel/automake19/Makefile
index b612c9870439..bfc38c2daad1 100644
--- a/devel/automake19/Makefile
+++ b/devel/automake19/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	automake
-PORTVERSION=	1.9.4
+PORTVERSION=	1.9.5
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	automake
@@ -24,7 +24,8 @@ USE_BZIP2=	yes
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	AUTOCONF=autoconf259 AUTOHEADER=autoheader259 MAKEINFO=makeinfo
-CONFIGURE_ARGS=	--program-suffix=${BUILD_VERSION}
+CONFIGURE_ARGS=	--program-suffix=${BUILD_VERSION} \
+		--infodir=${PREFIX}/info
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_REINPLACE=	yes
 INFO=		automake${BUILD_VERSION}
diff --git a/devel/automake19/distinfo b/devel/automake19/distinfo
index b4b48cfaf44a..4633e89d4e17 100644
--- a/devel/automake19/distinfo
+++ b/devel/automake19/distinfo
@@ -1,2 +1,2 @@
-MD5 (automake-1.9.4.tar.bz2) = 1b3a680fc5e046b275dd2456426f8a9e
-SIZE (automake-1.9.4.tar.bz2) = 751849
+MD5 (automake-1.9.5.tar.bz2) = 3a534ad55d781861e1e92d3b8d898a9a
+SIZE (automake-1.9.5.tar.bz2) = 758119
diff --git a/devel/automake19/files/patch-configure b/devel/automake19/files/patch-configure
index 5e520b19e19f..39b78eec5d87 100644
--- a/devel/automake19/files/patch-configure
+++ b/devel/automake19/files/patch-configure
@@ -1,11 +1,10 @@
---- configure.orig	Sat Dec 18 10:22:42 2004
-+++ configure	Mon Dec 27 22:40:24 2004
-@@ -508,3 +508,3 @@
- ac_unique_file="automake.in"
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os am_AUTOCONF INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar APIVERSION pkgvdatadir PERL TEX LN MODIFICATION_DELAY GREP EGREP FGREP LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os am_AUTOCONF INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar APIVERSION APIPVERSION pkgvdatadir PERL TEX LN MODIFICATION_DELAY GREP EGREP FGREP LIBOBJS LTLIBOBJS'
- ac_subst_files=''
-@@ -1974,6 +1974,6 @@
+--- configure.orig	Sat Feb 12 15:01:31 2005
++++ configure	Fri Feb 25 19:21:28 2005
+@@ -603,2 +603,3 @@
+ APIVERSION
++APIPVERSION
+ pkgvdatadir
+@@ -2130,6 +2131,6 @@
  APIVERSION=`echo "$VERSION" | sed -e 's/^\([0-9]*\.[0-9]*[a-z]*\).*$/\1/'`
 -
 +APIPVERSION=`echo "$VERSION" | sed -e 's/^\([0-9]*\)\.\([0-9]*[a-z]*\).*$/\1\2/'`
@@ -14,7 +13,7 @@
 -pkgvdatadir="\${datadir}/$PACKAGE-$APIVERSION"
 +pkgvdatadir="\${datadir}/automake${APIPVERSION}"
  
-@@ -3176,2 +3176,3 @@
+@@ -3289,2 +3290,3 @@
  s,@APIVERSION@,$APIVERSION,;t t
 +s,@APIPVERSION@,$APIPVERSION,;t t
  s,@pkgvdatadir@,$pkgvdatadir,;t t