Sat Aug 29 17:41:07 2015 UTC ()
Use -install_name on OSX to fix installed dylib.

Bump PKGREVISION as package built before the Mach-O shlibs checks were
introduced, but the PROVIDES were incorrect.


(jperkin)
diff -r1.38 -r1.39 pkgsrc/net/mDNSResponder/Makefile
diff -r1.32 -r1.33 pkgsrc/net/mDNSResponder/distinfo
diff -r1.13 -r1.14 pkgsrc/net/mDNSResponder/patches/patch-aa
diff -r1.2 -r1.3 pkgsrc/net/mDNSResponder/patches/patch-ad
diff -r1.1 -r1.2 pkgsrc/net/mDNSResponder/patches/patch-af
cvs diff -r1.38 -r1.39 pkgsrc/net/mDNSResponder/Makefile (expand / switch to unified diff)

--- pkgsrc/net/mDNSResponder/Makefile 2014/03/13 11:08:52 1.38
+++ pkgsrc/net/mDNSResponder/Makefile 2015/08/29 17:41:07 1.39
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.38 2014/03/13 11:08:52 jperkin Exp $ 1# $NetBSD: Makefile,v 1.39 2015/08/29 17:41:07 jperkin Exp $
2 2
3DISTNAME= mDNSResponder-258.14 3DISTNAME= mDNSResponder-258.14
 4PKGREVISION= 1
4CATEGORIES= net 5CATEGORIES= net
5MASTER_SITES= http://www.opensource.apple.com/tarballs/mDNSResponder/ 6MASTER_SITES= http://www.opensource.apple.com/tarballs/mDNSResponder/
6 7
7MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://developer.apple.com/bonjour/ 9HOMEPAGE= http://developer.apple.com/bonjour/
9COMMENT= Apple's mDNS responder 10COMMENT= Apple's mDNS responder
10LICENSE= apache-2.0 AND modified-bsd 11LICENSE= apache-2.0 AND modified-bsd
11 12
12USE_TOOLS+= gmake flex bison 13USE_TOOLS+= gmake flex bison
13BUILD_DIRS= mDNSPosix 14BUILD_DIRS= mDNSPosix
14BUILDDIR= ${WRKSRC}/mDNSPosix/build/prod 15BUILDDIR= ${WRKSRC}/mDNSPosix/build/prod
15AUTO_MKDIRS= yes 16AUTO_MKDIRS= yes
16MAKE_JOBS_SAFE= no 17MAKE_JOBS_SAFE= no
cvs diff -r1.32 -r1.33 pkgsrc/net/mDNSResponder/distinfo (expand / switch to unified diff)

