diff --git a/devel/Makefile b/devel/Makefile index b003792aaa54..96790110d44f 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -63,6 +63,7 @@ SUBDIR += automake14 SUBDIR += automake15 SUBDIR += automake18 + SUBDIR += automake19 SUBDIR += avalon-framework SUBDIR += avarice SUBDIR += avltree diff --git a/devel/automake110/Makefile b/devel/automake110/Makefile index f7e72ae75b79..c5156fa7a268 100644 --- a/devel/automake110/Makefile +++ b/devel/automake110/Makefile @@ -6,19 +6,18 @@ # PORTNAME= automake -PORTVERSION= 1.8.5 -PORTREVISION= 2 +PORTVERSION= 1.9 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= automake DISTNAME= automake-${PORTVERSION} MAINTAINER= ade@FreeBSD.org -COMMENT= GNU Standards-compliant Makefile generator (version 1.8) +COMMENT= GNU Standards-compliant Makefile generator (version 1.9) WANT_AUTOCONF_VER=259 WANT_AUTOCONF_RUN=yes -BUILD_VERSION= 18 +BUILD_VERSION= 19 PLIST_SUB= BUILD_VERSION=${BUILD_VERSION} LATEST_LINK= automake${BUILD_VERSION} USE_BZIP2= yes diff --git a/devel/automake110/distinfo b/devel/automake110/distinfo index 480673fff84c..c0c8c48f62b7 100644 --- a/devel/automake110/distinfo +++ b/devel/automake110/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.tar.bz2) = c0b6434087e3be0606ef9d172238f26c +SIZE (automake-1.9.tar.bz2) = 696476 diff --git a/devel/automake110/files/patch-configure b/devel/automake110/files/patch-configure index cba1f452d557..557068f2fd34 100644 --- a/devel/automake110/files/patch-configure +++ b/devel/automake110/files/patch-configure @@ -1,11 +1,11 @@ ---- configure.orig Sun Apr 25 05:34:33 2004 -+++ configure Thu May 13 13:22:46 2004 +--- configure.orig Wed Jul 28 13:09:03 2004 ++++ configure Thu Aug 5 13:11:18 2004 @@ -276,3 +276,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 INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot APIVERSION pkgvdatadir PERL TEX LN MODIFICATION_DELAY 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 INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot APIVERSION APIPVERSION pkgvdatadir PERL TEX LN MODIFICATION_DELAY 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 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 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 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 EGREP FGREP LIBOBJS LTLIBOBJS' ac_subst_files='' -@@ -1715,6 +1715,6 @@ +@@ -1727,6 +1727,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 +14,7 @@ -pkgvdatadir="\${datadir}/automake-${APIVERSION}" +pkgvdatadir="\${datadir}/automake${APIPVERSION}" -@@ -2652,2 +2652,3 @@ +@@ -2666,2 +2666,3 @@ s,@APIVERSION@,$APIVERSION,;t t +s,@APIPVERSION@,$APIPVERSION,;t t s,@pkgvdatadir@,$pkgvdatadir,;t t diff --git a/devel/automake110/files/patch-doc::automake.texi b/devel/automake110/files/patch-doc::automake.texi index 3e2e8cd439f4..6e64f1e4ea50 100644 --- a/devel/automake110/files/patch-doc::automake.texi +++ b/devel/automake110/files/patch-doc::automake.texi @@ -4,16 +4,16 @@ @c %**start of header -@setfilename automake.info -@settitle automake -+@setfilename automake18.info -+@settitle automake18 ++@setfilename automake19.info ++@settitle automake19 @setchapternewpage off @@ -36,3 +36,3 @@ @direntry -* automake: (automake). Making Makefile.in's. -+* automake18: (automake18). Making Makefile.in's. ++* automake19: (automake19). Making Makefile.in's. @end direntry @@ -41,3 +41,3 @@ @direntry -* aclocal: (automake)Invoking aclocal. Generating aclocal.m4. -+* aclocal18: (automake18)Invoking aclocal. Generating aclocal.m4. ++* aclocal19: (automake19)Invoking aclocal. Generating aclocal.m4. @end direntry diff --git a/devel/automake110/pkg-plist b/devel/automake110/pkg-plist index 2e307b872175..3f1b1facfe98 100644 --- a/devel/automake110/pkg-plist +++ b/devel/automake110/pkg-plist @@ -36,6 +36,7 @@ share/aclocal%%BUILD_VERSION%%/regex.m4 share/aclocal%%BUILD_VERSION%%/runlog.m4 share/aclocal%%BUILD_VERSION%%/sanity.m4 share/aclocal%%BUILD_VERSION%%/strip.m4 +share/aclocal%%BUILD_VERSION%%/tar.m4 share/automake%%BUILD_VERSION%%/Automake/ChannelDefs.pm share/automake%%BUILD_VERSION%%/Automake/Channels.pm share/automake%%BUILD_VERSION%%/Automake/Condition.pm @@ -74,6 +75,7 @@ share/automake%%BUILD_VERSION%%/am/footer.am share/automake%%BUILD_VERSION%%/am/header-vars.am share/automake%%BUILD_VERSION%%/am/header.am share/automake%%BUILD_VERSION%%/am/install.am +share/automake%%BUILD_VERSION%%/am/inst-vars.am share/automake%%BUILD_VERSION%%/am/java.am share/automake%%BUILD_VERSION%%/am/lang-compile.am share/automake%%BUILD_VERSION%%/am/lex.am diff --git a/devel/automake19/Makefile b/devel/automake19/Makefile index f7e72ae75b79..c5156fa7a268 100644 --- a/devel/automake19/Makefile +++ b/devel/automake19/Makefile @@ -6,19 +6,18 @@ # PORTNAME= automake -PORTVERSION= 1.8.5 -PORTREVISION= 2 +PORTVERSION= 1.9 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= automake DISTNAME= automake-${PORTVERSION} MAINTAINER= ade@FreeBSD.org -COMMENT= GNU Standards-compliant Makefile generator (version 1.8) +COMMENT= GNU Standards-compliant Makefile generator (version 1.9) WANT_AUTOCONF_VER=259 WANT_AUTOCONF_RUN=yes -BUILD_VERSION= 18 +BUILD_VERSION= 19 PLIST_SUB= BUILD_VERSION=${BUILD_VERSION} LATEST_LINK= automake${BUILD_VERSION} USE_BZIP2= yes diff --git a/devel/automake19/distinfo b/devel/automake19/distinfo index 480673fff84c..c0c8c48f62b7 100644 --- a/devel/automake19/distinfo +++ b/devel/automake19/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.tar.bz2) = c0b6434087e3be0606ef9d172238f26c +SIZE (automake-1.9.tar.bz2) = 696476 diff --git a/devel/automake19/files/patch-configure b/devel/automake19/files/patch-configure index cba1f452d557..557068f2fd34 100644 --- a/devel/automake19/files/patch-configure +++ b/devel/automake19/files/patch-configure @@ -1,11 +1,11 @@ ---- configure.orig Sun Apr 25 05:34:33 2004 -+++ configure Thu May 13 13:22:46 2004 +--- configure.orig Wed Jul 28 13:09:03 2004 ++++ configure Thu Aug 5 13:11:18 2004 @@ -276,3 +276,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 INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot APIVERSION pkgvdatadir PERL TEX LN MODIFICATION_DELAY 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 INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot APIVERSION APIPVERSION pkgvdatadir PERL TEX LN MODIFICATION_DELAY 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 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 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 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 EGREP FGREP LIBOBJS LTLIBOBJS' ac_subst_files='' -@@ -1715,6 +1715,6 @@ +@@ -1727,6 +1727,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 +14,7 @@ -pkgvdatadir="\${datadir}/automake-${APIVERSION}" +pkgvdatadir="\${datadir}/automake${APIPVERSION}" -@@ -2652,2 +2652,3 @@ +@@ -2666,2 +2666,3 @@ s,@APIVERSION@,$APIVERSION,;t t +s,@APIPVERSION@,$APIPVERSION,;t t s,@pkgvdatadir@,$pkgvdatadir,;t t diff --git a/devel/automake19/files/patch-doc::automake.texi b/devel/automake19/files/patch-doc::automake.texi index 3e2e8cd439f4..6e64f1e4ea50 100644 --- a/devel/automake19/files/patch-doc::automake.texi +++ b/devel/automake19/files/patch-doc::automake.texi @@ -4,16 +4,16 @@ @c %**start of header -@setfilename automake.info -@settitle automake -+@setfilename automake18.info -+@settitle automake18 ++@setfilename automake19.info ++@settitle automake19 @setchapternewpage off @@ -36,3 +36,3 @@ @direntry -* automake: (automake). Making Makefile.in's. -+* automake18: (automake18). Making Makefile.in's. ++* automake19: (automake19). Making Makefile.in's. @end direntry @@ -41,3 +41,3 @@ @direntry -* aclocal: (automake)Invoking aclocal. Generating aclocal.m4. -+* aclocal18: (automake18)Invoking aclocal. Generating aclocal.m4. ++* aclocal19: (automake19)Invoking aclocal. Generating aclocal.m4. @end direntry diff --git a/devel/automake19/pkg-plist b/devel/automake19/pkg-plist index 2e307b872175..3f1b1facfe98 100644 --- a/devel/automake19/pkg-plist +++ b/devel/automake19/pkg-plist @@ -36,6 +36,7 @@ share/aclocal%%BUILD_VERSION%%/regex.m4 share/aclocal%%BUILD_VERSION%%/runlog.m4 share/aclocal%%BUILD_VERSION%%/sanity.m4 share/aclocal%%BUILD_VERSION%%/strip.m4 +share/aclocal%%BUILD_VERSION%%/tar.m4 share/automake%%BUILD_VERSION%%/Automake/ChannelDefs.pm share/automake%%BUILD_VERSION%%/Automake/Channels.pm share/automake%%BUILD_VERSION%%/Automake/Condition.pm @@ -74,6 +75,7 @@ share/automake%%BUILD_VERSION%%/am/footer.am share/automake%%BUILD_VERSION%%/am/header-vars.am share/automake%%BUILD_VERSION%%/am/header.am share/automake%%BUILD_VERSION%%/am/install.am +share/automake%%BUILD_VERSION%%/am/inst-vars.am share/automake%%BUILD_VERSION%%/am/java.am share/automake%%BUILD_VERSION%%/am/lang-compile.am share/automake%%BUILD_VERSION%%/am/lex.am diff --git a/devel/gnu-automake/Makefile b/devel/gnu-automake/Makefile index f7e72ae75b79..c5156fa7a268 100644 --- a/devel/gnu-automake/Makefile +++ b/devel/gnu-automake/Makefile @@ -6,19 +6,18 @@ # PORTNAME= automake -PORTVERSION= 1.8.5 -PORTREVISION= 2 +PORTVERSION= 1.9 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= automake DISTNAME= automake-${PORTVERSION} MAINTAINER= ade@FreeBSD.org -COMMENT= GNU Standards-compliant Makefile generator (version 1.8) +COMMENT= GNU Standards-compliant Makefile generator (version 1.9) WANT_AUTOCONF_VER=259 WANT_AUTOCONF_RUN=yes -BUILD_VERSION= 18 +BUILD_VERSION= 19 PLIST_SUB= BUILD_VERSION=${BUILD_VERSION} LATEST_LINK= automake${BUILD_VERSION} USE_BZIP2= yes diff --git a/devel/gnu-automake/distinfo b/devel/gnu-automake/distinfo index 480673fff84c..c0c8c48f62b7 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.tar.bz2) = c0b6434087e3be0606ef9d172238f26c +SIZE (automake-1.9.tar.bz2) = 696476 diff --git a/devel/gnu-automake/files/patch-configure b/devel/gnu-automake/files/patch-configure index cba1f452d557..557068f2fd34 100644 --- a/devel/gnu-automake/files/patch-configure +++ b/devel/gnu-automake/files/patch-configure @@ -1,11 +1,11 @@ ---- configure.orig Sun Apr 25 05:34:33 2004 -+++ configure Thu May 13 13:22:46 2004 +--- configure.orig Wed Jul 28 13:09:03 2004 ++++ configure Thu Aug 5 13:11:18 2004 @@ -276,3 +276,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 INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot APIVERSION pkgvdatadir PERL TEX LN MODIFICATION_DELAY 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 INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot APIVERSION APIPVERSION pkgvdatadir PERL TEX LN MODIFICATION_DELAY 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 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 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 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 EGREP FGREP LIBOBJS LTLIBOBJS' ac_subst_files='' -@@ -1715,6 +1715,6 @@ +@@ -1727,6 +1727,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 +14,7 @@ -pkgvdatadir="\${datadir}/automake-${APIVERSION}" +pkgvdatadir="\${datadir}/automake${APIPVERSION}" -@@ -2652,2 +2652,3 @@ +@@ -2666,2 +2666,3 @@ s,@APIVERSION@,$APIVERSION,;t t +s,@APIPVERSION@,$APIPVERSION,;t t s,@pkgvdatadir@,$pkgvdatadir,;t t diff --git a/devel/gnu-automake/files/patch-doc::automake.texi b/devel/gnu-automake/files/patch-doc::automake.texi index 3e2e8cd439f4..6e64f1e4ea50 100644 --- a/devel/gnu-automake/files/patch-doc::automake.texi +++ b/devel/gnu-automake/files/patch-doc::automake.texi @@ -4,16 +4,16 @@ @c %**start of header -@setfilename automake.info -@settitle automake -+@setfilename automake18.info -+@settitle automake18 ++@setfilename automake19.info ++@settitle automake19 @setchapternewpage off @@ -36,3 +36,3 @@ @direntry -* automake: (automake). Making Makefile.in's. -+* automake18: (automake18). Making Makefile.in's. ++* automake19: (automake19). Making Makefile.in's. @end direntry @@ -41,3 +41,3 @@ @direntry -* aclocal: (automake)Invoking aclocal. Generating aclocal.m4. -+* aclocal18: (automake18)Invoking aclocal. Generating aclocal.m4. ++* aclocal19: (automake19)Invoking aclocal. Generating aclocal.m4. @end direntry diff --git a/devel/gnu-automake/pkg-plist b/devel/gnu-automake/pkg-plist index 2e307b872175..3f1b1facfe98 100644 --- a/devel/gnu-automake/pkg-plist +++ b/devel/gnu-automake/pkg-plist @@ -36,6 +36,7 @@ share/aclocal%%BUILD_VERSION%%/regex.m4 share/aclocal%%BUILD_VERSION%%/runlog.m4 share/aclocal%%BUILD_VERSION%%/sanity.m4 share/aclocal%%BUILD_VERSION%%/strip.m4 +share/aclocal%%BUILD_VERSION%%/tar.m4 share/automake%%BUILD_VERSION%%/Automake/ChannelDefs.pm share/automake%%BUILD_VERSION%%/Automake/Channels.pm share/automake%%BUILD_VERSION%%/Automake/Condition.pm @@ -74,6 +75,7 @@ share/automake%%BUILD_VERSION%%/am/footer.am share/automake%%BUILD_VERSION%%/am/header-vars.am share/automake%%BUILD_VERSION%%/am/header.am share/automake%%BUILD_VERSION%%/am/install.am +share/automake%%BUILD_VERSION%%/am/inst-vars.am share/automake%%BUILD_VERSION%%/am/java.am share/automake%%BUILD_VERSION%%/am/lang-compile.am share/automake%%BUILD_VERSION%%/am/lex.am