commit: 7e95cbbefb0f534e2696dd9b59b8e18912fe66f4 parent 5209078684ceda111328c2caac6d9f12f365668b Author: Andrius Štikonas <andrius@stikonas.eu> Date: Thu, 7 Jul 2022 20:43:39 +0100 Switch to unversioned automake.Diffstat:
38 files changed, 54 insertions(+), 48 deletions(-)diff --git a/sysa/SHA256SUMS.pkgs b/sysa/SHA256SUMS.pkgs@@ -12,18 +12,18 @@ d5fcce4baea5e11f983a7e4b7148545ab6720bb4e010898c73387f6711be67f4 autoconf-2.64_ 298dcf17a439adb306237b308e3c4ed3d376cb863ae0f0f08bfdf1f3199a548b autoconf-2.69_0.tar.bz2 d713ac1840e82250414ee4f7cd75c79ee44ecb4e8dfc659704eed3d75e7d348c autoconf-2.71_0.x86.xbps 6ff691e3ddd4f3d1796d28b07a2a96691dbd9801844c99ccbe660da59dabd74b autoconf-archive-2021.02.19_0.tar.bz2 -cf6b7bbdba1a58b0cc1e6dae36a82e3b28db8ee1e948225d72530accee32aaab automake-1.10.3_0.tar.bz2 -778efda0ea7a85c49a8d4f2ceda7dca1eb3e77ef91e3cd4036302bb5e90a620f automake-1.11.2_0.tar.bz2 -27cbc3f942fb386ad4fceb62188722dbd8a833082bc037e4f1688927a3df854d automake-1.15.1_0.tar.bz2 +fbd8739c8f69b388e2c54893faa1180cc38f2718339da82788312adb0201c5d0 automake-1.10.3_0.tar.bz2 +e5eae329b2f6854c18844df70fe13975d3c5394708e274616bc4168e55801b41 automake-1.11.2_0.tar.bz2 +732d12fdeea2c234750c8e91c90a90934d279283839cdabe0343fa765ba24168 automake-1.15.1_0.tar.bz2 a9c66f944e0dbebb3661bb134795749a6f3ef69abb69d6080ac90446b8cfb5e7 automake-1.16.3_0.x86.xbps 51ef85383c0afe88c17a25f8b49c4dfdd77c1cc6aa81568ec09d45a15d580de8 automake-1.4-p6_0.tar.bz2 8ec3af09fd23256f89b27833a8311ed347caf93d611b1209232ce104bb6fb4ef automake-1.6.3_0.tar.bz2 031119cb14859c8bf80d5df5e0bbc475cf67f04b645dc55c80bcabe1bb31a8cd automake-1.6.3_1.tar.bz2 b2eab85c4a22060cc18945f6cb24cdf928fee370fff3fe12482e866a1cace586 automake-1.6.3_2.tar.bz2 -ddd61cfdaea7a7a9b85eff7e2e597bf6c8af05215e34fd05a5c97f6afc5c31ef automake-1.7.8_0.tar.bz2 -8f8c29596333ddb8bf3d0e7ed5ee514e75cd248f06961f1ef666e6410e2d384c automake-1.7_0.tar.bz2 -d52aa64563e2a6fce48bb751fab9802a997772132d9e612ec77274e0e9bac3c9 automake-1.8.5_0.tar.bz2 -df5ab8ac7f13eb7aa5211ad4609578f0bb1ed4957ac5737cb78466f644760019 automake-1.9.6_0.tar.bz2 +76e897ec8e683eb15ab621c3a0d86613bc7cae43631c94e9c6388eb08db191ca automake-1.7.8_0.tar.bz2 +58a9ccbba82dda35673404135a855c19351ac758b2ac0c1e112d193b1dfb7df5 automake-1.7_0.tar.bz2 +75c5f2c2f636c4d763eef650ffdf638ff372444dce74e5c9bfe7c5ec824c2a26 automake-1.8.5_0.tar.bz2 +42fe9a42c457193e7bebf31b71eb28bc71e179ed9f2c78be242a5f6b03bbbbfe automake-1.9.6_0.tar.bz2 e180c61e3922b0546a6a3ee498abeba6dfdd404215ca850628a5277e5ede26e7 bash-5.1_0.tar.bz2 a6190872c4daf1b55a1ad1f2fd2e34bd251f3808f750bb4a7920b66d672497a8 binutils-2.14_0.tar.bz2 f566a5cb99adc8f572659ebf4a778ff23acf62d90b13a9983f56488a493b15b2 bison-2.3_0.tar.bz2diff --git a/sysa/autoconf-2.55/autoconf-2.55.sh b/sysa/autoconf-2.55/autoconf-2.55.sh@@ -10,7 +10,7 @@ src_prepare() { # Do not use pregenerated manpages sed -i '/SUBDIRS/s/ man//' Makefile.am - AUTOCONF=autoconf-2.54 autoreconf-2.54 + AUTOMAKE=automake-1.7 ACLOCAL=aclocal-1.7 AUTOCONF=autoconf-2.54 autoreconf-2.54 # Install autoconf data files into versioned directory for file in */*/Makefile.in */Makefile.in Makefile.in; dodiff --git a/sysa/autoconf-2.57/autoconf-2.57.sh b/sysa/autoconf-2.57/autoconf-2.57.sh@@ -9,7 +9,7 @@ src_prepare() { # Do not use pregenerated manpages sed -i '/SUBDIRS/s/ man//' Makefile.am - AUTOCONF=autoconf-2.55 autoreconf-2.55 -f + AUTOMAKE=automake-1.7 ACLOCAL=aclocal-1.7 AUTOCONF=autoconf-2.55 autoreconf-2.55 -f # Install autoconf data files into versioned directory for file in */*/Makefile.in */Makefile.in Makefile.in; dodiff --git a/sysa/autoconf-2.59/autoconf-2.59.sh b/sysa/autoconf-2.59/autoconf-2.59.sh@@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> +# SPDX-FileCopyrightText: 2022 Andrius Štikonas <andrius@stikonas.eu> # # SPDX-License-Identifier: GPL-3.0-or-later @@ -9,7 +9,7 @@ src_prepare() { # Do not use pregenerated manpages sed -i '/SUBDIRS/s/ man//' Makefile.am - AUTOCONF=autoconf-2.57 autoreconf-2.57 -f + AUTOMAKE=automake-1.7 ACLOCAL=aclocal-1.7 AUTOCONF=autoconf-2.57 autoreconf-2.57 -f # Install autoconf data files into versioned directory for file in */*/Makefile.in */Makefile.in Makefile.in; dodiff --git a/sysa/autoconf-2.61/autoconf-2.61.sh b/sysa/autoconf-2.61/autoconf-2.61.sh@@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> +# SPDX-FileCopyrightText: 2022 Andrius Štikonas <andrius@stikonas.eu> # # SPDX-License-Identifier: GPL-3.0-or-later @@ -6,7 +6,7 @@ src_prepare() { rm doc/standards.info man/*.1 sed -i -e '/AC_PROG_GREP/d' -e '/AC_PROG_SED/d' configure.ac - AUTOM4TE=autom4te-2.59 AUTOCONF=autoconf-2.59 autoreconf-2.59 -f + AUTOMAKE=automake-1.8 ACLOCAL=aclocal-1.8 AUTOM4TE=autom4te-2.59 AUTOCONF=autoconf-2.59 autoreconf-2.59 -f # Install autoconf data files into versioned directory for file in */*/Makefile.in */Makefile.in Makefile.in; dodiff --git a/sysa/autoconf-2.64/autoconf-2.64.sh b/sysa/autoconf-2.64/autoconf-2.64.sh@@ -5,7 +5,7 @@ src_prepare() { rm doc/standards.info man/*.1 - AUTOM4TE=autom4te-2.61 AUTOCONF=autoconf-2.61 autoreconf-2.61 -f + AUTOMAKE=automake-1.10 ACLOCAL=aclocal-1.10 AUTOM4TE=autom4te-2.61 AUTOCONF=autoconf-2.61 autoreconf-2.61 -f # Install autoconf data files into versioned directory for file in */*/Makefile.in */Makefile.in Makefile.in; dodiff --git a/sysa/automake-1.10.3/automake-1.10.3.sh b/sysa/automake-1.10.3/automake-1.10.3.sh@@ -23,6 +23,7 @@ src_compile() { src_install() { make install MAKEINFO=true DESTDIR="${DESTDIR}" rm "${DESTDIR}${PREFIX}/share/doc/automake/amhello-1.0.tar.gz" + rm "${DESTDIR}/usr/bin/automake" "${DESTDIR}/usr/bin/aclocal" # Delete some stray directories rm -r "${DESTDIR}${SOURCES}"diff --git a/sysa/automake-1.7.8/automake-1.7.8.sh b/sysa/automake-1.7.8/automake-1.7.8.sh@@ -1,11 +1,11 @@ -# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> +# SPDX-FileCopyrightText: 2022 Andrius Štikonas <andrius@stikonas.eu> # # SPDX-License-Identifier: GPL-3.0-or-later src_prepare() { rm -- configure Makefile.in */Makefile.in */*/Makefile.in aclocal.m4 automake.info* - AUTOCONF=autoconf-2.55 autoreconf-2.55 + AUTOMAKE=automake-1.7 ACLOCAL=aclocal-1.7 AUTOCONF=autoconf-2.55 autoreconf-2.55 } src_configure() { @@ -18,4 +18,5 @@ src_compile() { src_install() { make install MAKEINFO=true DESTDIR="${DESTDIR}" + rm "${DESTDIR}/usr/bin/automake" "${DESTDIR}/usr/bin/aclocal" }diff --git a/sysa/automake-1.7/automake-1.7.sh b/sysa/automake-1.7/automake-1.7.sh@@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> +# SPDX-FileCopyrightText: 2022 Andrius Štikonas <andrius@stikonas.eu> # # SPDX-License-Identifier: GPL-3.0-or-later @@ -20,5 +20,5 @@ src_compile() { src_install() { make install MAKEINFO=true DESTDIR="${DESTDIR}" + rm "${DESTDIR}/usr/bin/automake" "${DESTDIR}/usr/bin/aclocal" } -diff --git a/sysa/automake-1.8.5/automake-1.8.5.sh b/sysa/automake-1.8.5/automake-1.8.5.sh@@ -1,11 +1,11 @@ -# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> +# SPDX-FileCopyrightText: 2022 Andrius Štikonas <andrius@stikonas.eu> # # SPDX-License-Identifier: GPL-3.0-or-later src_prepare() { rm doc/automake.info* - AUTOCONF=autoconf-2.59 autoreconf-2.59 -f + AUTOMAKE=automake-1.7 ACLOCAL=aclocal-1.7 AUTOCONF=autoconf-2.59 autoreconf-2.59 -f } src_configure() { @@ -18,4 +18,5 @@ src_compile() { src_install() { make install MAKEINFO=true DESTDIR="${DESTDIR}" + rm "${DESTDIR}/usr/bin/automake" "${DESTDIR}/usr/bin/aclocal" }diff --git a/sysa/automake-1.9.6/automake-1.9.6.sh b/sysa/automake-1.9.6/automake-1.9.6.sh@@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> +# SPDX-FileCopyrightText: 2022 Andrius Štikonas <andrius@stikonas.eu> # # SPDX-License-Identifier: GPL-3.0-or-later @@ -6,7 +6,7 @@ src_prepare() { rm doc/automake.info* sed -i 's/1.8a/1.8.5/; s/ filename-length-max=99//' configure.ac - AUTOM4TE=autom4te-2.61 AUTOCONF=autoconf-2.61 autoreconf-2.61 -f + AUTOMAKE=automake-1.8 ACLOCAL=aclocal-1.8 AUTOM4TE=autom4te-2.61 AUTOCONF=autoconf-2.61 autoreconf-2.61 -f } src_configure() { @@ -19,4 +19,5 @@ src_compile() { src_install() { make install MAKEINFO=true DESTDIR="${DESTDIR}" + rm "${DESTDIR}/usr/bin/automake" "${DESTDIR}/usr/bin/aclocal" }diff --git a/sysa/curl-7.83.0/curl-7.83.0.sh b/sysa/curl-7.83.0/curl-7.83.0.sh@@ -15,7 +15,7 @@ src_prepare() { rm config.guess config.sub ltmain.sh libtoolize - AUTOM4TE=autom4te-2.64 autoreconf-2.64 -fi + AUTOMAKE=automake-1.10 ACLOCAL=aclocal-1.10 AUTOM4TE=autom4te-2.64 autoreconf-2.64 -fi } src_configure() {diff --git a/sysa/e2fsprogs-1.45.7/e2fsprogs-1.45.7.sh b/sysa/e2fsprogs-1.45.7/e2fsprogs-1.45.7.sh@@ -16,7 +16,7 @@ src_prepare() { rm config/config.guess config/config.sub config/ltmain.sh libtoolize -i - AUTOCONF=autoconf-2.64 AUTOM4TE=autom4te-2.64 autoreconf-2.64 -fi + AUTOMAKE=automake-1.10 ACLOCAL=aclocal-1.10 AUTOCONF=autoconf-2.64 AUTOM4TE=autom4te-2.64 autoreconf-2.64 -fi # Remove bison parser generated rm intl/plural.ydiff --git a/sysa/findutils-4.2.33/findutils-4.2.33.sh b/sysa/findutils-4.2.33/findutils-4.2.33.sh@@ -10,7 +10,7 @@ src_prepare() { default - AUTOM4TE=autom4te-2.61 AUTOCONF=autoconf-2.61 autoreconf-2.61 -f + AUTOMAKE=automake-1.9 ACLOCAL=aclocal-1.9 AUTOM4TE=autom4te-2.61 AUTOCONF=autoconf-2.61 autoreconf-2.61 -f # Pre-built texinfo files rm doc/find.infodiff --git a/sysa/help2man-1.36.4/help2man-1.36.4.sh b/sysa/help2man-1.36.4/help2man-1.36.4.sh@@ -6,7 +6,7 @@ src_prepare() { default - autoreconf-2.59 -f + ACLOCAL=aclocal-1.8 AUTOMAKE=automeke-1.8 autoreconf-2.59 -f rm help2man.info touch help2man.infodiff --git a/sysa/kbd-1.15/kbd-1.15.sh b/sysa/kbd-1.15/kbd-1.15.sh@@ -12,7 +12,7 @@ src_prepare() { sed -i -e 's/u_char/unsigned char/g' \ -e 's/u_short/unsigned short/g' src/dumpkeys.c src/loadkeys.y - AUTOPOINT=true AUTOM4TE=autom4te-2.64 autoreconf-2.64 -fi + AUTOPOINT=true AUTOMAKE=automake-1.10 ACLOCAL=aclocal-1.10 AUTOM4TE=autom4te-2.64 autoreconf-2.64 -fi } src_configure() {diff --git a/sysa/kexec-tools-2.0.22/kexec-tools-2.0.22.sh b/sysa/kexec-tools-2.0.22/kexec-tools-2.0.22.sh@@ -6,7 +6,7 @@ src_prepare() { default - AUTOM4TE=autom4te-2.64 autoreconf-2.64 -fi + AUTOMAKE=automake-1.10 ACLOCAL=aclocal-1.10 AUTOM4TE=autom4te-2.64 autoreconf-2.64 -fi } src_configure() {diff --git a/sysa/libtool-2.2.4/libtool-2.2.4.sh b/sysa/libtool-2.2.4/libtool-2.2.4.sh@@ -10,7 +10,7 @@ src_prepare() { rm -f doc/*.info - AUTOM4TE=autom4te-2.61 AUTOCONF=autoconf-2.61 AUTOHEADER=autoheader-2.61 AUTORECONF=autoreconf-2.61 ./bootstrap + AUTOMAKE=automake-1.9 ACLOCAL=aclocal-1.9 AUTOM4TE=autom4te-2.61 AUTOCONF=autoconf-2.61 AUTOHEADER=autoheader-2.61 AUTORECONF=autoreconf-2.61 ./bootstrap } src_configure() {diff --git a/sysa/make-3.82/make-3.82.sh b/sysa/make-3.82/make-3.82.sh@@ -9,7 +9,7 @@ src_prepare() { touch doc/make.info # We don't have autopoint from gettext yet - AUTOPOINT=true AUTOM4TE=autom4te-2.64 autoreconf-2.64 -fi + AUTOPOINT=true AUTOMAKE=automake-1.10 ACLOCAL=aclocal-1.10 AUTOM4TE=autom4te-2.64 autoreconf-2.64 -fi } src_configure() {diff --git a/sysa/util-linux-2.19.1/util-linux-2.19.1.sh b/sysa/util-linux-2.19.1/util-linux-2.19.1.sh@@ -6,7 +6,7 @@ src_prepare() { default # We don't have gettext (autopoint) yet. - AUTOPOINT=true AUTOM4TE=autom4te-2.64 autoreconf-2.64 -fi + AUTOPOINT=true AUTOMAKE=automake-1.10 ACLOCAL=aclocal-1.10 AUTOM4TE=autom4te-2.64 autoreconf-2.64 -fi } src_configure() {diff --git a/sysc/autoconf-2.69/autoconf-2.69.sh b/sysc/autoconf-2.69/autoconf-2.69.sh@@ -7,7 +7,7 @@ urls="http://mirrors.kernel.org/gnu/autoconf/autoconf-2.69.tar.xz" src_prepare() { rm doc/standards.info man/*.1 - autoreconf-2.64 -f + AUTOMAKE=automake-1.11 ACLOCAL=aclocal-1.11 autoreconf-2.64 -f # Install autoconf data files into versioned directory for file in */*/Makefile.in */Makefile.in Makefile.in; dodiff --git a/sysc/autoconf-archive-2021.02.19/autoconf-archive-2021.02.19.sh b/sysc/autoconf-archive-2021.02.19/autoconf-archive-2021.02.19.sh@@ -5,7 +5,7 @@ urls="http://mirrors.kernel.org/gnu/autoconf-archive/autoconf-archive-2021.02.19.tar.xz" src_prepare() { - autoreconf-2.69 -fi + AUTOMAKE=automake-1.15 ACLOCAL=aclocal-1.15 autoreconf-2.69 -fi } src_configure() {diff --git a/sysc/automake-1.11.2/automake-1.11.2.sh b/sysc/automake-1.11.2/automake-1.11.2.sh@@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> +# SPDX-FileCopyrightText: 2022 Andrius Štikonas <andrius@stikonas.eu> # SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space> # # SPDX-License-Identifier: GPL-3.0-or-later @@ -23,5 +23,6 @@ src_compile() { src_install() { make install MAKEINFO=true DESTDIR="${DESTDIR}" + rm "${DESTDIR}/usr/bin/automake" "${DESTDIR}/usr/bin/aclocal" rm "${DESTDIR}${PREFIX}/share/doc/automake/amhello-1.0.tar.gz" }diff --git a/sysc/automake-1.15.1/automake-1.15.1.sh b/sysc/automake-1.15.1/automake-1.15.1.sh@@ -27,5 +27,6 @@ src_compile() { src_install() { make install MAKEINFO=true DESTDIR="${DESTDIR}" + rm "${DESTDIR}/usr/bin/automake" "${DESTDIR}/usr/bin/aclocal" rm "${DESTDIR}${PREFIX}/share/doc/automake/amhello-1.0.tar.gz" }diff --git a/sysc/automake-1.16.3/automake-1.16.3.sh b/sysc/automake-1.16.3/automake-1.16.3.sh@@ -5,7 +5,7 @@ urls="https://mirrors.kernel.org/gnu/automake/automake-1.16.3.tar.xz" src_prepare() { - AUTOCONF=autoconf-2.69 AUTOM4TE=autom4te-2.69 ./bootstrap + AUTOMAKE=automake-1.15 ACLOCAL=aclocal-1.15 AUTOCONF=autoconf-2.69 AUTOM4TE=autom4te-2.69 ./bootstrap rm doc/automake-history.info doc/automake.info*diff --git a/sysc/bison-2.3/bison-2.3.sh b/sysc/bison-2.3/bison-2.3.sh@@ -11,7 +11,7 @@ src_prepare() { ../../import-gnulib.sh - AUTOPOINT=true autoreconf-2.69 -fi + AUTOPOINT=true AUTOMAKE=automake-1.15 ACLOCAL=aclocal-1.15 autoreconf-2.69 -fi # Remove pregenerated files rm src/parse-gram.c src/parse-gram.h src/scan-skel.c src/scan-gram.cdiff --git a/sysc/bison-3.4.2/bison-3.4.2.sh b/sysc/bison-3.4.2/bison-3.4.2.sh@@ -20,7 +20,7 @@ src_prepare() { ../../import-gnulib.sh - AUTOPOINT=true autoreconf-2.69 -fi + AUTOPOINT=true AUTOMAKE=automake-1.15 ACLOCAL=aclocal-1.15 autoreconf-2.69 -fi } src_configure() {diff --git a/sysc/coreutils-8.32/coreutils-8.32.sh b/sysc/coreutils-8.32/coreutils-8.32.sh@@ -23,7 +23,7 @@ regenerate_files() { echo "$VERSION" > .tarball-version # We don't have autopoint from gettext yet. - AUTOPOINT=true autoreconf-2.69 -fi + AUTOPOINT=true AUTOMAKE=automake-1.15 ACLOCAL=aclocal-1.15 autoreconf-2.69 -fi } src_prepare() {diff --git a/sysc/curl-7.83.0/curl-7.83.0.sh b/sysc/curl-7.83.0/curl-7.83.0.sh@@ -17,7 +17,7 @@ src_prepare() { rm config.guess config.sub ltmain.sh libtoolize - autoreconf-2.69 -fi + AUTOMAKE=automake-1.15 ACLOCAL=aclocal-1.15 autoreconf-2.69 -fi } src_configure() {diff --git a/sysc/flex-2.5.33/flex-2.5.33.sh b/sysc/flex-2.5.33/flex-2.5.33.sh@@ -7,7 +7,7 @@ urls="http://download.nust.na/pub2/openpkg1/sources/DST/flex/flex-2.5.33.tar.gz" src_prepare() { default - AUTOPOINT=true autoreconf-2.69 -fi + AUTOPOINT=true AUTOMAKE=automake-1.15 ACLOCAL=aclocal-1.15 autoreconf-2.69 -fi # Remove pregenerated files rm parse.c parse.h scan.cdiff --git a/sysc/gmp-6.2.1/gmp-6.2.1.sh b/sysc/gmp-6.2.1/gmp-6.2.1.sh@@ -10,7 +10,7 @@ src_prepare() { # Remove bison and flex generated files rm demos/calc/calc.{c,h} demos/calc/calclex.c - autoreconf-2.69 -fi + AUTOMAKE=automake-1.15 ACLOCAL=aclocal-1.15 autoreconf-2.69 -fi # Pre-built texinfo files find . -name '*.info*' -deletediff --git a/sysc/libarchive-3.5.2/libarchive-3.5.2.sh b/sysc/libarchive-3.5.2/libarchive-3.5.2.sh@@ -7,7 +7,7 @@ urls="http://libarchive.org/downloads/libarchive-3.5.2.tar.xz" src_prepare() { default - autoreconf-2.69 -fi + AUTOMAKE=automake-1.15 ACLOCAL=aclocal-1.15 autoreconf-2.69 -fi } src_configure() {diff --git a/sysc/make-4.2.1/make-4.2.1.sh b/sysc/make-4.2.1/make-4.2.1.sh@@ -11,7 +11,7 @@ src_prepare() { touch doc/make.info # We don't have autopoint from gettext yet - AUTOPOINT=true autoreconf-2.69 -fi + AUTOPOINT=true AUTOMAKE=automake-1.15 ACLOCAL=aclocal-1.15 autoreconf-2.69 -fi } src_configure() {diff --git a/sysc/mpc-1.2.1/mpc-1.2.1.sh b/sysc/mpc-1.2.1/mpc-1.2.1.sh@@ -8,7 +8,7 @@ src_prepare() { default find . -name '*.info' -delete - autoreconf-2.69 -fi + AUTOMAKE=automake-1.15 ACLOCAL=aclocal-1.15 autoreconf-2.69 -fi } src_configure() {diff --git a/sysc/mpfr-4.1.0/mpfr-4.1.0.sh b/sysc/mpfr-4.1.0/mpfr-4.1.0.sh@@ -8,7 +8,7 @@ src_prepare() { default find . -name '*.info' -delete - autoreconf-2.69 -fi + AUTOMAKE=automake-1.15 ACLOCAL=aclocal-1.15 autoreconf-2.69 -fi } src_configure() {diff --git a/sysc/pkg-config-0.29.2/pkg-config-0.29.2.sh b/sysc/pkg-config-0.29.2/pkg-config-0.29.2.sh@@ -5,7 +5,7 @@ urls="http://gentoo.osuosl.org/distfiles/pkg-config-0.29.2.tar.gz" src_prepare() { - autoreconf-2.69 -fi + AUTOMAKE=automake-1.15 ACLOCAL=aclocal-1.15 autoreconf-2.69 -fi } src_configure() {diff --git a/sysc/tar-1.34/tar-1.34.sh b/sysc/tar-1.34/tar-1.34.sh@@ -12,7 +12,7 @@ src_prepare() { . ../../import-gnulib.sh # We don't have autopoint from gettext yet - AUTOPOINT=true autoreconf-2.69 -fi + AUTOPOINT=true AUTOMAKE=automake-1.15 ACLOCAL=aclocal-1.15 autoreconf-2.69 -fi # Remove bison pregenerated file rm gnu/parse-datetime.cdiff --git a/sysc/xz-5.0.5/xz-5.0.5.sh b/sysc/xz-5.0.5/xz-5.0.5.sh@@ -7,7 +7,7 @@ urls="http://ixpeering.dl.sourceforge.net/project/lzmautils/xz-5.0.5.tar.bz2" src_prepare() { default - AUTOCONF=autoconf-2.64 AUTOM4TE=autom4te-2.64 autoreconf-2.64 -f + AUTOMAKE=automake-1.10 ACLOCAL=aclocal-1.10 AUTOCONF=autoconf-2.64 AUTOM4TE=autom4te-2.64 autoreconf-2.64 -f } src_configure() {