Fix compilation on Darwin

Package-Manager: portage-2.2.01.17168-prefix/cvs/Darwin powerpc

4 files changed, 45 insertions, 5 deletions

diff --git a/net-libs/libnet/ChangeLog b/net-libs/libnet/ChangeLog
index f398637e6598..f34265021f5c 100644
--- a/net-libs/libnet/ChangeLog
+++ b/net-libs/libnet/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/libnet
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnet/ChangeLog,v 1.67 2010/11/10 05:59:15 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnet/ChangeLog,v 1.68 2010/11/13 08:40:15 grobian Exp $
+
+  13 Nov 2010; Fabian Groffen <grobian@gentoo.org> libnet-1.1.5.ebuild,
+  +files/libnet-1.1.5-darwin.patch:
+  Fix compilation on Darwin
 
   10 Nov 2010; Jeroen Roovers <jer@gentoo.org> libnet-1.1.5.ebuild:
   Forgot one.
diff --git a/net-libs/libnet/Manifest b/net-libs/libnet/Manifest
index 402465d41b8c..fe9f65cb390f 100644
--- a/net-libs/libnet/Manifest
+++ b/net-libs/libnet/Manifest
@@ -1,11 +1,12 @@
 AUX 1.0.2a-slot.patch 7696 RMD160 9efca7d4e59ab46eaddb3932c39e86b7ad2bd9ce SHA1 4f4b0d316f8e61eb8d2daf25051036968d5d4594 SHA256 bd1d187bce4f5d618506d0149b469e4208eea0b45bbebec0aa190644be8d016e
 AUX libnet-1.1.4-zero-pointers-after-free.patch 870 RMD160 efbf34695710253105a792b1a65eaac187ed2b75 SHA1 30d5b10f10db27d923ae6d2d51795f9f68f71886 SHA256 d93e9401be39a278c6be60996cdd61240fb13571d8aba81326d5468b440bbd76
+AUX libnet-1.1.5-darwin.patch 595 RMD160 9e8113d58eddb0f456fe74e05a7c2b4dc89ed4e9 SHA1 5188141d86a217f87d0766185ddfc8cae5a6f03b SHA256 dcf3a67d375675544a104f8aedd318cb4ea5d907b3456d9330413ba784845eb8
 AUX libnet-gcc33-fix 563 RMD160 1d153e6ad09f447ab3ebc3568df9e595cc33f133 SHA1 5e29c42bfb18cd3bd55f8700bd0a2886d463c6e3 SHA256 b533c27f07bb27489b0a3941546788447cab6e767b489961ba7fc776ee49ed47
 DIST libnet-1.0.2a.tar.gz 140191 RMD160 43dd2edc31e56b42792727b88d81342dc26d3308 SHA1 804eaf43bb90f93e505d46a9668c914a112bf136 SHA256 7c7f2e8ccb47bb47072c5cd583fea5e90ab892c75889b625346b60d10464459a
 DIST libnet-1.1.4.tar.gz 1204502 RMD160 e9dd2026ac9191e62646ec97eb4896703b445685 SHA1 86a2f75b52c5b15dbd41c3e03356167de9c883e4 SHA256 de98229d9eca00b66c26cb368e582901cf768456321703bc38235e3b347b512d
 DIST libnet-1.1.5.tar.gz 1190258 RMD160 46c67e67760c636d7b41a30e13ee2ba97d1f866d SHA1 a2271762a7d6505c1ff6c4c048bf802e643b6790 SHA256 75588f8d1232e1df34eccf2dba5e66be197b345a07fae80d8275db994496a20d
 EBUILD libnet-1.0.2a-r3.ebuild 1619 RMD160 a605e55ae1f4e08efe1a5b492ade168b565eb598 SHA1 97b23d27dd7fc822876ff7f9e82b238536f54a39 SHA256 8388ff97f254654ce768ddc37c221e4fba1f7c4836baacfc94bdf45090a9af53
 EBUILD libnet-1.1.4-r1.ebuild 1073 RMD160 1223e90a20bd72ae8ab176a3c27e619e755b94a1 SHA1 94d11eac56a6cf8eae3fcfed342b839fe373128d SHA256 d0ec4826707bded1bf1bd68b9a7d62f852057d956ad9510bbd2eb8d962082ee4
