diff options
author | dbj <dbj@pkgsrc.org> | 2009-02-04 07:07:18 +0000 |
---|---|---|
committer | dbj <dbj@pkgsrc.org> | 2009-02-04 07:07:18 +0000 |
commit | a0c3bfccdd779bdd8f6e67832f5468b3c413615c (patch) | |
tree | fe47ba966b8c632d6350fc88858c270b8e662091 | |
parent | 6bcf840e5867698779e66513fd939a5fbc46ee8b (diff) | |
download | pkgsrc-a0c3bfccdd779bdd8f6e67832f5468b3c413615c.tar.gz |
include sys/socket.h when checking for CMSG_SPACE
improved fix for
PR pkg/40281
-rw-r--r-- | net/avahi/distinfo | 6 | ||||
-rw-r--r-- | net/avahi/patches/patch-ag | 18 | ||||
-rw-r--r-- | net/avahi/patches/patch-aj | 33 |
3 files changed, 37 insertions, 20 deletions
diff --git a/net/avahi/distinfo b/net/avahi/distinfo index 871cb796b07..2d31d7319fb 100644 --- a/net/avahi/distinfo +++ b/net/avahi/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2009/01/16 22:25:04 tonio Exp $ +$NetBSD: distinfo,v 1.5 2009/02/04 07:07:18 dbj Exp $ SHA1 (avahi-0.6.24.tar.gz) = a187af361fefc8bda026936bb07ccdeb41dc74bc RMD160 (avahi-0.6.24.tar.gz) = 94f59ccbd14d99e91e259b27dd7f03404c6691e6 @@ -7,7 +7,7 @@ SHA1 (patch-aa) = a7ef1cd3ad4ecdbb0668b544f7ea1fc4497c4dce SHA1 (patch-ab) = 8e29c8b2b9a1d52fba97360c30bb3ba26f657198 SHA1 (patch-ac) = 0484dc5e663fd299f46d15c283fb6fde4aab3537 SHA1 (patch-ad) = 9966ae9fd0d715fa735efc3b92b2cabe6de53b48 -SHA1 (patch-ag) = ddfcb74e5e34619245ad230a73c732261c2250ea +SHA1 (patch-ag) = 7d93a060fa3885bd862136ae218cbef6ce3c5685 SHA1 (patch-ah) = 63758f0e5ca24a1570c0c8dfea05836d6cce73f0 SHA1 (patch-ai) = 658dae685c3542c5d7f15cc8865e90a0292e4ad0 -SHA1 (patch-aj) = 9e41e3c06f375fb160366427e451cd1196a75b79 +SHA1 (patch-aj) = ab0d279dd40ef5c94969a082678bfad87c92a5ef diff --git a/net/avahi/patches/patch-ag b/net/avahi/patches/patch-ag index d7a659feca4..3ec1ccd8dd9 100644 --- a/net/avahi/patches/patch-ag +++ b/net/avahi/patches/patch-ag @@ -1,8 +1,8 @@ -$NetBSD: patch-ag,v 1.1 2008/12/23 02:08:06 hasso Exp $ +$NetBSD: patch-ag,v 1.2 2009/02/04 07:07:18 dbj Exp $ ---- configure.orig 2008-12-21 13:37:12 +0200 -+++ configure 2008-12-21 13:37:41 +0200 -@@ -22820,7 +22820,7 @@ with_distro=`echo ${with_distro} | tr '[ +--- configure.orig 2008-12-12 12:56:20.000000000 -0800 ++++ configure 2009-02-03 22:49:47.000000000 -0800 +@@ -18055,7 +18055,7 @@ with_distro=`echo ${with_distro} | tr '[ case $with_distro in debian|gentoo|archlinux|suse|fedora|mandriva|darwin|freebsd|slackware|none) ;; @@ -11,3 +11,13 @@ $NetBSD: patch-ag,v 1.1 2008/12/23 02:08:06 hasso Exp $ { $as_echo "$as_me:$LINENO: WARNING: Your distribution (${with_distro}) is supported but no init script exist yet! (patches welcome)" >&5 $as_echo "$as_me: WARNING: Your distribution (${with_distro}) is supported but no init script exist yet! (patches welcome)" >&2;} ;; +@@ -19348,7 +19348,8 @@ _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-$ac_includes_default ++#include<sys/socket.h> ++ + int + main () + { diff --git a/net/avahi/patches/patch-aj b/net/avahi/patches/patch-aj index eab692005bc..d663c8d9dcd 100644 --- a/net/avahi/patches/patch-aj +++ b/net/avahi/patches/patch-aj @@ -1,15 +1,22 @@ -$NetBSD: patch-aj,v 1.1 2009/01/16 22:25:04 tonio Exp $ +$NetBSD: patch-aj,v 1.2 2009/02/04 07:07:18 dbj Exp $ ---- config.h.in.orig 2008-12-12 21:57:30.000000000 +0100 -+++ config.h.in -@@ -384,6 +384,10 @@ - /* Define to 1 if you need to in order for `stat' and other things to work. */ - #undef _POSIX_SOURCE - -+#ifdef __APPLE__ -+#define _DARWIN_C_SOURCE 1 -+#endif -+ - /* Define to empty if `const' does not conform to ANSI C. */ - #undef const +--- configure.ac.orig 2008-06-23 16:17:27.000000000 -0700 ++++ configure.ac 2009-02-03 22:23:51.000000000 -0800 +@@ -266,7 +266,7 @@ with_distro=`echo ${with_distro} | tr '[ + case $with_distro in + debian|gentoo|archlinux|suse|fedora|mandriva|darwin|freebsd|slackware|none) + ;; +- netbsd) ++ netbsd|dragonfly) + AC_MSG_WARN([Your distribution (${with_distro}) is supported but no init script exist yet! (patches welcome)]) + ;; + linux) +@@ -348,7 +348,7 @@ AC_HEADER_SYS_WAIT + # Solaris stuff + AC_SEARCH_LIBS([inet_ntop],[nsl]) + AC_SEARCH_LIBS([recv],[socket]) +- AC_CHECK_DECL([CMSG_SPACE],,CFLAGS="$CFLAGS -D_XOPEN_SOURCE=500 -D__EXTENSIONS__") ++ AC_CHECK_DECL([CMSG_SPACE],,CFLAGS="$CFLAGS -D_XOPEN_SOURCE=500 -D__EXTENSIONS__",[#include<sys/socket.h>]) + # Checks for library functions. + AC_FUNC_MEMCMP |