diff options
| author | abs <abs@pkgsrc.org> | 2010-12-07 22:53:48 +0000 |
|---|---|---|
| committer | abs <abs@pkgsrc.org> | 2010-12-07 22:53:48 +0000 |
| commit | a6ed28f2a09974094f9a5f81c2738660f3501dc2 (patch) | |
| tree | cc7d3e6778d50a28c7e5df8d9999804ba6059600 /net/dhcpcd | |
| parent | 4d50c57aee8909a746d8bb4e790315adf60f523d (diff) | |
| download | pkgsrc-a6ed28f2a09974094f9a5f81c2738660f3501dc2.tar.gz | |
Fix build on OS X, bump PKGREVISION. Note dhcpcd runs but something in
OS X seems to be eating the dhcp server's responses, even with the
OS X interface config set to manual.
Diffstat (limited to 'net/dhcpcd')
| -rw-r--r-- | net/dhcpcd/Makefile | 3 | ||||
| -rw-r--r-- | net/dhcpcd/patches/patch-aa | 35 | ||||
| -rw-r--r-- | net/dhcpcd/patches/patch-ab | 14 |
3 files changed, 51 insertions, 1 deletions
diff --git a/net/dhcpcd/Makefile b/net/dhcpcd/Makefile index 820b69a81b9..00afa1e7d1a 100644 --- a/net/dhcpcd/Makefile +++ b/net/dhcpcd/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.26 2010/11/27 12:59:31 roy Exp $ +# $NetBSD: Makefile,v 1.27 2010/12/07 22:53:48 abs Exp $ # DISTNAME= dhcpcd-5.2.9 +PKGREVISION= 1 CATEGORIES= net MASTER_SITES= ftp://roy.marples.name/pub/dhcpcd/ MASTER_SITES+= http://roy.aydogan.net/dhcpcd/ diff --git a/net/dhcpcd/patches/patch-aa b/net/dhcpcd/patches/patch-aa new file mode 100644 index 00000000000..7cb3058e487 --- /dev/null +++ b/net/dhcpcd/patches/patch-aa @@ -0,0 +1,35 @@ +$NetBSD: patch-aa,v 1.3 2010/12/07 22:53:48 abs Exp $ + +--- if-bsd.c.orig 2010-12-05 21:31:47.000000000 +0000 ++++ if-bsd.c +@@ -37,10 +37,12 @@ + #include <net/if_dl.h> + #include <net/route.h> + #include <netinet/in.h> +-#ifdef __DragonFly__ ++#ifndef __APPLE__ ++# ifdef __DragonFly__ + # include <netproto/802_11/ieee80211_ioctl.h> +-#else ++# else + # include <net80211/ieee80211_ioctl.h> ++# endif + #endif + + #include <errno.h> +@@ -342,6 +344,7 @@ manage_link(int fd) + for (p = link_buf; p < e; p += rtm->rtm_msglen) { + rtm = (struct rt_msghdr *)(void *)p; + switch(rtm->rtm_type) { ++#ifdef RTM_IFANNOUNCE + case RTM_IFANNOUNCE: + ifan = (struct if_announcemsghdr *)(void *)p; + switch(ifan->ifan_what) { +@@ -353,6 +356,7 @@ manage_link(int fd) + break; + } + break; ++#endif + case RTM_IFINFO: + ifm = (struct if_msghdr *)(void *)p; + memset(ifname, 0, sizeof(ifname)); diff --git a/net/dhcpcd/patches/patch-ab b/net/dhcpcd/patches/patch-ab new file mode 100644 index 00000000000..3452203aeaf --- /dev/null +++ b/net/dhcpcd/patches/patch-ab @@ -0,0 +1,14 @@ +$NetBSD: patch-ab,v 1.1 2010/12/07 22:53:48 abs Exp $ + +--- platform-bsd.c.orig 2010-12-05 22:00:27.000000000 +0000 ++++ platform-bsd.c +@@ -31,6 +31,9 @@ + + #include "platform.h" + ++#ifdef __APPLE__ ++# define SYS_NMLN 256 ++#endif + static char march[SYS_NMLN]; + + char * |