small build fix for bsd

Package-Manager: portage-2.1.3.18

4 files changed, 41 insertions, 13 deletions

diff --git a/media-libs/libcaca/ChangeLog b/media-libs/libcaca/ChangeLog
index cc7fc3f36f5f..6c0750471680 100644
--- a/media-libs/libcaca/ChangeLog
+++ b/media-libs/libcaca/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libcaca
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/ChangeLog,v 1.48 2007/11/05 22:37:59 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/ChangeLog,v 1.49 2007/11/06 23:21:18 aballier Exp $
+
+  06 Nov 2007; Alexis Ballier <aballier@gentoo.org>
+  +files/libcaca-0.99_beta12-bsd.patch, libcaca-0.99_beta12.ebuild:
+  small build fix for bsd
 
 *libcaca-0.99_beta12 (05 Nov 2007)
 
diff --git a/media-libs/libcaca/Manifest b/media-libs/libcaca/Manifest
index 3a79da06f59c..3a1f1818823c 100644
--- a/media-libs/libcaca/Manifest
+++ b/media-libs/libcaca/Manifest
@@ -9,6 +9,10 @@ AUX libcaca-0.9-libtool2.patch 4375 RMD160 ce1e4684b995abea83caf5b359571195f43b5
 MD5 347cd869231b76bab7edada5d9bc813b files/libcaca-0.9-libtool2.patch 4375
 RMD160 ce1e4684b995abea83caf5b359571195f43b5158 files/libcaca-0.9-libtool2.patch 4375
 SHA256 4cdac586c27368ef1119535c0da3cb94c3d4ab062f64be07db8f9128b1ba584c files/libcaca-0.9-libtool2.patch 4375
+AUX libcaca-0.99_beta12-bsd.patch 578 RMD160 b79e89f7f0cfeb2f8f3cd6a4c88bd8fbc9256053 SHA1 cf27c242bfdab52374fb30d23b288c9b00d26279 SHA256 37add8c840d46cec324b3c02a7e1f9f956caf7e3491244c169e481e12896530f
+MD5 c4d85ea06a5a8842f024d08dfa2d5cb5 files/libcaca-0.99_beta12-bsd.patch 578
+RMD160 b79e89f7f0cfeb2f8f3cd6a4c88bd8fbc9256053 files/libcaca-0.99_beta12-bsd.patch 578
+SHA256 37add8c840d46cec324b3c02a7e1f9f956caf7e3491244c169e481e12896530f files/libcaca-0.99_beta12-bsd.patch 578
 AUX libcaca-0.99_beta4-deoptimise.patch 946 RMD160 c20434fcdbcf9345ae0862d7c235279add4a9acb SHA1 b66f86e03cc38f1b98486f55c4b1ea9cac5704bb SHA256 532edfc8702337b0e007eb9e82454094717ee923197203f82f67bc0584fdf738
 MD5 0d81bafb753610a5fbf32b6ba8ffe433 files/libcaca-0.99_beta4-deoptimise.patch 946
 RMD160 c20434fcdbcf9345ae0862d7c235279add4a9acb files/libcaca-0.99_beta4-deoptimise.patch 946
@@ -29,18 +33,18 @@ EBUILD libcaca-0.99_beta11.ebuild 1542 RMD160 46e400402d220f23b3b44cc02e1e821aa2
 MD5 43a5f39875c80b1713d3b0ee1f6fa50a libcaca-0.99_beta11.ebuild 1542
 RMD160 46e400402d220f23b3b44cc02e1e821aa23960bf libcaca-0.99_beta11.ebuild 1542
 SHA256 b23285dd744c46f1f364edf0e8820eadd73d362754a8af7fa47a9e7730221b52 libcaca-0.99_beta11.ebuild 1542
-EBUILD libcaca-0.99_beta12.ebuild 1517 RMD160 84cfb7ac009c0fe738c16e0f6947d0c5e81d7f73 SHA1 9eec86cb1977ec553658e76beb08da879ba55241 SHA256 d2b204769314d1fd3bda34915ea70d539fde1cc3eb9d4d70a3f7144c78ed458c
-MD5 0df06a9a2ec2cd32f15eebee3ba832c2 libcaca-0.99_beta12.ebuild 1517
-RMD160 84cfb7ac009c0fe738c16e0f6947d0c5e81d7f73 libcaca-0.99_beta12.ebuild 1517
-SHA256 d2b204769314d1fd3bda34915ea70d539fde1cc3eb9d4d70a3f7144c78ed458c libcaca-0.99_beta12.ebuild 1517
+EBUILD libcaca-0.99_beta12.ebuild 1554 RMD160 607344d7b3981933e8b95ab566e41a3dff2140af SHA1 cb294694e7feee7f80520197defcc663bd6831e6 SHA256 6a7631caa88a7e40a9770e9b8d9d103caa9a0e48a8f68acdec7ef7173e900d00
+MD5 a9920140c094708642937c4a9421e257 libcaca-0.99_beta12.ebuild 1554
+RMD160 607344d7b3981933e8b95ab566e41a3dff2140af libcaca-0.99_beta12.ebuild 1554
+SHA256 6a7631caa88a7e40a9770e9b8d9d103caa9a0e48a8f68acdec7ef7173e900d00 libcaca-0.99_beta12.ebuild 1554
 EBUILD libcaca-0.99_beta7.ebuild 1640 RMD160 26ccb776778c64d3f5376bb9e5f2daf26b05069a SHA1 82017b53b7ce3884fde059d65d98368eb94b4c27 SHA256 4326ec0e07489ac83108ca5cb447d096fa096d336301af680d35ab25b2eb09ee
 MD5 8981308f85787c32c8c209204cab8a8a libcaca-0.99_beta7.ebuild 1640
 RMD160 26ccb776778c64d3f5376bb9e5f2daf26b05069a libcaca-0.99_beta7.ebuild 1640
 SHA256 4326ec0e07489ac83108ca5cb447d096fa096d336301af680d35ab25b2eb09ee libcaca-0.99_beta7.ebuild 1640
