summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2005-12-30 23:56:44 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2005-12-30 23:56:44 +0000
commit76f8f1ac26be848d9f1abfc85c59eedfc4a73427 (patch)
treeed0f3d69d2bc2ef6727a31d726438f16b621463c /media-gfx/xloadimage
parent+move net-misc/rfb x11-misc/x11vnc (diff)
downloadgentoo-2-76f8f1ac26be848d9f1abfc85c59eedfc4a73427.tar.gz
gentoo-2-76f8f1ac26be848d9f1abfc85c59eedfc4a73427.tar.bz2
gentoo-2-76f8f1ac26be848d9f1abfc85c59eedfc4a73427.zip
Move the sedout of malloc.h to general scope.
(Portage version: 2.1_pre2)
Diffstat (limited to 'media-gfx/xloadimage')
-rw-r--r--media-gfx/xloadimage/ChangeLog6
-rw-r--r--media-gfx/xloadimage/xloadimage-4.1-r4.ebuild8
2 files changed, 11 insertions, 3 deletions
diff --git a/media-gfx/xloadimage/ChangeLog b/media-gfx/xloadimage/ChangeLog
index 0d5387895d8b..cfdc83e5c104 100644
--- a/media-gfx/xloadimage/ChangeLog
+++ b/media-gfx/xloadimage/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-gfx/xloadimage
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xloadimage/ChangeLog,v 1.32 2005/12/12 05:33:04 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xloadimage/ChangeLog,v 1.33 2005/12/30 23:56:44 flameeyes Exp $
+
+ 30 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
+ xloadimage-4.1-r4.ebuild:
+ Move the sedout of malloc.h to general scope.
12 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
xloadimage-4.1-r4.ebuild:
diff --git a/media-gfx/xloadimage/xloadimage-4.1-r4.ebuild b/media-gfx/xloadimage/xloadimage-4.1-r4.ebuild
index 0a5163e5e9cc..f577b744ff1d 100644
--- a/media-gfx/xloadimage/xloadimage-4.1-r4.ebuild
+++ b/media-gfx/xloadimage/xloadimage-4.1-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/media-gfx/xloadimage/xloadimage-4.1-r4.ebuild,v 1.12 2005/12/12 05:33:04 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xloadimage/xloadimage-4.1-r4.ebuild,v 1.13 2005/12/30 23:56:44 flameeyes Exp $
inherit alternatives eutils flag-o-matic
@@ -39,8 +39,12 @@ src_unpack() {
sed -i "s:OPT_FLAGS=:OPT_FLAGS=$CFLAGS:" Make.conf
sed -i "s:^#include <varargs.h>:#include <stdarg.h>:" ${S}/rlelib.c
+ # On FreeBSD systems malloc.h is a false header asking for fixes.
+ # On MacOSX it would require malloc/malloc.h
+ # On other systems it's simply unneeded
+ sed -i -e 's,<malloc.h>,<stdlib.h>,' vicar.c
+
if use userland_Darwin ; then
- sed -i 's,<malloc.h>,<malloc/malloc.h>,' vicar.c
for f in $(grep zopen * | cut -d':' -f1 | uniq);do
sed -i "s:zopen:zloadimage_zopen:g" $f
done