Fri Jul 5 16:28:43 2013 UTC ()
Fix build on NetBSD 6.99.23.

* EXTRACT_USING=bsdtar for supressing warnings in extract stage.
* Add a patch to fix build on NetBSD 6.99.23, IP_PKTINFO related.


(ryoon)
diff -r1.45 -r1.46 pkgsrc/net/avahi/Makefile
diff -r1.12 -r1.13 pkgsrc/net/avahi/distinfo
diff -r0 -r1.1 pkgsrc/net/avahi/patches/patch-avahi-core_socket.c
cvs diff -r1.45 -r1.46 pkgsrc/net/avahi/Makefile (expand / switch to unified diff)

--- pkgsrc/net/avahi/Makefile 2013/06/17 12:44:54 1.45
+++ pkgsrc/net/avahi/Makefile 2013/07/05 16:28:43 1.46
@@ -1,25 +1,27 @@ @@ -1,25 +1,27 @@
1# $NetBSD: Makefile,v 1.45 2013/06/17 12:44:54 wiz Exp $ 1# $NetBSD: Makefile,v 1.46 2013/07/05 16:28:43 ryoon Exp $
2 2
3DISTNAME= avahi-0.6.31 3DISTNAME= avahi-0.6.31
4PKGREVISION= 12 4PKGREVISION= 12
5CATEGORIES= net 5CATEGORIES= net
6MASTER_SITES= http://avahi.org/download/ 6MASTER_SITES= http://avahi.org/download/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://avahi.org/ 9HOMEPAGE= http://avahi.org/
10COMMENT= Facilitate service discovery on a local network 10COMMENT= Facilitate service discovery on a local network
11LICENSE= gnu-lgpl-v2.1 11LICENSE= gnu-lgpl-v2.1
12 12
 13EXTRACT_USING= bsdtar
 14
13GNU_CONFIGURE= YES 15GNU_CONFIGURE= YES
14USE_LIBTOOL= YES 16USE_LIBTOOL= YES
15USE_PKGINSTALL= YES 17USE_PKGINSTALL= YES
16USE_PKGLOCALEDIR= YES 18USE_PKGLOCALEDIR= YES
17USE_TOOLS+= pkg-config gmake intltool msgfmt xgettext 19USE_TOOLS+= pkg-config gmake intltool msgfmt xgettext
18MAKE_JOBS_SAFE= no 20MAKE_JOBS_SAFE= no
19 21
20PKGCONFIG_OVERRIDE+= avahi-client.pc.in 22PKGCONFIG_OVERRIDE+= avahi-client.pc.in
21PKGCONFIG_OVERRIDE+= avahi-compat-howl.pc.in 23PKGCONFIG_OVERRIDE+= avahi-compat-howl.pc.in
22PKGCONFIG_OVERRIDE+= avahi-compat-libdns_sd.pc.in 24PKGCONFIG_OVERRIDE+= avahi-compat-libdns_sd.pc.in
23PKGCONFIG_OVERRIDE+= avahi-core.pc.in 25PKGCONFIG_OVERRIDE+= avahi-core.pc.in
24PKGCONFIG_OVERRIDE+= avahi-glib.pc.in 26PKGCONFIG_OVERRIDE+= avahi-glib.pc.in
25PKGCONFIG_OVERRIDE+= avahi-gobject.pc.in 27PKGCONFIG_OVERRIDE+= avahi-gobject.pc.in
cvs diff -r1.12 -r1.13 pkgsrc/net/avahi/distinfo (expand / switch to unified diff)

--- pkgsrc/net/avahi/distinfo 2013/04/21 00:58:46 1.12
+++ pkgsrc/net/avahi/distinfo 2013/07/05 16:28:43 1.13
@@ -1,9 +1,10 @@ @@ -1,9 +1,10 @@
1$NetBSD: distinfo,v 1.12 2013/04/21 00:58:46 rodent Exp $ 1$NetBSD: distinfo,v 1.13 2013/07/05 16:28:43 ryoon Exp $
2 2
3SHA1 (avahi-0.6.31.tar.gz) = 7e05bd78572c9088b03b1207a0ad5aba38490684 3SHA1 (avahi-0.6.31.tar.gz) = 7e05bd78572c9088b03b1207a0ad5aba38490684
4RMD160 (avahi-0.6.31.tar.gz) = 122f553ee2d43cdd0185540a63a8e1f587bdb08e 4RMD160 (avahi-0.6.31.tar.gz) = 122f553ee2d43cdd0185540a63a8e1f587bdb08e
5Size (avahi-0.6.31.tar.gz) = 1268686 bytes 5Size (avahi-0.6.31.tar.gz) = 1268686 bytes
6SHA1 (patch-aa) = 95b883bf14dd1852cdf0ea8a364c57717eebb03f 6SHA1 (patch-aa) = 95b883bf14dd1852cdf0ea8a364c57717eebb03f
7SHA1 (patch-ab) = e230ea9d57f40915469486faf4ffaf90ea3ebac3 7SHA1 (patch-ab) = e230ea9d57f40915469486faf4ffaf90ea3ebac3
8SHA1 (patch-ah) = 4b3ffdb927daef8c939527fd5c5893f9f88b3ff3 8SHA1 (patch-ah) = 4b3ffdb927daef8c939527fd5c5893f9f88b3ff3
9SHA1 (patch-ai) = 48c5fca5683323a30dc646e5eafb1834e7bedaeb 9SHA1 (patch-ai) = 48c5fca5683323a30dc646e5eafb1834e7bedaeb
 10SHA1 (patch-avahi-core_socket.c) = 503f05f77d95b6f73d933810371c53242d13058c
File Added: pkgsrc/net/avahi/patches/patch-avahi-core_socket.c
$NetBSD: patch-avahi-core_socket.c,v 1.1 2013/07/05 16:28:43 ryoon Exp $

* Fix build on NetBSD 6.99.23.
  From martin@'s post on tech-pkg@.

--- avahi-core/socket.c.orig	2011-04-25 00:12:18.000000000 +0000
+++ avahi-core/socket.c
@@ -528,7 +528,11 @@ int avahi_send_dns_packet_ipv4(
             pkti->ipi_ifindex = interface;
 
         if (src_address)
+#ifdef __linux__
             pkti->ipi_spec_dst.s_addr = src_address->address;
+#else
+            pkti->ipi_addr.s_addr = src_address->address;
+#endif
     }
 #elif defined(IP_MULTICAST_IF)
     if (src_address) {