CVS commit: pkgsrc/net/mDNSResponder

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri Nov 10 11:21:52 UTC 2017

Modified Files:
        pkgsrc/net/mDNSResponder: Makefile distinfo
        pkgsrc/net/mDNSResponder/patches: patch-ad

Log Message:
mDNSResponder: Ensure dns-sd is built with correct CFLAGS.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 pkgsrc/net/mDNSResponder/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/net/mDNSResponder/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/mDNSResponder/patches/patch-ad

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/mDNSResponder/Makefile
diff -u pkgsrc/net/mDNSResponder/Makefile:1.43 pkgsrc/net/mDNSResponder/Makefile:1.44
--- pkgsrc/net/mDNSResponder/Makefile:1.43      Sun Sep  3 08:53:12 2017
+++ pkgsrc/net/mDNSResponder/Makefile   Fri Nov 10 11:21:52 2017
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.43 2017/09/03 08:53:12 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2017/11/10 11:21:52 jperkin Exp $
 
 DISTNAME=      mDNSResponder-258.14
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    net
 MASTER_SITES=  http://www.opensource.apple.com/tarballs/mDNSResponder/
 

Index: pkgsrc/net/mDNSResponder/distinfo
diff -u pkgsrc/net/mDNSResponder/distinfo:1.35 pkgsrc/net/mDNSResponder/distinfo:1.36
--- pkgsrc/net/mDNSResponder/distinfo:1.35      Fri Nov 20 09:32:53 2015
+++ pkgsrc/net/mDNSResponder/distinfo   Fri Nov 10 11:21:52 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.35 2015/11/20 09:32:53 jperkin Exp $
+$NetBSD: distinfo,v 1.36 2017/11/10 11:21:52 jperkin Exp $
 
 SHA1 (mDNSResponder-258.14.tar.gz) = 2a34794ff9a5184ce1e57ccea4001b5af6635f7b
 RMD160 (mDNSResponder-258.14.tar.gz) = fbd9dcfa84dbeb9de379066958a0b509af074dbc
@@ -8,7 +8,7 @@ SHA1 (patch-Clients_dns-sd.c) = 5adac63b
 SHA1 (patch-aa) = d6659292433dce614fe60cd4190445393d364801
 SHA1 (patch-ab) = 473db16e4d454899c364fb2d9fa8d344d47ca008
 SHA1 (patch-ac) = 9907f0e55d421fccd3d491d4f0d872f328198c19
-SHA1 (patch-ad) = b4ae68358c1c7ad1d7477e88aa5f7822d0d01978
+SHA1 (patch-ad) = 2492a26a500ebef3902cbd19f0ab7bc9005588a1
 SHA1 (patch-ae) = 49091d627fd3a800ed027566c728022b901d126b
 SHA1 (patch-af) = c0787da4901a9dd4ff02063e11bcd9daf2a5c6b4
 SHA1 (patch-mDNSShared_dnsextd__parser.y) = dde7eca76c2b5158c2ac96764f91ce773464094a

Index: pkgsrc/net/mDNSResponder/patches/patch-ad
diff -u pkgsrc/net/mDNSResponder/patches/patch-ad:1.3 pkgsrc/net/mDNSResponder/patches/patch-ad:1.4
--- pkgsrc/net/mDNSResponder/patches/patch-ad:1.3       Sat Aug 29 17:41:07 2015
+++ pkgsrc/net/mDNSResponder/patches/patch-ad   Fri Nov 10 11:21:52 2017
@@ -1,13 +1,19 @@
-$NetBSD: patch-ad,v 1.3 2015/08/29 17:41:07 jperkin Exp $
+$NetBSD: patch-ad,v 1.4 2017/11/10 11:21:52 jperkin Exp $
+
+Ensure we pass the correct compiler flags.
 
 --- Clients/Makefile.orig      2009-08-11 01:13:47.000000000 +0000
 +++ Clients/Makefile
-@@ -42,7 +42,7 @@ build:
+@@ -42,10 +42,10 @@ build:
        mkdir build
  
  build/dns-sd: build dns-sd.c ClientCommon.c
 -      cc $(filter %.c %.o, $+) $(LIBS) -I../mDNSShared -Wall -o $@
-+      cc $(filter %.c %.o, $+) $(LIBS) $(LDFLAGS) -I../mDNSShared -Wall -o $@
++      cc $(filter %.c %.o, $+) $(CFLAGS) $(LIBS) $(LDFLAGS) -I../mDNSShared -Wall -o $@
  
  build/dns-sd64: build dns-sd.c ClientCommon.c
-       cc $(filter %.c %.o, $+) $(LIBS) -I../mDNSShared -Wall -o $@ -m64
+-      cc $(filter %.c %.o, $+) $(LIBS) -I../mDNSShared -Wall -o $@ -m64
++      cc $(filter %.c %.o, $+) $(CFLAGS) $(LIBS) -I../mDNSShared -Wall -o $@ -m64
+ 
+ # Note, we can make a 'fat' version of dns-sd using 'lipo', as shown below, but we
+ # don't, because we don't want or need a 'fat' version of dns-sd, because it will