--- net/mDNSResponder/Makefile	(revision 388831)
+++ net/mDNSResponder/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	mDNSResponder
 PORTVERSION=	567
+PORTREVISION=	1
 CATEGORIES=	net dns
 MASTER_SITES=	http://opensource.apple.com/tarballs/${PORTNAME}/
 
@@ -39,8 +40,8 @@ 
 	cd ${WRKSRC}/mDNSShared/ && ${INSTALL_MAN} ${EXTRA_MAN1} ${STAGEDIR}${PREFIX}/man/man1/
 	cd ${WRKSRC}/mDNSShared/ && ${INSTALL_MAN} ${EXTRA_MAN8} ${STAGEDIR}${PREFIX}/man/man8/
 	cd ${WRKSRC}/mDNSPosix/build/prod/ && ${INSTALL_PROGRAM} ${EXTRA_SBIN} ${STAGEDIR}${PREFIX}/sbin/
-	${CHMOD} u+w ${STAGEDIR}${PREFIX}/bin/* ${STAGEDIR}${PREFIX}/lib/libdns_sd.so.1 ${STAGEDIR}${PREFIX}/sbin/*
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* ${STAGEDIR}${PREFIX}/lib/libdns_sd.so.1 ${STAGEDIR}${PREFIX}/sbin/*
-	${CHMOD} u-w ${STAGEDIR}${PREFIX}/bin/* ${STAGEDIR}${PREFIX}/lib/libdns_sd.so.1 ${STAGEDIR}${PREFIX}/sbin/*
+	${CHMOD} u+w ${STAGEDIR}${PREFIX}/bin/* ${STAGEDIR}${PREFIX}/lib/lib*.so.1 ${STAGEDIR}${PREFIX}/sbin/*
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* ${STAGEDIR}${PREFIX}/lib/lib*.so.1 ${STAGEDIR}${PREFIX}/sbin/*
+	${CHMOD} u-w ${STAGEDIR}${PREFIX}/bin/* ${STAGEDIR}${PREFIX}/lib/lib*.so.1 ${STAGEDIR}${PREFIX}/sbin/*
 
 .include <bsd.port.mk>
--- net/mDNSResponder/files/patch-mDNSPosix-Makefile	(revision 388831)
+++ net/mDNSResponder/files/patch-mDNSPosix-Makefile	(working copy)
@@ -20,8 +20,35 @@ 
  # FreeBSD 4 requires threaded code to be compiled and linked using the "-pthread" option,
  # and requires that the "-lpthread" link option NOT be used
  # This appies only to FreeBSD -- "man cc" on FreeBSD says:
-@@ -217,7 +217,7 @@ CFLAGS = $(CFLAGS_COMMON) $(CFLAGS_OS) $
+@@ -134,6 +134,8 @@ CFLAGS_PTHREAD   = -pthread -D_THREAD_SA
+ LINKOPTS_PTHREAD = -pthread
+ JAVACFLAGS_OS += -I$(JDK)/include/freebsd
+ LDCONFIG = ldconfig
++OPTIONALTARG = nss_mdns
++OPTINSTALL = InstalledNSS
+ else
  
+ ifeq ($(os),openbsd)
+@@ -165,10 +167,17 @@ endif
+ endif
+ 
+ NSSLIBNAME  := libnss_mdns
++ifeq ($(os),freebsd)
++NSSVERSION  := $(LIBVERS)
++NSSLIBFILE  := $(NSSLIBNAME).$(LDSUFFIX).$(LIBVERS)
++NSSLINKNAME := $(NSSLIBNAME).$(LDSUFFIX)
++NSSINSTPATH := $(INSTBASE)/lib
++else
+ NSSVERSION  := 0.2
+ NSSLIBFILE  := $(NSSLIBNAME)-$(NSSVERSION).so
+ NSSLINKNAME := $(NSSLIBNAME).so.2
+ NSSINSTPATH := /lib
++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)
+@@ -217,7 +226,7 @@ CFLAGS = $(CFLAGS_COMMON) $(CFLAGS_OS) $
+ 
  all: setup Daemon libdns_sd Clients SAClient SAResponder SAProxyResponder Identify NetMonitor dnsextd $(OPTIONALTARG)
  
 -install: setup InstalledDaemon InstalledStartup InstalledLib InstalledManPages InstalledClients $(OPTINSTALL)
@@ -29,7 +56,7 @@ 
  
  # 'setup' sets up the build directory structure the way we want
  setup:
-@@ -257,13 +257,13 @@ libdns_sd: setup $(BUILDDIR)/libdns_sd.$
+@@ -257,13 +266,13 @@ 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)
@@ -46,12 +73,12 @@ 
  	@$(MAKE) -C ../Clients
  
  # nss_mdns target builds the Name Service Switch module
-@@ -271,49 +271,49 @@ nss_mdns: setup $(BUILDDIR)/$(NSSLIBFILE
+@@ -271,49 +280,49 @@ nss_mdns: setup $(BUILDDIR)/$(NSSLIBFILE
  	@echo "Name Service Switch module done"
  
  $(BUILDDIR)/$(NSSLIBFILE): $(CLIENTLIBOBJS) $(OBJDIR)/nss_mdns.c.so.o
 -	@$(LD) $(LINKOPTS) -o $@ $+
-+	@$(CC) $(LINKOPTS) -shared -Wl,-soname=$(NSSLINKNAME) -o $@ $+
++	@$(CC) $(LINKOPTS) -shared -Wl,-soname=$(NSSLIBFILE) -o $@ $+
  	@$(STRIP) $@
  
  #############################################################################
@@ -78,7 +105,7 @@ 
  	@echo $+ " installed"
  
 -InstalledNSS: $(NSSINSTPATH)/$(NSSLINKNAME) /etc/nss_mdns.conf $(MANPATH)/man5/nss_mdns.conf.5 $(MANPATH)/man8/libnss_mdns.8
-+InstalledNSS: $(DESTDIR)$(NSSINSTPATH)/$(NSSLINKNAME) /etc/nss_mdns.conf $(DESTDIR)$(MANPATH)/man5/nss_mdns.conf.5 $(DESTDIR)$(MANPATH)/man8/libnss_mdns.8
++InstalledNSS: $(DESTDIR)$(NSSINSTPATH)/$(NSSLINKNAME) $(DESTDIR)$(INSTBASE)/etc/nss_mdns.conf.sample $(DESTDIR)$(MANPATH)/man5/nss_mdns.conf.5 $(DESTDIR)$(MANPATH)/man8/libnss_mdns.8
  	@echo $+ " installed"
  
  # Note: If daemon already installed, we make sure it's stopped before overwriting it
@@ -108,7 +135,7 @@ 
  	$(CP) $< $@
  	chmod ugo+x $@
  	$@ start
-@@ -330,26 +330,26 @@ else
+@@ -330,36 +339,35 @@ else
  endif
  endif
  
@@ -132,9 +159,10 @@ 
  	$(CP) $< $@
  
 -$(NSSINSTPATH)/$(NSSLINKNAME): $(NSSINSTPATH)/$(NSSLIBFILE)
-+$(DESTDIR)$(NSSINSTPATH)/$(NSSLINKNAME): $(NSSINSTPATH)/$(NSSLIBFILE)
- 	$(LN) $< $@
- 	ldconfig
+-	$(LN) $< $@
+-	ldconfig
++$(DESTDIR)$(NSSINSTPATH)/$(NSSLINKNAME): $(DESTDIR)$(NSSINSTPATH)/$(NSSLIBFILE)
++	$(LN) $(NSSLIBFILE) $(DESTDIR)$(NSSINSTPATH)/$(NSSLINKNAME)
  
 -$(NSSINSTPATH)/$(NSSLIBFILE): $(BUILDDIR)/$(NSSLIBFILE)
 +$(DESTDIR)$(NSSINSTPATH)/$(NSSLIBFILE): $(BUILDDIR)/$(NSSLIBFILE)
@@ -141,7 +169,20 @@ 
  	$(CP) $< $@
  	chmod 444 $@
  
-@@ -491,6 +491,8 @@ $(OBJDIR)/NetMonitor.c.o:            $(C
+-/etc/nss_mdns.conf: nss_mdns.conf
++$(DESTDIR)$(INSTBASE)/etc/nss_mdns.conf.sample: nss_mdns.conf
+ 	$(CP) $< $@
+ 	chmod 444 $@
+ 	# Check the nsswitch.conf file.
+ 	# If 'mdns' does not already appear on the "hosts:" line, then add it right before 'dns'
+-	cp -f /etc/nsswitch.conf /etc/nsswitch.conf.pre-mdns
+-	sed -e '/mdns/!s/^\(hosts:.*\)dns\(.*\)/\1mdns dns\2/' /etc/nsswitch.conf.pre-mdns > /etc/nsswitch.conf
++	#cp -f /etc/nsswitch.conf /etc/nsswitch.conf.pre-mdns
++	#sed -e '/mdns/!s/^\(hosts:.*\)dns\(.*\)/\1mdns dns\2/' /etc/nsswitch.conf.pre-mdns > /etc/nsswitch.conf
+ 
+ #############################################################################
+ 
+@@ -491,6 +499,8 @@ $(OBJDIR)/NetMonitor.c.o:            $(C
  $(BUILDDIR)/dnsextd:                 $(DNSEXTDOBJ) $(OBJDIR)/dnsextd.c.threadsafe.o
  	$(CC) $+ -o $@ $(LINKOPTS) $(LINKOPTS_PTHREAD)
  
--- net/mDNSResponder/pkg-plist	(revision 388831)
+++ net/mDNSResponder/pkg-plist	(working copy)
@@ -4,11 +4,16 @@ 
 bin/mDNSNetMonitor
 bin/mDNSProxyResponderPosix
 bin/mDNSResponderPosix
+@sample etc/nss_mdns.conf.sample
 include/dns_sd.h
 lib/libdns_sd.so
 lib/libdns_sd.so.1
+lib/libnss_mdns.so
+lib/libnss_mdns.so.1
 man/man1/dns-sd.1.gz
+man/man5/nss_mdns.conf.5.gz
 man/man8/dnsextd.8.gz
+man/man8/libnss_mdns.8.gz
 man/man8/mDNSResponderPosix.8.gz
 man/man8/mdnsd.8.gz
 sbin/dnsextd