Replace the osx patch with a more generic sed line that works for FreeBSD, too. Add ~x86-fbsd keyword.

(Portage version: 2.1_pre7-r4)

3 files changed, 10 insertions, 117 deletions

diff --git a/media-libs/aalib/ChangeLog b/media-libs/aalib/ChangeLog
index 9c25a6068f9a..0a4d7ba7e81a 100644
--- a/media-libs/aalib/ChangeLog
+++ b/media-libs/aalib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/aalib
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/aalib/ChangeLog,v 1.24 2006/04/04 02:59:31 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/aalib/ChangeLog,v 1.25 2006/04/08 00:49:28 flameeyes Exp $
+
+  08 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -files/aalib-1.4_rc5-osx.patch, aalib-1.4_rc5.ebuild:
+  Replace the osx patch with a more generic sed line that works for FreeBSD,
+  too. Add ~x86-fbsd keyword.
 
   04 Apr 2006; Aron Griffis <agriffis@gentoo.org> aalib-1.4_rc5.ebuild:
   Mark 1.4_rc5 stable on ia64
diff --git a/media-libs/aalib/aalib-1.4_rc5.ebuild b/media-libs/aalib/aalib-1.4_rc5.ebuild
index b69fa7bf1fca..3e06363ba913 100644
--- a/media-libs/aalib/aalib-1.4_rc5.ebuild
+++ b/media-libs/aalib/aalib-1.4_rc5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/aalib/aalib-1.4_rc5.ebuild,v 1.9 2006/04/04 02:59:31 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/aalib/aalib-1.4_rc5.ebuild,v 1.10 2006/04/08 00:49:28 flameeyes Exp $
 
 inherit eutils libtool toolchain-funcs
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/aa-project/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh sparc ~x86 ~x86-fbsd"
 IUSE="X slang gpm"
 
 RDEPEND="X? ( || ( x11-libs/libX11 virtual/x11 ) )"
@@ -29,10 +29,8 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-1.4_rc4-gentoo.patch
 	epatch "${FILESDIR}"/${PN}-1.4_rc4-m4.patch
-	if use ppc-macos; then
-		cd src
-		epatch "${FILESDIR}"/${P}-osx.patch
-	fi
+
+	sed -i -e 's:#include <malloc.h>:#include <stdlib.h>:g' ${S}/src/*.c
 	elibtoolize
 }
 
diff --git a/media-libs/aalib/files/aalib-1.4_rc5-osx.patch b/media-libs/aalib/files/aalib-1.4_rc5-osx.patch
deleted file mode 100644
index b19ab6ac2a67..000000000000
--- a/media-libs/aalib/files/aalib-1.4_rc5-osx.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-diff -Naur src-old/aados.c src/aados.c
---- src-old/aados.c	Sat Apr  9 17:44:58 2005
-+++ src/aados.c	Sat Apr  9 17:46:00 2005
-@@ -5,7 +5,7 @@
- #include <go32.h>

- #include <dpmi.h>

- #include <sys/nearptr.h>

--#include <malloc.h>

-+#include <malloc/malloc.h>

- #include "aalib.h"

- #include "aaint.h"

- int __use_nearptr_hack;

-diff -Naur src-old/aadoskbd.c src/aadoskbd.c
---- src-old/aadoskbd.c	Sat Apr  9 17:44:58 2005
-+++ src/aadoskbd.c	Sat Apr  9 17:46:09 2005
-@@ -4,7 +4,7 @@
- #include <go32.h>
- #include <dpmi.h>
- #include <sys/nearptr.h>
--#include <malloc.h>
-+#include <malloc/malloc.h>
- #include <stdlib.h>
- #include <dos.h>
- #include <dpmi.h>
-diff -Naur src-old/aaedit.c src/aaedit.c
---- src-old/aaedit.c	Sat Apr  9 17:44:58 2005
-+++ src/aaedit.c	Sat Apr  9 17:46:18 2005
-@@ -1,6 +1,6 @@
- #include <string.h>
- #include <ctype.h>
--#include <malloc.h>
-+#include <malloc/malloc.h>
- #include "aalib.h"
- #include "aaint.h"
- static void aa_editdisplay(struct aa_edit *e)
-diff -Naur src-old/aakbdreg.c src/aakbdreg.c
---- src-old/aakbdreg.c	Sat Apr  9 17:44:58 2005
-+++ src/aakbdreg.c	Sat Apr  9 17:46:36 2005
-@@ -1,4 +1,4 @@
--#include <malloc.h>
-+#include <malloc/malloc.h>
- #include "config.h"
- #include "aalib.h"
- #include "aaint.h"
-diff -Naur src-old/aalib.c src/aalib.c
---- src-old/aalib.c	Sat Apr  9 17:44:58 2005
-+++ src/aalib.c	Sat Apr  9 17:46:46 2005
-@@ -1,6 +1,6 @@
- #include <stdio.h>
- #include <string.h>
--#include <malloc.h>
-+#include <malloc/malloc.h>
- #include "aalib.h"
- #include "aaint.h"
- 
-diff -Naur src-old/aamoureg.c src/aamoureg.c
---- src-old/aamoureg.c	Sat Apr  9 17:44:58 2005
-+++ src/aamoureg.c	Sat Apr  9 17:47:08 2005
-@@ -1,4 +1,4 @@
--#include <malloc.h>
-+#include <malloc/malloc.h>
- #include "config.h"
- #include "aalib.h"
- #include "aaint.h"
-diff -Naur src-old/aarec.c src/aarec.c
---- src-old/aarec.c	Sat Apr  9 17:44:58 2005
-+++ src/aarec.c	Sat Apr  9 17:47:15 2005
-@@ -1,5 +1,5 @@
- #include <string.h>
--#include <malloc.h>
-+#include <malloc/malloc.h>
- #include "aalib.h"
- #include "aaint.h"
- aa_linkedlist *aa_kbdrecommended = NULL, *aa_mouserecommended = NULL,
-diff -Naur src-old/aaregist.c src/aaregist.c
---- src-old/aaregist.c	Sat Apr  9 17:44:58 2005
-+++ src/aaregist.c	Sat Apr  9 17:47:25 2005
-@@ -1,4 +1,4 @@
--#include <malloc.h>
-+#include <malloc/malloc.h>
- #include "config.h"
- #include "aalib.h"
- #include "aaint.h"
-diff -Naur src-old/aax.c src/aax.c
---- src-old/aax.c	Sat Apr  9 17:45:25 2005
-+++ src/aax.c	Sat Apr  9 17:42:07 2005
-@@ -1,4 +1,4 @@
--#include <malloc.h>
-+#include <malloc/malloc.h>
- #include <stdlib.h>
- #include <string.h>
- #include <stdio.h>
-diff -Naur src-old/aaxkbd.c src/aaxkbd.c
---- src-old/aaxkbd.c	Sat Apr  9 17:45:13 2005
-+++ src/aaxkbd.c	Sat Apr  9 17:42:07 2005
-@@ -1,4 +1,4 @@
--#include <malloc.h>
-+#include <malloc/malloc.h>
- #include <stdlib.h>
- #include <string.h>
- #include <stdio.h>
-diff -Naur src-old/aaxmouse.c src/aaxmouse.c
---- src-old/aaxmouse.c	Sat Apr  9 17:45:38 2005
-+++ src/aaxmouse.c	Sat Apr  9 17:42:07 2005
-@@ -1,4 +1,4 @@
--#include <malloc.h>
-+#include <malloc/malloc.h>
- #include <stdlib.h>
- #include <string.h>
- #include <stdio.h>