summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-11-07 08:11:47 +0000
committerMike Frysinger <vapier@gentoo.org>2006-11-07 08:11:47 +0000
commita35bc4742515fe0c9311eb87289ae340ea7a49a7 (patch)
treea5a6def95693c2bd1be65b46c31b49c03564002c /media-libs
parentppc stable, bug #141737 (diff)
downloadgentoo-2-a35bc4742515fe0c9311eb87289ae340ea7a49a7.tar.gz
gentoo-2-a35bc4742515fe0c9311eb87289ae340ea7a49a7.tar.bz2
gentoo-2-a35bc4742515fe0c9311eb87289ae340ea7a49a7.zip
Fixup autotools.
(Portage version: 2.1.2_rc1-r4)
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/sdl-mixer/ChangeLog6
-rw-r--r--media-libs/sdl-mixer/files/sdl-mixer-1.2.7-build.patch11
-rw-r--r--media-libs/sdl-mixer/sdl-mixer-1.2.7.ebuild9
3 files changed, 21 insertions, 5 deletions
diff --git a/media-libs/sdl-mixer/ChangeLog b/media-libs/sdl-mixer/ChangeLog
index 498c63614b8b..90cf016e4860 100644
--- a/media-libs/sdl-mixer/ChangeLog
+++ b/media-libs/sdl-mixer/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/sdl-mixer
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/ChangeLog,v 1.50 2006/11/01 18:15:03 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/ChangeLog,v 1.51 2006/11/07 08:11:47 vapier Exp $
+
+ 07 Nov 2006; Mike Frysinger <vapier@gentoo.org>
+ +files/sdl-mixer-1.2.7-build.patch, sdl-mixer-1.2.7.ebuild:
+ Fixup autotools.
01 Nov 2006; Michael Sterrett <mr_bones_@gentoo.org>
-files/1.2.5-gcc3.patch, -files/sdl-mixer-1.2.5-amd64-mikmod.patch,
diff --git a/media-libs/sdl-mixer/files/sdl-mixer-1.2.7-build.patch b/media-libs/sdl-mixer/files/sdl-mixer-1.2.7-build.patch
new file mode 100644
index 000000000000..4fd5170b9dfd
--- /dev/null
+++ b/media-libs/sdl-mixer/files/sdl-mixer-1.2.7-build.patch
@@ -0,0 +1,11 @@
+--- configure.in
++++ configure.in
+@@ -37,7 +37,7 @@
+ AC_SUBST(LT_AGE)
+
+ dnl Detect the canonical build and host environments
+-AC_CONFIG_AUX_DIRS($srcdir/build-scripts)
++AC_CONFIG_AUX_DIR(build-scripts)
+ AC_CANONICAL_HOST
+
+ dnl Set up the compiler and linker flags
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.7.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.7.ebuild
index 626ba9af91be..c08ed473e1ad 100644
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.7.ebuild
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.7.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/sdl-mixer-1.2.7.ebuild,v 1.13 2006/11/07 08:02:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/sdl-mixer-1.2.7.ebuild,v 1.14 2006/11/07 08:11:47 vapier Exp $
WANT_AUTOCONF="latest"
WANT_AUTOMAKE="latest"
-inherit eutils
+inherit eutils autotools
MY_P=${P/sdl-/SDL_}
DESCRIPTION="Simple Direct Media Layer Mixer Library"
@@ -27,7 +27,8 @@ S=${WORKDIR}/${MY_P}
src_unpack() {
unpack ${A}
cd "${S}"
- epatch "${FILESDIR}/${P}-libmikmod.patch"
+ epatch "${FILESDIR}"/${P}-libmikmod.patch
+ epatch "${FILESDIR}"/${P}-build.patch
sed -i \
-e 's:/usr/local/lib/timidity:/usr/share/timidity:' \
timidity/config.h \
@@ -49,6 +50,6 @@ src_compile() {
}
src_install() {
- make DESTDIR="${D}" install || die "make install failed"
+ emake DESTDIR="${D}" install || die "make install failed"
dodoc CHANGES README
}