From 37d11c70d79c2fed1264bc59b2a0ce2677c47f09 Mon Sep 17 00:00:00 2001 From: jperkin Date: Sat, 29 Aug 2015 17:41:07 +0000 Subject: 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. --- net/mDNSResponder/Makefile | 3 ++- net/mDNSResponder/distinfo | 8 ++++---- net/mDNSResponder/patches/patch-aa | 20 +++++++++++++++++--- net/mDNSResponder/patches/patch-ad | 4 ++-- net/mDNSResponder/patches/patch-af | 6 +++--- 5 files changed, 28 insertions(+), 13 deletions(-) diff --git a/net/mDNSResponder/Makefile b/net/mDNSResponder/Makefile index fa7da15e9a1..b37aa5fdd19 100644 --- a/net/mDNSResponder/Makefile +++ b/net/mDNSResponder/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.38 2014/03/13 11:08:52 jperkin Exp $ +# $NetBSD: Makefile,v 1.39 2015/08/29 17:41:07 jperkin Exp $ DISTNAME= mDNSResponder-258.14 +PKGREVISION= 1 CATEGORIES= net MASTER_SITES= http://www.opensource.apple.com/tarballs/mDNSResponder/ diff --git a/net/mDNSResponder/distinfo b/net/mDNSResponder/distinfo index 94665892e2a..5b9407274ff 100644 --- a/net/mDNSResponder/distinfo +++ b/net/mDNSResponder/distinfo @@ -1,15 +1,15 @@ -$NetBSD: distinfo,v 1.32 2014/05/12 15:06:55 ryoon Exp $ +$NetBSD: distinfo,v 1.33 2015/08/29 17:41:07 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) = 36bdbbe8d44391e6c625d38f5b77813b6d76f41e +SHA1 (patch-aa) = d6659292433dce614fe60cd4190445393d364801 SHA1 (patch-ab) = 473db16e4d454899c364fb2d9fa8d344d47ca008 SHA1 (patch-ac) = 1dd233e060f980eda9b11fbbf62f619e533ee96f -SHA1 (patch-ad) = 612390897ad2f395ceb7394b644f977c4858d6cc +SHA1 (patch-ad) = b4ae68358c1c7ad1d7477e88aa5f7822d0d01978 SHA1 (patch-ae) = 49091d627fd3a800ed027566c728022b901d126b -SHA1 (patch-af) = bce933daa008f081b72c5d509e84704be13360dc +SHA1 (patch-af) = c0787da4901a9dd4ff02063e11bcd9daf2a5c6b4 SHA1 (patch-mDNSShared_dnsextd__parser.y) = dde7eca76c2b5158c2ac96764f91ce773464094a SHA1 (patch-mDNSShared_dnssd__clientstub.c) = 591801ae08dce4a44c06dd52a46fcd63807eafcc SHA1 (patch-mDNSShared_uds__daemon.c) = df279d3871bb6ead1563c79c99c4d2dc6d91ff79 diff --git a/net/mDNSResponder/patches/patch-aa b/net/mDNSResponder/patches/patch-aa index 23b91118703..2f6c3641b9c 100644 --- a/net/mDNSResponder/patches/patch-aa +++ b/net/mDNSResponder/patches/patch-aa @@ -1,9 +1,10 @@ -$NetBSD: patch-aa,v 1.13 2014/05/12 15:06:56 ryoon Exp $ +$NetBSD: patch-aa,v 1.14 2015/08/29 17:41:07 jperkin Exp $ Find libpthread.so when not on the default rpath. Allow custom CC and CFLAGS. Disable -Werror on OSX. Fix build failure under OpenBSD, __guard_local issue. +Fix -install_name on OSX. --- mDNSPosix/Makefile.orig 2009-08-11 01:13:47.000000000 +0000 +++ mDNSPosix/Makefile @@ -42,7 +43,7 @@ Fix build failure under OpenBSD, __guard_local issue. JAVACFLAGS_OS += -I$(JDK)/include/freebsd LDCONFIG = ldconfig else -@@ -134,14 +133,14 @@ else +@@ -134,17 +133,18 @@ else ifeq ($(os),openbsd) CFLAGS_OS = -DHAVE_BROKEN_RECVDSTADDR LDCONFIG = ldconfig @@ -59,7 +60,11 @@ Fix build failure under OpenBSD, __guard_local issue. LD = $(CC) -dynamiclib LINKOPTS = -lSystem LDSUFFIX = dylib -@@ -205,7 +204,7 @@ endif ++INSTALL_NAME = -install_name $(PREFIX)/lib/libdns_sd.$(LDSUFFIX) + JDK = /System/Library/Frameworks/JavaVM.framework/Home + JAVACFLAGS_OS = -dynamiclib -I/System/Library/Frameworks/JavaVM.framework/Headers -framework JavaVM + else +@@ -205,7 +205,7 @@ endif endif endif @@ -68,3 +73,12 @@ Fix build failure under OpenBSD, __guard_local issue. ############################################################################# +@@ -249,7 +249,7 @@ libdns_sd: setup $(BUILDDIR)/libdns_sd.$ + CLIENTLIBOBJS = $(OBJDIR)/dnssd_clientlib.c.so.o $(OBJDIR)/dnssd_clientstub.c.so.o $(OBJDIR)/dnssd_ipc.c.so.o + + $(BUILDDIR)/libdns_sd.$(LDSUFFIX): $(CLIENTLIBOBJS) +- @$(LD) $(LINKOPTS) -o $@ $+ ++ @$(LD) $(LINKOPTS) $(INSTALL_NAME) -o $@ $+ + @$(STRIP) $@ + + Clients: setup libdns_sd ../Clients/build/dns-sd diff --git a/net/mDNSResponder/patches/patch-ad b/net/mDNSResponder/patches/patch-ad index 7dd0b98e6a2..0f4d0e356e4 100644 --- a/net/mDNSResponder/patches/patch-ad +++ b/net/mDNSResponder/patches/patch-ad @@ -1,6 +1,6 @@ -$NetBSD: patch-ad,v 1.2 2011/01/12 08:53:52 adam Exp $ +$NetBSD: patch-ad,v 1.3 2015/08/29 17:41:07 jperkin Exp $ ---- Clients/Makefile.orig 2008-09-05 17:37:08.000000000 +0000 +--- Clients/Makefile.orig 2009-08-11 01:13:47.000000000 +0000 +++ Clients/Makefile @@ -42,7 +42,7 @@ build: mkdir build diff --git a/net/mDNSResponder/patches/patch-af b/net/mDNSResponder/patches/patch-af index 6b429aeeebd..500edcfbece 100644 --- a/net/mDNSResponder/patches/patch-af +++ b/net/mDNSResponder/patches/patch-af @@ -1,10 +1,10 @@ -$NetBSD: patch-af,v 1.1 2011/01/12 08:53:52 adam Exp $ +$NetBSD: patch-af,v 1.2 2015/08/29 17:41:07 jperkin Exp $ mDNSPlatformSetAllowSleep only defined for Mac OS X. ---- mDNSCore/mDNS.c.orig 2010-10-08 23:05:00.000000000 +0000 +--- mDNSCore/mDNS.c.orig 2010-11-18 01:05:40.000000000 +0000 +++ mDNSCore/mDNS.c -@@ -4011,8 +4011,10 @@ mDNSexport void mDNS_UpdateAllowSleep(mD +@@ -4020,8 +4020,10 @@ mDNSexport void mDNS_UpdateAllowSleep(mD #endif /* !defined(IDLESLEEPCONTROL_DISABLED) */ } -- cgit v1.2.3