-MISC ChangeLog 6639 RMD160 37539c398c25659faab9050802ea3a41a76ab772 SHA1 698faad6fce6133d2d83e88b8d8b5cafad4f4e4f SHA256 47e668aade2c3fcb595cbd44b3f5e51f7164748726e0ec2c0c94f8ff5970e493
-MD5 638558d6b4fe28d1b1e2b391e694108d ChangeLog 6639
-RMD160 37539c398c25659faab9050802ea3a41a76ab772 ChangeLog 6639
-SHA256 47e668aade2c3fcb595cbd44b3f5e51f7164748726e0ec2c0c94f8ff5970e493 ChangeLog 6639
+MISC ChangeLog 6786 RMD160 d646539527dd0c917c4d4769092e961c643d3dd4 SHA1 733f2567b2f005e69192d0fef41fc416459740a3 SHA256 24b8d114f327807d7bf22d880f87d00f9ee8a40369be8fdc9df9efc5112ef4c1
+MD5 dafba37d6f536b9a799d67c2ab6ceba4 ChangeLog 6786
+RMD160 d646539527dd0c917c4d4769092e961c643d3dd4 ChangeLog 6786
+SHA256 24b8d114f327807d7bf22d880f87d00f9ee8a40369be8fdc9df9efc5112ef4c1 ChangeLog 6786
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
 MD5 0338bfb24d7bfb6450aac4dd025c0096 metadata.xml 223
 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 metadata.xml 223
@@ -60,7 +64,7 @@ SHA256 1a409d1dda4bdf19d33eb0ffb0f810bd8b5fbb5a8515a1d7d9d30d23885ee229 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHL5tYvFcC4BYPU0oRAgxXAJ903/TiC+4mnyM/BBTpBL1N9dyuwwCeJAad
-1QBALZCaldfBmMcq2WbweDg=
-=efCY
+iD8DBQFHMPcJvFcC4BYPU0oRApdXAJ0Sxrvx0qrZ0t6mdj2gWV6F+Tpg6gCff0Vw
+M/x0Y9NAIOwEBd6By16qxsA=
+=dUHG
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libcaca/files/libcaca-0.99_beta12-bsd.patch b/media-libs/libcaca/files/libcaca-0.99_beta12-bsd.patch
new file mode 100644
index 000000000000..6483503f3bc3
--- /dev/null
+++ b/media-libs/libcaca/files/libcaca-0.99_beta12-bsd.patch
@@ -0,0 +1,19 @@
+--- libcaca-0.99.beta12-new/src/cacaserver.c	2007-11-06 13:19:34 +0000
++++ libcaca-0.99.beta12/src/cacaserver.c	2007-11-06 13:19:50 +0000
+@@ -25,13 +25,14 @@
+ /* for sockaddr_in (not included from arpa/inet.h in 10.3.9 SDK) */
+ #       include <netinet/in.h>
+ #   endif
+-#elif defined(HAVE_NETINET_IN_H)
+-#   include <netinet/in.h>
+ #elif defined(HAVE_WINSOCK2_H)
+ #   include <winsock2.h>
+ #   include <ws2tcpip.h>
+ #   define USE_WINSOCK 1
+ #endif
++#if defined(HAVE_NETINET_IN_H)
++#   include <netinet/in.h>
++#endif
+ #if defined(HAVE_UNISTD_H)
+ #   include <unistd.h>
+ #endif
diff --git a/media-libs/libcaca/libcaca-0.99_beta12.ebuild b/media-libs/libcaca/libcaca-0.99_beta12.ebuild
index a0a60354d3ef..dcf718301903 100644
--- a/media-libs/libcaca/libcaca-0.99_beta12.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta12.ebuild,v 1.1 2007/11/05 22:37:59 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta12.ebuild,v 1.2 2007/11/06 23:21:18 aballier Exp $
 
 inherit eutils autotools libtool
 
@@ -30,6 +30,7 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}/${PN}-0.99_beta4-deoptimise.patch"
+	epatch "${FILESDIR}/${P}-bsd.patch"
 
 	eautoreconf
 	elibtoolize