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

Package-Manager: portage-2.2.0_alpha73/cvs/Linux x86_64

4 files changed, 115 insertions, 9 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/Manifest b/media-gfx/sane-backends/Manifest
index ec41fd09b4cd..15e5277b75d0 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 1.0.20-unbreak-udev.diff 688 RMD160 467154092c84c81c6444b788fa9a10d909930a84 SHA1 63d5f52ae04e17a9d1722d55f6e1b6f8ca5094a4 SHA256 467a170a9f4c5d825893029607dcdcb45110c3f2838e9ee230fdbbc1f8f0567e
 AUX broken_coolscan.patch 442 RMD160 9935934fe6963b7da31b544c7f3baa9065c39bab SHA1 2f1bda3b6bb54cae882005eb709cda33cfd17af8 SHA256 87b327a370f4f7e2884a9715dc880362f313611badf978ba1a1dd23f46284c98
 AUX epson2fixes-1.0.19.patch 922 RMD160 bdfa3ffb1bbdf78000531093663c134e7b63958e SHA1 daa5e62c01370c788a25448472fc9d5b55abaf9f SHA256 630aa0ed61c8d426f2b06c557a148caaf2ca07d659e97425fd121c5f896dc203
@@ -5,6 +8,7 @@ AUX fujitsu_DBG_LEVEL.patch 680 RMD160 ed131cc2269ca0e621b226a34e7a96ed319d0162
 AUX genesys_io.patch 918 RMD160 fe105f644eec67a8626db78820a79f51c55ff2ca SHA1 6b75065e2db52ebc7ea58c89e4b4738a016c5b28 SHA256 c45f86420009e1c12c5cde449509bd7c14e94663b36969ff8f60732cb784eff7
 AUX niash_array_index.patch 4141 RMD160 31f84f470b4aecbfec00cdb72cb382481d092f41 SHA1 27edb0c70d8e2dc7e2e2403e164a9c1cc5681aab SHA256 a44687911c10e66c1a57efe73508d1c78eed55fa2699fe7e13c62ddc7b646187
 AUX parallel-install-1.0.19.patch 1117 RMD160 c6bc5abc5275dea4418f61cdd4dc007a45e12454 SHA1 5b5e9082f39d34d68fdefd5531e257fb7f7bdbda SHA256 5c3cb9747058df277eb6d7db8574252149834b61b68e0569ddf61bf67869449f
+AUX sane-backends-1.0.22-freebsd.patch 2227 RMD160 19ec3464d8d14aff8a5229eeeff7c424931a381a SHA1 89bd9ec0cbcfc7a288100c62baaa7212d8c5a5b4 SHA256 63944bde43b1cc838c1561d74c6fc1cb54adad080ca8db0a8a5725602e0f1b1e
 AUX sane-backends-1.0.22-libv4l-0.8.3.patch 999 RMD160 8b0a462c87e577cd4e1ae9cadb60c9b8fa340970 SHA1 7550b1a85bd127fa47218c002347b91680b7f1fc SHA256 bbfeaead9ed58110974c01d79b0b723e7fb34b9c4c73b1a78672b56376ca82bd
 AUX sane-backends-1.0.22-xerox_mfp-usb.patch 2308 RMD160 8b5547706e391226c33f8fcaa451c384844afba8 SHA1 1e10c4057d839e7a6263d5721b4b47984d7cbb88 SHA256 d3d9a03cb082fb1b735debbfe8a948cb4cee14b13c53a4cc9cd49f23174972c0
 AUX udev-rule-4.patch 1861 RMD160 eb841e97e2729dd7645df9261178d1f644b20032 SHA1 0d4911e060b683c4ded5eaf016c83f022ac94303 SHA256 d423f5027041c1a8fba0873941ad4fc60bc857b788b4e4bd6896b82942a2ca6c
@@ -27,10 +31,23 @@ EBUILD sane-backends-1.0.19-r2.ebuild 4529 RMD160 eefe04dde29997ea05d0a01c2d37c4
 EBUILD sane-backends-1.0.20-r3.ebuild 4462 RMD160 5be64742bac6fe9f3187ac2147034a03fa470c6a SHA1 92640bea67d69c4ccc1abbc1671e4d1851998020 SHA256 83595e9ac052f4f32b2130f457dd47077f742de603a618bcc6de44f7325dceac
 EBUILD sane-backends-1.0.21-r1.ebuild 4748 RMD160 300d19dc149bacb0a5f797596547c3870859bfa2 SHA1 242cfadaa6c4e87b35e1646fc131fc3e76d206d9 SHA256 59c7a673da2bd800037a734c847febb5a8af3a6abdb1d46f9b5c4d3b09023aa7
 EBUILD sane-backends-1.0.22-r1.ebuild 4708 RMD160 70ed09e05fbb1ddb1bd03e2faf0fb6dd1ee4fa11 SHA1 f9ae30ac92e9ce72bee2b1d9b3ff3f472b3ff7b9 SHA256 6b6ab20823421276384031b413c0957d2abc18fba4088a5002b794a5cf33c892
