[pkgsrc/trunk]: pkgsrc/net/udpcast On NetBSD, SIOCGIFINDEX exists, but ip_mre...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2f93017982b7
branches:  trunk
changeset: 626362:2f93017982b7
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri Nov 08 21:16:43 2013 +0000

description:
On NetBSD, SIOCGIFINDEX exists, but ip_mreqn doesn't.

diffstat:

 net/udpcast/distinfo         |   4 ++--
 net/udpcast/patches/patch-ab |  22 ++++++++++++++++++++--
 2 files changed, 22 insertions(+), 4 deletions(-)

diffs (47 lines):

diff -r 373d5e6b66de -r 2f93017982b7 net/udpcast/distinfo
--- a/net/udpcast/distinfo      Fri Nov 08 21:16:02 2013 +0000
+++ b/net/udpcast/distinfo      Fri Nov 08 21:16:43 2013 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.5 2013/01/11 13:31:54 joerg Exp $
+$NetBSD: distinfo,v 1.6 2013/11/08 21:16:43 joerg Exp $
 
 SHA1 (udpcast-20060619.tar.gz) = ae95820c746fc6d6dc2c4c97d24d52105983e15c
 RMD160 (udpcast-20060619.tar.gz) = 1f8ffefc5f5a412f1b8bb371895987734f6159b1
 Size (udpcast-20060619.tar.gz) = 76311 bytes
 SHA1 (patch-aa) = 71af13c0bede7748e8b9d32f920488d263d3348f
-SHA1 (patch-ab) = c992f92e58bdc0726cc659e4720274ebcea58eb1
+SHA1 (patch-ab) = 948022fd5122a5bd4ceaa6045710e6da753ae42e
 SHA1 (patch-ac) = 13e8289e336de78413ed6c9fdce6508222577365
 SHA1 (patch-ad) = ab0ab1e9f5cd98d0e1ffd15f7846ea889608fed8
 SHA1 (patch-ae) = 4937aec1283ca42652f9614e317fa63dcc500019
diff -r 373d5e6b66de -r 2f93017982b7 net/udpcast/patches/patch-ab
--- a/net/udpcast/patches/patch-ab      Fri Nov 08 21:16:02 2013 +0000
+++ b/net/udpcast/patches/patch-ab      Fri Nov 08 21:16:43 2013 +0000
@@ -1,7 +1,25 @@
-$NetBSD: patch-ab,v 1.2 2006/08/28 15:07:48 drochner Exp $
+$NetBSD: patch-ab,v 1.3 2013/11/08 21:16:43 joerg Exp $
 
---- socklib.c.orig     2006-05-24 00:19:49.000000000 +0200
+--- socklib.c.orig     2006-05-23 22:19:49.000000000 +0000
 +++ socklib.c
+@@ -368,7 +368,7 @@ int setTtl(int sock, int ttl) {
+     return setsockopt(sock, SOL_IP, IP_MULTICAST_TTL, (char*)&ttl, sizeof(int));
+ }
+ 
+-#ifdef SIOCGIFINDEX
++#if defined(SIOCGIFINDEX) && !defined(__NetBSD__)
+ # define IP_MREQN ip_mreqn
+ #else
+ # define IP_MREQN ip_mreq
+@@ -382,7 +382,7 @@ int setTtl(int sock, int ttl) {
+  */
+ static int fillMreq(int sock, net_if_t *net_if, struct in_addr addr,
+                   struct IP_MREQN *mreq) {
+-#ifdef SIOCGIFINDEX
++#if defined(SIOCGIFINDEX) && !defined(__NetBSD__)
+     mreq->imr_ifindex = net_if->index;
+     mreq->imr_address.s_addr = 0;
+ #else
 @@ -879,6 +879,9 @@ int makeSocket(addr_type_t addr_type, 
      int ret, s;
      struct sockaddr_in myaddr;