summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2005-02-19 18:59:29 +0000
committerMike Frysinger <vapier@gentoo.org>2005-02-19 18:59:29 +0000
commit8faeb195c771310ad20e627efcdcffbf108a489c (patch)
tree779c658e05436ea34676eda7161f60cccf2d7a4f /sys-apps/gawk
parentStable on alpha, bug 81735. (diff)
downloadhistorical-8faeb195c771310ad20e627efcdcffbf108a489c.tar.gz
historical-8faeb195c771310ad20e627efcdcffbf108a489c.tar.bz2
historical-8faeb195c771310ad20e627efcdcffbf108a489c.zip
refactor build dirs a little to make sure xmlgawk gets the same patches as the normal gawk
Package-Manager: portage-2.0.51-r15
Diffstat (limited to 'sys-apps/gawk')
-rw-r--r--sys-apps/gawk/Manifest2
-rw-r--r--sys-apps/gawk/gawk-3.1.4-r4.ebuild30
2 files changed, 18 insertions, 14 deletions
diff --git a/sys-apps/gawk/Manifest b/sys-apps/gawk/Manifest
index af580a7b7ced..7c59a90a4c58 100644
--- a/sys-apps/gawk/Manifest
+++ b/sys-apps/gawk/Manifest
@@ -1,6 +1,6 @@
MD5 5a8887d1e776c8225d172073a4306711 ChangeLog 9047
MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 9e7da5b88140d89adf09e81ed814bfcf gawk-3.1.4-r4.ebuild 3533
+MD5 5637846b720ae483533452b033e00175 gawk-3.1.4-r4.ebuild 3600
MD5 560c671909467b8f321e5db41ce92383 gawk-3.1.3-r2.ebuild 2783
MD5 1a6ff83a6dd7c5f300803cae1cabd4ae files/gawk-3.1.2-dec-alpha-compiler.diff 461
MD5 e01879d30ddf2eb060f2ba2fa745a922 files/digest-gawk-3.1.4-r4 132
diff --git a/sys-apps/gawk/gawk-3.1.4-r4.ebuild b/sys-apps/gawk/gawk-3.1.4-r4.ebuild
index 66360fafc25f..31a7fa273780 100644
--- a/sys-apps/gawk/gawk-3.1.4-r4.ebuild
+++ b/sys-apps/gawk/gawk-3.1.4-r4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-3.1.4-r4.ebuild,v 1.1 2005/02/19 17:56:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-3.1.4-r4.ebuild,v 1.2 2005/02/19 18:59:29 vapier Exp $
inherit eutils toolchain-funcs
@@ -20,51 +20,55 @@ RDEPEND="virtual/libc
DEPEND="${RDEPEND}
nls? ( sys-devel/gettext )"
+SXML=${WORKDIR}/xmlgawk
+SFFS=${WORKDIR}/filefuncs
+
src_unpack() {
unpack ${P}.tar.gz
# Copy filefuncs module's source over ...
- cp -PR "${FILESDIR}"/filefuncs "${WORKDIR}"/ || die "cp failed"
+ cp -PR "${FILESDIR}"/filefuncs "${SFFS}"/ || die "cp failed"
cd "${S}"
epatch "${FILESDIR}"/${P}-disable-DFA.patch #78227
epatch "${FILESDIR}"/${PN}-3.1.3-getpgrp_void.patch #fedora
- epatch "${FILESDIR}"/${P}-flonum.patch #fedora
epatch "${FILESDIR}"/${P}-nextc.patch #fedora
epatch "${FILESDIR}"/${P}-uplow.patch #fedora
# support for dec compiler.
[[ $(tc-getCC) == "ccc" ]] && epatch ${FILESDIR}/${PN}-3.1.2-dec-alpha-compiler.diff
if use xml ; then
- mkdir xmlgawk
- cd xmlgawk
- unpack ${P}.tar.gz
- epatch "${DISTDIR}"/${XML_PATCH} #57857
+ mkdir "${SXML}"
+ cp -r "${S}"/* "${SXML}"/
+ cd "${SXML}"
+ EPATCH_OPTS="-p2 -g0" epatch "${DISTDIR}"/${XML_PATCH} #57857
fi
+
+ cd "${S}"
+ epatch "${FILESDIR}"/${P}-flonum.patch #fedora
}
src_compile() {
econf --bindir=/bin $(use_enable nls) || die
emake || die "emake failed"
if use xml ; then
- cd xmlgawk/${P}
+ cd "${SXML}"
econf $(use_enable nls) || die
emake || die "xmlgawk make failed"
- cd ../..
fi
- cd ../filefuncs
+ cd "${SFFS}"
emake AWKINCDIR="${S}" CC=$(tc-getCC) || die "filefuncs emake failed"
}
src_install() {
make install DESTDIR="${D}" || die "install failed"
if use xml ; then
- newbin xmlgawk/${P}/gawk xmlgawk || die "xmlgawk failed"
+ newbin "${SXML}"/gawk xmlgawk || die "xmlgawk failed"
insinto /usr/include/awk
- doins xmlgawk/${P}/xml_puller.h || die "xml inc failed"
+ doins "${SXML}"/xml_puller.h || die "xml inc failed"
fi
- cd ../filefuncs
+ cd "${SFFS}"
make \
DESTDIR="${D}" \
AWKINCDIR="${S}" \