7 files changed, 91 insertions, 76 deletions

diff --git a/net/mDNSResponder/Makefile b/net/mDNSResponder/Makefile
index b2a1c62123c6..8f1db57f6912 100644
--- a/net/mDNSResponder/Makefile
+++ b/net/mDNSResponder/Makefile
@@ -7,9 +7,9 @@
 #
 
 PORTNAME=	mDNSResponder
-PORTVERSION=	108
+PORTVERSION=	214
 CATEGORIES=	net dns
-MASTER_SITES=	http://www.opensource.apple.com/darwinsource/tarballs/other/
+MASTER_SITES=	http://opensource.apple.com/tarballs/mDNSResponder/
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/net/mDNSResponder/distinfo b/net/mDNSResponder/distinfo
index 6d7b7327b4e4..832c4a2fe4fe 100644
--- a/net/mDNSResponder/distinfo
+++ b/net/mDNSResponder/distinfo
@@ -1,3 +1,3 @@
-MD5 (mDNSResponder-108.tar.gz) = 645eda2dd5d465b8dabedc3b87e1b31a
-SHA256 (mDNSResponder-108.tar.gz) = 262d945eaaa6a8071a98512d3b13699d2c0ea8713410daf8c81c3add8d17809f
-SIZE (mDNSResponder-108.tar.gz) = 1362840
+MD5 (mDNSResponder-214.tar.gz) = 8285a8f63c63a824cbafb9b6404163e8
+SHA256 (mDNSResponder-214.tar.gz) = d8df2983869370853e3b189e209a68ec879295bd476f24a789c982292969df97
+SIZE (mDNSResponder-214.tar.gz) = 1623680
diff --git a/net/mDNSResponder/files/patch-aa b/net/mDNSResponder/files/patch-aa
index 0bcb1efc46eb..f056d9f1d7b4 100644
--- a/net/mDNSResponder/files/patch-aa
+++ b/net/mDNSResponder/files/patch-aa
@@ -1,55 +1,20 @@
---- mDNSPosix/#Client.c~	Mon Mar 14 14:59:47 2005
-+++ mDNSPosix/Client.c	Mon Mar 14 14:59:47 2005
-@@ -272,7 +272,7 @@
-         result = 2;
-     }
-     if ( (result != 0) || (gMDNSPlatformPosixVerboseLevel > 0) ) {
--        fprintf(stderr, "%s: Finished with status %ld, result %d\n", gProgramName, status, result);
-+        fprintf(stderr, "%s: Finished with status %d, result %d\n", gProgramName, status, result);
-     }
- 
-     return 0;
---- mDNSPosix/#Identify.c~	Mon Mar 14 15:00:56 2005
-+++ mDNSPosix/Identify.c	Mon Mar 14 15:00:56 2005
-@@ -400,7 +400,7 @@
-     	gRRCache, RR_CACHE_SIZE,
-     	mDNS_Init_DontAdvertiseLocalAddresses,
-     	mDNS_Init_NoInitCallback, mDNS_Init_NoInitCallbackContext);
--	if (status) { fprintf(stderr, "Daemon start: mDNS_Init failed %ld\n", status); return(status); }
-+	if (status) { fprintf(stderr, "Daemon start: mDNS_Init failed %d\n", status); return(status); }
- 
- 	signal(SIGINT, HandleSIG);	// SIGINT is what you get for a Ctrl-C
- 	signal(SIGTERM, HandleSIG);
---- mDNSPosix/#NetMonitor.c~	Mon Mar 14 15:01:26 2005
-+++ mDNSPosix/NetMonitor.c	Mon Mar 14 15:01:26 2005
-@@ -1126,7 +1126,7 @@
- 		}
- 
- 	status = mDNSNetMonitor();
--	if (status) { fprintf(stderr, "%s: mDNSNetMonitor failed %ld\n", progname, status); return(status); }
-+	if (status) { fprintf(stderr, "%s: mDNSNetMonitor failed %d\n", progname, status); return(status); }
- 	return(0);
- 
- usage:
---- mDNSPosix/#Responder.c~	Mon Mar 14 15:01:05 2005
-+++ mDNSPosix/Responder.c	Mon Mar 14 15:01:05 2005
-@@ -832,7 +832,7 @@
-         result = 2;
-     }
-     if ( (result != 0) || (gMDNSPlatformPosixVerboseLevel > 0) ) {
--        fprintf(stderr, "%s: Finished with status %ld, result %d\n", gProgramName, status, result);
-+        fprintf(stderr, "%s: Finished with status %d, result %d\n", gProgramName, status, result);
-     }
-     
-     return result;
---- mDNSPosix/#ProxyResponder.c~	Mon Mar 14 15:06:18 2005
-+++ mDNSPosix/ProxyResponder.c	Mon Mar 14 15:06:19 2005
-@@ -322,7 +322,7 @@
- 		mDNS_Init_NoCache, mDNS_Init_ZeroCacheSize,
- 		mDNS_Init_DontAdvertiseLocalAddresses,
- 		mDNS_Init_NoInitCallback, mDNS_Init_NoInitCallbackContext);
--	if (status) { fprintf(stderr, "Daemon start: mDNS_Init failed %ld\n", status); return(status); }
-+	if (status) { fprintf(stderr, "Daemon start: mDNS_Init failed %d\n", status); return(status); }
- 
- 	mDNSPosixListenForSignalInEventLoop(SIGINT);
- 	mDNSPosixListenForSignalInEventLoop(SIGTERM);
+--- mDNSShared/dnssd_clientstub.c.orig	2009-12-24 18:06:21.000000000 +0900
++++ mDNSShared/dnssd_clientstub.c	2009-12-24 18:09:24.000000000 +0900
+@@ -432,7 +432,7 @@
+ 			{
+ 			// Should never happen. If it does, it indicates some OS bug,
+ 			// or that the mDNSResponder daemon crashed (which should never happen).
+-			syslog(LOG_WARNING, "dnssd_clientstub write_all(%d) failed %ld/%d %d %s", sd, num_written, len,
++			syslog(LOG_WARNING, "dnssd_clientstub write_all(%d) failed %zd/%d %d %s", sd, num_written, len,
+ 				(num_written < 0) ? dnssd_errno                 : 0,
+ 				(num_written < 0) ? dnssd_strerror(dnssd_errno) : "");
+ 			return -1;
+@@ -458,7 +458,7 @@
+ 			{
+ 			// Should never happen. If it does, it indicates some OS bug,
+ 			// or that the mDNSResponder daemon crashed (which should never happen).
+-			syslog(LOG_WARNING, "dnssd_clientstub read_all(%d) failed %ld/%d %d %s", sd, num_read, len,
++			syslog(LOG_WARNING, "dnssd_clientstub read_all(%d) failed %zd/%d %d %s", sd, num_read, len,
+ 				(num_read < 0) ? dnssd_errno                 : 0,
+ 				(num_read < 0) ? dnssd_strerror(dnssd_errno) : "");
+ 			return (num_read < 0 && dnssd_errno == dnssd_EWOULDBLOCK) ? read_all_wouldblock : read_all_fail;
diff --git a/net/mDNSResponder/files/patch-mDNSPosix_Makefile b/net/mDNSResponder/files/patch-mDNSPosix_Makefile
index af5049d87b8d..f37c7deac4f9 100644
--- a/net/mDNSResponder/files/patch-mDNSPosix_Makefile
+++ b/net/mDNSResponder/files/patch-mDNSPosix_Makefile
@@ -1,11 +1,20 @@
---- mDNSPosix/Makefile.orig	Mon Aug  7 03:47:48 2006
-+++ mDNSPosix/Makefile	Mon Aug  7 03:48:14 2006
-@@ -401,7 +401,7 @@
+--- mDNSPosix/Makefile.orig	2009-02-03 04:44:06.000000000 +0900
++++ mDNSPosix/Makefile	2009-12-24 18:01:14.000000000 +0900
+@@ -380,7 +380,7 @@
+ LOCALBASE?=/usr/local
+ INSTBASE=$(LOCALBASE)
+ STARTUPSCRIPTNAME=mdns.sh
+-CFLAGS_OS =
++CFLAGS_OS = -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
+ # This appies only to FreeBSD -- "man cc" on FreeBSD says:
+@@ -473,7 +473,7 @@
  
- all: setup Daemon libdns_sd Client Responder ProxyResponder Identify NetMonitor dnsextd $(OPTIONALTARG)
+ all: setup Daemon libdns_sd Clients SAClient SAResponder SAProxyResponder Identify NetMonitor dnsextd $(OPTIONALTARG)
  
--install: setup InstalledDaemon InstalledLib InstalledStartup InstalledManPages $(OPTINSTALL)
-+install: setup InstalledDaemon InstalledLib InstalledManPages $(OPTINSTALL)
+-install: setup InstalledDaemon InstalledStartup InstalledLib InstalledManPages InstalledClients $(OPTINSTALL)
++install: setup InstalledDaemon InstalledLib InstalledManPages InstalledClients $(OPTINSTALL)
  
  # 'setup' sets up the build directory structure the way we want
  setup:
diff --git a/net/mDNSResponder/files/patch-mDNSShared::dns_sd.h b/net/mDNSResponder/files/patch-mDNSShared::dns_sd.h
deleted file mode 100644
index a5b98389c0b3..000000000000
--- a/net/mDNSResponder/files/patch-mDNSShared::dns_sd.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./mDNSShared/dns_sd.h.orig	Tue Aug  8 17:27:30 2006
-+++ ./mDNSShared/dns_sd.h	Tue Aug  8 17:27:52 2006
-@@ -39,6 +39,7 @@
- #define DNSSD_API
- #endif
- 
-+#include <osreldate.h>
- #if defined(__FreeBSD_version) && (__FreeBSD_version < 500000)
- /* stdint.h does not exist on FreeBSD 4.x; its types are defined in sys/types.h instead */
- #include <sys/types.h>
diff --git a/net/mDNSResponder/files/patch-mDNSShared__CommonServices.h b/net/mDNSResponder/files/patch-mDNSShared__CommonServices.h
new file mode 100644
index 000000000000..bd9487ecabb2
--- /dev/null
+++ b/net/mDNSResponder/files/patch-mDNSShared__CommonServices.h
@@ -0,0 +1,50 @@
+--- mDNSShared/CommonServices.h.orig	2009-03-31 04:51:29.000000000 +0900
++++ mDNSShared/CommonServices.h	2010-01-13 13:10:59.000000000 +0900
+@@ -92,6 +92,15 @@
+ 	#endif
+ #endif
+ 
++// FreeBSD
++
++#if( !defined( TARGET_OS_FREEBSD ) )
++	#if( defined( __FreeBSD__ ) )
++		#define	TARGET_OS_FREEBSD		1
++	#else
++		#define	TARGET_OS_FREEBSD		0
++	#endif
++#endif
+ // Linux
+ 
+ #if( !defined( TARGET_OS_LINUX ) )
+@@ -128,7 +137,7 @@
+ 	
+ 	// No predefined macro for VxWorks so just assume VxWorks if nothing else is set.
+ 	
+-	#if( !macintosh && !__MACH__  && !defined( __linux__ ) && !defined ( __SVR4 ) && !defined ( __sun ) && !defined( __PALMOS_TRAPS__ ) && !defined( __PALMOS_ARMLET__ ) && !defined( _WIN32 ) )
++	#if( !macintosh && !__MACH__  && !defined( __FreeBSD__ ) && !defined( __linux__ ) && !defined ( __SVR4 ) && !defined ( __sun ) && !defined( __PALMOS_TRAPS__ ) && !defined( __PALMOS_ARMLET__ ) && !defined( _WIN32 ) )
+ 		#define	TARGET_OS_VXWORKS		1
+ 	#else
+ 		#define	TARGET_OS_VXWORKS		0
+@@ -217,6 +226,13 @@
+ 	#include	<libkern/OSTypes.h>
+ 	#include	<sys/types.h>
+ 	
++#elif( TARGET_OS_FREEBSD )
++
++	// FreeBSD
++	#include	<stdint.h>
++	#include	<netinet/in.h>
++	#include	<arpa/inet.h>
++
+ #elif( TARGET_OS_LINUX )
+ 	
+ 	// Linux
+@@ -493,7 +509,7 @@
+ // - Windows
+ 
+ #if( TARGET_LANGUAGE_C_LIKE )
+-	#if( !defined(_SSIZE_T) && ( TARGET_OS_WIN32 || !defined( _BSD_SSIZE_T_DEFINED_ ) ) && !TARGET_OS_LINUX && !TARGET_OS_VXWORKS && !TARGET_OS_MAC)
++	#if( !defined(_SSIZE_T) && ( TARGET_OS_WIN32 || !defined( _BSD_SSIZE_T_DEFINED_ ) ) && !TARGET_OS_FREEBSD && !TARGET_OS_LINUX && !TARGET_OS_VXWORKS && !TARGET_OS_MAC)
+ 		typedef int						ssize_t;
+ 	#endif
+ #endif
diff --git a/net/mDNSResponder/pkg-plist b/net/mDNSResponder/pkg-plist
index 1dc49f5642a9..0d5d3adedff4 100644
--- a/net/mDNSResponder/pkg-plist
+++ b/net/mDNSResponder/pkg-plist
@@ -1,3 +1,4 @@
+bin/dns-sd
 bin/mDNSClientPosix
 bin/mDNSIdentify
 bin/mDNSNetMonitor