6 files changed, 23 insertions, 33 deletions

diff --git a/net/mDNSResponder/Makefile b/net/mDNSResponder/Makefile
index 2fdf9ee23e31..0993949f190b 100644
--- a/net/mDNSResponder/Makefile
+++ b/net/mDNSResponder/Makefile
@@ -7,14 +7,13 @@
 #
 
 PORTNAME=	mDNSResponder
-PORTVERSION=	107.1
-PORTREVISION=	2
+PORTVERSION=	107.5
 CATEGORIES=	net dns
 MASTER_SITES=	http://darwinsource.opendarwin.org/tarballs/apsl/
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	"Apple's mDNSResponder"
+COMMENT=	Apple's mDNSResponder
 
 INSTALLS_SHLIB=	YES
 
@@ -30,18 +29,22 @@ EXTRA_PROGS_BIN=mDNSClientPosix \
 		mDNSResponderPosix
 EXTRA_PROGS_SBIN=dnsextd
 
-EXTRAMAN8=	dnsextd.8 mDNSResponder.8
+EXTRAMAN8=	dnsextd.8 mDNSResponderPosix.8
 
 MAN8=		mdnsd.8 ${EXTRAMAN8}
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "alpha"
-BROKEN=		"Does not compile on alpha"
+BROKEN=		Does not compile on alpha
 .endif
 
+post-patch:
+	${MV} ${WRKSRC}/mDNSShared/mDNSResponder.8 \
+		${WRKSRC}/mDNSShared/mDNSResponderPosix.8
 pre-build:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
+		-e 's|mDNSResponder.8|mDNSResponderPosix.8|g' \
 		${WRKSRC}/mDNSPosix/Makefile
 
 post-install:
diff --git a/net/mDNSResponder/distinfo b/net/mDNSResponder/distinfo
index 0477f2cb19ee..6b229f52bf77 100644
--- a/net/mDNSResponder/distinfo
+++ b/net/mDNSResponder/distinfo
@@ -1,3 +1,3 @@
-MD5 (mDNSResponder-107.1.tar.gz) = 0182d100b3f7929649bfc6c29715d4d7
-SHA256 (mDNSResponder-107.1.tar.gz) = e977f077bb9e6b339a5e075e55b22dcfa86e392f0fdac4e424b87cf64283b8ab
-SIZE (mDNSResponder-107.1.tar.gz) = 1325181
+MD5 (mDNSResponder-107.5.tar.gz) = ec345a16649ecb5b6e50096f2b5cbdaf
+SHA256 (mDNSResponder-107.5.tar.gz) = 8703e4a72108a8ed89194af7658cac348592e84fa67bd2d3794da4d81a610cf5
+SIZE (mDNSResponder-107.5.tar.gz) = 1379397
diff --git a/net/mDNSResponder/files/patch-mDNSPosix_Makefile b/net/mDNSResponder/files/patch-mDNSPosix_Makefile
index 3cda77d917a2..2816a684bb36 100644
--- a/net/mDNSResponder/files/patch-mDNSPosix_Makefile
+++ b/net/mDNSResponder/files/patch-mDNSPosix_Makefile
@@ -1,14 +1,11 @@
-
-$FreeBSD$
-
---- mDNSPosix/Makefile.orig
-+++ mDNSPosix/Makefile
-@@ -369,7 +369,7 @@
+--- mDNSPosix/Makefile.orig	Fri Mar 10 14:35:15 2006
++++ mDNSPosix/Makefile	Fri Mar 10 14:35:31 2006
+@@ -407,7 +407,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-mDNSPosix_mDNSUNP.c b/net/mDNSResponder/files/patch-mDNSPosix_mDNSUNP.c
deleted file mode 100644
index 550457a8ddf0..000000000000
--- a/net/mDNSResponder/files/patch-mDNSPosix_mDNSUNP.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- mDNSPosix/mDNSUNP.c.orig	Fri Apr  8 23:43:59 2005
-+++ mDNSPosix/mDNSUNP.c	Tue May 10 21:16:46 2005
-@@ -331,7 +331,7 @@
-         ifr = (struct ifreq *) ptr;
- 
- 		len = GET_SA_LEN(ifr->ifr_addr);
--		ptr += sizeof(struct ifreq); /* for next one in buffer */
-+		ptr += sizeof(ifr->ifr_name) + len; /* for next one in buffer */
-     
- //        fprintf(stderr, "intf %d name=%s AF=%d\n", index, ifr->ifr_name, ifr->ifr_addr.sa_family);
-         
diff --git a/net/mDNSResponder/files/patch-mDNSShared::dns_sd.h b/net/mDNSResponder/files/patch-mDNSShared::dns_sd.h
index 2f7bac6c1852..2c7c41054569 100644
--- a/net/mDNSResponder/files/patch-mDNSShared::dns_sd.h
+++ b/net/mDNSResponder/files/patch-mDNSShared::dns_sd.h
@@ -1,10 +1,10 @@
---- mDNSShared/dns_sd.h.orig	Sat Dec 18 04:14:23 2004
-+++ mDNSShared/dns_sd.h	Mon Feb 14 13:52:41 2005
-@@ -39,6 +39,7 @@
- #define DNSSD_API
+--- mDNSShared/dns_sd.h.orig	Tue Dec 20 22:24:58 2005
++++ mDNSShared/dns_sd.h	Fri Mar 10 14:41:32 2006
+@@ -42,6 +42,7 @@
  #endif
  
+ /* stdint.h does not exist on FreeBSD 4.x; its types are defined in sys/types.h instead */
 +#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/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