Add a patch to make it build on FreeBSD. Bug #390089

(Portage version: 2.2.0_alpha73/cvs/Linux x86_64)

3 files changed, 92 insertions, 3 deletions

diff --git a/media-gfx/sane-backends/ChangeLog b/media-gfx/sane-backends/ChangeLog
index 9949baef7fb6..a60b1eba7e52 100644
--- a/media-gfx/sane-backends/ChangeLog
+++ b/media-gfx/sane-backends/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/sane-backends
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.196 2011/11/10 21:27:20 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.197 2011/11/17 07:59:03 naota Exp $
+
+  17 Nov 2011; Naohiro Aota <naota@gentoo.org> sane-backends-1.0.22-r2.ebuild,
+  +files/sane-backends-1.0.22-freebsd.patch:
+  Add a patch to make it build on FreeBSD. Bug #390089
 
 *sane-backends-1.0.22-r2 (10 Nov 2011)
 
diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.22-freebsd.patch b/media-gfx/sane-backends/files/sane-backends-1.0.22-freebsd.patch
new file mode 100644
index 000000000000..a952ee065b61
--- /dev/null
+++ b/media-gfx/sane-backends/files/sane-backends-1.0.22-freebsd.patch
@@ -0,0 +1,84 @@
+--- sanei/sanei_usb.c.orig	2009-07-26 21:29:33.000000000 +0200
++++ sanei/sanei_usb.c	2009-07-26 21:31:42.000000000 +0200
+@@ -96,7 +96,8 @@
+ }
+ #endif /* HAVE_USBCALLS */
+ 
+-#if defined (__FreeBSD__) 
++#if (defined (__FreeBSD__) && (__FreeBSD_version < 800064))
++#include <sys/param.h>
+ #include <dev/usb/usb.h>
+ #endif /* __FreeBSD__ */
+ #if defined (__DragonFly__)
+@@ -273,7 +274,7 @@
+     *vendorID = vendor;
+     *productID = product;
+   }
+-#elif defined (__FreeBSD__) || defined (__DragonFly__)
++#elif (defined (__FreeBSD__) && __FreeBSD_version < 800064) || defined (__DragonFly__)
+   {
+     int controller;
+     int ctrl_fd;
+--- backend/epson2.c.orig	2010-04-05 22:18:04.000000000 +0900
++++ backend/epson2.c	2010-05-10 22:18:47.000000000 +0900
+@@ -57,6 +57,10 @@
+ #include <unistd.h>
+ #include <errno.h>
+ #include <sys/time.h>
++#ifdef __FreeBSD__
++#include <sys/types.h>
++#include <sys/socket.h>
++#endif
+ 
+ #include "sane/saneopts.h"
+ #include "sane/sanei_scsi.h"
+--- include/sane/sanei_tcp.h.orig	2006-11-30 14:23:19.000000000 -0900
++++ include/sane/sanei_tcp.h	2009-01-16 05:02:42.000000000 -0900
+@@ -20,6 +20,9 @@
+ 
+ #include <sane/sane.h>
+ 
++#ifdef __FreeBSD__
++#include <sys/types.h>
++#endif
+ #include <netinet/in.h>
+ #include <netdb.h>
+ 
+--- backend/epson2-commands.c.orig	2010-04-05 22:18:04.000000000 +0900
++++ backend/epson2-commands.c	2010-05-10 22:24:33.000000000 +0900
+@@ -21,6 +21,9 @@
+ 
+ #include <byteorder.h>
+ #include <math.h>
++#ifdef __FreeBSD__
++#include <sys/types.h>
++#endif
+ 
+ #include "epson2.h"
+ #include "epson2-io.h"
+--- backend/magicolor.c.orig	2011-01-31 03:49:46.000000000 +0900
++++ backend/magicolor.c	2011-08-02 02:38:15.000000000 +0900
+@@ -50,6 +50,10 @@
+ #include <unistd.h>
+ #include <errno.h>
+ #include <sys/time.h>
++#ifdef __FreeBSD__
++#include <sys/types.h>
++#include <sys/socket.h>
++#endif
+ #include <math.h>
+ #include <poll.h>
+ 
+--- backend/xerox_mfp-tcp.c.orig	2010-12-02 08:49:58.000000000 +0900
++++ backend/xerox_mfp-tcp.c	2011-08-02 02:37:27.000000000 +0900
+@@ -27,6 +27,10 @@
+ #include <unistd.h>
+ #include <errno.h>
+ #include <sys/time.h>
++#ifdef __FreeBSD__
++#include <sys/types.h>
++#include <sys/socket.h>
++#endif
+ 
+ #include "sane/saneopts.h"
+ #include "sane/sanei_scsi.h"
diff --git a/media-gfx/sane-backends/sane-backends-1.0.22-r2.ebuild b/media-gfx/sane-backends/sane-backends-1.0.22-r2.ebuild
index be6d33279482..74fa76c6aa35 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.22-r2.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.22-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.22-r2.ebuild,v 1.1 2011/11/10 21:27:20 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.22-r2.ebuild,v 1.2 2011/11/17 07:59:03 naota Exp $
 
 EAPI="4"
 
@@ -138,7 +138,7 @@ SRC_URI="ftp://ftp.sane-project.org/pub/sane/${P}/${P}.tar.gz
 	ftp://ftp.sane-project.org/pub/sane/old-versions/${P}/${P}.tar.gz"
 SLOT="0"
 LICENSE="GPL-2 public-domain"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
 pkg_setup() {
 	enewgroup scanner
@@ -159,6 +159,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-libv4l-0.8.3.patch
 	# Bug #329047
 	epatch "${FILESDIR}"/niash_array_index.patch
+	epatch "${FILESDIR}"/${P}-freebsd.patch
 }
 
 src_configure() {