From 45483ef4aa47642e2e18542fac4631f00d88535b Mon Sep 17 00:00:00 2001 From: Alexpux Date: Wed, 18 Dec 2013 13:06:25 +0400 Subject: [PATCH] Add sets of packages to implement automake-wrapper package as in gentoo. --- automake-wrapper/PKGBUILD | 35 ++ automake-wrapper/am-wrapper-9.sh | 187 ++++++++++ automake/PKGBUILD | 43 --- automake1.10/PKGBUILD | 72 ++++ automake1.10/automake-1.10-makeinfo-fix.patch | 36 ++ automake1.10/automake-1.10-msys2.patch | 33 ++ automake1.10/automake.install | 22 ++ automake1.10/automake1.10-documentation.patch | 29 ++ automake1.11/PKGBUILD | 72 ++++ automake1.11/automake-1.11-makeinfo-fix.patch | 36 ++ automake1.11/automake-1.11-msys2.patch | 67 ++++ automake1.11/automake.install | 22 ++ automake1.11/automake1.11-documentation.patch | 29 ++ automake1.12/PKGBUILD | 73 ++++ .../automake-1.14-msys2.patch | 0 automake1.12/automake.install | 22 ++ automake1.12/automake1.12-documentation.patch | 41 +++ automake1.13/PKGBUILD | 73 ++++ automake1.13/automake-1.14-msys2.patch | 67 ++++ automake1.13/automake.install | 22 ++ automake1.13/automake1.13-documentation.patch | 43 +++ automake1.14/PKGBUILD | 74 ++++ automake1.14/automake-1.14-msys2.patch | 67 ++++ automake1.14/automake.install | 22 ++ automake1.14/automake1.14-documentation.patch | 43 +++ automake1.6/PKGBUILD | 79 +++++ automake1.6/automake-1.7-msys2.patch | 33 ++ {automake => automake1.6}/automake.install | 2 +- ...utomake1.6-accomodate-newer-autoconf.patch | 23 ++ .../automake1.6-add-dirlist-support.patch | 322 ++++++++++++++++++ .../automake1.6-avoid-autoreconf.patch | 22 ++ automake1.6/automake1.6-documentation.patch | 28 ++ automake1.7/PKGBUILD | 77 +++++ automake1.7/automake-1.7-msys2.patch | 33 ++ .../automake-1.7.9-gentoo-test-fixes.patch | 46 +++ automake1.7/automake.install | 22 ++ .../automake1.7-cygwin-test-fixes.patch | 68 ++++ automake1.7/automake1.7-documentation.patch | 27 ++ automake1.8/PKGBUILD | 80 +++++ automake1.8/automake-1.8-msys2.patch | 33 ++ .../automake-1.8.5-gentoo-test-fixes.patch | 43 +++ automake1.8/automake.install | 22 ++ .../automake1.8-cygwin-test-fixes.patch | 52 +++ automake1.8/automake1.8-documentation.patch | 38 +++ .../automake1.8-vs-modern-libtool.patch | 8 + automake1.9/PKGBUILD | 94 +++++ automake1.9/automake-1.9-makeinfo-fix.patch | 30 ++ automake1.9/automake-1.9-msys2.patch | 33 ++ ...ake-1.9.6-gentoo-aclocal7-test-sleep.patch | 39 +++ ...utomake-1.9.6-gentoo-ignore-comments.patch | 29 ++ ...make-1.9.6-gentoo-include-dir-prefix.patch | 31 ++ automake1.9/automake.install | 22 ++ .../automake1.9-avoid-autoreconf.patch | 55 +++ ...omake1.9-backport-pr401-test-and-fix.patch | 299 ++++++++++++++++ .../automake1.9-cygwin-test-fixes.patch | 19 ++ automake1.9/automake1.9-documentation.patch | 27 ++ .../automake1.9-vs-modern-libtool.patch | 8 + 57 files changed, 2930 insertions(+), 44 deletions(-) create mode 100644 automake-wrapper/PKGBUILD create mode 100644 automake-wrapper/am-wrapper-9.sh delete mode 100644 automake/PKGBUILD create mode 100644 automake1.10/PKGBUILD create mode 100644 automake1.10/automake-1.10-makeinfo-fix.patch create mode 100644 automake1.10/automake-1.10-msys2.patch create mode 100644 automake1.10/automake.install create mode 100644 automake1.10/automake1.10-documentation.patch create mode 100644 automake1.11/PKGBUILD create mode 100644 automake1.11/automake-1.11-makeinfo-fix.patch create mode 100644 automake1.11/automake-1.11-msys2.patch create mode 100644 automake1.11/automake.install create mode 100644 automake1.11/automake1.11-documentation.patch create mode 100644 automake1.12/PKGBUILD rename {automake => automake1.12}/automake-1.14-msys2.patch (100%) create mode 100644 automake1.12/automake.install create mode 100644 automake1.12/automake1.12-documentation.patch create mode 100644 automake1.13/PKGBUILD create mode 100644 automake1.13/automake-1.14-msys2.patch create mode 100644 automake1.13/automake.install create mode 100644 automake1.13/automake1.13-documentation.patch create mode 100644 automake1.14/PKGBUILD create mode 100644 automake1.14/automake-1.14-msys2.patch create mode 100644 automake1.14/automake.install create mode 100644 automake1.14/automake1.14-documentation.patch create mode 100644 automake1.6/PKGBUILD create mode 100644 automake1.6/automake-1.7-msys2.patch rename {automake => automake1.6}/automake.install (88%) create mode 100644 automake1.6/automake1.6-accomodate-newer-autoconf.patch create mode 100644 automake1.6/automake1.6-add-dirlist-support.patch create mode 100644 automake1.6/automake1.6-avoid-autoreconf.patch create mode 100644 automake1.6/automake1.6-documentation.patch create mode 100644 automake1.7/PKGBUILD create mode 100644 automake1.7/automake-1.7-msys2.patch create mode 100644 automake1.7/automake-1.7.9-gentoo-test-fixes.patch create mode 100644 automake1.7/automake.install create mode 100644 automake1.7/automake1.7-cygwin-test-fixes.patch create mode 100644 automake1.7/automake1.7-documentation.patch create mode 100644 automake1.8/PKGBUILD create mode 100644 automake1.8/automake-1.8-msys2.patch create mode 100644 automake1.8/automake-1.8.5-gentoo-test-fixes.patch create mode 100644 automake1.8/automake.install create mode 100644 automake1.8/automake1.8-cygwin-test-fixes.patch create mode 100644 automake1.8/automake1.8-documentation.patch create mode 100644 automake1.8/automake1.8-vs-modern-libtool.patch create mode 100644 automake1.9/PKGBUILD create mode 100644 automake1.9/automake-1.9-makeinfo-fix.patch create mode 100644 automake1.9/automake-1.9-msys2.patch create mode 100644 automake1.9/automake-1.9.6-gentoo-aclocal7-test-sleep.patch create mode 100644 automake1.9/automake-1.9.6-gentoo-ignore-comments.patch create mode 100644 automake1.9/automake-1.9.6-gentoo-include-dir-prefix.patch create mode 100644 automake1.9/automake.install create mode 100644 automake1.9/automake1.9-avoid-autoreconf.patch create mode 100644 automake1.9/automake1.9-backport-pr401-test-and-fix.patch create mode 100644 automake1.9/automake1.9-cygwin-test-fixes.patch create mode 100644 automake1.9/automake1.9-documentation.patch create mode 100644 automake1.9/automake1.9-vs-modern-libtool.patch diff --git a/automake-wrapper/PKGBUILD b/automake-wrapper/PKGBUILD new file mode 100644 index 00000000000..6815e71cb7c --- /dev/null +++ b/automake-wrapper/PKGBUILD @@ -0,0 +1,35 @@ +# Maintainer: Alexey Pavlov + +pkgname=automake-wrapper +pkgver=9 +pkgrel=2 +pkgdesc="Wrapper scripts for automake and aclocal" +arch=('any') +license=('GPL') +url="http://www.gentoo.org" +groups=('base-devel') +depends=('bash' 'gawk' + #'automake1.4' + #'automake1.5' + 'automake1.6' + 'automake1.7' + 'automake1.7' + 'automake1.8' + 'automake1.9' + 'automake1.10' + 'automake1.11' + 'automake1.12' + 'automake1.13' + 'automake1.14') +#install=automake.install +source=("am-wrapper-${pkgver}.sh") +md5sums=('0b1f6f9288b3d1a64b858b18c958dce2') +provides=("automake") +conflicts=("automake") + +package() { + mkdir -p ${pkgdir}/usr/bin + + cp "${srcdir}"/am-wrapper-${pkgver}.sh ${pkgdir}/usr/bin/automake + cp "${srcdir}"/am-wrapper-${pkgver}.sh ${pkgdir}/usr/bin/aclocal +} diff --git a/automake-wrapper/am-wrapper-9.sh b/automake-wrapper/am-wrapper-9.sh new file mode 100644 index 00000000000..26455634d8d --- /dev/null +++ b/automake-wrapper/am-wrapper-9.sh @@ -0,0 +1,187 @@ +#!/bin/sh +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake-wrapper/files/am-wrapper-9.sh,v 1.1 2013/06/23 04:50:40 vapier Exp $ + +# Executes the correct automake version. +# +# If WANT_AUTOMAKE is set (can be a whitespace delimited list of versions): +# - attempt to find an installed version using those +# - if magic keyword 'latest' is found, pick the latest version that exists +# - if nothing found, warn, and proceed as if WANT_AUTOMAKE was not set (below) +# If WANT_AUTOMAKE is not set: +# - Try to detect the version of automake used to generate things (look at +# Makefile.in and aclocal.m4 and any other useful file) +# - If detected version is not found, warn and proceed as if blank slate +# - Try to locate the latest version of automake that exists and run it + +(set -o posix) 2>/dev/null && set -o posix + +_stderr() { printf 'am-wrapper: %s: %b\n' "${argv0}" "$*" 1>&2; } +warn() { _stderr "warning: $*"; } +err() { _stderr "error: $*"; exit 1; } +unset IFS +which() { + local p + IFS=: # we don't use IFS anywhere, so don't bother saving/restoring + for p in ${PATH} ; do + p="${p}/$1" + [ -e "${p}" ] && echo "${p}" && return 0 + done + unset IFS + return 1 +} + +# +# Sanitize argv[0] since it isn't always a full path #385201 +# +argv0=${0##*/} +case $0 in + ${argv0}) + # find it in PATH + if ! full_argv0=$(which "${argv0}") ; then + err "could not locate ${argv0}; file a bug" + fi + ;; + *) + # re-use full/relative paths + full_argv0=$0 + ;; +esac + +if ! seq 0 0 2>/dev/null 1>&2 ; then #338518 + seq() { + local f l i + case $# in + 1) f=1 i=1 l=$1;; + 2) f=$1 i=1 l=$2;; + 3) f=$1 i=$2 l=$3;; + esac + while :; do + [ $l -lt $f -a $i -gt 0 ] && break + [ $f -lt $l -a $i -lt 0 ] && break + echo $f + : $(( f += i )) + done + return 0 + } +fi + +# +# Set up bindings between actual version and WANT_AUTOMAKE; +# Start with last known versions to speed up lookup process. +# +LAST_KNOWN_AUTOMAKE_VER="14" +vers=$(printf '1.%s ' `seq ${LAST_KNOWN_AUTOMAKE_VER} -1 4`) + +# +# Helper to scan for a usable program based on version. +# +binary= +all_vers= +find_binary() { + local v + all_vers="${all_vers} $*" # For error messages. + for v ; do + if [ -x "${full_argv0}-${v}" ] ; then + binary="${full_argv0}-${v}" + binary_ver=${v} + return 0 + fi + done + return 1 +} + +# +# Try and find a usable automake version. First check the WANT_AUTOMAKE +# setting (whitespace delimited list), then fallback to the latest. +# +find_latest() { + if ! find_binary ${vers} ; then + # Brute force it. + find_binary $(printf '1.%s ' `seq 99 -1 ${LAST_KNOWN_AUTOMAKE_VER}`) + fi +} +for wx in ${WANT_AUTOMAKE:-latest} ; do + if [ "${wx}" = "latest" ] ; then + find_latest && break + else + find_binary ${wx} && break + fi +done + +if [ -z "${binary}" ] && [ -n "${WANT_AUTOMAKE}" ] ; then + warn "could not locate installed version for WANT_AUTOMAKE='${WANT_AUTOMAKE}'; ignoring" + unset WANT_AUTOMAKE + find_latest +fi + +if [ -z "${binary}" ] ; then + err "Unable to locate any usuable version of automake.\n" \ + "\tI tried these versions:${all_vers}\n" \ + "\tWith a base name of '${full_argv0}'." +fi + +# +# autodetect helpers +# +do_awk() { + local file=$1 ; shift + local v=$(awk -v regex="$*" '{ + if (ret = match($0, regex)) { + s = substr($0, ret, RLENGTH) + ret = match(s, "[0-9]\\.[0-9]+") + print substr(s, ret, RLENGTH) + exit + } + }' "${file}") + case " ${auto_vers} " in + *" ${v} "*) ;; + *) auto_vers="${auto_vers:+${auto_vers} }${v}" ;; + esac +} + +# +# autodetect routine +# +if [ -z "${WANT_AUTOMAKE}" ] ; then + auto_vers= + if [ -r "Makefile.in" ] ; then + do_awk Makefile.in '^# Makefile.in generated (automatically )?by automake [0-9]\\.[0-9]+' + fi + if [ -r "aclocal.m4" ] ; then + do_awk aclocal.m4 'generated automatically by aclocal [0-9]\\.[0-9]+' + do_awk aclocal.m4 '[[:space:]]*\\[?AM_AUTOMAKE_VERSION\\(\\[?[0-9]\\.[0-9]+[^)]*\\]?\\)' + fi + # We don't need to set $binary here as it has already been setup for us + # earlier to the latest available version. + if [ -n "${auto_vers}" ] ; then + if ! find_binary ${auto_vers} ; then + warn "auto-detected versions not found (${auto_vers}); falling back to latest available" + fi + fi +fi + +if [ -n "${WANT_AMWRAPPER_DEBUG}" ] ; then + if [ -n "${WANT_AUTOMAKE}" ] ; then + warn "DEBUG: WANT_AUTOMAKE is set to ${WANT_AUTOMAKE}" + fi + warn "DEBUG: will execute <${binary}>" +fi + +# +# for further consistency +# +export WANT_AUTOMAKE="${binary_ver}" + +# +# Now try to run the binary +# +if [ ! -x "${binary}" ] ; then + # this shouldn't happen + err "${binary} is missing or not executable.\n" \ + "\tPlease try installing the correct version of automake." +fi + +exec "${binary}" "$@" +# The shell will error out if `exec` failed. diff --git a/automake/PKGBUILD b/automake/PKGBUILD deleted file mode 100644 index e0ad295f7ca..00000000000 --- a/automake/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# Maintainer: Alexey Pavlov - -pkgname=automake -pkgver=1.14 -pkgrel=1 -pkgdesc="A GNU tool for automatically creating Makefiles" -arch=('any') -license=('GPL') -url="http://www.gnu.org/software/automake" -groups=('base-devel') -depends=('perl' 'bash') -makedepends=('autoconf') -checkdepends=('dejagnu' 'python2') -install=automake.install -source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig} - automake-1.14-msys2.patch) -md5sums=('cb3fba6d631cddf12e230fd0cc1890df' - 'SKIP' - '233d8dc0c46722a8940bac31a2a25cbc') - -prepare() { - cd ${srcdir}/${pkgname}-${pkgver} - - patch -p1 -i ${srcdir}/automake-1.14-msys2.patch -} - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr - make -} - -check() { - cd ${srcdir}/${pkgname}-${pkgver} - - # expect 2 failures due to perl-5.18 incompatibility - make -k check || true -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install -} diff --git a/automake1.10/PKGBUILD b/automake1.10/PKGBUILD new file mode 100644 index 00000000000..580680b9edf --- /dev/null +++ b/automake1.10/PKGBUILD @@ -0,0 +1,72 @@ +# Maintainer: Alexey Pavlov + +pkgname=automake1.10 +pkgver=1.10.3 +pkgrel=1 +pkgdesc="A GNU tool for automatically creating Makefiles" +arch=('any') +license=('GPL') +url="http://www.gnu.org/software/automake" +groups=('base-devel') +depends=('perl' 'bash') +makedepends=('autoconf') +checkdepends=('dejagnu' 'python2') +install=automake.install +source=(ftp://ftp.gnu.org/gnu/automake/automake-${pkgver}.tar.bz2{,.sig} + automake-1.10-msys2.patch + automake1.10-documentation.patch + automake-1.10-makeinfo-fix.patch) +md5sums=('b8e67fb458da396bc35555af7ef2b49f' + 'SKIP' + '0cc04bed86ae6d1b5c3bd90ba3593ee6' + 'b9537a6237a5bdf8c48a76c277b53ae6' + '79199a6a20eaab3f95f17cfde86e628d') + +prepare() { + cd ${srcdir}/automake-${pkgver} + + patch -p2 -i ${srcdir}/automake1.10-documentation.patch + patch -p1 -i ${srcdir}/automake-1.10-makeinfo-fix.patch + patch -p1 -i ${srcdir}/automake-1.10-msys2.patch +} + +build() { + cd ${srcdir}/automake-${pkgver} + ./configure --prefix=/usr + make + + (cd doc && makeinfo -I ${srcdir}/automake-${pkgver}/doc -o automake1.10.info automake.texi) +} + +check() { + cd ${srcdir}/automake-${pkgver} + + # expect 2 failures due to perl-5.18 incompatibility + make -k check || true +} + +package() { + cd ${srcdir}/automake-${pkgver} + make DESTDIR=${pkgdir} install + + # install the 1.11 versioned info files + for f in `find ${pkgdir}/usr/share/info -name "*.info*"` ; do + rm -f ${f} + done + for f in `find ${srcdir}/automake-${pkgver} -name "*.info*"` ; do + bf=`basename $f` + cp $f ${pkgdir}/usr/share/info/ + done + + # remove the unversioned executables + rm -f ${pkgdir}/usr/bin/automake ${pkgdir}/usr/bin/aclocal + + # remove the unversioned man pages + rm -f ${pkgdir}/usr/share/man/man1/automake.1 + rm -f ${pkgdir}/usr/share/man/man1/aclocal.1 + + # remove the unversioned info files + rm -f ${pkgdir}/usr/share/info/automake.info* + + rm -rf ${pkgdir}/usr/share/doc +} diff --git a/automake1.10/automake-1.10-makeinfo-fix.patch b/automake1.10/automake-1.10-makeinfo-fix.patch new file mode 100644 index 00000000000..d61b6d0209d --- /dev/null +++ b/automake1.10/automake-1.10-makeinfo-fix.patch @@ -0,0 +1,36 @@ +--- automake-1.10.3/doc/automake.texi.orig 2009-12-08 22:36:30.000000000 +0300 ++++ automake-1.10.3/doc/automake.texi 2013-12-18 09:37:58.142800000 +0400 +@@ -11635,11 +11635,11 @@ + Options: these items on which Automake works have been rewritten as + separate Perl modules, and documented. + +-@itemx 2004-01-11 Automake 1.8.1 +-@itemx 2004-01-12 Automake 1.8.2 +-@itemx 2004-03-07 Automake 1.8.3 +-@itemx 2004-04-25 Automake 1.8.4 +-@itemx 2004-05-16 Automake 1.8.5 ++@item 2004-01-11 Automake 1.8.1 ++@item 2004-01-12 Automake 1.8.2 ++@item 2004-03-07 Automake 1.8.3 ++@item 2004-04-25 Automake 1.8.4 ++@item 2004-05-16 Automake 1.8.5 + + @item 2004-07-28 Automake 1.9 + +@@ -11652,13 +11652,13 @@ + + Aside from this it contains mainly minor changes and bug-fixes. + +-@itemx 2004-08-11 Automake 1.9.1 +-@itemx 2004-09-19 Automake 1.9.2 ++@item 2004-08-11 Automake 1.9.1 ++@item 2004-09-19 Automake 1.9.2 + + Automake has ten years. This chapter of the manual was initially + written for this occasion. + +-@itemx 2007-10-29 Automake repository moves to @code{savannah.gnu.org} and uses ++@item 2007-10-29 Automake repository moves to @code{savannah.gnu.org} and uses + git as primary repository. + + @end table diff --git a/automake1.10/automake-1.10-msys2.patch b/automake1.10/automake-1.10-msys2.patch new file mode 100644 index 00000000000..bf3fd9cb133 --- /dev/null +++ b/automake1.10/automake-1.10-msys2.patch @@ -0,0 +1,33 @@ +--- automake-1.10.3/lib/config.guess.orig 2009-12-08 22:36:30.000000000 +0300 ++++ automake-1.10.3/lib/config.guess 2013-12-18 09:32:40.711600000 +0400 +@@ -800,6 +800,9 @@ + i*:CYGWIN*:*) + echo ${UNAME_MACHINE}-pc-cygwin + exit ;; ++ i*:MSYS*:*) ++ echo ${UNAME_MACHINE}-pc-msys ++ exit ;; + *:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 + exit ;; +@@ -840,6 +843,9 @@ + amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) + echo x86_64-unknown-cygwin + exit ;; ++ amd64:MSYS*:*:* | x86_64:MSYS*:*:*) ++ echo x86_64-unknown-msys ++ exit ;; + p*:CYGWIN*:*) + echo powerpcle-unknown-cygwin + exit ;; +--- automake-1.10.3/lib/config.sub.orig 2009-12-08 22:36:30.000000000 +0300 ++++ automake-1.10.3/lib/config.sub 2013-12-18 09:31:52.226800000 +0400 +@@ -1293,7 +1293,7 @@ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* | -cegcc* \ +- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ ++ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ diff --git a/automake1.10/automake.install b/automake1.10/automake.install new file mode 100644 index 00000000000..796238575ae --- /dev/null +++ b/automake1.10/automake.install @@ -0,0 +1,22 @@ +infodir=usr/share/info +filelist=(automake1.10.info automake1.10.info-1 automake1.10.info-2) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +# vim:set ts=2 sw=2 et: diff --git a/automake1.10/automake1.10-documentation.patch b/automake1.10/automake1.10-documentation.patch new file mode 100644 index 00000000000..aa22003583b --- /dev/null +++ b/automake1.10/automake1.10-documentation.patch @@ -0,0 +1,29 @@ +--- origsrc/automake-1.10.3/doc/automake.texi 2009-12-08 14:36:30.000000000 -0500 ++++ src/automake-1.10.3/doc/automake.texi 2009-12-24 09:43:17.696000000 -0500 +@@ -1,7 +1,7 @@ + \input texinfo @c -*-texinfo-*- + @c %**start of header +-@setfilename automake.info +-@settitle automake ++@setfilename automake1.10.info ++@settitle automake1.10 + @setchapternewpage off + @c %**end of header + +@@ -32,13 +32,13 @@ section entitled ``@acronym{GNU} Free Do + @c (Autoconf has a similar setup.) + @dircategory Software development + @direntry +-* Automake: (automake). Making GNU standards-compliant Makefiles. ++* Automake-1.10: (automake1.10). Making GNU standards-compliant Makefiles. + @end direntry + + @dircategory Individual utilities + @direntry +-* aclocal: (automake)Invoking aclocal. Generating aclocal.m4. +-* automake: (automake)Invoking Automake. Generating Makefile.in. ++* aclocal-1.10: (automake1.10)Invoking aclocal. Generating aclocal.m4. ++* automake-1.10: (automake1.10)Invoking Automake. Generating Makefile.in. + @end direntry + + @titlepage diff --git a/automake1.11/PKGBUILD b/automake1.11/PKGBUILD new file mode 100644 index 00000000000..350d88d7c22 --- /dev/null +++ b/automake1.11/PKGBUILD @@ -0,0 +1,72 @@ +# Maintainer: Alexey Pavlov + +pkgname=automake1.11 +pkgver=1.11.6 +pkgrel=1 +pkgdesc="A GNU tool for automatically creating Makefiles" +arch=('any') +license=('GPL') +url="http://www.gnu.org/software/automake" +groups=('base-devel') +depends=('perl' 'bash') +makedepends=('autoconf') +checkdepends=('dejagnu' 'python2') +install=automake.install +source=(ftp://ftp.gnu.org/gnu/automake/automake-${pkgver}.tar.xz{,.sig} + automake-1.11-msys2.patch + automake1.11-documentation.patch + automake-1.11-makeinfo-fix.patch) +md5sums=('cf4752287ad708f83bd3689da57a32c9' + 'SKIP' + 'a092a0617795ff482591b84184934276' + '5802e665ccf58509f774ba999b509c51' + '9871ecdc828cac4b4b0dae2b0a91089f') + +prepare() { + cd ${srcdir}/automake-${pkgver} + + patch -p2 -i ${srcdir}/automake1.11-documentation.patch + patch -p1 -i ${srcdir}/automake-1.11-makeinfo-fix.patch + patch -p1 -i ${srcdir}/automake-1.11-msys2.patch +} + +build() { + cd ${srcdir}/automake-${pkgver} + ./configure --prefix=/usr + make + + (cd doc && makeinfo -I ${srcdir}/automake-${pkgver}/doc -o automake1.11.info automake.texi) +} + +check() { + cd ${srcdir}/automake-${pkgver} + + # expect 2 failures due to perl-5.18 incompatibility + make -k check || true +} + +package() { + cd ${srcdir}/automake-${pkgver} + make DESTDIR=${pkgdir} install + + # install the 1.11 versioned info files + for f in `find ${pkgdir}/usr/share/info -name "*.info*"` ; do + rm -f ${f} + done + for f in `find ${srcdir}/automake-${pkgver} -name "*.info*"` ; do + bf=`basename $f` + cp $f ${pkgdir}/usr/share/info/ + done + + # remove the unversioned executables + rm -f ${pkgdir}/usr/bin/automake ${pkgdir}/usr/bin/aclocal + + # remove the unversioned man pages + rm -f ${pkgdir}/usr/share/man/man1/automake.1 + rm -f ${pkgdir}/usr/share/man/man1/aclocal.1 + + # remove the unversioned info files + rm -f ${pkgdir}/usr/share/info/automake.info* + + rm -rf ${pkgdir}/usr/share/doc +} diff --git a/automake1.11/automake-1.11-makeinfo-fix.patch b/automake1.11/automake-1.11-makeinfo-fix.patch new file mode 100644 index 00000000000..4c199f9af17 --- /dev/null +++ b/automake1.11/automake-1.11-makeinfo-fix.patch @@ -0,0 +1,36 @@ +--- automake-1.11.6/doc/automake.texi.orig 2013-12-18 09:13:19.803200000 +0400 ++++ automake-1.11.6/doc/automake.texi 2013-12-18 09:16:16.734200000 +0400 +@@ -13089,11 +13089,11 @@ + Options: these items on which Automake works have been rewritten as + separate Perl modules, and documented. + +-@itemx 2004-01-11 Automake 1.8.1 +-@itemx 2004-01-12 Automake 1.8.2 +-@itemx 2004-03-07 Automake 1.8.3 +-@itemx 2004-04-25 Automake 1.8.4 +-@itemx 2004-05-16 Automake 1.8.5 ++@item 2004-01-11 Automake 1.8.1 ++@item 2004-01-12 Automake 1.8.2 ++@item 2004-03-07 Automake 1.8.3 ++@item 2004-04-25 Automake 1.8.4 ++@item 2004-05-16 Automake 1.8.5 + + @item 2004-07-28 Automake 1.9 + +@@ -13106,13 +13106,13 @@ + + Aside from this it contains mainly minor changes and bug-fixes. + +-@itemx 2004-08-11 Automake 1.9.1 +-@itemx 2004-09-19 Automake 1.9.2 ++@item 2004-08-11 Automake 1.9.1 ++@item 2004-09-19 Automake 1.9.2 + + Automake has ten years. This chapter of the manual was initially + written for this occasion. + +-@itemx 2007-10-29 Automake repository moves to @code{savannah.gnu.org} and uses ++@item 2007-10-29 Automake repository moves to @code{savannah.gnu.org} and uses + git as primary repository. + + @end table diff --git a/automake1.11/automake-1.11-msys2.patch b/automake1.11/automake-1.11-msys2.patch new file mode 100644 index 00000000000..7ddfdb783e9 --- /dev/null +++ b/automake1.11/automake-1.11-msys2.patch @@ -0,0 +1,67 @@ +diff -Naur automake-1.14-orig/lib/ar-lib automake-1.14/lib/ar-lib +--- automake-1.14-orig/lib/ar-lib 2013-05-09 18:13:08.000000000 +0000 ++++ automake-1.14/lib/ar-lib 2013-05-16 09:13:29.442382800 +0000 +@@ -53,7 +53,7 @@ + MINGW*) + file_conv=mingw + ;; +- CYGWIN*) ++ CYGWIN*|MSYS*) + file_conv=cygwin + ;; + *) +@@ -65,7 +65,7 @@ + mingw) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; +- cygwin) ++ cygwin|msys) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine) +diff -Naur automake-1.14-orig/lib/compile automake-1.14/lib/compile +--- automake-1.14-orig/lib/compile 2013-05-09 18:13:08.000000000 +0000 ++++ automake-1.14/lib/compile 2013-05-16 09:14:34.254882800 +0000 +@@ -53,7 +53,7 @@ + MINGW*) + file_conv=mingw + ;; +- CYGWIN*) ++ CYGWIN*|MSYS*) + file_conv=cygwin + ;; + *) +@@ -67,7 +67,7 @@ + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; +- cygwin/*) ++ cygwin/*|msys/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) +diff -Naur automake-1.14-orig/lib/config.guess automake-1.14/lib/config.guess +--- automake-1.14-orig/lib/config.guess 2013-05-13 20:12:48.000000000 +0000 ++++ automake-1.14/lib/config.guess 2013-05-16 09:14:15.176757800 +0000 +@@ -845,6 +845,9 @@ + amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) + echo x86_64-unknown-cygwin + exit ;; ++ amd64:MSYS*:*:* | x86_64:MSYS*:*:*) ++ echo x86_64-unknown-msys ++ exit ;; + p*:CYGWIN*:*) + echo powerpcle-unknown-cygwin + exit ;; +diff -Naur automake-1.14-orig/t/compile5.test automake-1.14/t/compile5.test +--- automake-1.14-orig/tests/compile5.test 2013-05-09 18:13:08.000000000 +0000 ++++ automake-1.14/tests/compile5.test 2013-05-16 09:15:38.355468800 +0000 +@@ -47,7 +47,7 @@ + ;; + esac + case @build_os@ in +- mingw* | cygwin*) ++ mingw* | cygwin* | msys*) + ;; + *) + winepath -w / \ diff --git a/automake1.11/automake.install b/automake1.11/automake.install new file mode 100644 index 00000000000..dafe7d5ada3 --- /dev/null +++ b/automake1.11/automake.install @@ -0,0 +1,22 @@ +infodir=usr/share/info +filelist=(automake1.11.info automake1.11.info-1 automake1.11.info-2) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +# vim:set ts=2 sw=2 et: diff --git a/automake1.11/automake1.11-documentation.patch b/automake1.11/automake1.11-documentation.patch new file mode 100644 index 00000000000..bdf162d2830 --- /dev/null +++ b/automake1.11/automake1.11-documentation.patch @@ -0,0 +1,29 @@ +--- origsrc/automake-1.11.6/doc/automake.texi 2012-07-09 11:39:57.000000000 -0400 ++++ src/automake-1.11.6/doc/automake.texi 2012-08-31 20:51:13.314190500 -0400 +@@ -1,7 +1,7 @@ + \input texinfo @c -*-texinfo-*- + @c %**start of header +-@setfilename automake.info +-@settitle automake ++@setfilename automake1.11.info ++@settitle automake1.11 + @setchapternewpage off + @c %**end of header + +@@ -40,13 +40,13 @@ section entitled ``GNU Free Documentatio + + @dircategory Software development + @direntry +-* Automake: (automake). Making GNU standards-compliant Makefiles. ++* Automake-1.11: (automake1.11). Making GNU standards-compliant Makefiles. + @end direntry + + @dircategory Individual utilities + @direntry +-* aclocal-invocation: (automake)aclocal Invocation. Generating aclocal.m4. +-* automake-invocation: (automake)automake Invocation. Generating Makefile.in. ++* aclocal-1.11-invocation: (automake1.11)aclocal Invocation. Generating aclocal.m4. ++* automake-1.11-invocation: (automake1.11)automake Invocation. Generating Makefile.in. + @end direntry + + @titlepage diff --git a/automake1.12/PKGBUILD b/automake1.12/PKGBUILD new file mode 100644 index 00000000000..285945b367a --- /dev/null +++ b/automake1.12/PKGBUILD @@ -0,0 +1,73 @@ +# Maintainer: Alexey Pavlov + +pkgname=automake1.12 +pkgver=1.12.6 +pkgrel=1 +pkgdesc="A GNU tool for automatically creating Makefiles" +arch=('any') +license=('GPL') +url="http://www.gnu.org/software/automake" +groups=('base-devel') +depends=('perl' 'bash') +makedepends=('autoconf') +checkdepends=('dejagnu' 'python2') +install=automake.install +source=(ftp://ftp.gnu.org/gnu/automake/automake-${pkgver}.tar.xz{,.sig} + automake-1.14-msys2.patch + automake1.12-documentation.patch) +md5sums=('140e084223bf463a24c1a28427c6aec7' + 'SKIP' + '233d8dc0c46722a8940bac31a2a25cbc' + '0b1ea43e3b8cb33562c15eb13b29488c') + +prepare() { + cd ${srcdir}/automake-${pkgver} + + patch -p2 -i ${srcdir}/automake1.12-documentation.patch + patch -p1 -i ${srcdir}/automake-1.14-msys2.patch +} + +build() { + cd ${srcdir}/automake-${pkgver} + ./configure --prefix=/usr + make + + (cd doc && makeinfo -I ${srcdir}/automake-${pkgver}/doc -o automake1.12.info automake.texi) + (cd doc && makeinfo -I ${srcdir}/automake-${pkgver}/doc -o automake-history1.12.info automake-history.texi) +} + +check() { + cd ${srcdir}/automake-${pkgver} + + # expect 2 failures due to perl-5.18 incompatibility + make -k check || true +} + +package() { + cd ${srcdir}/automake-${pkgver} + make DESTDIR=${pkgdir} install + + mv ${pkgdir}/usr/share/aclocal/README ${pkgdir}/usr/share/aclocal/README.am12 + + # install the 1.12 versioned info files + for f in `find ${pkgdir}/usr/share/info -name "*.info*"` ; do + rm -f ${f} + done + for f in `find ${srcdir}/automake-${pkgver} -name "*.info*"` ; do + bf=`basename $f` + cp $f ${pkgdir}/usr/share/info/ + done + + # remove the unversioned executables + rm -f ${pkgdir}/usr/bin/automake ${pkgdir}/usr/bin/aclocal + + # remove the unversioned man pages + rm -f ${pkgdir}/usr/share/man/man1/automake.1 + rm -f ${pkgdir}/usr/share/man/man1/aclocal.1 + + # remove the unversioned info files + rm -f ${pkgdir}/usr/share/info/automake.info* + rm -f ${pkgdir}/usr/share/info/automake-history.info* + + rm -rf ${pkgdir}/usr/share/doc +} diff --git a/automake/automake-1.14-msys2.patch b/automake1.12/automake-1.14-msys2.patch similarity index 100% rename from automake/automake-1.14-msys2.patch rename to automake1.12/automake-1.14-msys2.patch diff --git a/automake1.12/automake.install b/automake1.12/automake.install new file mode 100644 index 00000000000..f58a03c4bfd --- /dev/null +++ b/automake1.12/automake.install @@ -0,0 +1,22 @@ +infodir=usr/share/info +filelist=(automake1.12.info automake1.12.info-1 automake1.12.info-2 automake-history1.12.info) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +# vim:set ts=2 sw=2 et: diff --git a/automake1.12/automake1.12-documentation.patch b/automake1.12/automake1.12-documentation.patch new file mode 100644 index 00000000000..787e74f85be --- /dev/null +++ b/automake1.12/automake1.12-documentation.patch @@ -0,0 +1,41 @@ +--- origsrc/automake-1.12.5/doc/automake-history.texi 2012-11-15 10:56:40.000000000 -0500 ++++ src/automake-1.12.5/doc/automake-history.texi 2012-12-05 22:19:58.808409700 -0500 +@@ -1,7 +1,7 @@ + \input texinfo @c -*-texinfo-*- + @c %**start of header +-@setfilename automake-history.info +-@settitle automake-history ++@setfilename automake-history1.12.info ++@settitle automake-history1.12 + @setchapternewpage on + @c %**end of header + +--- origsrc/automake-1.12.5/doc/automake.texi 2012-11-17 10:25:47.000000000 -0500 ++++ src/automake-1.12.5/doc/automake.texi 2012-12-05 22:19:58.818410300 -0500 +@@ -1,7 +1,7 @@ + \input texinfo @c -*-texinfo-*- + @c %**start of header +-@setfilename automake.info +-@settitle automake ++@setfilename automake1.12.info ++@settitle automake1.12 + @setchapternewpage off + @c %**end of header + +@@ -38,13 +38,13 @@ section entitled ``GNU Free Documentatio + + @dircategory Software development + @direntry +-* Automake: (automake). Making GNU standards-compliant Makefiles. ++* Automake-1.12: (automake1.12). Making GNU standards-compliant Makefiles. + @end direntry + + @dircategory Individual utilities + @direntry +-* aclocal-invocation: (automake)aclocal Invocation. Generating aclocal.m4. +-* automake-invocation: (automake)automake Invocation. Generating Makefile.in. ++* aclocal-1.12-invocation: (automake1.12)aclocal Invocation. Generating aclocal.m4. ++* automake-1.12-invocation: (automake1.12)automake Invocation. Generating Makefile.in. + @end direntry + + @titlepage diff --git a/automake1.13/PKGBUILD b/automake1.13/PKGBUILD new file mode 100644 index 00000000000..af5ca6de516 --- /dev/null +++ b/automake1.13/PKGBUILD @@ -0,0 +1,73 @@ +# Maintainer: Alexey Pavlov + +pkgname=automake1.13 +pkgver=1.13.4 +pkgrel=1 +pkgdesc="A GNU tool for automatically creating Makefiles" +arch=('any') +license=('GPL') +url="http://www.gnu.org/software/automake" +groups=('base-devel') +depends=('perl' 'bash') +makedepends=('autoconf') +checkdepends=('dejagnu' 'python2') +install=automake.install +source=(ftp://ftp.gnu.org/gnu/automake/automake-${pkgver}.tar.xz{,.sig} + automake-1.14-msys2.patch + automake1.13-documentation.patch) +md5sums=('71b03c1bc4f587add12604587d9276d1' + 'SKIP' + '233d8dc0c46722a8940bac31a2a25cbc' + '2e85e5cdd7db44bba63126a9e95cdbf4') + +prepare() { + cd ${srcdir}/automake-${pkgver} + + patch -p2 -i ${srcdir}/automake1.13-documentation.patch + patch -p1 -i ${srcdir}/automake-1.14-msys2.patch +} + +build() { + cd ${srcdir}/automake-${pkgver} + ./configure --prefix=/usr + make + + (cd doc && makeinfo -I ${srcdir}/automake-${pkgver}/doc -o automake1.13.info automake.texi) + (cd doc && makeinfo -I ${srcdir}/automake-${pkgver}/doc -o automake-history1.13.info automake-history.texi) +} + +check() { + cd ${srcdir}/automake-${pkgver} + + # expect 2 failures due to perl-5.18 incompatibility + make -k check || true +} + +package() { + cd ${srcdir}/automake-${pkgver} + make DESTDIR=${pkgdir} install + + mv ${pkgdir}/usr/share/aclocal/README ${pkgdir}/usr/share/aclocal/README.am13 + + # install the 1.13 versioned info files + for f in `find ${pkgdir}/usr/share/info -name "*.info*"` ; do + rm -f ${f} + done + for f in `find ${srcdir}/automake-${pkgver} -name "*.info*"` ; do + bf=`basename $f` + cp $f ${pkgdir}/usr/share/info/ + done + + # remove the unversioned executables + rm -f ${pkgdir}/usr/bin/automake ${pkgdir}/usr/bin/aclocal + + # remove the unversioned man pages + rm -f ${pkgdir}/usr/share/man/man1/automake.1 + rm -f ${pkgdir}/usr/share/man/man1/aclocal.1 + + # remove the unversioned info files + rm -f ${pkgdir}/usr/share/info/automake.info* + rm -f ${pkgdir}/usr/share/info/automake-history.info* + + rm -rf ${pkgdir}/usr/share/doc +} diff --git a/automake1.13/automake-1.14-msys2.patch b/automake1.13/automake-1.14-msys2.patch new file mode 100644 index 00000000000..f61b1dc257e --- /dev/null +++ b/automake1.13/automake-1.14-msys2.patch @@ -0,0 +1,67 @@ +diff -Naur automake-1.14-orig/lib/ar-lib automake-1.14/lib/ar-lib +--- automake-1.14-orig/lib/ar-lib 2013-05-09 18:13:08.000000000 +0000 ++++ automake-1.14/lib/ar-lib 2013-05-16 09:13:29.442382800 +0000 +@@ -53,7 +53,7 @@ + MINGW*) + file_conv=mingw + ;; +- CYGWIN*) ++ CYGWIN*|MSYS*) + file_conv=cygwin + ;; + *) +@@ -65,7 +65,7 @@ + mingw) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; +- cygwin) ++ cygwin|msys) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine) +diff -Naur automake-1.14-orig/lib/compile automake-1.14/lib/compile +--- automake-1.14-orig/lib/compile 2013-05-09 18:13:08.000000000 +0000 ++++ automake-1.14/lib/compile 2013-05-16 09:14:34.254882800 +0000 +@@ -53,7 +53,7 @@ + MINGW*) + file_conv=mingw + ;; +- CYGWIN*) ++ CYGWIN*|MSYS*) + file_conv=cygwin + ;; + *) +@@ -67,7 +67,7 @@ + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; +- cygwin/*) ++ cygwin/*|msys/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) +diff -Naur automake-1.14-orig/lib/config.guess automake-1.14/lib/config.guess +--- automake-1.14-orig/lib/config.guess 2013-05-13 20:12:48.000000000 +0000 ++++ automake-1.14/lib/config.guess 2013-05-16 09:14:15.176757800 +0000 +@@ -845,6 +845,9 @@ + amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) + echo x86_64-unknown-cygwin + exit ;; ++ amd64:MSYS*:*:* | x86_64:MSYS*:*:*) ++ echo x86_64-unknown-msys ++ exit ;; + p*:CYGWIN*:*) + echo powerpcle-unknown-cygwin + exit ;; +diff -Naur automake-1.14-orig/t/compile5.sh automake-1.14/t/compile5.sh +--- automake-1.14-orig/t/compile5.sh 2013-05-09 18:13:08.000000000 +0000 ++++ automake-1.14/t/compile5.sh 2013-05-16 09:15:38.355468800 +0000 +@@ -47,7 +47,7 @@ + ;; + esac + case @build_os@ in +- mingw* | cygwin*) ++ mingw* | cygwin* | msys*) + ;; + *) + winepath -w / \ diff --git a/automake1.13/automake.install b/automake1.13/automake.install new file mode 100644 index 00000000000..f63f673cae3 --- /dev/null +++ b/automake1.13/automake.install @@ -0,0 +1,22 @@ +infodir=usr/share/info +filelist=(automake1.13.info automake1.13.info-1 automake1.13.info-2 automake-history1.13.info) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +# vim:set ts=2 sw=2 et: diff --git a/automake1.13/automake1.13-documentation.patch b/automake1.13/automake1.13-documentation.patch new file mode 100644 index 00000000000..2387f42f0eb --- /dev/null +++ b/automake1.13/automake1.13-documentation.patch @@ -0,0 +1,43 @@ +diff -urN origsrc/automake-1.13.4/doc/automake.texi src/automake-1.13.4/doc/automake.texi +--- origsrc/automake-1.13.4/doc/automake.texi 2013-06-14 08:31:35.000000000 -0400 ++++ src/automake-1.13.4/doc/automake.texi 2013-07-29 20:55:51.467702100 -0400 +@@ -1,7 +1,7 @@ + \input texinfo @c -*-texinfo-*- + @c %**start of header +-@setfilename automake.info +-@settitle automake ++@setfilename automake1.13.info ++@settitle automake1.13 + @setchapternewpage off + @c %**end of header + +@@ -38,13 +38,13 @@ + + @dircategory Software development + @direntry +-* Automake: (automake). Making GNU standards-compliant Makefiles. ++* Automake-1.13: (automake1.13). Making GNU standards-compliant Makefiles. + @end direntry + + @dircategory Individual utilities + @direntry +-* aclocal-invocation: (automake)aclocal Invocation. Generating aclocal.m4. +-* automake-invocation: (automake)automake Invocation. Generating Makefile.in. ++* aclocal-1.13-invocation: (automake1.13)aclocal Invocation. Generating aclocal.m4. ++* automake-1.13-invocation: (automake1.13)automake Invocation. Generating Makefile.in. + @end direntry + + @titlepage +diff -x CYGWIN-PATCHES -urN origsrc/automake-1.13.4/doc/automake-history.texi src/automake-1.13.4/doc/automake-history.texi +--- origsrc/automake-1.13.4/doc/automake-history.texi 2013-06-09 05:31:22.000000000 -0400 ++++ src/automake-1.13.4/doc/automake-history.texi 2013-07-29 20:54:49.821176100 -0400 +@@ -1,7 +1,7 @@ + \input texinfo @c -*-texinfo-*- + @c %**start of header +-@setfilename automake-history.info +-@settitle automake-history ++@setfilename automake-history1.13.info ++@settitle automake-history1.13 + @setchapternewpage on + @c %**end of header + diff --git a/automake1.14/PKGBUILD b/automake1.14/PKGBUILD new file mode 100644 index 00000000000..b89b8a617f7 --- /dev/null +++ b/automake1.14/PKGBUILD @@ -0,0 +1,74 @@ +# Maintainer: Alexey Pavlov + +pkgname=automake1.14 +pkgver=1.14 +pkgrel=1 +pkgdesc="A GNU tool for automatically creating Makefiles" +arch=('any') +license=('GPL') +url="http://www.gnu.org/software/automake" +groups=('base-devel') +depends=('perl' 'bash') +makedepends=('autoconf') +checkdepends=('dejagnu' 'python2') +install=automake.install +source=(ftp://ftp.gnu.org/gnu/automake/automake-${pkgver}.tar.xz{,.sig} + automake1.14-documentation.patch + automake-1.14-msys2.patch) +md5sums=('cb3fba6d631cddf12e230fd0cc1890df' + 'SKIP' + '6966aacbdd0fbfcb0694963a5a53b042' + '233d8dc0c46722a8940bac31a2a25cbc') +replace=('automake') + +prepare() { + cd ${srcdir}/automake-${pkgver} + + patch -p2 -i ${srcdir}/automake1.14-documentation.patch + patch -p1 -i ${srcdir}/automake-1.14-msys2.patch +} + +build() { + cd ${srcdir}/automake-${pkgver} + ./configure --prefix=/usr + make + + (cd doc && makeinfo -I ${srcdir}/automake-${pkgver}/doc -o automake1.14.info automake.texi) + (cd doc && makeinfo -I ${srcdir}/automake-${pkgver}/doc -o automake-history1.14.info automake-history.texi) +} + +check() { + cd ${srcdir}/automake-${pkgver} + + # expect 2 failures due to perl-5.18 incompatibility + make -k check || true +} + +package() { + cd ${srcdir}/automake-${pkgver} + make DESTDIR=${pkgdir} install + + mv ${pkgdir}/usr/share/aclocal/README ${pkgdir}/usr/share/aclocal/README.am14 + + # install the 1.14 versioned info files + for f in `find ${pkgdir}/usr/share/info -name "*.info*"` ; do + rm -f ${f} + done + for f in `find ${srcdir}/automake-${pkgver} -name "*.info*"` ; do + bf=`basename $f` + cp $f ${pkgdir}/usr/share/info/ + done + + # remove the unversioned executables + rm -f ${pkgdir}/usr/bin/automake ${pkgdir}/usr/bin/aclocal + + # remove the unversioned man pages + rm -f ${pkgdir}/usr/share/man/man1/automake.1 + rm -f ${pkgdir}/usr/share/man/man1/aclocal.1 + + # remove the unversioned info files + rm -f ${pkgdir}/usr/share/info/automake.info* + rm -f ${pkgdir}/usr/share/info/automake-history.info* + + rm -rf ${pkgdir}/usr/share/doc +} diff --git a/automake1.14/automake-1.14-msys2.patch b/automake1.14/automake-1.14-msys2.patch new file mode 100644 index 00000000000..f61b1dc257e --- /dev/null +++ b/automake1.14/automake-1.14-msys2.patch @@ -0,0 +1,67 @@ +diff -Naur automake-1.14-orig/lib/ar-lib automake-1.14/lib/ar-lib +--- automake-1.14-orig/lib/ar-lib 2013-05-09 18:13:08.000000000 +0000 ++++ automake-1.14/lib/ar-lib 2013-05-16 09:13:29.442382800 +0000 +@@ -53,7 +53,7 @@ + MINGW*) + file_conv=mingw + ;; +- CYGWIN*) ++ CYGWIN*|MSYS*) + file_conv=cygwin + ;; + *) +@@ -65,7 +65,7 @@ + mingw) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; +- cygwin) ++ cygwin|msys) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine) +diff -Naur automake-1.14-orig/lib/compile automake-1.14/lib/compile +--- automake-1.14-orig/lib/compile 2013-05-09 18:13:08.000000000 +0000 ++++ automake-1.14/lib/compile 2013-05-16 09:14:34.254882800 +0000 +@@ -53,7 +53,7 @@ + MINGW*) + file_conv=mingw + ;; +- CYGWIN*) ++ CYGWIN*|MSYS*) + file_conv=cygwin + ;; + *) +@@ -67,7 +67,7 @@ + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; +- cygwin/*) ++ cygwin/*|msys/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) +diff -Naur automake-1.14-orig/lib/config.guess automake-1.14/lib/config.guess +--- automake-1.14-orig/lib/config.guess 2013-05-13 20:12:48.000000000 +0000 ++++ automake-1.14/lib/config.guess 2013-05-16 09:14:15.176757800 +0000 +@@ -845,6 +845,9 @@ + amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) + echo x86_64-unknown-cygwin + exit ;; ++ amd64:MSYS*:*:* | x86_64:MSYS*:*:*) ++ echo x86_64-unknown-msys ++ exit ;; + p*:CYGWIN*:*) + echo powerpcle-unknown-cygwin + exit ;; +diff -Naur automake-1.14-orig/t/compile5.sh automake-1.14/t/compile5.sh +--- automake-1.14-orig/t/compile5.sh 2013-05-09 18:13:08.000000000 +0000 ++++ automake-1.14/t/compile5.sh 2013-05-16 09:15:38.355468800 +0000 +@@ -47,7 +47,7 @@ + ;; + esac + case @build_os@ in +- mingw* | cygwin*) ++ mingw* | cygwin* | msys*) + ;; + *) + winepath -w / \ diff --git a/automake1.14/automake.install b/automake1.14/automake.install new file mode 100644 index 00000000000..848f8fedec7 --- /dev/null +++ b/automake1.14/automake.install @@ -0,0 +1,22 @@ +infodir=usr/share/info +filelist=(automake1.14.info automake1.14.info-1 automake1.14.info-2 automake-history1.14.info) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +# vim:set ts=2 sw=2 et: diff --git a/automake1.14/automake1.14-documentation.patch b/automake1.14/automake1.14-documentation.patch new file mode 100644 index 00000000000..eb0ec7fbe38 --- /dev/null +++ b/automake1.14/automake1.14-documentation.patch @@ -0,0 +1,43 @@ +diff -urN origsrc/automake-1.14/doc/automake.texi src/automake-1.14/doc/automake.texi +--- origsrc/automake-1.14/doc/automake.texi 2013-06-20 04:44:16.000000000 -0400 ++++ src/automake-1.14/doc/automake.texi 2013-07-29 21:17:31.819078000 -0400 +@@ -1,7 +1,7 @@ + \input texinfo @c -*-texinfo-*- + @c %**start of header +-@setfilename automake.info +-@settitle automake ++@setfilename automake1.14.info ++@settitle automake1.14 + @setchapternewpage off + @c %**end of header + +@@ -38,13 +38,13 @@ + + @dircategory Software development + @direntry +-* Automake: (automake). Making GNU standards-compliant Makefiles. ++* Automake-1.14: (automake1.14). Making GNU standards-compliant Makefiles. + @end direntry + + @dircategory Individual utilities + @direntry +-* aclocal-invocation: (automake)aclocal Invocation. Generating aclocal.m4. +-* automake-invocation: (automake)automake Invocation. Generating Makefile.in. ++* aclocal-1.14-invocation: (automake1.14)aclocal Invocation. Generating aclocal.m4. ++* automake-1.14-invocation: (automake1.14)automake Invocation. Generating Makefile.in. + @end direntry + + @titlepage +diff -urN origsrc/automake-1.14/doc/automake-history.texi src/automake-1.14/doc/automake-history.texi +--- origsrc/automake-1.14/doc/automake-history.texi 2013-06-19 05:29:50.000000000 -0400 ++++ src/automake-1.14/doc/automake-history.texi 2013-07-29 21:16:25.582289400 -0400 +@@ -1,7 +1,7 @@ + \input texinfo @c -*-texinfo-*- + @c %**start of header +-@setfilename automake-history.info +-@settitle automake-history ++@setfilename automake-history1.14.info ++@settitle automake-history1.14 + @setchapternewpage on + @c %**end of header + diff --git a/automake1.6/PKGBUILD b/automake1.6/PKGBUILD new file mode 100644 index 00000000000..684f1b890ab --- /dev/null +++ b/automake1.6/PKGBUILD @@ -0,0 +1,79 @@ +# Maintainer: Alexey Pavlov + +pkgname=automake1.6 +pkgver=1.6.3 +pkgrel=1 +pkgdesc="A GNU tool for automatically creating Makefiles" +arch=('any') +license=('GPL') +url="http://www.gnu.org/software/automake" +groups=('base-devel') +depends=('perl' 'bash') +makedepends=('autoconf') +checkdepends=('dejagnu' 'python2') +install=automake.install +source=(ftp://ftp.gnu.org/gnu/automake/automake-${pkgver}.tar.bz2 + automake1.6-add-dirlist-support.patch + automake1.6-accomodate-newer-autoconf.patch + automake1.6-documentation.patch + automake1.6-avoid-autoreconf.patch + automake-1.7-msys2.patch) +md5sums=('2e8053609e9d318f80db0fce29dca7e9' + 'dd1c78ca9682f3f71d1b898d227d6bea' + '3126d87e09e012495e6dbca62ff97535' + 'a7f4523fc25881deadcf580a6e79f4a2' + '84dc4f87235cf1148de5de94ba9f05c3' + 'a952177db4955709b3363b9b14c9ace5') + +prepare() { + cd ${srcdir}/automake-${pkgver} + + patch -p2 -i ${srcdir}/automake1.6-add-dirlist-support.patch + patch -p2 -i ${srcdir}/automake1.6-accomodate-newer-autoconf.patch + patch -p2 -i ${srcdir}/automake1.6-documentation.patch + patch -p1 -i ${srcdir}/automake1.6-avoid-autoreconf.patch + patch -p1 -i ${srcdir}/automake-1.7-msys2.patch +} + +build() { + cd ${srcdir}/automake-${pkgver} + ./configure --prefix=/usr + make + + (makeinfo -I ${srcdir}/automake-${pkgver} -o automake1.6.info automake.texi) +} + +check() { + cd ${srcdir}/automake-${pkgver} + + # expect 2 failures due to perl-5.18 incompatibility + make -k check || true +} + +package() { + cd ${srcdir}/automake-${pkgver} + make DESTDIR=${pkgdir} install + + mv ${pkgdir}/usr/info ${pkgdir}/usr/share/ + + # install the 1.6 versioned info files + for f in `find ${pkgdir}/usr/share/info -name "*.info*"` ; do + rm -f ${f} + done + for f in `find ${srcdir}/automake-${pkgver} -name "*.info*"` ; do + bf=`basename $f` + cp $f ${pkgdir}/usr/share/info/ + done + + # remove the unversioned executables + rm -f ${pkgdir}/usr/bin/automake ${pkgdir}/usr/bin/aclocal + + # remove the unversioned man pages + rm -f ${pkgdir}/usr/share/man/man1/automake.1 + rm -f ${pkgdir}/usr/share/man/man1/aclocal.1 + + # remove the unversioned info files + rm -f ${pkgdir}/usr/share/info/automake.info* + + rm -rf ${pkgdir}/usr/share/doc +} diff --git a/automake1.6/automake-1.7-msys2.patch b/automake1.6/automake-1.7-msys2.patch new file mode 100644 index 00000000000..148067d805f --- /dev/null +++ b/automake1.6/automake-1.7-msys2.patch @@ -0,0 +1,33 @@ +--- automake-1.7.9/lib/config.guess.orig 2005-07-10 21:16:04.000000000 +0400 ++++ automake-1.7.9/lib/config.guess 2013-12-18 09:57:07.220600000 +0400 +@@ -769,6 +769,9 @@ + i*:CYGWIN*:*) + echo ${UNAME_MACHINE}-pc-cygwin + exit 0 ;; ++ i*:MSYS*:*) ++ echo ${UNAME_MACHINE}-pc-msys ++ exit 0 ;; + i*:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 + exit 0 ;; +@@ -797,6 +800,9 @@ + i*:UWIN*:*) + echo ${UNAME_MACHINE}-pc-uwin + exit 0 ;; ++ amd64:MSYS*:*:* | x86_64:MSYS*:*:*) ++ echo x86_64-unknown-msys ++ exit 0 ;; + p*:CYGWIN*:*) + echo powerpcle-unknown-cygwin + exit 0 ;; +--- automake-1.7.9/lib/config.sub.orig 2013-12-18 09:56:00.256200000 +0400 ++++ automake-1.7.9/lib/config.sub 2013-12-18 09:58:59.954200000 +0400 +@@ -1180,7 +1180,7 @@ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* \ +- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ ++ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ diff --git a/automake/automake.install b/automake1.6/automake.install similarity index 88% rename from automake/automake.install rename to automake1.6/automake.install index 26ce3ce7755..823d3c3adee 100644 --- a/automake/automake.install +++ b/automake1.6/automake.install @@ -1,5 +1,5 @@ infodir=usr/share/info -filelist=(automake.info automake.info-1 automake.info-2) +filelist=(automake1.6.info) post_install() { [ -x usr/bin/install-info ] || return 0 diff --git a/automake1.6/automake1.6-accomodate-newer-autoconf.patch b/automake1.6/automake1.6-accomodate-newer-autoconf.patch new file mode 100644 index 00000000000..59a9ced28ef --- /dev/null +++ b/automake1.6/automake1.6-accomodate-newer-autoconf.patch @@ -0,0 +1,23 @@ +--- origsrc/automake-1.6.3/tests/depcomp2.test 2001-12-26 03:22:05.000000000 -0500 ++++ src/automake-1.6.3/tests/depcomp2.test 2008-10-25 17:03:51.255889600 -0400 +@@ -37,4 +37,6 @@ + $AUTOMAKE --add-missing || exit 1 + $AUTOCONF || exit 1 + CC='gcc' ./configure 2>error.log +-test -z "`cat error.log`" ++-test -z "`cat error.log`" ++# accomodate newer autoconf ++test -z "`cat error.log | sed -e '/seems to ignore the --datarootdir setting/d'`" +--- origsrc/automake-1.6.3/tests/man2.test 2002-04-26 11:58:38.000000000 -0400 ++++ src/automake-1.6.3/tests/man2.test 2008-10-25 17:03:51.275918400 -0400 +@@ -26,6 +26,7 @@ + ./configure --prefix='' + DESTDIR="`pwd`/=inst" $MAKE -e SHELL=/bin/sh install + +-test -f ./=inst/man/man2/foo.2 +-test -f ./=inst/man/man4/foo.4 +-test -f ./=inst/man/man4/bar.4 ++# accomodate newer autoconf ++test -f ./=inst/man/man2/foo.2 || test -f ./=inst/share/man/man2/foo.2 ++test -f ./=inst/man/man4/foo.4 || test -f ./=inst/share/man/man4/foo.4 ++test -f ./=inst/man/man4/bar.4 || test -f ./=inst/share/man/man4/bar.4 diff --git a/automake1.6/automake1.6-add-dirlist-support.patch b/automake1.6/automake1.6-add-dirlist-support.patch new file mode 100644 index 00000000000..bcd7edcf477 --- /dev/null +++ b/automake1.6/automake1.6-add-dirlist-support.patch @@ -0,0 +1,322 @@ +--- origsrc/automake-1.6.3/aclocal.in 2002-06-21 15:45:04.000000000 -0400 ++++ src/automake-1.6.3/aclocal.in 2008-10-25 17:03:51.225846400 -0400 +@@ -46,6 +46,11 @@ + # Note also that the versioned directory is handled later. + $acdir = "@datadir@/aclocal"; + $default_acdir = $acdir; ++# contains a list of directories, one per line, to be added ++# to the dirlist in addition to $acdir, as if -I had been ++# added to the command line. If acdir has been redirected, ++# we will also check the specified acdir (this is done later). ++$default_dirlist = "$default_acdir/dirlist"; + + # Some globals. + +@@ -215,6 +220,26 @@ + exit 0; + } + ++ $default_dirlist="$acdir/dirlist" ++ if $acdir ne $default_acdir; ++ ++ if (open (DEFAULT_DIRLIST, $default_dirlist)) ++ { ++ while () ++ { ++ # Ignore '#' lines. ++ next if /^#/; ++ # strip off newlines and end-of-line comments ++ s/\s*\#.*$//; ++ chomp ($contents=$_); ++ if (-d $contents ) ++ { ++ push (@dirlist, $contents); ++ } ++ } ++ close (DEFAULT_DIRLIST); ++ } ++ + # Search the versioned directory near the end, and then the + # unversioned directory last. Only do this if the user didn't + # override acdir. +--- origsrc/automake-1.6.3/automake.texi 2002-07-16 17:14:57.000000000 -0400 ++++ src/automake-1.6.3/automake.texi 2008-10-25 17:03:51.235860800 -0400 +@@ -1301,7 +1301,8 @@ + to supply their own macros. + + At startup, @code{aclocal} scans all the @file{.m4} files it can find, +-looking for macro definitions. Then it scans @file{configure.in}. Any ++looking for macro definitions (@pxref{Macro search path}). Then it ++scans @file{configure.in}. Any + mention of one of the macros found in the first step causes that macro, + and any macros it in turn requires, to be put into @file{aclocal.m4}. + +@@ -1316,6 +1317,17 @@ + comment which will be completely ignored by @code{aclocal}, use + @samp{##} as the comment leader. + ++@menu ++* aclocal options:: Options supported by aclocal ++* Macro search path:: How aclocal finds .m4 files ++@end menu ++ ++@node aclocal options, Macro search path, Invoking aclocal, Invoking aclocal ++@section aclocal options ++ ++@cindex aclocal, Options ++@cindex Options, aclocal ++ + @code{aclocal} accepts the following options: + + @table @code +@@ -1353,6 +1365,143 @@ + Print the version number of Automake and exit. + @end table + ++@node Macro search path, , aclocal options, Invoking aclocal ++@section Macro search path ++ ++@cindex Macro search path ++@cindex aclocal search path ++ ++By default, @command{aclocal} searches for @file{.m4} files in the following ++directories, in this order: ++ ++@table @code ++@item @var{acdir-APIVERSION} ++This is where the @file{.m4} macros distributed with automake itself ++are stored. @var{APIVERSION} depends on the automake release used; ++for automake 1.6.x, @var{APIVERSION} = @code{1.6}. ++ ++@item @var{acdir} ++This directory is intended for third party @file{.m4} files, and is ++configured when @command{automake} itself is built. This is ++@file{@@datadir@@/aclocal/}, which typically ++expands to @file{$@{prefix@}/share/aclocal/}. To find the compiled-in ++value of @var{acdir}, use the @code{--print-ac-dir} option ++(@pxref{aclocal options}). ++@end table ++ ++As an example, suppose that automake-1.6.2 was configured with ++@code{--prefix=/usr/local}. Then, the search path would be: ++ ++@enumerate ++@item @file{/usr/local/share/aclocal-1.6/} ++@item @file{/usr/local/share/aclocal/} ++@end enumerate ++ ++As explained in (@pxref{aclocal options}), there are several options that ++can be used to change or extend this search path. ++ ++@subsection Modifying the macro search path: @code{--acdir} ++ ++The most obvious option to modify the search path is ++@code{--acdir=@var{dir}}, which changes default directory and ++drops the @var{APIVERSION} directory. For example, if one specifies ++@code{--acdir=/opt/private/}, then the search path becomes: ++ ++@enumerate ++@item @file{/opt/private/} ++@end enumerate ++ ++Note that this option, @code{--acdir}, is intended for use ++by the internal automake test suite only; it is not ordinarily ++needed by end-users. ++ ++@subsection Modifying the macro search path: @code{-I @var{dir}} ++ ++Any extra directories specified using @code{-I} options ++(@pxref{aclocal options}) are @emph{prepended} to this search list. Thus, ++@code{aclocal -I /foo -I /bar} results in the following search path: ++ ++@enumerate ++@item @file{/foo} ++@item @file{/bar} ++@item @var{acdir}-@var{APIVERSION} ++@item @var{acdir} ++@end enumerate ++ ++@subsection Modifying the macro search path: @file{dirlist} ++ ++There is a third mechanism for customizing the search path. If a ++@file{dirlist} file exists in @var{acdir}, then that ++file is assumed to contain a list of directories, one per line, to ++be added to the search list. These directories are searched @emph{after} ++any directories specified on the command line using @code{-I}, but ++@emph{before} the @var{acdir} and @var{acdir-APIVERSION} directories. ++ ++For example, suppose ++@file{@var{acdir}/dirlist} contains the following: ++ ++@example ++/test1 ++/test2 ++@end example ++ ++and that @code{aclocal} was called with the @code{-I /foo -I /bar} options. ++Then, the search path would be ++ ++@enumerate ++@item @file{/foo} ++@item @file{/bar} ++@item @file{/test1} ++@item @file{/test2} ++@item @var{acdir}-@var{APIVERSION} ++@item @var{acdir} ++@end enumerate ++ ++If the @code{--acdir=@var{dir}} option is used, ++then @command{aclocal} will search for the @file{dirlist} file in ++the @emph{redirected} @var{acdir} directory. In the ++@code{--acdir} example above, @command{aclocal} will search the ++@file{/opt/private/} directory for @file{dirlist}. Again, however, ++the @code{--acdir} option is intended for use by the internal ++automake test suite only; @code{--acdir} is not ordinarily ++needed by end-users. ++ ++@file{dirlist} is useful in the following situation: suppose that ++@code{automake} version @code{1.6.2} is installed with ++$prefix=/usr by the system vendor. Thus, the default search ++directories are ++ ++@enumerate ++@item @file{/usr/share/aclocal-1.6/} ++@item @file{/usr/share/aclocal/} ++@end enumerate ++ ++However, suppose further that many packages have been manually ++installed on the system, with $prefix=/usr/local, as is typical. ++In that case, many of these ``extra'' @file{.m4} files are in ++@file{/usr/local/share/aclocal}. The only way to force ++@file{/usr/bin/aclocal} to find these ``extra'' @file{.m4} files ++is to always call @code{aclocal -I /usr/local/share/aclocal}. ++This is inconvenient. With @file{dirlist}, one may create the file ++ ++@file{/usr/share/aclocal/dirlist} ++ ++which contains only the single line ++ ++@file{/usr/local/share/aclocal} ++ ++Now, the ``default'' search path on the affected system is ++ ++@enumerate ++@item @file{/usr/local/share/aclocal/} ++@item @file{/usr/share/aclocal-1.6/} ++@item @file{/usr/share/aclocal/} ++@end enumerate ++ ++without the need for @code{-I} options; @code{-I} options can be reserved ++for project-specific needs (@file{my-source-dir/m4/}), rather than ++using it to work around local system-dependent tool installation ++directories. + + @node Macros, Extending aclocal, Invoking aclocal, configure + @section Autoconf macros supplied with Automake +--- origsrc/automake-1.6.3/m4/dirlist 1969-12-31 19:00:00.000000000 -0500 ++++ src/automake-1.6.3/m4/dirlist 2008-10-25 17:03:51.245875200 -0400 +@@ -0,0 +1,3 @@ ++# This file is used by the testsuite (dirlist.test) ++# it should not be installed ++./dirlist-test +--- origsrc/automake-1.6.3/m4/Makefile.am 2002-07-23 12:58:38.000000000 -0400 ++++ src/automake-1.6.3/m4/Makefile.am 2008-10-25 17:03:51.235860800 -0400 +@@ -29,3 +29,4 @@ + + nodist_m4data_DATA = amversion.m4 + DISTCLEANFILES = amversion.m4 ++EXTRA_DIST = dirlist +--- origsrc/automake-1.6.3/NEWS 2002-07-26 15:25:22.000000000 -0400 ++++ src/automake-1.6.3/NEWS 2008-10-25 17:03:51.205817600 -0400 +@@ -1,3 +1,8 @@ ++Cygwin-special: ++ - add support for extending aclocal's default macro search path ++ using a ``dirlist'' file within the $acdir directory. Accepted ++ for 1.7.x ++ + New in 1.6.3: + * Support for AM_INIT_GETTEXT([external]) + * Bug fixes, including: +--- origsrc/automake-1.6.3/tests/defs 2002-06-13 15:51:11.000000000 -0400 ++++ src/automake-1.6.3/tests/defs 2008-10-25 17:03:51.255889600 -0400 +@@ -112,14 +112,37 @@ + # other `-I' directories added for libtool and gettext might contain + # files from an old version of Automake that we don't want to use. + aclocaldir=`(aclocal --print-ac-dir) 2>/dev/null` ++aclocalver=`(aclocal --version) 2>/dev/null | \ ++ sed 's/^.* \([0-9][0-9]*\.[0-9][0-9]*[a-z]*\).*$/\1/;1q'` ++dirlistdir=${aclocaldir}-${aclocalver} ++extra_includes="" ++if [ -f ${dirlistdir}/dirlist ] ; then ++ extra_includes=`(tmp_inc="" ++ while read LINE ; do ++ tmp_inc="$tmp_inc -I $LINE" ++ done ++ echo $tmp_inc) < ${dirlistdir}/dirlist` ++fi + case $required in + *libtool* ) +- test -f "$aclocaldir/libtool.m4" || exit 77 +- ACLOCAL="$ACLOCAL -I $srcdir/../m4 -I $aclocaldir" ++ libtool_found=no ++ for d in $extra_includes $aclocaldir ; do ++ if [ "x$d" != "x-I" ] && [ -f "$d/libtool.m4" ] ; then ++ libtool_found=yes ++ fi ++ done ++ test "x$libtool_found" = "xyes" || exit 77 ++ ACLOCAL="$ACLOCAL -I $srcdir/../m4 $extra_includes -I $aclocaldir" + ;; + *gettext* ) +- test -f "$aclocaldir/gettext.m4" || exit 77 +- ACLOCAL="$ACLOCAL -I $srcdir/../m4 -I $aclocaldir" ++ gettext_found=no ++ for d in $extra_includes $aclocaldir ; do ++ if [ "x$d" != "x-I" ] && [ -f "$d/gettext.m4" ] ; then ++ gettext_found=yes ++ fi ++ done ++ test "x$gettext_found" = "xyes" || exit 77 ++ ACLOCAL="$ACLOCAL -I $srcdir/../m4 $extra_includes -I $aclocaldir" + ;; + esac + +--- origsrc/automake-1.6.3/tests/dirlist.test 1969-12-31 19:00:00.000000000 -0500 ++++ src/automake-1.6.3/tests/dirlist.test 2008-10-25 17:03:51.265904000 -0400 +@@ -0,0 +1,26 @@ ++#! /bin/sh ++ ++# Check dirlist support. ++# This test relies on m4/dirlist ++ ++. $srcdir/defs || exit 1 ++ ++cat > configure.in <>dirlist-test/dirlist-check.m4 << 'END' ++AC_DEFUN([AM_INIT_GUILE_MODULE],[ ++. $srcdir/../GUILE-VERSION ++AM_INIT_AUTOMAKE($PACKAGE, $VERSION) ++AC_CONFIG_AUX_DIR(..) ++module=[$1] ++AC_SUBST(module)]) ++END ++ ++$ACLOCAL || exit 1 ++ ++grep 'DEFUN.*AM_INIT_GUILE_MODULE' aclocal.m4 +--- origsrc/automake-1.6.3/tests/Makefile.am 2002-07-23 14:29:13.000000000 -0400 ++++ src/automake-1.6.3/tests/Makefile.am 2008-10-25 17:03:51.245875200 -0400 +@@ -126,6 +126,7 @@ + depend3.test \ + depend4.test \ + dirforbid.test \ ++dirlist.test \ + dirname.test \ + discover.test \ + distcommon.test \ diff --git a/automake1.6/automake1.6-avoid-autoreconf.patch b/automake1.6/automake1.6-avoid-autoreconf.patch new file mode 100644 index 00000000000..b1316a13eb4 --- /dev/null +++ b/automake1.6/automake1.6-avoid-autoreconf.patch @@ -0,0 +1,22 @@ +diff -urN -x .build -x .inst -x .sinst automake-1.6.3-orig/m4/Makefile.in automake-1.6.3/m4/Makefile.in +--- automake-1.6.3-orig/m4/Makefile.in 2002-07-28 13:18:29.000000000 -0400 ++++ automake-1.6.3/m4/Makefile.in 2005-06-26 02:48:36.140625000 -0400 +@@ -89,6 +89,7 @@ + + nodist_m4data_DATA = amversion.m4 + DISTCLEANFILES = amversion.m4 ++EXTRA_DIST = dirlist + subdir = m4 + mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs + CONFIG_CLEAN_FILES = amversion.m4 +diff -urN -x .build -x .inst -x .sinst automake-1.6.3-orig/tests/Makefile.in automake-1.6.3/tests/Makefile.in +--- automake-1.6.3-orig/tests/Makefile.in 2002-07-28 13:18:30.000000000 -0400 ++++ automake-1.6.3/tests/Makefile.in 2005-06-26 02:48:36.296875000 -0400 +@@ -204,6 +204,7 @@ + depend3.test \ + depend4.test \ + dirforbid.test \ ++dirlist.test \ + dirname.test \ + discover.test \ + distcommon.test \ diff --git a/automake1.6/automake1.6-documentation.patch b/automake1.6/automake1.6-documentation.patch new file mode 100644 index 00000000000..c1272ed81fe --- /dev/null +++ b/automake1.6/automake1.6-documentation.patch @@ -0,0 +1,28 @@ +--- origsrc/automake-1.6.3/automake.texi 2002-07-16 17:14:57.000000000 -0400 ++++ src/automake-1.6.3/automake.texi 2008-10-25 17:03:51.235860800 -0400 +@@ -1,20 +1,20 @@ + \input texinfo @c -*-texinfo-*- + @c %**start of header +-@setfilename automake.info +-@settitle automake ++@setfilename automake1.6.info ++@settitle automake1.6 + @setchapternewpage off + @c %**end of header + + @include version.texi + +-@dircategory GNU programming tools ++@dircategory Software development + @direntry +-* automake: (automake). Making Makefile.in's ++* automake-1.6: (automake1.6). Making Makefile.in's + @end direntry + + @dircategory Individual utilities + @direntry +-* aclocal: (automake)Invoking aclocal. Generating aclocal.m4 ++* aclocal-1.6: (automake1.6)Invoking aclocal. Generating aclocal.m4 + @end direntry + + @ifinfo diff --git a/automake1.7/PKGBUILD b/automake1.7/PKGBUILD new file mode 100644 index 00000000000..64d1a1f09ba --- /dev/null +++ b/automake1.7/PKGBUILD @@ -0,0 +1,77 @@ +# Maintainer: Alexey Pavlov + +pkgname=automake1.7 +pkgver=1.7.9 +pkgrel=1 +pkgdesc="A GNU tool for automatically creating Makefiles" +arch=('any') +license=('GPL') +url="http://www.gnu.org/software/automake" +groups=('base-devel') +depends=('perl' 'bash') +makedepends=('autoconf') +checkdepends=('dejagnu' 'python2') +install=automake.install +source=(ftp://ftp.gnu.org/gnu/automake/automake-${pkgver}.tar.bz2{,.sig} + automake-1.7.9-gentoo-test-fixes.patch + automake1.7-cygwin-test-fixes.patch + automake1.7-documentation.patch + automake-1.7-msys2.patch) +md5sums=('571fd0b0598eb2a27dcf68adcfddfacb' + 'SKIP' + 'fdeb1b5ca48d002a20e844f3787bdd7b' + 'b9f0c21088dcc7d6ac4c90e719625347' + 'f2120c31bf9b4fd8c7812970346735a3' + 'a952177db4955709b3363b9b14c9ace5') + +prepare() { + cd ${srcdir}/automake-${pkgver} + + patch -p1 -i ${srcdir}/automake-1.7.9-gentoo-test-fixes.patch + patch -p2 -i ${srcdir}/automake1.7-cygwin-test-fixes.patch + patch -p2 -i ${srcdir}/automake1.7-documentation.patch + patch -p1 -i ${srcdir}/automake-1.7-msys2.patch +} + +build() { + cd ${srcdir}/automake-${pkgver} + ./configure --prefix=/usr + make + + (makeinfo -I ${srcdir}/automake-${pkgver} -o automake1.7.info automake.texi) +} + +check() { + cd ${srcdir}/automake-${pkgver} + + # expect 2 failures due to perl-5.18 incompatibility + make -k check || true +} + +package() { + cd ${srcdir}/automake-${pkgver} + make DESTDIR=${pkgdir} install + + mv ${pkgdir}/usr/info ${pkgdir}/usr/share/ + + # install the 1.7 versioned info files + for f in `find ${pkgdir}/usr/share/info -name "*.info*"` ; do + rm -f ${f} + done + for f in `find ${srcdir}/automake-${pkgver} -name "*.info*"` ; do + bf=`basename $f` + cp $f ${pkgdir}/usr/share/info/ + done + + # remove the unversioned executables + rm -f ${pkgdir}/usr/bin/automake ${pkgdir}/usr/bin/aclocal + + # remove the unversioned man pages + rm -f ${pkgdir}/usr/share/man/man1/automake.1 + rm -f ${pkgdir}/usr/share/man/man1/aclocal.1 + + # remove the unversioned info files + rm -f ${pkgdir}/usr/share/info/automake.info* + + rm -rf ${pkgdir}/usr/share/doc +} diff --git a/automake1.7/automake-1.7-msys2.patch b/automake1.7/automake-1.7-msys2.patch new file mode 100644 index 00000000000..148067d805f --- /dev/null +++ b/automake1.7/automake-1.7-msys2.patch @@ -0,0 +1,33 @@ +--- automake-1.7.9/lib/config.guess.orig 2005-07-10 21:16:04.000000000 +0400 ++++ automake-1.7.9/lib/config.guess 2013-12-18 09:57:07.220600000 +0400 +@@ -769,6 +769,9 @@ + i*:CYGWIN*:*) + echo ${UNAME_MACHINE}-pc-cygwin + exit 0 ;; ++ i*:MSYS*:*) ++ echo ${UNAME_MACHINE}-pc-msys ++ exit 0 ;; + i*:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 + exit 0 ;; +@@ -797,6 +800,9 @@ + i*:UWIN*:*) + echo ${UNAME_MACHINE}-pc-uwin + exit 0 ;; ++ amd64:MSYS*:*:* | x86_64:MSYS*:*:*) ++ echo x86_64-unknown-msys ++ exit 0 ;; + p*:CYGWIN*:*) + echo powerpcle-unknown-cygwin + exit 0 ;; +--- automake-1.7.9/lib/config.sub.orig 2013-12-18 09:56:00.256200000 +0400 ++++ automake-1.7.9/lib/config.sub 2013-12-18 09:58:59.954200000 +0400 +@@ -1180,7 +1180,7 @@ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* \ +- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ ++ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ diff --git a/automake1.7/automake-1.7.9-gentoo-test-fixes.patch b/automake1.7/automake-1.7.9-gentoo-test-fixes.patch new file mode 100644 index 00000000000..00854886d66 --- /dev/null +++ b/automake1.7/automake-1.7.9-gentoo-test-fixes.patch @@ -0,0 +1,46 @@ +Fix the tests so they don't fail :) + +exdir2 man2 transform: #159557 #162565 +grab updates from newer automake + +mkdir-tests.m4: +when mixing newer gettext with this automake, the tests bomb out +as AM_PROG_MKDIR_P is not provided properly + +--- automake-1.7.9/tests/man2.test ++++ automake-1.7.9/tests/man2.test +@@ -41,7 +41,7 @@ + $AUTOMAKE + + # Let's play with $DESTDIR too, it shouldn't hurt. +-./configure --prefix='' ++./configure --prefix='' --mandir=/man + DESTDIR="`pwd`/_inst" $MAKE -e install + + test -f ./_inst/man/man2/foo.2 +--- automake-1.7.9/tests/transform.test ++++ automake-1.7.9/tests/transform.test +@@ -56,7 +56,7 @@ + $AUTOCONF + $AUTOMAKE + +-./configure --program-prefix=gnu- --prefix `pwd`/inst ++./configure --program-prefix=gnu- --prefix `pwd`/inst --mandir `pwd`/inst/man + $MAKE + $MAKE test-install + $MAKE uninstall +--- automake-1.7.9/tests/exdir2.test ++++ automake-1.7.9/tests/exdir2.test +@@ -23,7 +23,7 @@ + . ./defs || exit 1 + + cat > Makefile.am << 'EOF' +-html_DATA = zot.html ++quuz_DATA = zot.html + pkgdata_DATA = qbert + EOF + +--- automake-1.7.9/m4/mkdir-tests.m4 ++++ automake-1.7.9/m4/mkdir-tests.m4 +@@ -0,0 +1 @@ ++AC_DEFUN([AM_PROG_MKDIR_P]) diff --git a/automake1.7/automake.install b/automake1.7/automake.install new file mode 100644 index 00000000000..0fa1a6e09ed --- /dev/null +++ b/automake1.7/automake.install @@ -0,0 +1,22 @@ +infodir=usr/share/info +filelist=(automake1.7.info) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +# vim:set ts=2 sw=2 et: diff --git a/automake1.7/automake1.7-cygwin-test-fixes.patch b/automake1.7/automake1.7-cygwin-test-fixes.patch new file mode 100644 index 00000000000..5227d1bb1cf --- /dev/null +++ b/automake1.7/automake1.7-cygwin-test-fixes.patch @@ -0,0 +1,68 @@ +--- origsrc/automake-1.7.9/lib/am/libtool.am 2003-06-04 15:23:26.000000000 -0400 ++++ src/automake-1.7.9/lib/am/libtool.am 2008-10-25 23:02:40.663657600 -0400 +@@ -28,4 +28,4 @@ + + ?TOPDIR?distclean-am: distclean-libtool + ?TOPDIR?distclean-libtool: +-?TOPDIR? -rm -f libtool ++?TOPDIR? -rm -f libtool config.lt +--- origsrc/automake-1.7.9/tests/libtool5.test 2003-09-07 15:58:39.000000000 -0400 ++++ src/automake-1.7.9/tests/libtool5.test 2008-10-25 18:39:40.252540800 -0400 +@@ -46,4 +46,4 @@ + + libtoolize + $ACLOCAL +-$AUTOMAKE ++$AUTOMAKE --add-missing +--- origsrc/automake-1.7.9/tests/ltcond.test 2003-08-06 19:34:41.000000000 -0400 ++++ src/automake-1.7.9/tests/ltcond.test 2008-10-25 18:39:40.262555200 -0400 +@@ -64,7 +64,7 @@ + libtoolize + $ACLOCAL + $AUTOCONF +-$AUTOMAKE ++$AUTOMAKE --add-missing + + # Install libraries in lib/, and the rest in empty/. + # (in fact there is no "rest", so as the name imply empty/ is +--- origsrc/automake-1.7.9/tests/ltcond2.test 2003-07-30 17:38:38.000000000 -0400 ++++ src/automake-1.7.9/tests/ltcond2.test 2008-10-25 18:39:40.302612800 -0400 +@@ -75,7 +75,7 @@ + libtoolize + $ACLOCAL + $AUTOCONF +-$AUTOMAKE ++$AUTOMAKE --add-missing + ./configure + $MAKE check + test -f check-ok +--- origsrc/automake-1.7.9/tests/ltconv.test 2003-08-05 15:42:40.000000000 -0400 ++++ src/automake-1.7.9/tests/ltconv.test 2008-10-25 18:39:40.302612800 -0400 +@@ -113,7 +113,7 @@ + libtoolize + $ACLOCAL + $AUTOCONF +-$AUTOMAKE ++$AUTOMAKE --add-missing + + # Install libraries in lib/, programs in bin/, and the rest in empty/. + # (in fact there is no "rest", so as the name imply empty/ is +--- origsrc/automake-1.7.9/tests/subst.test 2003-06-04 15:23:28.000000000 -0400 ++++ src/automake-1.7.9/tests/subst.test 2008-10-25 22:53:11.645449600 -0400 +@@ -24,8 +24,14 @@ + . ./defs || exit 1 + + cat >> configure.in << 'END' +-AC_SUBST($1) +-AC_SUBST([$]$1) dnl this is the actual invocation that was used ++dnl This test used to have the following lines, which cannot have ++dnl worked sensibly with Autoconf for years, however: ++dnl AC_SUBST($1) ++dnl AC_SUBST([$]$1) dnl this is the actual invocation that was used ++dnl ++AC_DEFUN([FOO], ++[AC_SUBST([$1])]) ++FOO([BAR]) + END + + : > Makefile.am diff --git a/automake1.7/automake1.7-documentation.patch b/automake1.7/automake1.7-documentation.patch new file mode 100644 index 00000000000..929816a05c5 --- /dev/null +++ b/automake1.7/automake1.7-documentation.patch @@ -0,0 +1,27 @@ +--- origsrc/automake-1.7.9/automake.texi 2003-11-09 13:57:13.000000000 -0500 ++++ src/automake-1.7.9/automake.texi 2008-10-25 18:39:40.232512000 -0400 +@@ -1,7 +1,7 @@ + \input texinfo @c -*-texinfo-*- + @c %**start of header +-@setfilename automake.info +-@settitle automake ++@setfilename automake1.7.info ++@settitle automake1.7 + @setchapternewpage off + @c %**end of header + +@@ -9,12 +9,12 @@ + + @dircategory Software development + @direntry +-* automake: (automake). Making Makefile.in's. ++* automake-1.7: (automake1.7). Making Makefile.in's. + @end direntry + + @dircategory Individual utilities + @direntry +-* aclocal: (automake)Invoking aclocal. Generating aclocal.m4. ++* aclocal-1.7: (automake1.7)Invoking aclocal. Generating aclocal.m4. + @end direntry + + @ifinfo diff --git a/automake1.8/PKGBUILD b/automake1.8/PKGBUILD new file mode 100644 index 00000000000..6e4876c5b17 --- /dev/null +++ b/automake1.8/PKGBUILD @@ -0,0 +1,80 @@ +# Maintainer: Alexey Pavlov + +pkgname=automake1.8 +pkgver=1.8.5 +pkgrel=2 +pkgdesc="A GNU tool for automatically creating Makefiles" +arch=('any') +license=('GPL') +url="http://www.gnu.org/software/automake" +groups=('base-devel') +depends=('perl' 'bash') +makedepends=('autoconf') +checkdepends=('dejagnu' 'python2') +install=automake.install +source=(ftp://ftp.gnu.org/gnu/automake/automake-${pkgver}.tar.bz2{,.sig} + automake-1.8.5-gentoo-test-fixes.patch + automake1.8-vs-modern-libtool.patch + automake1.8-documentation.patch + automake1.8-cygwin-test-fixes.patch + automake-1.8-msys2.patch) +md5sums=('0114aa6d7dc32112834b68105fb8d7e2' + 'SKIP' + '55580e93282f69d20f530d549d3f85e7' + '43ef156d754ee41f85e2804f1718b6a4' + 'be4babc88c8211c327c8f99aa8d7250b' + '6120f3f38c5a5425430878c8eaafdfdb' + '56bdd4270df3c06ade981e995ad15d66') + +prepare() { + cd ${srcdir}/automake-${pkgver} + + patch -p1 -i ${srcdir}/automake-1.8.5-gentoo-test-fixes.patch + patch -p2 -i ${srcdir}/automake1.8-vs-modern-libtool.patch + patch -p2 -i ${srcdir}/automake1.8-documentation.patch + patch -p2 -i ${srcdir}/automake1.8-cygwin-test-fixes.patch + + patch -p1 -i ${srcdir}/automake-1.8-msys2.patch +} + +build() { + cd ${srcdir}/automake-${pkgver} + ./configure --prefix=/usr + make + + (cd doc && makeinfo -I ${srcdir}/automake-${pkgver}/doc -o automake1.8.info automake.texi) +} + +check() { + cd ${srcdir}/automake-${pkgver} + + # expect 2 failures due to perl-5.18 incompatibility + make -k check || true +} + +package() { + cd ${srcdir}/automake-${pkgver} + make DESTDIR=${pkgdir} install + mv ${pkgdir}/usr/info ${pkgdir}/usr/share/ + + # install the 1.8 versioned info files + for f in `find ${pkgdir}/usr/share/info -name "*.info*"` ; do + rm -f ${f} + done + for f in `find ${srcdir}/automake-${pkgver} -name "*.info*"` ; do + bf=`basename $f` + cp $f ${pkgdir}/usr/share/info/ + done + + # remove the unversioned executables + rm -f ${pkgdir}/usr/bin/automake ${pkgdir}/usr/bin/aclocal + + # remove the unversioned man pages + rm -f ${pkgdir}/usr/share/man/man1/automake.1 + rm -f ${pkgdir}/usr/share/man/man1/aclocal.1 + + # remove the unversioned info files + rm -f ${pkgdir}/usr/share/info/automake.info* + + rm -rf ${pkgdir}/usr/share/doc +} diff --git a/automake1.8/automake-1.8-msys2.patch b/automake1.8/automake-1.8-msys2.patch new file mode 100644 index 00000000000..87ec0db52e9 --- /dev/null +++ b/automake1.8/automake-1.8-msys2.patch @@ -0,0 +1,33 @@ +--- automake-1.8.5/lib/config.guess.orig 2005-07-10 21:16:04.000000000 +0400 ++++ automake-1.8.5/lib/config.guess 2013-12-18 09:57:07.220600000 +0400 +@@ -769,6 +769,9 @@ + i*:CYGWIN*:*) + echo ${UNAME_MACHINE}-pc-cygwin + exit 0 ;; ++ i*:MSYS*:*) ++ echo ${UNAME_MACHINE}-pc-msys ++ exit 0 ;; + i*:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 + exit 0 ;; +@@ -797,6 +800,9 @@ + i*:UWIN*:*) + echo ${UNAME_MACHINE}-pc-uwin + exit 0 ;; ++ amd64:MSYS*:*:* | x86_64:MSYS*:*:*) ++ echo x86_64-unknown-msys ++ exit 0 ;; + p*:CYGWIN*:*) + echo powerpcle-unknown-cygwin + exit 0 ;; +--- automake-1.8.5/lib/config.sub.orig 2013-12-18 09:56:00.256200000 +0400 ++++ automake-1.8.5/lib/config.sub 2013-12-18 09:58:59.954200000 +0400 +@@ -1180,7 +1180,7 @@ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* \ +- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ ++ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ diff --git a/automake1.8/automake-1.8.5-gentoo-test-fixes.patch b/automake1.8/automake-1.8.5-gentoo-test-fixes.patch new file mode 100644 index 00000000000..43290d1e0d4 --- /dev/null +++ b/automake1.8/automake-1.8.5-gentoo-test-fixes.patch @@ -0,0 +1,43 @@ +Fix the tests so they don't fail :) + +exdir2 man2 transform: #159557 #162565 +grab updates from newer automake + +--- automake-1.8.5/tests/man2.test ++++ automake-1.8.5/tests/man2.test +@@ -41,7 +41,7 @@ + $AUTOMAKE + + # Let's play with $DESTDIR too, it shouldn't hurt. +-./configure --prefix='' ++./configure --prefix='' --mandir=/man + DESTDIR="`pwd`/_inst" $MAKE -e install + + test -f ./_inst/man/man2/foo.2 +--- automake-1.8.5/tests/transform.test ++++ automake-1.8.5/tests/transform.test +@@ -56,7 +56,7 @@ + $AUTOCONF + $AUTOMAKE + +-./configure --program-prefix=gnu- --prefix `pwd`/inst ++./configure --program-prefix=gnu- --prefix `pwd`/inst --mandir `pwd`/inst/man + $MAKE + $MAKE test-install + $MAKE uninstall +--- automake-1.8.5/tests/exdir2.test ++++ automake-1.8.5/tests/exdir2.test +@@ -25,11 +25,11 @@ + set -e + + cat > Makefile.am << 'EOF' +-html_DATA = zot.html ++quuz_DATA = zot.html + pkgdata_DATA = qbert + EOF + + $ACLOCAL + AUTOMAKE_fails + grep 'pkgdatadir' stderr && exit 1 +-grep 'Makefile.am:1:.*htmldir.*undefined' stderr ++grep 'Makefile.am:1:.*quuzdir.*undefined' stderr diff --git a/automake1.8/automake.install b/automake1.8/automake.install new file mode 100644 index 00000000000..31806ac309f --- /dev/null +++ b/automake1.8/automake.install @@ -0,0 +1,22 @@ +infodir=usr/share/info +filelist=(automake1.8.info) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +# vim:set ts=2 sw=2 et: diff --git a/automake1.8/automake1.8-cygwin-test-fixes.patch b/automake1.8/automake1.8-cygwin-test-fixes.patch new file mode 100644 index 00000000000..31197c47ed5 --- /dev/null +++ b/automake1.8/automake1.8-cygwin-test-fixes.patch @@ -0,0 +1,52 @@ +--- origsrc/automake-1.8.5/tests/subst.test 2003-11-14 16:26:01.000000000 -0500 ++++ src/automake-1.8.5/tests/subst.test 2008-10-26 22:19:04.909673600 -0400 +@@ -24,8 +24,14 @@ + . ./defs || exit 1 + + cat >> configure.in << 'END' +-AC_SUBST($1) +-AC_SUBST([$]$1) dnl this is the actual invocation that was used ++dnl This test used to have the following lines, which cannot have ++dnl worked sensibly with Autoconf for years, however: ++dnl AC_SUBST($1) ++dnl AC_SUBST([$]$1) dnl this is the actual invocation that was used ++dnl ++AC_DEFUN([FOO], ++[AC_SUBST([$1])]) ++FOO([BAR]) + END + + : > Makefile.am +--- origsrc/automake-1.8.5/tests/yacc6.test 2004-05-13 13:44:17.000000000 -0400 ++++ src/automake-1.8.5/tests/yacc6.test 2008-10-26 22:19:04.909673600 -0400 +@@ -29,7 +29,7 @@ + set -e + + cat >> configure.in << 'END' +-AC_CONFIG_AUX_DIR([aux]) ++AC_CONFIG_AUX_DIR([auxdir]) + AC_PROG_CC + AC_PROG_YACC + AC_CONFIG_FILES([sub/Makefile]) +@@ -45,7 +45,7 @@ + test `ls -1t sub/main.$(OBJEXT) z | sed 1q` = sub/main.$(OBJEXT) + END + +-mkdir aux sub ++mkdir auxdir sub + + cat > sub/Makefile.am << 'END' + bin_PROGRAMS = foo bar +@@ -84,10 +84,10 @@ + $ACLOCAL + $AUTOCONF + $AUTOMAKE -a +-test -f aux/ylwrap ++test -f auxdir/ylwrap + test ! -f ylwrap + test ! -f sub/ylwrap +-$FGREP '(top_srcdir)/aux/ylwrap' sub/Makefile.in ++$FGREP '(top_srcdir)/auxdir/ylwrap' sub/Makefile.in + ./configure + $MAKE + grep '#.*line.*foo.y' sub/foo.c diff --git a/automake1.8/automake1.8-documentation.patch b/automake1.8/automake1.8-documentation.patch new file mode 100644 index 00000000000..2d6f4639429 --- /dev/null +++ b/automake1.8/automake1.8-documentation.patch @@ -0,0 +1,38 @@ +--- origsrc/automake-1.8.5/doc/automake.texi 2004-05-13 16:41:35.000000000 -0400 ++++ src/automake-1.8.5/doc/automake.texi 2008-10-26 22:19:04.899659200 -0400 +@@ -1,7 +1,7 @@ + \input texinfo @c -*-texinfo-*- + @c %**start of header +-@setfilename automake.info +-@settitle automake ++@setfilename automake1.8.info ++@settitle automake1.8 + @setchapternewpage off + @c %**end of header + +@@ -34,12 +34,12 @@ + + @dircategory Software development + @direntry +-* automake: (automake). Making Makefile.in's. ++* automake-1.8: (automake1.8). Making Makefile.in's. + @end direntry + + @dircategory Individual utilities + @direntry +-* aclocal: (automake)Invoking aclocal. Generating aclocal.m4. ++* aclocal-1.8: (automake1.8)Invoking aclocal. Generating aclocal.m4. + @end direntry + + @titlepage +--- origsrc/automake-1.8.5/aclocal.in 2004-04-10 13:15:32.000000000 -0400 ++++ src/automake-1.8.5/aclocal.in 2008-10-26 22:19:04.889644800 -0400 +@@ -323,7 +323,7 @@ + if (! defined $1) + { + print STDERR "$file:$.: warning: underquoted definition of $2\n"; +- print STDERR " run info '(automake)Extending aclocal'\n" ++ print STDERR " run info '(automake1.8)Extending aclocal'\n" + . " or see http://sources.redhat.com/automake/" + . "automake.html#Extending%20aclocal\n" + unless $underquoted_manual_once; diff --git a/automake1.8/automake1.8-vs-modern-libtool.patch b/automake1.8/automake1.8-vs-modern-libtool.patch new file mode 100644 index 00000000000..ef2d403f967 --- /dev/null +++ b/automake1.8/automake1.8-vs-modern-libtool.patch @@ -0,0 +1,8 @@ +--- origsrc/automake-1.8.5/lib/am/libtool.am 2003-06-02 03:08:40.000000000 -0400 ++++ src/automake-1.8.5/lib/am/libtool.am 2008-10-26 22:19:04.909673600 -0400 +@@ -28,4 +28,4 @@ + + ?TOPDIR?distclean-am: distclean-libtool + ?TOPDIR?distclean-libtool: +-?TOPDIR? -rm -f libtool ++?TOPDIR? -rm -f libtool config.lt diff --git a/automake1.9/PKGBUILD b/automake1.9/PKGBUILD new file mode 100644 index 00000000000..ee28396a4bb --- /dev/null +++ b/automake1.9/PKGBUILD @@ -0,0 +1,94 @@ +# Maintainer: Alexey Pavlov + +pkgname=automake1.9 +pkgver=1.9.6 +pkgrel=1 +pkgdesc="A GNU tool for automatically creating Makefiles" +arch=('any') +license=('GPL') +url="http://www.gnu.org/software/automake" +groups=('base-devel') +depends=('perl' 'bash') +makedepends=('autoconf') +checkdepends=('dejagnu' 'python2') +install=automake.install +source=(ftp://ftp.gnu.org/gnu/automake/automake-${pkgver}.tar.bz2{,.sig} + automake-1.9.6-gentoo-aclocal7-test-sleep.patch + automake-1.9.6-gentoo-ignore-comments.patch + automake-1.9.6-gentoo-include-dir-prefix.patch + automake1.9-backport-pr401-test-and-fix.patch + automake1.9-vs-modern-libtool.patch + automake1.9-cygwin-test-fixes.patch + automake1.9-documentation.patch + automake1.9-avoid-autoreconf.patch + automake-1.9-msys2.patch + automake-1.9-makeinfo-fix.patch) +md5sums=('c11b8100bb311492d8220378fd8bf9e0' + 'SKIP' + '7c3755a846d4a5cc4c3230f3895f537a' + '3099ade0063f414271664a3909abac9e' + '41bfebb78fd15ed76ef2ae3a7d76d726' + '677f5c9f68425384eb8c65f9030e3219' + 'c9dc1735dc968162822a507220e971ec' + '78b543eac0a9d105ac0c26f9bcd14c0b' + '0531ba4c4abdeb1a650d9d2b157ef223' + 'e8322fa37f3aaf8376807d3f34cd985a' + '294217de89557bb836aef02a04e48143' + '9874687415659b15082ecfd46a5623c4') + +prepare() { + cd ${srcdir}/automake-${pkgver} + + patch -p1 -i ${srcdir}/automake-1.9.6-gentoo-aclocal7-test-sleep.patch + patch -p0 -i ${srcdir}/automake-1.9.6-gentoo-ignore-comments.patch + patch -p0 -i ${srcdir}/automake-1.9.6-gentoo-include-dir-prefix.patch + patch -p2 -i ${srcdir}/automake1.9-backport-pr401-test-and-fix.patch + patch -p2 -i ${srcdir}/automake1.9-vs-modern-libtool.patch + patch -p2 -i ${srcdir}/automake1.9-cygwin-test-fixes.patch + patch -p2 -i ${srcdir}/automake1.9-documentation.patch + patch -p1 -i ${srcdir}/automake1.9-avoid-autoreconf.patch + + patch -p1 -i ${srcdir}/automake-1.9-makeinfo-fix.patch + patch -p1 -i ${srcdir}/automake-1.9-msys2.patch +} + +build() { + cd ${srcdir}/automake-${pkgver} + ./configure --prefix=/usr + make + + (cd doc && makeinfo -I ${srcdir}/automake-${pkgver}/doc -o automake1.9.info automake.texi) +} + +check() { + cd ${srcdir}/automake-${pkgver} + + # expect 2 failures due to perl-5.18 incompatibility + make -k check || true +} + +package() { + cd ${srcdir}/automake-${pkgver} + make DESTDIR=${pkgdir} install + + # install the 1.11 versioned info files + for f in `find ${pkgdir}/usr/share/info -name "*.info*"` ; do + rm -f ${f} + done + for f in `find ${srcdir}/automake-${pkgver} -name "*.info*"` ; do + bf=`basename $f` + cp $f ${pkgdir}/usr/share/info/ + done + + # remove the unversioned executables + rm -f ${pkgdir}/usr/bin/automake ${pkgdir}/usr/bin/aclocal + + # remove the unversioned man pages + rm -f ${pkgdir}/usr/share/man/man1/automake.1 + rm -f ${pkgdir}/usr/share/man/man1/aclocal.1 + + # remove the unversioned info files + rm -f ${pkgdir}/usr/share/info/automake.info* + + rm -rf ${pkgdir}/usr/share/doc +} diff --git a/automake1.9/automake-1.9-makeinfo-fix.patch b/automake1.9/automake-1.9-makeinfo-fix.patch new file mode 100644 index 00000000000..ac9955a92f4 --- /dev/null +++ b/automake1.9/automake-1.9-makeinfo-fix.patch @@ -0,0 +1,30 @@ +--- automake-1.9.6/doc/automake.texi.orig 2013-12-18 10:00:16.915800000 +0400 ++++ automake-1.9.6/doc/automake.texi 2013-12-18 10:04:18.807600000 +0400 +@@ -9500,11 +9500,11 @@ + Options: these items on which Automake works have been rewritten as + separate Perl modules, and documented. + +-@itemx 2004-01-11 Automake 1.8.1 +-@itemx 2004-01-12 Automake 1.8.2 +-@itemx 2004-03-07 Automake 1.8.3 +-@itemx 2004-04-25 Automake 1.8.4 +-@itemx 2004-05-16 Automake 1.8.5 ++@item 2004-01-11 Automake 1.8.1 ++@item 2004-01-12 Automake 1.8.2 ++@item 2004-03-07 Automake 1.8.3 ++@item 2004-04-25 Automake 1.8.4 ++@item 2004-05-16 Automake 1.8.5 + + @item 2004-07-28 Automake 1.9 + +@@ -9517,8 +9517,8 @@ + + Aside from this it contains mainly minor changes and bug-fixes. + +-@itemx 2004-08-11 Automake 1.9.1 +-@itemx 2004-09-19 Automake 1.9.2 ++@item 2004-08-11 Automake 1.9.1 ++@item 2004-09-19 Automake 1.9.2 + + Automake has ten years. This chapter of the manual was initially + written for this occasion. diff --git a/automake1.9/automake-1.9-msys2.patch b/automake1.9/automake-1.9-msys2.patch new file mode 100644 index 00000000000..5f5682f14f6 --- /dev/null +++ b/automake1.9/automake-1.9-msys2.patch @@ -0,0 +1,33 @@ +--- automake-1.9.6/lib/config.guess.orig 2005-07-10 21:16:04.000000000 +0400 ++++ automake-1.9.6/lib/config.guess 2013-12-18 09:57:07.220600000 +0400 +@@ -769,6 +769,9 @@ + i*:CYGWIN*:*) + echo ${UNAME_MACHINE}-pc-cygwin + exit ;; ++ i*:MSYS*:*) ++ echo ${UNAME_MACHINE}-pc-msys ++ exit ;; + i*:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 + exit ;; +@@ -797,6 +800,9 @@ + amd64:CYGWIN*:*:*) + echo x86_64-unknown-cygwin + exit ;; ++ amd64:MSYS*:*:* | x86_64:MSYS*:*:*) ++ echo x86_64-unknown-msys ++ exit ;; + p*:CYGWIN*:*) + echo powerpcle-unknown-cygwin + exit ;; +--- automake-1.9.6/lib/config.sub.orig 2013-12-18 09:56:00.256200000 +0400 ++++ automake-1.9.6/lib/config.sub 2013-12-18 09:58:59.954200000 +0400 +@@ -1180,7 +1180,7 @@ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* \ +- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ ++ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ diff --git a/automake1.9/automake-1.9.6-gentoo-aclocal7-test-sleep.patch b/automake1.9/automake-1.9.6-gentoo-aclocal7-test-sleep.patch new file mode 100644 index 00000000000..ea2b227b8d4 --- /dev/null +++ b/automake1.9/automake-1.9.6-gentoo-aclocal7-test-sleep.patch @@ -0,0 +1,39 @@ +http://bugs.gentoo.org/197366 + +commit 8952f7248c2637426bcf83d38f07a8b02124a06e +Author: Ralf Wildenhues +Date: Wed May 10 20:50:53 2006 +0000 + + * tests/aclocal7.test: Add `$sleep's between file touching + and automake resp aclocal+automake invocations, to ensure + they complete with a time stamp strictly later than the touched + file. + +diff --git a/tests/aclocal7.test b/tests/aclocal7.test +index 787565c..f6d5e31 100755 +--- a/tests/aclocal7.test ++++ b/tests/aclocal7.test +@@ -89,6 +89,7 @@ test `ls -1t sub/Makefile.in foo | sed 1q` = sub/Makefile.in + touch fragment.inc + $sleep + touch foo ++$sleep + $ACLOCAL -I m4 + $AUTOMAKE --no-force + # Only ./Makefile.in should change. +@@ -101,6 +102,7 @@ grep README Makefile.in && exit 1 + : > README + $sleep + touch foo ++$sleep + $AUTOMAKE --no-force + # Even if no dependency change, the content changed. + test `ls -1t Makefile.in foo | sed 1q` = Makefile.in +@@ -111,6 +113,7 @@ grep README Makefile.in + : > sub/Makefile.in + $sleep + touch foo ++$sleep + $ACLOCAL -I m4 + $AUTOMAKE --no-force + # Only sub/Makefile.in should change. diff --git a/automake1.9/automake-1.9.6-gentoo-ignore-comments.patch b/automake1.9/automake-1.9.6-gentoo-ignore-comments.patch new file mode 100644 index 00000000000..f62987456cf --- /dev/null +++ b/automake1.9/automake-1.9.6-gentoo-ignore-comments.patch @@ -0,0 +1,29 @@ +http://bugs.gentoo.org/126388 + +2006-03-16 Mike Frysinger + + * aclocal.in (scan_configure_dep): Ignore ## lines. + (scan_file): Remove dnl and # comments. + +--- aclocal.in ++++ aclocal.in +@@ -227,6 +227,8 @@ + foreach (split ("\n", $contents)) + { + ++$line; ++ # Ignore `##' lines. ++ next if /^##/; + # Remove comments from current line. + s/\bdnl\b.*$//; + s/\#.*$//; +@@ -311,6 +313,10 @@ + + $contents .= $_; + ++ # Remove comments from current line. ++ s/\bdnl\b.*$//; ++ s/\#.*$//; ++ + while (/$ac_defun_rx/go) + { + if (! defined $1) diff --git a/automake1.9/automake-1.9.6-gentoo-include-dir-prefix.patch b/automake1.9/automake-1.9.6-gentoo-include-dir-prefix.patch new file mode 100644 index 00000000000..a1d62a78e11 --- /dev/null +++ b/automake1.9/automake-1.9.6-gentoo-include-dir-prefix.patch @@ -0,0 +1,31 @@ +http://bugs.gentoo.org/107435 +http://lists.gnu.org/archive/html/automake/2005-09/msg00088.html + +2005-09-27 Stepan Kasal + + * automake.in (handle_single_transform): Direct suffix rule preserves + the directory prefix, so the generated object name should contain + it, too. + +--- automake.in 2005-09-17 15:05:39.000000000 +0200 ++++ automake.in 2005-09-27 17:10:47.000000000 +0200 +@@ -1755,6 +1755,10 @@ + # This is probably the result of a direct suffix rule. + # In this case we just accept the rewrite. + $object = "$base$extension"; ++ if ($directory ne '') ++ { ++ $object = $directory . '/' . $object; ++ } + $linker = ''; + } + else +@@ -1824,7 +1828,7 @@ + + # For Java, the way we're handling it right now, a + # `..' component doesn't make sense. +- if ($lang->name eq 'java' && $object =~ /(\/|^)\.\.\//) ++ if ($lang && $lang->name eq 'java' && $object =~ /(\/|^)\.\.\//) + { + err_am "`$full' should not contain a `..' component"; + } diff --git a/automake1.9/automake.install b/automake1.9/automake.install new file mode 100644 index 00000000000..6bfaf14689d --- /dev/null +++ b/automake1.9/automake.install @@ -0,0 +1,22 @@ +infodir=usr/share/info +filelist=(automake1.9.info automake1.9.info-1 automake1.9.info-2) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +# vim:set ts=2 sw=2 et: diff --git a/automake1.9/automake1.9-avoid-autoreconf.patch b/automake1.9/automake1.9-avoid-autoreconf.patch new file mode 100644 index 00000000000..3e3280acffa --- /dev/null +++ b/automake1.9/automake1.9-avoid-autoreconf.patch @@ -0,0 +1,55 @@ +diff -urN -x .build -x .inst -x .sinst automake-1.9.6-orig/tests/Makefile.in automake-1.9.6/tests/Makefile.in +--- automake-1.9.6-orig/tests/Makefile.in 2005-07-10 14:14:53.000000000 -0400 ++++ automake-1.9.6/tests/Makefile.in 2005-08-28 23:28:38.453556800 -0400 +@@ -34,6 +34,7 @@ + PRE_UNINSTALL = : + POST_UNINSTALL = : + build_triplet = @build@ ++LIBOBJDIR = + subdir = tests + DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/aclocal.in $(srcdir)/automake.in $(srcdir)/defs.in +@@ -66,7 +67,6 @@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + FGREP = @FGREP@ +-GREP = @GREP@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -102,27 +102,20 @@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ +-datarootdir = @datarootdir@ +-docdir = @docdir@ +-dvidir = @dvidir@ + exec_prefix = @exec_prefix@ + host_alias = @host_alias@ +-htmldir = @htmldir@ + includedir = @includedir@ + infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ +-localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ +-pdfdir = @pdfdir@ + pkgvdatadir = @pkgvdatadir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ +-psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ +@@ -538,6 +531,7 @@ + pr300-ltlib.test \ + pr300-prog.test \ + pr307.test \ ++pr401.test \ + prefix.test \ + primary.test \ + primary2.test \ diff --git a/automake1.9/automake1.9-backport-pr401-test-and-fix.patch b/automake1.9/automake1.9-backport-pr401-test-and-fix.patch new file mode 100644 index 00000000000..5e7a06e2b77 --- /dev/null +++ b/automake1.9/automake1.9-backport-pr401-test-and-fix.patch @@ -0,0 +1,299 @@ +--- origsrc/automake-1.9.6/automake.in 2008-10-27 08:43:13.042076800 -0400 ++++ src/automake-1.9.6/automake.in 2008-10-27 08:43:38.017990400 -0400 +@@ -334,6 +334,10 @@ + # in Makefiles. + my $am_config_aux_dir = ''; + ++# Directory to search for AC_LIBSOURCE file, as set by AC_CONFIG_LIBOBJ_DIR ++# in configure.ac. ++my $config_libobj_dir = ''; ++ + # Whether AM_GNU_GETTEXT has been seen in configure.ac. + my $seen_gettext = 0; + # Whether AM_GNU_GETTEXT([external]) is used. +@@ -2074,7 +2078,7 @@ + + if ($iter =~ /\.h$/) + { +- require_file_with_macro ($cond, $var, FOREIGN, $iter); ++ require_libobj_with_macro ($cond, $var, FOREIGN, $iter); + } + elsif ($iter ne 'alloca.c') + { +@@ -2086,7 +2090,7 @@ + my $bs = var ('BUILT_SOURCES'); + if (! $bs || ! grep (/$rewrite/, $bs->value_as_list_recursive)) + { +- require_file_with_macro ($cond, $var, FOREIGN, $iter); ++ require_libobj_with_macro ($cond, $var, FOREIGN, $iter); + } + } + } +@@ -2099,7 +2103,7 @@ + $lt ||= ''; + $var->requires_variables ("\@${lt}ALLOCA\@ used", $lt . 'ALLOCA'); + $dep_files{'$(DEPDIR)/alloca.P' . $myobjext} = 1; +- require_file_with_macro ($cond, $var, FOREIGN, 'alloca.c'); ++ require_libobj_with_macro ($cond, $var, FOREIGN, 'alloca.c'); + &saw_extension ('c'); + } + +@@ -4638,6 +4642,7 @@ + AC_CONFIG_AUX_DIR => 1, + AC_CONFIG_FILES => 1, + AC_CONFIG_HEADERS => 1, ++ AC_CONFIG_LIBOBJ_DIR => 1, + AC_CONFIG_LINKS => 1, + AC_INIT => 0, + AC_LIBSOURCE => 1, +@@ -4733,6 +4738,12 @@ + push @config_headers, $spec; + } + } ++ elsif ($macro eq 'AC_CONFIG_LIBOBJ_DIR') ++ { ++ $config_libobj_dir = $args[1]; ++ $relative_dir = '.'; ++ check_directory ($config_libobj_dir, $where); ++ } + elsif ($macro eq 'AC_CONFIG_LINKS') + { + foreach my $spec (split (' ', $args[1])) +@@ -5766,6 +5777,15 @@ + use constant IN_COMMENT => 2; + my $prev_state = IN_RULE_DEF; + ++ # Calculate the relative path from this Makefile to LIBOBJDIR. ++ my $am_libobj_dir = ''; ++ unless ($config_libobj_dir eq '') ++ { ++ my $dir = File::Spec->abs2rel ($config_libobj_dir, $relative_dir); ++ $am_libobj_dir = "$dir/" unless $dir eq ''; ++ } ++ &define_variable ('LIBOBJDIR', "$am_libobj_dir", INTERNAL); ++ + while ($_ = $am_file->getline) + { + $where->set ("$amfile:$."); +@@ -6984,6 +7004,22 @@ + require_file ($macro->rdef ($cond)->location, $mystrict, @files); + } + ++# &require_libobj_with_macro ($COND, $MACRO, $MYSTRICT, @FILES) ++# ------------------------------------------------------------- ++sub require_libobj_with_macro ($$$@) ++{ ++ my ($cond, $macro, $mystrict, @files) = @_; ++ $macro = rvar ($macro) unless ref $macro; ++ if ($config_libobj_dir eq '') ++ { ++ require_file ($macro->rdef ($cond)->location, $mystrict, @files); ++ } ++ else ++ { ++ require_file_internal ($macro->rdef ($cond)->location, $mystrict, ++ $config_libobj_dir, @files); ++ } ++} + + # &require_conf_file ($WHERE, $MYSTRICT, @FILES) + # ---------------------------------------------- +--- origsrc/automake-1.9.6/doc/automake.texi 2005-07-09 05:28:44.000000000 -0400 ++++ src/automake-1.9.6/doc/automake.texi 2008-10-27 19:44:50.308644800 -0400 +@@ -3901,7 +3901,10 @@ + + The @code{AC_CONFIG_LIBOBJ_DIR} tells Autoconf that the source files + of these object files are to be found in the @file{lib/} directory. +-Automake does not yet use this information; it knows the source files ++ ++In conjunction with @code{subdir-objects}, Automake uses this ++information to deduce that the object files will be in the same ++subdirectory relative to @code{$top_builddir}; it knows the source files + are expected to be in the directory where the @samp{$(LIBOBJS)} and + @samp{$(ALLOCA)} variables are used. + +@@ -3947,13 +3950,9 @@ + tool2_SOURCES = @dots{} + @end example + +-Please note it would be wrong to use the variables @samp{$(LIBOBJS)} or +-@samp{$(ALLOCA)} in @file{src/Makefile.am}, because these variables +-contains unprefixed object names, and, for instance, +-@file{malloc.$(OBJEXT)} is not buildable in the @file{src/} directory. +-(Actually if you try using @samp{$(LIBOBJS)} in @file{src/}, Automake +-will require a copy of @file{malloc.c}, @file{memcmp.c}, +-@file{strdup.c}, @file{alloca.c} in @file{src/} too.) ++Please note @code{$(LIBOBJS)} or @code{$(ALLOCA)} can only be used in ++@file{src/Makefile.am} in @code{subdir-objects} mode, because these ++variables contain object names prefixed with @code{$(LIBOBJDIR)}. + + Because @samp{$(LIBOBJS)} and @samp{$(ALLOCA)} contain object + file names that end with @samp{.$(OBJEXT)}, they are not suitable for +--- origsrc/automake-1.9.6/tests/Makefile.am 2005-06-30 17:17:13.000000000 -0400 ++++ src/automake-1.9.6/tests/Makefile.am 2008-10-27 08:43:38.068062400 -0400 +@@ -412,6 +412,7 @@ + pr300-ltlib.test \ + pr300-prog.test \ + pr307.test \ ++pr401.test \ + prefix.test \ + primary.test \ + primary2.test \ +--- origsrc/automake-1.9.6/tests/pr401.test 1969-12-31 19:00:00.000000000 -0500 ++++ src/automake-1.9.6/tests/pr401.test 2008-10-27 08:43:38.078076800 -0400 +@@ -0,0 +1,155 @@ ++#! /bin/sh ++# Copyright (C) 2005 Free Software Foundation, Inc. ++# ++# This file is part of GNU Automake. ++# ++# GNU Automake is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2, or (at your option) ++# any later version. ++# ++# GNU Automake is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with Automake; see the file COPYING. If not, write to ++# the Free Software Foundation, Inc., 59 Temple Place - Suite 330, ++# Boston, MA 02111-1307, USA. ++ ++# Check support for AC_CONFIG_LIBOBJ_DIR vs LIBOBJS. ++ ++required=gcc ++. ./defs || exit 1 ++ ++set -e ++ ++mkdir lib src ++ ++cat >lib/feep.c <<'EOF' ++char * ++feep () ++{ ++ return "feep"; ++} ++EOF ++ ++cat >src/feep.c <<'EOF' ++#include ++ ++extern char *feep (); ++ ++int ++main (int argc, char **argv) ++{ ++ printf ("%s\n", feep ()); ++ return 0; ++} ++EOF ++ ++cat >>configure.in << 'EOF' ++## These lines are activated for later tests ++#: AC_CONFIG_LIBOBJ_DIR([lib]) ++AC_PROG_CC ++#: AM_PROG_CC_C_O ++AC_LIBOBJ([feep]) ++AC_LIBSOURCE([feep.c]) ++AC_PROG_RANLIB ++AC_CONFIG_FILES([lib/Makefile src/Makefile]) ++AC_OUTPUT ++EOF ++ ++## ------------------------------------------ ## ++## First a test of traditional LIBOBJS usage. ## ++## ------------------------------------------ ## ++ ++cat >Makefile.am <<'EOF' ++SUBDIRS = lib src ++EOF ++ ++cat >lib/Makefile.am <<'EOF' ++noinst_LIBRARIES = libfeep.a ++libfeep_a_SOURCES = ++libfeep_a_LIBADD = $(LIBOBJS) ++EOF ++ ++cat >src/Makefile.am <<'EOF' ++check_PROGRAMS = feep ++feep_LDADD = $(top_builddir)/lib/libfeep.a ++ ++TESTS = feep ++EOF ++ ++$ACLOCAL ++$AUTOCONF ++$AUTOMAKE ++./configure ++$MAKE ++$MAKE check ++ ++rm -f configure Makefile* lib/Makefile* src/Makefile* */feep.o */libfeep.a ++ ++ ++## -------------------------------------------- ## ++## Test using LIBOBJS from a sibling directory. ## ++## -------------------------------------------- ## ++ ++$PERL -pi -e 's/#: //' configure.in ++$PERL -pi -e 's/lib\/Makefile //' configure.in ++ ++cat >Makefile.am <<'EOF' ++SUBDIRS = src ++EOF ++ ++cat > src/Makefile.am <<'EOF' ++AUTOMAKE_OPTIONS = subdir-objects ++ ++noinst_LIBRARIES = libfeep.a ++libfeep_a_SOURCES = ++libfeep_a_LIBADD = $(LIBOBJS) ++ ++check_PROGRAMS = feep ++feep_LDADD = ./libfeep.a ++ ++TESTS = feep ++EOF ++ ++$ACLOCAL ++$AUTOCONF ++$AUTOMAKE --add-missing ++./configure ++$MAKE ++$MAKE check ++ ++rm -f configure Makefile* src/Makefile* */feep.o */libfeep.a ++ ++ ++## ----------------------------------------- ## ++## Test using LIBOBJS from parent directory. ## ++## ----------------------------------------- ## ++ ++$PERL -pi -e 's/^.*src\/Makefile.*$//' configure.in ++ ++cat >Makefile.am <<'EOF' ++AUTOMAKE_OPTIONS = subdir-objects ++ ++noinst_LIBRARIES = lib/libfeep.a ++lib_libfeep_a_SOURCES = ++lib_libfeep_a_LIBADD = $(LIBOBJS) ++ ++check_PROGRAMS = src/feep ++src_feep_SOURCES = src/feep.c ++src_feep_LDADD = ./lib/libfeep.a ++ ++TESTS = src/feep ++EOF ++ ++$ACLOCAL ++$AUTOCONF ++$AUTOMAKE ++./configure ++$MAKE ++$MAKE check ++ ++rm -f configure Makefile* */feep.o */libfeep.a diff --git a/automake1.9/automake1.9-cygwin-test-fixes.patch b/automake1.9/automake1.9-cygwin-test-fixes.patch new file mode 100644 index 00000000000..37602bb8295 --- /dev/null +++ b/automake1.9/automake1.9-cygwin-test-fixes.patch @@ -0,0 +1,19 @@ +--- origsrc/automake-1.9.6/tests/subst.test 2005-05-14 16:21:27.000000000 -0400 ++++ src/automake-1.9.6/tests/subst.test 2008-10-27 19:28:56.286828800 -0400 +@@ -24,8 +24,14 @@ + . ./defs || exit 1 + + cat >> configure.in << 'END' +-AC_SUBST($1) +-AC_SUBST([$]$1) dnl this is the actual invocation that was used ++dnl This test used to have the following lines, which cannot have ++dnl worked sensibly with Autoconf for years, however: ++dnl AC_SUBST($1) ++dnl AC_SUBST([$]$1) dnl this is the actual invocation that was used ++dnl ++AC_DEFUN([FOO], ++[AC_SUBST([$1])]) ++FOO([BAR]) + END + + : > Makefile.am diff --git a/automake1.9/automake1.9-documentation.patch b/automake1.9/automake1.9-documentation.patch new file mode 100644 index 00000000000..618e90d0797 --- /dev/null +++ b/automake1.9/automake1.9-documentation.patch @@ -0,0 +1,27 @@ +--- origsrc/automake-1.9.6/doc/automake.texi 2005-07-09 05:28:44.000000000 -0400 ++++ src/automake-1.9.6/doc/automake.texi 2008-10-27 19:44:50.308644800 -0400 +@@ -1,7 +1,7 @@ + \input texinfo @c -*-texinfo-*- + @c %**start of header +-@setfilename automake.info +-@settitle automake ++@setfilename automake1.9.info ++@settitle automake1.9 + @setchapternewpage off + @c %**end of header + +@@ -34,12 +34,12 @@ + + @dircategory Software development + @direntry +-* automake: (automake). Making Makefile.in's. ++* automake-1.9: (automake1.9). Making Makefile.in's. + @end direntry + + @dircategory Individual utilities + @direntry +-* aclocal: (automake)Invoking aclocal. Generating aclocal.m4. ++* aclocal-1.9: (automake1.9)Invoking aclocal. Generating aclocal.m4. + @end direntry + + @titlepage diff --git a/automake1.9/automake1.9-vs-modern-libtool.patch b/automake1.9/automake1.9-vs-modern-libtool.patch new file mode 100644 index 00000000000..f1928ff2448 --- /dev/null +++ b/automake1.9/automake1.9-vs-modern-libtool.patch @@ -0,0 +1,8 @@ +--- origsrc/automake-1.9.6/lib/am/libtool.am 2005-05-14 16:21:06.000000000 -0400 ++++ src/automake-1.9.6/lib/am/libtool.am 2008-10-27 08:43:38.058048000 -0400 +@@ -28,4 +28,4 @@ + + ?TOPDIR?distclean-am: distclean-libtool + ?TOPDIR?distclean-libtool: +-?TOPDIR? -rm -f libtool ++?TOPDIR? -rm -f libtool config.lt