[pkgsrc/trunk]: pkgsrc/net/mDNSResponder Fix build on OSX.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/272e98baa4bf
branches:  trunk
changeset: 625808:272e98baa4bf
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Thu Oct 24 21:19:12 2013 +0000

description:
Fix build on OSX.

diffstat:

 net/mDNSResponder/distinfo         |   4 ++--
 net/mDNSResponder/patches/patch-aa |  20 ++++++++++++--------
 2 files changed, 14 insertions(+), 10 deletions(-)

diffs (81 lines):

diff -r 8197917bfd16 -r 272e98baa4bf net/mDNSResponder/distinfo
--- a/net/mDNSResponder/distinfo        Thu Oct 24 19:25:43 2013 +0000
+++ b/net/mDNSResponder/distinfo        Thu Oct 24 21:19:12 2013 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.30 2013/08/16 10:10:26 jperkin Exp $
+$NetBSD: distinfo,v 1.31 2013/10/24 21:19:12 jperkin Exp $
 
 SHA1 (mDNSResponder-258.14.tar.gz) = 2a34794ff9a5184ce1e57ccea4001b5af6635f7b
 RMD160 (mDNSResponder-258.14.tar.gz) = fbd9dcfa84dbeb9de379066958a0b509af074dbc
 Size (mDNSResponder-258.14.tar.gz) = 1833244 bytes
 SHA1 (patch-Clients_dns-sd.c) = 5adac63ba76497056c1abfd426460560b8a3f012
-SHA1 (patch-aa) = 3f31f10ab6bf0d3ec72b56791cc4db5f24bfeb0b
+SHA1 (patch-aa) = ca1e37346b7400649957da8470efb62a343aff68
 SHA1 (patch-ab) = 8567d3a9849377fdfd1fd98f1b0dd164561bb6c9
 SHA1 (patch-ac) = 3fb065c49ed434f031ea29214ec4140b24f8da64
 SHA1 (patch-ad) = 612390897ad2f395ceb7394b644f977c4858d6cc
diff -r 8197917bfd16 -r 272e98baa4bf net/mDNSResponder/patches/patch-aa
--- a/net/mDNSResponder/patches/patch-aa        Thu Oct 24 19:25:43 2013 +0000
+++ b/net/mDNSResponder/patches/patch-aa        Thu Oct 24 21:19:12 2013 +0000
@@ -1,9 +1,10 @@
-$NetBSD: patch-aa,v 1.11 2011/01/12 08:53:52 adam Exp $
+$NetBSD: patch-aa,v 1.12 2013/10/24 21:19:12 jperkin Exp $
 
 Find libpthread.so when not on the default rpath.
 Allow custom CC and CFLAGS.
+Disable -Werror on OSX.
 
---- mDNSPosix/Makefile.orig    2009-02-02 19:44:06.000000000 +0000
+--- mDNSPosix/Makefile.orig    2009-08-11 01:13:47.000000000 +0000
 +++ mDNSPosix/Makefile
 @@ -54,7 +54,6 @@ COREDIR = ../mDNSCore
  SHAREDDIR ?= ../mDNSShared
@@ -13,7 +14,7 @@
  BISON = @bison
  FLEX = @flex
  LD = ld -shared
-@@ -64,7 +64,7 @@ LN = ln -s -f
+@@ -64,7 +63,7 @@ LN = ln -s -f
  CFLAGS_COMMON = -I$(COREDIR) -I$(SHAREDDIR) -I$(OBJDIR) -fwrapv -W -Wall -DPID_FILE=\"/var/run/mdnsd.pid\" -DMDNS_UDS_SERVERPATH=\"/var/run/mdnsd\"
  CFLAGS_PTHREAD =
  LINKOPTS =
@@ -22,7 +23,7 @@
  LDSUFFIX = so
  JAVACFLAGS_OS = -fPIC -shared -ldns_sd
  
-@@ -100,7 +100,7 @@ endif
+@@ -100,7 +99,7 @@ endif
  else
  
  ifeq ($(os),linux)
@@ -31,7 +32,7 @@
  FLEXFLAGS_OS = -l
  JAVACFLAGS_OS += -I$(JDK)/include/linux
  OPTIONALTARG = nss_mdns
-@@ -126,7 +126,7 @@ CFLAGS_OS =
+@@ -126,7 +125,7 @@ CFLAGS_OS =
  #     -pthread
  #       Link a user-threaded process against libc_r instead of libc.
  CFLAGS_PTHREAD   = -pthread -D_THREAD_SAFE
@@ -40,15 +41,18 @@
  JAVACFLAGS_OS += -I$(JDK)/include/freebsd
  LDCONFIG = ldconfig
  else
-@@ -141,7 +140,6 @@ ifeq ($(os),x)
+@@ -139,9 +138,8 @@ else
+ ifeq ($(os),x)
+ # We have to define __MAC_OS_X_VERSION_MIN_REQUIRED=__MAC_OS_X_VERSION_10_4 or on Leopard
  # we get build failures: ‘daemon’ is deprecated (declared at /usr/include/stdlib.h:283)
- CFLAGS_OS = -DHAVE_IPV6 -no-cpp-precomp -Werror -Wdeclaration-after-statement \
+-CFLAGS_OS = -DHAVE_IPV6 -no-cpp-precomp -Werror -Wdeclaration-after-statement \
++CFLAGS_OS = -DHAVE_IPV6 -no-cpp-precomp -Wdeclaration-after-statement \
        -D__MAC_OS_X_VERSION_MIN_REQUIRED=__MAC_OS_X_VERSION_10_4 #-Wunreachable-code
 -CC = @gcc-4.0
  LD = $(CC) -dynamiclib
  LINKOPTS = -lSystem
  LDSUFFIX = dylib
-@@ -205,7 +204,7 @@ endif
+@@ -205,7 +203,7 @@ endif
  endif
  endif