-EBUILD libnet-1.1.5.ebuild 989 RMD160 04eb3d7fcdf95c92ef3b34e90a81f1f345008e9a SHA1 8f711b8cd3905ae699bd22f8dede30b93f0692c6 SHA256 b8d1e2de7b31d8185266b86b809b4e1110c0cceece4e10fba6f60839d5b84247
-MISC ChangeLog 8890 RMD160 dc586e33282acfa1fb65dafbad6a8e7c2c83425b SHA1 93e3a8f5d653eea9664a5965cff79a2bd6635b08 SHA256 219e8a4f4e638e0ba435b90ae8ad27be498f0026bc8506a938d229f4b240f14b
+EBUILD libnet-1.1.5.ebuild 1053 RMD160 0572e0889ccf45c1bd698e1bdfa8a5be43b9631f SHA1 539321490a5f590ccfd55574761c71fddb64c619 SHA256 ce2084262cc75bbf5a611cd2b666997dc3963a6673b8601f64579a640bce4ebf
+MISC ChangeLog 9031 RMD160 731cd0ea0eb32696f73c766032bb5db36f182994 SHA1 1f4447f55fc15ce2541ecbf33c3e82529fb3f065 SHA256 86bf13d9630b6156a96513ea0814a8d62cdf4b7a862c010b6897efeb5a9190af
 MISC metadata.xml 1021 RMD160 1e9e28f0dfd9ec6ffff940be53303d9b88b25b9f SHA1 6a1e29dba034a48b8dc54af7fb5bc3cfc1f6f364 SHA256 dde6801b0f8a66cc775c3cb6cadacf0a5c0f024d3535b22b2c787057b5b3e889
diff --git a/net-libs/libnet/files/libnet-1.1.5-darwin.patch b/net-libs/libnet/files/libnet-1.1.5-darwin.patch
new file mode 100644
index 000000000000..5fa49a157a27
--- /dev/null
+++ b/net-libs/libnet/files/libnet-1.1.5-darwin.patch
@@ -0,0 +1,31 @@
+In file included from libnet_write.c:36:
+/usr/include/netinet/udp.h:66: error: expected specifier-qualifier-list before 'u_short'
+make: *** [libnet_write.lo] Error 1
+
+
+--- src/libnet_write.c
++++ src/libnet_write.c
+@@ -32,9 +32,6 @@
+  *
+  */
+ 
+-#include <netinet/in.h>
+-#include <netinet/udp.h>
+-
+ #if (HAVE_CONFIG_H)
+ #include "../include/config.h"
+ #endif
+@@ -47,6 +44,13 @@
+ #include "Ntddndis.h"
+ #endif
+ 
++#ifdef HAVE_SYS_TYPES_H
++#include <sys/types.h>  /* for u_short in udphdr on Darwin */
++#endif
++
++#include <netinet/in.h>
++#include <netinet/udp.h>
++
+ int
+ libnet_write(libnet_t *l)
+ {
diff --git a/net-libs/libnet/libnet-1.1.5.ebuild b/net-libs/libnet/libnet-1.1.5.ebuild
index ea8d849fa054..aed004114be2 100644
--- a/net-libs/libnet/libnet-1.1.5.ebuild
+++ b/net-libs/libnet/libnet-1.1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnet/libnet-1.1.5.ebuild,v 1.3 2010/11/10 05:59:15 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnet/libnet-1.1.5.ebuild,v 1.4 2010/11/13 08:40:15 grobian Exp $
 
 EAPI="2"
 
@@ -18,7 +18,11 @@ IUSE="doc"
 DEPEND="sys-devel/autoconf"
 RDEPEND=""
 
-src_install(){
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-darwin.patch
+}
+
+src_install() {
 	emake DESTDIR="${D}" install || die "Failed to install"
 
 	dodoc README \