use sed -i; more error checking/messages

3 files changed, 32 insertions, 21 deletions

diff --git a/media-libs/allegttf/ChangeLog b/media-libs/allegttf/ChangeLog
index 53e6c437dcc8..f392a9cbd30a 100644
--- a/media-libs/allegttf/ChangeLog
+++ b/media-libs/allegttf/ChangeLog
@@ -1,5 +1,8 @@
 # ChangeLog for media-libs/allegttf
 
+  30 Jan 2004; Michael Sterrett <mr_bones_@gentoo.org> allegttf-2.0.ebuild:
+  use sed -i; more error checking/messages
+
 *allegttf-2.0 (13 Feb 2003)
  
   12 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
diff --git a/media-libs/allegttf/Manifest b/media-libs/allegttf/Manifest
index ba4a2dd5f2bd..e337ffb3889a 100644
--- a/media-libs/allegttf/Manifest
+++ b/media-libs/allegttf/Manifest
@@ -1,3 +1,3 @@
-MD5 7fbddd40a9e2c8f950c289ae13267bf4 ChangeLog 238
-MD5 6918e18919a86d281a7139ab6158fc77 allegttf-2.0.ebuild 951
+MD5 b3b474bbb74c61afcb9a530db555f921 ChangeLog 358
+MD5 dd01f9373d1770d1a70a733fa3f378de allegttf-2.0.ebuild 1173
 MD5 04f31f756935643608f37080dc44fc03 files/digest-allegttf-2.0 64
diff --git a/media-libs/allegttf/allegttf-2.0.ebuild b/media-libs/allegttf/allegttf-2.0.ebuild
index 727c1914f9c0..820aeb6137de 100644
--- a/media-libs/allegttf/allegttf-2.0.ebuild
+++ b/media-libs/allegttf/allegttf-2.0.ebuild
@@ -1,38 +1,46 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/allegttf/allegttf-2.0.ebuild,v 1.4 2003/09/11 01:17:46 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/allegttf/allegttf-2.0.ebuild,v 1.5 2004/01/31 00:22:52 mr_bones_ Exp $
 
 DESCRIPTION="Anti-aliased text output and font loading routines for Allegro"
 HOMEPAGE="http://huizen.dds.nl/~deleveld/allegttf.htm"
 SRC_URI="http://huizen.dds.nl/~deleveld/${P}.tar.gz"
+
+KEYWORDS="x86"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
 IUSE=""
-DEPEND=">=media-libs/allegro-4.0.0"
-RDEPEND="${DEPEND}"
-S="${WORKDIR}/${P}"
+
+RDEPEND=">=media-libs/allegro-4.0.0"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
+
+src_unpack() {
+	unpack ${A}
+
+	sed -i \
+		-e 's/make/$(MAKE)/' ${S}/Makefile \
+			|| die "sed Makefile failed"
+}
 
 src_compile() {
-	emake || die
-	emake examples || die
+	emake || die "emake failed"
+	emake examples || die "emake failed (examples)"
 }
 
 src_install() {
-	dodir /usr/include
-	dodir /usr/lib
-
 	cd ${S}/source
-	mv makefile.lnx makefile.lnx_orig
 	# hardcoded install paths in makefile
-	sed s/'\/usr\/local'/'${D}\/usr'/ makefile.lnx_orig > makefile.lnx
+	sed -i \
+		-e s/'\/usr\/local'/'${D}\/usr'/ makefile.lnx \
+			|| die "sed failed"
 
 	cd ${S}
-	dodoc docs/*.txt *.txt
-	dohtml docs/allegttf.htm
-
+	dodir /usr/include
+	dodir /usr/lib
+	make install || die "make install failed"
+	dodoc docs/*.txt *.txt || die "dodoc failed"
+	dohtml docs/allegttf.htm || die "dohtml failed"
 	insinto /usr/share/doc/${P}/examples
-	doins examples/*
-
-	make install || die
+	doins examples/* || die "doins failed"
 }