Added patch to fix compilation on Darwin (and FreeBSD) and marked ~x86-macos and ~ppc-macos, bug #292187

(Portage version: 2.2.00.15134-prefix/cvs/Darwin powerpc)

3 files changed, 53 insertions, 8 deletions

diff --git a/app-backup/boxbackup/ChangeLog b/app-backup/boxbackup/ChangeLog
index b5fefeef4318..4edec99c0981 100644
--- a/app-backup/boxbackup/ChangeLog
+++ b/app-backup/boxbackup/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-backup/boxbackup
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/boxbackup/ChangeLog,v 1.18 2009/10/12 17:17:57 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/boxbackup/ChangeLog,v 1.19 2009/12/23 15:08:20 grobian Exp $
+
+  23 Dec 2009; Fabian Groffen <grobian@gentoo.org> boxbackup-0.10.ebuild,
+  +files/boxbackup-0.10-malloc.patch:
+  Added patch to fix compilation on Darwin (and FreeBSD) and marked
+  ~x86-macos and ~ppc-macos, bug #292187
 
   12 Oct 2009; Mark Loeser <halcy0n@gentoo.org> boxbackup-0.10.ebuild:
   QA fixes; unquoted variables
diff --git a/app-backup/boxbackup/boxbackup-0.10.ebuild b/app-backup/boxbackup/boxbackup-0.10.ebuild
index 2cbeb126a624..c64ba6d88a92 100644
--- a/app-backup/boxbackup/boxbackup-0.10.ebuild
+++ b/app-backup/boxbackup/boxbackup-0.10.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/boxbackup/boxbackup-0.10.ebuild,v 1.13 2009/10/12 17:17:57 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/boxbackup/boxbackup-0.10.ebuild,v 1.14 2009/12/23 15:08:20 grobian Exp $
 
 inherit eutils autotools
 
 DESCRIPTION="A completely automatic on-line backup system"
-HOMEPAGE="http://boxbackup.org"
+HOMEPAGE="http://boxbackup.org/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 x86 ~ppc-macos ~x86-macos"
 IUSE="client-only"
 DEPEND="sys-libs/zlib
 	sys-libs/db
@@ -21,9 +21,10 @@ RDEPEND="${DEPEND}
 src_unpack() {
 	unpack ${A}
 
-	epatch "${FILESDIR}/${P}"-gentoo.patch
-	epatch "${FILESDIR}/${P}"-gcc41-noll.patch
-	epatch "${FILESDIR}/${P}"-gcc43.patch
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch "${FILESDIR}"/${P}-gcc41-noll.patch
+	epatch "${FILESDIR}"/${P}-gcc43.patch
+	epatch "${FILESDIR}"/${P}-malloc.patch
 
 	cd "${S}"
 	AT_M4DIR="infrastructure/m4" eautoreconf
@@ -49,7 +50,7 @@ src_install() {
 
 	# move executables from /usr/bin to /usr/sbin, as configuration of
 	# this is unfortunately not optimal
-	mv "${D}/usr/bin" "${D}/usr/sbin" || die "could not move files from bin to sbin"
+	mv "${D%/}${EPREFIX}/usr/bin" "${D%/}${EPREFIX}/usr/sbin" || die "could not move files from bin to sbin"
 }
 
 pkg_preinst() {
diff --git a/app-backup/boxbackup/files/boxbackup-0.10-malloc.patch b/app-backup/boxbackup/files/boxbackup-0.10-malloc.patch
new file mode 100644
index 000000000000..a3c34393ea20
--- /dev/null
+++ b/app-backup/boxbackup/files/boxbackup-0.10-malloc.patch
@@ -0,0 +1,39 @@
+include stdlib.h instead of malloc.h, since the latter may not be
+available, or be somewhere else, while the former should be always
+around.  This is in particular a problem on Darwin and *BSD.
+http://bugs.gentoo.org/show_bug.cgi?id=292187
+
+--- boxbackup-0.10/lib/backupclient/BackupStoreFile.h
++++ boxbackup-0.10/lib/backupclient/BackupStoreFile.h
+@@ -53,7 +53,7 @@
+ #include "BackupStoreFilename.h"
+ 
+ #include <memory>
+-#include <malloc.h>
++#include <stdlib.h>
+ 
+ typedef struct 
+ {
+
+--- boxbackup-0.10/lib/common/WaitForEvent.cpp
++++ boxbackup-0.10/lib/common/WaitForEvent.cpp
+@@ -53,7 +53,7 @@
+ 
+ #include <errno.h>
+ #include <string.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ 
+ #include "WaitForEvent.h"
+ 
+--- boxbackup-0.10/lib/raidfile/RaidFileRead.cpp
++++ boxbackup-0.10/lib/raidfile/RaidFileRead.cpp
+@@ -59,7 +59,7 @@
+ 
+ #include <stdio.h>
+ #include <string.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <memory>
+ #include <map>
+