--- pkgsrc/net/mDNSResponder/distinfo 2014/05/12 15:06:55 1.32
+++ pkgsrc/net/mDNSResponder/distinfo 2015/08/29 17:41:07 1.33
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: distinfo,v 1.32 2014/05/12 15:06:55 ryoon Exp $ 1$NetBSD: distinfo,v 1.33 2015/08/29 17:41:07 jperkin Exp $
2 2
3SHA1 (mDNSResponder-258.14.tar.gz) = 2a34794ff9a5184ce1e57ccea4001b5af6635f7b 3SHA1 (mDNSResponder-258.14.tar.gz) = 2a34794ff9a5184ce1e57ccea4001b5af6635f7b
4RMD160 (mDNSResponder-258.14.tar.gz) = fbd9dcfa84dbeb9de379066958a0b509af074dbc 4RMD160 (mDNSResponder-258.14.tar.gz) = fbd9dcfa84dbeb9de379066958a0b509af074dbc
5Size (mDNSResponder-258.14.tar.gz) = 1833244 bytes 5Size (mDNSResponder-258.14.tar.gz) = 1833244 bytes
6SHA1 (patch-Clients_dns-sd.c) = 5adac63ba76497056c1abfd426460560b8a3f012 6SHA1 (patch-Clients_dns-sd.c) = 5adac63ba76497056c1abfd426460560b8a3f012
7SHA1 (patch-aa) = 36bdbbe8d44391e6c625d38f5b77813b6d76f41e 7SHA1 (patch-aa) = d6659292433dce614fe60cd4190445393d364801
8SHA1 (patch-ab) = 473db16e4d454899c364fb2d9fa8d344d47ca008 8SHA1 (patch-ab) = 473db16e4d454899c364fb2d9fa8d344d47ca008
9SHA1 (patch-ac) = 1dd233e060f980eda9b11fbbf62f619e533ee96f 9SHA1 (patch-ac) = 1dd233e060f980eda9b11fbbf62f619e533ee96f
10SHA1 (patch-ad) = 612390897ad2f395ceb7394b644f977c4858d6cc 10SHA1 (patch-ad) = b4ae68358c1c7ad1d7477e88aa5f7822d0d01978
11SHA1 (patch-ae) = 49091d627fd3a800ed027566c728022b901d126b 11SHA1 (patch-ae) = 49091d627fd3a800ed027566c728022b901d126b
12SHA1 (patch-af) = bce933daa008f081b72c5d509e84704be13360dc 12SHA1 (patch-af) = c0787da4901a9dd4ff02063e11bcd9daf2a5c6b4
13SHA1 (patch-mDNSShared_dnsextd__parser.y) = dde7eca76c2b5158c2ac96764f91ce773464094a 13SHA1 (patch-mDNSShared_dnsextd__parser.y) = dde7eca76c2b5158c2ac96764f91ce773464094a
14SHA1 (patch-mDNSShared_dnssd__clientstub.c) = 591801ae08dce4a44c06dd52a46fcd63807eafcc 14SHA1 (patch-mDNSShared_dnssd__clientstub.c) = 591801ae08dce4a44c06dd52a46fcd63807eafcc
15SHA1 (patch-mDNSShared_uds__daemon.c) = df279d3871bb6ead1563c79c99c4d2dc6d91ff79 15SHA1 (patch-mDNSShared_uds__daemon.c) = df279d3871bb6ead1563c79c99c4d2dc6d91ff79
cvs diff -r1.13 -r1.14 pkgsrc/net/mDNSResponder/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/net/mDNSResponder/patches/patch-aa 2014/05/12 15:06:56 1.13
+++ pkgsrc/net/mDNSResponder/patches/patch-aa 2015/08/29 17:41:07 1.14
@@ -1,19 +1,20 @@ @@ -1,19 +1,20 @@
1$NetBSD: patch-aa,v 1.13 2014/05/12 15:06:56 ryoon Exp $ 1$NetBSD: patch-aa,v 1.14 2015/08/29 17:41:07 jperkin Exp $
2 2
3Find libpthread.so when not on the default rpath. 3Find libpthread.so when not on the default rpath.
4Allow custom CC and CFLAGS. 4Allow custom CC and CFLAGS.
5Disable -Werror on OSX. 5Disable -Werror on OSX.
6Fix build failure under OpenBSD, __guard_local issue. 6Fix build failure under OpenBSD, __guard_local issue.
 7Fix -install_name on OSX.
