[pkgsrc/trunk]: pkgsrc/sysutils/cfengine2 Use sizeof() to calculate size of s...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5382609bf88b
branches:  trunk
changeset: 569002:5382609bf88b
user:      sekiya <sekiya%pkgsrc.org@localhost>
date:      Sat Jan 02 10:55:05 2010 +0000

description:
Use sizeof() to calculate size of struct ifreq on NetBSD.

Fixes:

        Interface 1: wm0
        Interface 4: o0
        cfservd: No such network device
        cfservd: ioctl: Socket operation on non-socket

... at startup.

diffstat:

 sysutils/cfengine2/Makefile         |   4 ++--
 sysutils/cfengine2/distinfo         |   3 ++-
 sysutils/cfengine2/patches/patch-ac |  11 +++++++++++
 3 files changed, 15 insertions(+), 3 deletions(-)

diffs (42 lines):

diff -r a5bc16578ec6 -r 5382609bf88b sysutils/cfengine2/Makefile
--- a/sysutils/cfengine2/Makefile       Sat Jan 02 03:48:40 2010 +0000
+++ b/sysutils/cfengine2/Makefile       Sat Jan 02 10:55:05 2010 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2008/09/19 07:38:56 rhaen Exp $
+# $NetBSD: Makefile,v 1.28 2010/01/02 10:55:05 sekiya Exp $
 #
 
 DISTNAME=              cfengine-2.2.8
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=            sysutils net
 MASTER_SITES=          http://www.cfengine.org/downloads/ \
                        http://ftp.osuosl.org/pub/cfengine/ \
diff -r a5bc16578ec6 -r 5382609bf88b sysutils/cfengine2/distinfo
--- a/sysutils/cfengine2/distinfo       Sat Jan 02 03:48:40 2010 +0000
+++ b/sysutils/cfengine2/distinfo       Sat Jan 02 10:55:05 2010 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.11 2008/09/07 10:14:31 rhaen Exp $
+$NetBSD: distinfo,v 1.12 2010/01/02 10:55:05 sekiya Exp $
 
 SHA1 (cfengine-2.2.8.tar.gz) = 670b5fc15a4dd5c80b301adf1e1bf7979161a049
 RMD160 (cfengine-2.2.8.tar.gz) = a35ac5d87a345f38a779719314d3978ee9e3045c
 Size (cfengine-2.2.8.tar.gz) = 2715678 bytes
 SHA1 (patch-aa) = cdbebcf1a8d284bbaa9e8e0deb60112c5e33287c
 SHA1 (patch-ab) = 5c90d568392cba0b1049b607f861a4cf65e82740
+SHA1 (patch-ac) = 0962334c9251cf16bc4faa42d2b16c2b60a5c549
diff -r a5bc16578ec6 -r 5382609bf88b sysutils/cfengine2/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/cfengine2/patches/patch-ac       Sat Jan 02 10:55:05 2010 +0000
@@ -0,0 +1,11 @@
+--- src/nameinfo.c.orig        2010-01-01 17:23:25.000000000 +0900
++++ src/nameinfo.c     2010-01-01 17:23:48.000000000 +0900
+@@ -37,7 +37,7 @@
+ #include <sys/syssgi.h>
+ #endif
+ 
+-#ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
++#if defined (HAVE_STRUCT_SOCKADDR_SA_LEN) && !defined(__NetBSD__)
+ # ifdef _SIZEOF_ADDR_IFREQ
+ #  define SIZEOF_IFREQ(x) _SIZEOF_ADDR_IFREQ(x)
+ # else