-EBUILD sane-backends-1.0.22-r2.ebuild 4956 RMD160 e0e42a455ed7b64404b47ed6f4d8963346d9a9c9 SHA1 a56f2789e7339bbf74d0376ed77b85ed1d628c61 SHA256 d04213ae27dc80561362e1abd2a024237ad8548e9dbe2e23da7c8131df737944
-MISC ChangeLog 34011 RMD160 046d25411b5645c0e618f587e71cf105c4464df2 SHA1 dbce260167bf785e489db8702c21b901fc8dfb69 SHA256 02db9daea5f70f0c362e9d8c715108fa7dd76e90a01b5c624dd05481f70b14c0
+EBUILD sane-backends-1.0.22-r2.ebuild 5004 RMD160 cfa2466ee283a156c3897d6d6845e3c48e9a9ce7 SHA1 34ada60acb880b6c5649c7b8943b2ffeec020564 SHA256 4389ef2beee950136a249de84a031b1b82bfc672c9d3add614d6d92c02c19927
+MISC ChangeLog 34188 RMD160 98aa408348f228cf02ad61b7a39fa5638d18566c SHA1 2e48c40f1d47ab660566536c61edfcf016dd50c6 SHA256 f28ba5e0d674664c8885af2ad6bd7847a9a88cc1952f64d615ac53a3327af54d
 MISC metadata.xml 203 RMD160 300bee51281e761b0c22b6b7994210d0e02af2eb SHA1 becd8a4405785b35675e2e84ec4ef696f0278802 SHA256 fa46f560cb484f9b761d3b5c3f3fd3368d4d68c241fa2697225f139fe6e03476
-MISC sane-backends-1.0.21-r1.ebuild.orig 4641 RMD160 fe0fa0fbeb1d2836379af62bea985461fb85302b SHA1 ac489d62b2e61b9d986bf33c359d18dbd6d443df SHA256 864f82c84673185907982c8192ecc8a6f253a9917dd0a8a768a4ebc901631ddf
-MISC sane-backends-1.0.21-r1.ebuild.rej 383 RMD160 ab238c107d34c87d9f2fd21e6b68117650d2fc08 SHA1 57ff56131cb4b464ca14a8c7d001e06376a249c4 SHA256 0ff45e0af845e8a245b5b36c559b507a1ae752098a8587d0dcde184f3c59194f
-MISC sane-backends-1.0.22-r2.ebuild.orig 4791 RMD160 fd8ce82595fa221f93cec67c5ce617f0a55e3645 SHA1 6c17f13a8bdb1cd7c11d1898977be96c944e5a4a SHA256 7ec2dd0e8644a41033ef43b5510f5b1480dd334c144a819a04f62ff05e32e166
-MISC sane-backends-1.0.22-r2.ebuild.rej 244 RMD160 59722b6f5d5874acd704d3d9d883c76fea14dc7c SHA1 cdfba30fa25d94c44b5c95ef712c7b33573a0679 SHA256 9b18e5cd8d25d34c94887c9c8776d95c06cbfff3ff2248f7341a472d7613b6d7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBCAAGBQJOxL7VAAoJEDYO1FT4VRUU4MAP/iW5Xtrn/uFNeo2FjiA3Yd+R
+EEUOjhZrbqG9LfcEfXLPNpiyJ30hittMqwt/GM9cc8K8GbNLi3HJI/b6lEWvOtz4
+VjgBOjSfph/w7H0Gwoi+38Bcx9HqGALEuEormQud6zj1ni8O2H8LjoBLcjYk2jCc
+3lUqqsB796hvmR63LkApi9x7Qyyhdd6/i7Uyt/ytVv0ZwQxYNExkZB4GT9LnEH4x
+B2B/E5LFcKk8tr4Xqc4oJ1WIado1/ZkLY76afGdIAQD3BELTDE5HjvhKWbN7NOiW
+RKYOXzLoPPvA1Na1lTxRAF07JKIau/hLHyWJc9CPRq9JQkFfraJYDuUeHV4rHNFy
+I0QnPCMhUZQCNJKMz5eDaXtBU8jSFbdPD2j9HR4IxOZpPcOz+0Wdxzdc7yVbEJdv
+qT9K6QL9/Ek+VF5wsQSwNYNFSVCCKvfmVta47hzchxqbhm0cdqShvgvuMzsIo8In
+rrDVdW29LYw9Qt6geZDzK6MdQGNlGEbgbiTNrOR3ydUE8QRMneKjmSmxW1FPsnk8
+vjjglWzkaiQ7D1kUZ4mZSEjHcLD4BrwrtKHfpTEBKD+INcYynZvb8WPmr2lIsOxo
+V3CNk86EADBxaLlIt+3q14zz+DgHYNArbtnN1Vw/kQbujdXoL835uHQOLJY/+vXX
+ast/ARDDpJULq8lLaqvL
+=4ReD
+-----END PGP SIGNATURE-----
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() {