7 8
8--- mDNSPosix/Makefile.orig 2009-08-11 01:13:47.000000000 +0000 9--- mDNSPosix/Makefile.orig 2009-08-11 01:13:47.000000000 +0000
9+++ mDNSPosix/Makefile 10+++ mDNSPosix/Makefile
10@@ -54,7 +54,6 @@ COREDIR = ../mDNSCore 11@@ -54,7 +54,6 @@ COREDIR = ../mDNSCore
11 SHAREDDIR ?= ../mDNSShared 12 SHAREDDIR ?= ../mDNSShared
12 JDK = /usr/jdk 13 JDK = /usr/jdk
13  14
14-CC = @cc 15-CC = @cc
15 BISON = @bison 16 BISON = @bison
16 FLEX = @flex 17 FLEX = @flex
17 LD = ld -shared 18 LD = ld -shared
18@@ -64,7 +63,7 @@ LN = ln -s -f 19@@ -64,7 +63,7 @@ LN = ln -s -f
19 CFLAGS_COMMON = -I$(COREDIR) -I$(SHAREDDIR) -I$(OBJDIR) -fwrapv -W -Wall -DPID_FILE=\"/var/run/mdnsd.pid\" -DMDNS_UDS_SERVERPATH=\"/var/run/mdnsd\" 20 CFLAGS_COMMON = -I$(COREDIR) -I$(SHAREDDIR) -I$(OBJDIR) -fwrapv -W -Wall -DPID_FILE=\"/var/run/mdnsd.pid\" -DMDNS_UDS_SERVERPATH=\"/var/run/mdnsd\"
@@ -32,39 +33,52 @@ Fix build failure under OpenBSD, __guard @@ -32,39 +33,52 @@ Fix build failure under OpenBSD, __guard
32+CFLAGS_OS = -DNOT_HAVE_SA_LEN -DUSES_NETLINK -DHAVE_LINUX -DTARGET_OS_LINUX -D_GNU_SOURCE 33+CFLAGS_OS = -DNOT_HAVE_SA_LEN -DUSES_NETLINK -DHAVE_LINUX -DTARGET_OS_LINUX -D_GNU_SOURCE
33 FLEXFLAGS_OS = -l 34 FLEXFLAGS_OS = -l
34 JAVACFLAGS_OS += -I$(JDK)/include/linux 35 JAVACFLAGS_OS += -I$(JDK)/include/linux
35 OPTIONALTARG = nss_mdns 36 OPTIONALTARG = nss_mdns
36@@ -126,7 +125,7 @@ CFLAGS_OS = 37@@ -126,7 +125,7 @@ CFLAGS_OS =
37 # -pthread 38 # -pthread
38 # Link a user-threaded process against libc_r instead of libc. 39 # Link a user-threaded process against libc_r instead of libc.
39 CFLAGS_PTHREAD = -pthread -D_THREAD_SAFE 40 CFLAGS_PTHREAD = -pthread -D_THREAD_SAFE
40-LINKOPTS_PTHREAD = -pthread 41-LINKOPTS_PTHREAD = -pthread
41+LINKOPTS_PTHREAD = $(LIBFLAGS) ${COMPILER_RPATH_FLAG}${PTHREADBASE}/lib ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} ${EXTRA_LIBS} 42+LINKOPTS_PTHREAD = $(LIBFLAGS) ${COMPILER_RPATH_FLAG}${PTHREADBASE}/lib ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} ${EXTRA_LIBS}
42 JAVACFLAGS_OS += -I$(JDK)/include/freebsd 43 JAVACFLAGS_OS += -I$(JDK)/include/freebsd
43 LDCONFIG = ldconfig 44 LDCONFIG = ldconfig
44 else 45 else
45@@ -134,14 +133,14 @@ else 46@@ -134,17 +133,18 @@ else
46 ifeq ($(os),openbsd) 47 ifeq ($(os),openbsd)
47 CFLAGS_OS = -DHAVE_BROKEN_RECVDSTADDR 48 CFLAGS_OS = -DHAVE_BROKEN_RECVDSTADDR
48 LDCONFIG = ldconfig 49 LDCONFIG = ldconfig
49+LD = cc -shared 50+LD = cc -shared
50 else 51 else
51  52
52 ifeq ($(os),x) 53 ifeq ($(os),x)
53 # We have to define __MAC_OS_X_VERSION_MIN_REQUIRED=__MAC_OS_X_VERSION_10_4 or on Leopard 54 # We have to define __MAC_OS_X_VERSION_MIN_REQUIRED=__MAC_OS_X_VERSION_10_4 or on Leopard
54 # we get build failures: ‘daemon’ is deprecated (declared at /usr/include/stdlib.h:283) 55 # we get build failures: ‘daemon’ is deprecated (declared at /usr/include/stdlib.h:283)
55-CFLAGS_OS = -DHAVE_IPV6 -no-cpp-precomp -Werror -Wdeclaration-after-statement \ 56-CFLAGS_OS = -DHAVE_IPV6 -no-cpp-precomp -Werror -Wdeclaration-after-statement \
56+CFLAGS_OS = -DHAVE_IPV6 -no-cpp-precomp -Wdeclaration-after-statement \ 57+CFLAGS_OS = -DHAVE_IPV6 -no-cpp-precomp -Wdeclaration-after-statement \
57 -D__MAC_OS_X_VERSION_MIN_REQUIRED=__MAC_OS_X_VERSION_10_4 #-Wunreachable-code 58 -D__MAC_OS_X_VERSION_MIN_REQUIRED=__MAC_OS_X_VERSION_10_4 #-Wunreachable-code
58-CC = @gcc-4.0 59-CC = @gcc-4.0
59 LD = $(CC) -dynamiclib 60 LD = $(CC) -dynamiclib
60 LINKOPTS = -lSystem 61 LINKOPTS = -lSystem
61 LDSUFFIX = dylib 62 LDSUFFIX = dylib
62@@ -205,7 +204,7 @@ endif 63+INSTALL_NAME = -install_name $(PREFIX)/lib/libdns_sd.$(LDSUFFIX)
 64 JDK = /System/Library/Frameworks/JavaVM.framework/Home
 65 JAVACFLAGS_OS = -dynamiclib -I/System/Library/Frameworks/JavaVM.framework/Headers -framework JavaVM
 66 else
 67@@ -205,7 +205,7 @@ endif
63 endif 68 endif
64 endif 69 endif
65  70
66-CFLAGS = $(CFLAGS_COMMON) $(CFLAGS_OS) $(CFLAGS_DEBUG) 71-CFLAGS = $(CFLAGS_COMMON) $(CFLAGS_OS) $(CFLAGS_DEBUG)
67+CFLAGS += $(CFLAGS_COMMON) $(CFLAGS_OS) -DMDNS_DEBUGMSGS=0 72+CFLAGS += $(CFLAGS_COMMON) $(CFLAGS_OS) -DMDNS_DEBUGMSGS=0
68  73
69 ############################################################################# 74 #############################################################################
70  75
 76@@ -249,7 +249,7 @@ libdns_sd: setup $(BUILDDIR)/libdns_sd.$
 77 CLIENTLIBOBJS = $(OBJDIR)/dnssd_clientlib.c.so.o $(OBJDIR)/dnssd_clientstub.c.so.o $(OBJDIR)/dnssd_ipc.c.so.o
 78
 79 $(BUILDDIR)/libdns_sd.$(LDSUFFIX): $(CLIENTLIBOBJS)
 80- @$(LD) $(LINKOPTS) -o $@ $+
 81+ @$(LD) $(LINKOPTS) $(INSTALL_NAME) -o $@ $+
 82 @$(STRIP) $@
 83
 84 Clients: setup libdns_sd ../Clients/build/dns-sd
