Attachment 156993 Details for Bug 200356 – Diffs for the port

Diffs for the port

diffs.txt (text/plain), 4.85 KB, created by sef on 2015-05-21 01:12:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: sef

Created: 2015-05-21 01:12:57 UTC

Size: 4.85 KB

patch

obsolete

>diff --git a/net/mDNSResponder/Makefile b/net/mDNSResponder/Makefile
>index c34b691..9deea24 100644
>--- a/net/mDNSResponder/Makefile
>+++ b/net/mDNSResponder/Makefile
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	mDNSResponder
> PORTVERSION=	561.1.1
>+PORTREVISION=	2
> CATEGORIES=	net dns
> MASTER_SITES=	http://opensource.apple.com/tarballs/${PORTNAME}/
> 
>diff --git a/net/mDNSResponder/files/patch-mDNSPosix-Makefile b/net/mDNSResponder/files/patch-mDNSPosix-Makefile
>index 492a90a..ca333c1 100644
>--- a/net/mDNSResponder/files/patch-mDNSPosix-Makefile
>+++ b/net/mDNSResponder/files/patch-mDNSPosix-Makefile
>@@ -1,5 +1,5 @@
>---- mDNSPosix/Makefile.orig	2012-10-18 06:11:12.000000000 +0800
>-+++ mDNSPosix/Makefile	2014-01-04 11:50:07.945929359 +0800
>+--- mDNSPosix/Makefile.orig	2012-10-17 15:11:12.000000000 -0700
>++++ mDNSPosix/Makefile	2015-05-20 13:49:29.000000000 -0700
> @@ -54,8 +54,8 @@
>  SHAREDDIR ?= ../mDNSShared
>  JDK = /usr/jdk
>@@ -11,16 +11,61 @@
>  FLEX = @flex
>  LD = ld -shared
>  CP = cp
>-@@ -122,7 +122,7 @@
>+@@ -64,7 +64,7 @@
>+ 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 =
>+-LINKOPTS_PTHREAD = -lpthread
>++LINKOPTS_PTHREAD = -pthread
>+ LDSUFFIX = so
>+ JAVACFLAGS_OS = -fPIC -shared -ldns_sd
>+ 
>+@@ -122,9 +122,9 @@
>  # If not already defined, set LOCALBASE to /usr/local
>  LOCALBASE?=/usr/local
>  INSTBASE=$(LOCALBASE)
> -CFLAGS_OS = -DHAVE_IPV6
> +CFLAGS_OS = -DHAVE_IPV6 -DTARGET_OS_FREEBSD
>  # FreeBSD 4 requires threaded code to be compiled and linked using the "-pthread" option,
>- # and requires that the "-lpthread" link option NOT be used
>+-# and requires that the "-lpthread" link option NOT be used
>++# and requires that the "-pthread" link option NOT be used
>  # This appies only to FreeBSD -- "man cc" on FreeBSD says:
>-@@ -216,7 +216,7 @@
>+ #   FreeBSD SPECIFIC OPTIONS
>+ #     -pthread
>+@@ -133,6 +133,8 @@
>+ LINKOPTS_PTHREAD = -pthread
>+ JAVACFLAGS_OS += -I$(JDK)/include/freebsd
>+ LDCONFIG = ldconfig
>++OPTIONALTARG = nss_mdns
>++OPTINSTALL   = InstalledNSS
>+ else
>+ 
>+ ifeq ($(os),openbsd)
>+@@ -163,12 +165,22 @@
>+ endif
>+ endif
>+ 
>++ifeq ($(os),freebsd)
>++# FreeBSD and linux don't link the same way.
>++NSSLIBNAME  := nss_mdns
>++NSSVERSION  := 1
>++NSSLIBFILE  := $(NSSLIBNAME).so.$(NSSVERSION)
>++NSSLINKNAME := lib$(NSSLIBNAME).so
>++NSSINSTPATH := $(LOCALBASE)/lib
>++NSSLINKOPTS := -rpath-link $(BUILDDIR) -L$(BUILDDIR) -ldns_sd
>++else
>+ NSSLIBNAME  := libnss_mdns
>+ NSSVERSION  := 0.2
>+ NSSLIBFILE  := $(NSSLIBNAME)-$(NSSVERSION).so
>+ NSSLINKNAME := $(NSSLIBNAME).so.2
>+ NSSINSTPATH := /lib
>+-
>++NSSLINKOPTS :=
>++endif
>+ # If not otherwise defined, we install into /usr/lib and /usr/include
>+ # and our startup script is called mdns (e.g. /etc/init.d/mdns)
>+ INSTBASE?=/usr
>+@@ -216,7 +228,7 @@
>  
>  all: setup Daemon libdns_sd Clients SAClient SAResponder SAProxyResponder Identify NetMonitor dnsextd $(OPTIONALTARG)
>  
>@@ -29,7 +74,7 @@
>  
>  # 'setup' sets up the build directory structure the way we want
>  setup:
>-@@ -259,10 +259,10 @@
>+@@ -259,10 +271,10 @@
>  	@$(LD) $(LINKOPTS) -o $@ $+
>  	@$(STRIP) $@
>  
>@@ -42,7 +87,14 @@
>  	@$(MAKE) -C ../Clients
>  
>  # nss_mdns target builds the Name Service Switch module
>-@@ -276,43 +276,43 @@
>+@@ -270,49 +282,49 @@
>+ 	@echo "Name Service Switch module done"
>+ 
>+ $(BUILDDIR)/$(NSSLIBFILE): $(CLIENTLIBOBJS) $(OBJDIR)/nss_mdns.c.so.o
>+-	@$(LD) $(LINKOPTS) -o $@ $+
>++	@$(LD) $(LINKOPTS) $(NSSLINKOPTS) -o $@ $+
>+ 	@$(STRIP) $@
>+ 
>  #############################################################################
>  
>  # The Install targets place built stuff in their proper places
>@@ -97,7 +149,7 @@
>  	$(CP) $< $@
>  	chmod ugo+x $@
>  	$@ start
>-@@ -329,26 +329,26 @@
>+@@ -329,26 +341,26 @@
>  endif
>  endif
>  
>@@ -112,7 +164,7 @@
>  	chmod 444 $@
>  
> -$(MANPATH)/man8/mdnsd.8: $(SHAREDDIR)/mDNSResponder.8
>-+$(DESTDIR)$(MANPATH)/man8/mdnsd.8: $(SHAREDDIR)/mDNSResponder.8
>++$(DESTDIR)$(MANPATH)/man8/mdnsd.8: $(SHAREDDIR)/mDNSResponderPosix.8
>  	cp $< $@
>  	chmod 444 $@
>  
>@@ -121,7 +173,7 @@
>  	$(CP) $< $@
>  
> -$(NSSINSTPATH)/$(NSSLINKNAME): $(NSSINSTPATH)/$(NSSLIBFILE)
>-+$(DESTDIR)$(NSSINSTPATH)/$(NSSLINKNAME): $(NSSINSTPATH)/$(NSSLIBFILE)
>++$(DESTDIR)$(NSSINSTPATH)/$(NSSLINKNAME): $(DESTDIR)$(NSSINSTPATH)/$(NSSLIBFILE)
>  	$(LN) $< $@
>  	ldconfig
>  
>@@ -130,7 +182,7 @@
>  	$(CP) $< $@
>  	chmod 444 $@
>  
>-@@ -490,6 +490,8 @@
>+@@ -490,6 +502,8 @@
>  $(BUILDDIR)/dnsextd:                 $(DNSEXTDOBJ) $(OBJDIR)/dnsextd.c.threadsafe.o
>  	$(CC) $+ -o $@ $(LINKOPTS) $(LINKOPTS_PTHREAD)
>  
>diff --git a/net/mDNSResponder/pkg-plist b/net/mDNSResponder/pkg-plist
>index 3ce2c98..3342fbf 100644
>--- a/net/mDNSResponder/pkg-plist
>+++ b/net/mDNSResponder/pkg-plist
>@@ -7,6 +7,8 @@ bin/mDNSResponderPosix
> include/dns_sd.h
> lib/libdns_sd.so
> lib/libdns_sd.so.1
>+lib/libnss_mdns.so
>+lib/nss_mdns.so.1
> man/man1/dns-sd.1.gz
> man/man8/dnsextd.8.gz
> man/man8/mDNSResponderPosix.8.gz

Actions: View

Attachments on bug 200356: 156993 | 157538 | 157540 | 157542