diff options
author | Martin Schlemmer <azarah@gentoo.org> | 2002-03-21 20:45:42 +0000 |
---|---|---|
committer | Martin Schlemmer <azarah@gentoo.org> | 2002-03-21 20:45:42 +0000 |
commit | 2f013cf9807aa662fd15d2545c91bf250cf22fa5 (patch) | |
tree | 9deb0dcdb61358ed99bace995be087e8ac005bff /sys-devel/automake | |
parent | removing test file (diff) | |
download | gentoo-2-2f013cf9807aa662fd15d2545c91bf250cf22fa5.tar.gz gentoo-2-2f013cf9807aa662fd15d2545c91bf250cf22fa5.tar.bz2 gentoo-2-2f013cf9807aa662fd15d2545c91bf250cf22fa5.zip |
new dual version
Diffstat (limited to 'sys-devel/automake')
-rw-r--r-- | sys-devel/automake/ChangeLog | 9 | ||||
-rw-r--r-- | sys-devel/automake/automake-1.4-r2.ebuild | 27 | ||||
-rw-r--r-- | sys-devel/automake/automake-1.5.ebuild | 25 | ||||
-rw-r--r-- | sys-devel/automake/automake-1.5d.ebuild (renamed from sys-devel/automake/automake-1.6.ebuild) | 7 | ||||
-rw-r--r-- | sys-devel/automake/automake-1.6-r1.ebuild | 115 | ||||
-rw-r--r-- | sys-devel/automake/files/am-wrapper.pl | 52 | ||||
-rw-r--r-- | sys-devel/automake/files/digest-automake-1.4-r2 | 1 | ||||
-rw-r--r-- | sys-devel/automake/files/digest-automake-1.5d | 1 | ||||
-rw-r--r-- | sys-devel/automake/files/digest-automake-1.6 | 1 | ||||
-rw-r--r-- | sys-devel/automake/files/digest-automake-1.6-r1 (renamed from sys-devel/automake/files/digest-automake-1.5) | 1 |
10 files changed, 181 insertions, 58 deletions
diff --git a/sys-devel/automake/ChangeLog b/sys-devel/automake/ChangeLog index 1ba48aa47c6f..37c7260101dc 100644 --- a/sys-devel/automake/ChangeLog +++ b/sys-devel/automake/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-devel/automake # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/ChangeLog,v 1.2 2002/03/21 13:16:23 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/ChangeLog,v 1.3 2002/03/21 20:45:42 azarah Exp $ + +*automake-1.6-r1 (21 March 2002) + + 21 March 2002; M.Schlemmer <azarah@gentoo.org> : + + Create dual ebuild for automake-1.4x and automake-1.6x. Have the + same autodetection as autoconf-1.53, check am-wrapper.pl for details. *automake-1.6 (21 March 2002) diff --git a/sys-devel/automake/automake-1.4-r2.ebuild b/sys-devel/automake/automake-1.4-r2.ebuild deleted file mode 100644 index c6468d676b77..000000000000 --- a/sys-devel/automake/automake-1.4-r2.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Daniel robbins <drobbins@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.4-r2.ebuild,v 1.2 2001/11/24 18:40:50 drobbins Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="Used to generate Makefile.in from Makefile.am" -SRC_URI="ftp://prep.ai.mit.edu/gnu/automake/${A}" -HOMEPAGE="http://www.gnu.org/software/automake/automake.html" - -DEPEND="sys-devel/perl" - -src_compile() { - - try ./configure --prefix=/usr --infodir=/usr/share/info --host=${CHOST} - try make ${MAKEOPTS} -} - -src_install() { - - try make prefix=${D}/usr infodir=${D}/usr/share/info install - dodoc COPYING NEWS README THANKS TODO AUTHORS ChangeLog - -} - - diff --git a/sys-devel/automake/automake-1.5.ebuild b/sys-devel/automake/automake-1.5.ebuild deleted file mode 100644 index a85de0ef415c..000000000000 --- a/sys-devel/automake/automake-1.5.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Daniel robbins <drobbins@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.5.ebuild,v 1.2 2001/11/24 18:40:50 drobbins Exp $ - -P=automake-1.4-p5 -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="Used to generate Makefile.in from Makefile.am" -SRC_URI="ftp://prep.ai.mit.edu/gnu/automake/${A}" -HOMEPAGE="http://www.gnu.org/software/automake/automake.html" - -DEPEND="sys-devel/perl" - -src_compile() { - try ./configure --prefix=/usr --infodir=/usr/share/info --host=${CHOST} - try make ${MAKEOPTS} -} - -src_install() { - try make prefix=${D}/usr infodir=${D}/usr/share/info install - dodoc COPYING NEWS README THANKS TODO AUTHORS ChangeLog -} - - diff --git a/sys-devel/automake/automake-1.6.ebuild b/sys-devel/automake/automake-1.5d.ebuild index 6e7bd49f2230..0cee4d25bb45 100644 --- a/sys-devel/automake/automake-1.6.ebuild +++ b/sys-devel/automake/automake-1.5d.ebuild @@ -1,12 +1,13 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later # Author: Daniel robbins <drobbins@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.6.ebuild,v 1.1 2002/03/21 13:16:23 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.5d.ebuild,v 1.1 2002/03/21 20:45:42 azarah Exp $ S=${WORKDIR}/${P} DESCRIPTION="Used to generate Makefile.in from Makefile.am" -SRC_URI="ftp://ftp.gnu.org/gnu/automake/${P}.tar.gz" -# ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.bz2" +SRC_URI="ftp://sources.redhat.com/pub/automake/automake-1.5d.tar.bz2" +#ftp://ftp.gnu.org/gnu/automake/${P}.tar.gz" +#ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.bz2" HOMEPAGE="http://www.gnu.org/software/automake/automake.html" DEPEND="sys-devel/perl diff --git a/sys-devel/automake/automake-1.6-r1.ebuild b/sys-devel/automake/automake-1.6-r1.ebuild new file mode 100644 index 000000000000..a3dbc06a8e71 --- /dev/null +++ b/sys-devel/automake/automake-1.6-r1.ebuild @@ -0,0 +1,115 @@ +# Copyright 1999-2002 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License, v2 or later +# Maintainer: Daniel Robbins <drobbins@gentoo.org> +# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.6-r1.ebuild,v 1.1 2002/03/21 20:45:42 azarah Exp $ + +OLD_PV=1.4-p5 +OLD_P=${PN}-${OLD_PV} +S=${WORKDIR}/${P} +OLD_S=${WORKDIR}/${OLD_P} +DESCRIPTION="Used to generate Makefile.in from Makefile.am" +SRC_URI="ftp://ftp.gnu.org/gnu/${PN}/${P}.tar.gz + ftp://ftp.gnu.org/gnu/${PN}/${OLD_P}.tar.gz" +HOMEPAGE="http://www.gnu.org/software/automake/automake.html" + +DEPEND="sys-devel/perl + >=sys-devel/autoconf-2.53" + + +src_compile() { + + # + # ************ automake-1.6x ************ + # + + # stupid configure script goes and run autoconf in a subdir, + # so 'ac-wrapper.pl' do not detect that it should use + # autoconf-2.5x + export WANT_AUTOCONF_2_5=1 + + cd ${S} + + cp automake.texi automake.texi.orig + sed -e "s:setfilename automake.info:setfilename automake-1.6.info:" \ + automake.texi.orig >automake.texi + + ./configure --prefix=/usr \ + --infodir=/usr/share/info \ + --mandir=/usr/share/man \ + --target=${CHOST} || die + + emake ${MAKEOPTS} || die + + unset WANT_AUTOCONF_2_5 + + # + # ************ automake-1.4-p5 ************ + # + cd ${OLD_S} + ./configure --prefix=/usr \ + --infodir=/usr/share/info \ + --mandir=/usr/share/man \ + --target=${CHOST} || die + + emake ${MAKEOPTS} || die +} + +src_install() { + + # install wrapper script for autodetecting the proper version + # to use. + exeinto /usr/lib/${PN} + doexe ${FILESDIR}/am-wrapper.pl + + # + # ************ automake-1.6x ************ + # + + cd ${S} + make DESTDIR=${D} \ + install || die + + for x in automake aclocal + do + mv ${D}/usr/bin/${x}-${PV} ${D}/usr/bin/${x}-1.6x + rm -f ${D}/usr/bin/${x} + done + + doinfo automake-1.6.info* + + docinto ${PF}/${PV} + dodoc COPYING NEWS README THANKS TODO AUTHORS ChangeLog + + # + # ************ automake-1.4-p5 ************ + # + + cd ${OLD_S} + make prefix=${D}/usr \ + mandir=${D}/usr/share/man \ + infodir=${D}/usr/share/info \ + install || die + + for x in automake aclocal + do + mv ${D}/usr/bin/${x} ${D}/usr/bin/${x}-1.4 + dosym ../lib/${PN}/am-wrapper.pl /usr/bin/${x} + done + + docinto ${PF}/${OLD_PV} + dodoc COPYING NEWS README THANKS TODO AUTHORS ChangeLog +} + +pkg_preinst() { + + # remove these to make sure symlinks install properly if old versions + # was binaries + for x in automake aclocal + do + if [ -e /usr/bin/${x} ] + then + rm -f /usr/bin/${x} + fi + done +} + diff --git a/sys-devel/automake/files/am-wrapper.pl b/sys-devel/automake/files/am-wrapper.pl new file mode 100644 index 000000000000..70f2d9066749 --- /dev/null +++ b/sys-devel/automake/files/am-wrapper.pl @@ -0,0 +1,52 @@ +#!/usr/bin/perl +# +# +# Guillaume Cottenceau (gc@mandrakesoft.com) +# +# Copyright 2001 MandrakeSoft +# +# This software may be freely redistributed under the terms of the GNU +# public license. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# +# +# Executes the correct autoconf version. +# +# - defaults to automake-1.4 +# - runs automake-1.6x if it exists and... +# - envvar WANT_AUTOMAKE_1_6 is set to `1' +# -or- +# - configure.ac is present +# -or- +# - `configure.in' contains AC_PREREQ and the value's 3 first letters +# are stringwise greater than '2.1' +# + +#use MDK::Common; + +sub cat_ { local *F; open F, $_[0] or return; my @l = <F>; wantarray ? @l : join '', @l } + +my $binary = "$0-1.4"; +my $binary_new = "$0-1.6x"; + +if (!$ENV{WANT_AUTOMAKE_1_4}) { + if (-x $binary_new # user may have only 2.13 + && ($ENV{WANT_AUTOMAKE_1_6} + || -r 'configure.ac' + || (cat_('configure.in') =~ /^\s*AC_PREREQ\(([^\)]{3})[^\)]*\)/m ? $1 : '') gt '2.1' + || (cat_('aclocal.m4') =~ /^\s*AC_PREREQ\(([^\)]{3})[^\)]*\)/m ? $1 : '') gt '2.1')) { + $ENV{WANT_AUTOMAKE_1_6} = 1; # to prevent further "cats" and to enhance consistency (possible cwd etc) + $binary = $binary_new; + } else { + $ENV{WANT_AUTOMAKE_1_4} = 1; # for further consistency + } +} + +$ENV{WANT_AMWRAPPER_DEBUG} and print STDERR "am-wrapper: will execute <$binary>\n"; + +exec $binary, @ARGV; + +die "am-wrapper: ouch, couldn't call binary ($binary).\n"; diff --git a/sys-devel/automake/files/digest-automake-1.4-r2 b/sys-devel/automake/files/digest-automake-1.4-r2 deleted file mode 100644 index 42a65aa154f7..000000000000 --- a/sys-devel/automake/files/digest-automake-1.4-r2 +++ /dev/null @@ -1 +0,0 @@ -MD5 1d483ffa4349bfc9ab8ae0de0c617c7b automake-1.4.tar.gz 353241 diff --git a/sys-devel/automake/files/digest-automake-1.5d b/sys-devel/automake/files/digest-automake-1.5d new file mode 100644 index 000000000000..576050465468 --- /dev/null +++ b/sys-devel/automake/files/digest-automake-1.5d @@ -0,0 +1 @@ +MD5 78b3eb4d3d593ceaa32c1d33d6abcdf6 automake-1.5d.tar.bz2 455041 diff --git a/sys-devel/automake/files/digest-automake-1.6 b/sys-devel/automake/files/digest-automake-1.6 deleted file mode 100644 index 6105b85b6970..000000000000 --- a/sys-devel/automake/files/digest-automake-1.6 +++ /dev/null @@ -1 +0,0 @@ -MD5 549af723e3757f71e2a904dbd46d9e76 automake-1.6.tar.gz 588712 diff --git a/sys-devel/automake/files/digest-automake-1.5 b/sys-devel/automake/files/digest-automake-1.6-r1 index 8d7cff9313f9..8ba67b46b232 100644 --- a/sys-devel/automake/files/digest-automake-1.5 +++ b/sys-devel/automake/files/digest-automake-1.6-r1 @@ -1 +1,2 @@ MD5 e10679bba411f8602eed004012d915e3 automake-1.4-p5.tar.gz 376992 +MD5 549af723e3757f71e2a904dbd46d9e76 automake-1.6.tar.gz 588712 |