cvs diff -r1.2 -r1.3 pkgsrc/net/mDNSResponder/patches/patch-ad (expand / switch to unified diff)

--- pkgsrc/net/mDNSResponder/patches/patch-ad 2011/01/12 08:53:52 1.2
+++ pkgsrc/net/mDNSResponder/patches/patch-ad 2015/08/29 17:41:07 1.3
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-ad,v 1.2 2011/01/12 08:53:52 adam Exp $ 1$NetBSD: patch-ad,v 1.3 2015/08/29 17:41:07 jperkin Exp $
2 2
3--- Clients/Makefile.orig 2008-09-05 17:37:08.000000000 +0000 3--- Clients/Makefile.orig 2009-08-11 01:13:47.000000000 +0000
4+++ Clients/Makefile 4+++ Clients/Makefile
5@@ -42,7 +42,7 @@ build: 5@@ -42,7 +42,7 @@ build:
6 mkdir build 6 mkdir build
7  7
8 build/dns-sd: build dns-sd.c ClientCommon.c 8 build/dns-sd: build dns-sd.c ClientCommon.c
9- cc $(filter %.c %.o, $+) $(LIBS) -I../mDNSShared -Wall -o $@ 9- cc $(filter %.c %.o, $+) $(LIBS) -I../mDNSShared -Wall -o $@
10+ cc $(filter %.c %.o, $+) $(LIBS) $(LDFLAGS) -I../mDNSShared -Wall -o $@ 10+ cc $(filter %.c %.o, $+) $(LIBS) $(LDFLAGS) -I../mDNSShared -Wall -o $@
11  11
12 build/dns-sd64: build dns-sd.c ClientCommon.c 12 build/dns-sd64: build dns-sd.c ClientCommon.c
13 cc $(filter %.c %.o, $+) $(LIBS) -I../mDNSShared -Wall -o $@ -m64 13 cc $(filter %.c %.o, $+) $(LIBS) -I../mDNSShared -Wall -o $@ -m64
cvs diff -r1.1 -r1.2 pkgsrc/net/mDNSResponder/patches/patch-af (expand / switch to unified diff)

--- pkgsrc/net/mDNSResponder/patches/patch-af 2011/01/12 08:53:52 1.1
+++ pkgsrc/net/mDNSResponder/patches/patch-af 2015/08/29 17:41:07 1.2
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: patch-af,v 1.1 2011/01/12 08:53:52 adam Exp $ 1$NetBSD: patch-af,v 1.2 2015/08/29 17:41:07 jperkin Exp $
2 2
3mDNSPlatformSetAllowSleep only defined for Mac OS X. 3mDNSPlatformSetAllowSleep only defined for Mac OS X.
4 4
5--- mDNSCore/mDNS.c.orig 2010-10-08 23:05:00.000000000 +0000 5--- mDNSCore/mDNS.c.orig 2010-11-18 01:05:40.000000000 +0000
6+++ mDNSCore/mDNS.c 6+++ mDNSCore/mDNS.c
7@@ -4011,8 +4011,10 @@ mDNSexport void mDNS_UpdateAllowSleep(mD 7@@ -4020,8 +4020,10 @@ mDNSexport void mDNS_UpdateAllowSleep(mD
8 #endif /* !defined(IDLESLEEPCONTROL_DISABLED) */ 8 #endif /* !defined(IDLESLEEPCONTROL_DISABLED) */
9 } 9 }
10  10
11+#if 0 11+#if 0
12 // Call the platform code to enable/disable sleep 12 // Call the platform code to enable/disable sleep
13 mDNSPlatformSetAllowSleep(m, allowSleep); 13 mDNSPlatformSetAllowSleep(m, allowSleep);
14+#endif 14+#endif
15 } 15 }
16  16
17 mDNSlocal void SendSPSRegistration(mDNS *const m, NetworkInterfaceInfo *intf, const mDNSOpaque16 id) 17 mDNSlocal void SendSPSRegistration(mDNS *const m, NetworkInterfaceInfo *intf, const mDNSOpaque16 id)