Update to 98.

PR: 77514

7 files changed, 34 insertions, 130 deletions

diff --git a/net/mDNSResponder/Makefile b/net/mDNSResponder/Makefile
index 88497cf038e5..ad26265aeb9e 100644
--- a/net/mDNSResponder/Makefile
+++ b/net/mDNSResponder/Makefile
@@ -7,9 +7,8 @@
 #
 
 PORTNAME=	mDNSResponder
-PORTVERSION=	62
-PORTREVISION=	1
-CATEGORIES=	net
+PORTVERSION=	98
+CATEGORIES=	net dns
 MASTER_SITES=	http://darwinsource.opendarwin.org/tarballs/apsl/
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
@@ -19,17 +18,33 @@ COMMENT=	"Apple's mDNSResponder"
 INSTALLS_SHLIB=	YES
 
 USE_GMAKE=	YES
-MAKE_ARGS+=	os=freebsd
+USE_REINPLACE=	YES
+MAKE_ARGS+=	os=freebsd LOCALBASE=${PREFIX} MANPATH=${MANPREFIX}/man
 BUILD_WRKSRC=	${WRKSRC}/mDNSPosix
 INSTALL_WRKSRC=	${WRKSRC}/mDNSPosix
-EXTRA_PROGS=	mDNSClientPosix \
+EXTRA_PROGS_BIN=mDNSClientPosix \
 		mDNSIdentify \
 		mDNSNetMonitor \
 		mDNSProxyResponderPosix \
 		mDNSResponderPosix
+EXTRA_PROGS_SBIN=dnsextd
+
+EXTRAMAN8=	dnsextd.8 mDNSResponder.8
+
+MAN8=		mdnsd.8 ${EXTRAMAN8}
+
+pre-build:
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
+		${WRKSRC}/mDNSPosix/Makefile
 
 post-install:
 	cd ${INSTALL_WRKSRC}/build/prod && \
-	    ${INSTALL_PROGRAM} ${EXTRA_PROGS} ${PREFIX}/bin
+		${INSTALL_PROGRAM} ${EXTRA_PROGS_BIN} ${PREFIX}/bin && \
+		${INSTALL_PROGRAM} ${EXTRA_PROGS_SBIN} ${PREFIX}/sbin
+.	for section in 1 2 3 4 5 6 7 8
+.		for page in ${EXTRAMAN${section}}
+			${INSTALL_MAN} ${WRKSRC}/mDNSShared/${page} ${MAN${section}PREFIX}/man/man${page:E}/
+.		endfor
+.	endfor
 
 .include <bsd.port.mk>
diff --git a/net/mDNSResponder/distinfo b/net/mDNSResponder/distinfo
index fa0392e5f8e3..be3b7a127e92 100644
--- a/net/mDNSResponder/distinfo
+++ b/net/mDNSResponder/distinfo
@@ -1,2 +1,2 @@
-MD5 (mDNSResponder-62.tar.gz) = 345da920880bcc028eacf4d11d96cc61
-SIZE (mDNSResponder-62.tar.gz) = 767255
+MD5 (mDNSResponder-98.tar.gz) = 26ddb6f2ed2c451704d26e80da5fdcb9
+SIZE (mDNSResponder-98.tar.gz) = 1369226
diff --git a/net/mDNSResponder/files/patch-mDNSCore::mDNSClientAPI.h b/net/mDNSResponder/files/patch-mDNSCore::mDNSClientAPI.h
index e1f03d822e2c..e69de29bb2d1 100644
--- a/net/mDNSResponder/files/patch-mDNSCore::mDNSClientAPI.h
+++ b/net/mDNSResponder/files/patch-mDNSCore::mDNSClientAPI.h
@@ -1,16 +0,0 @@
---- mDNSCore/mDNSClientAPI.h.old	Tue Mar  2 15:01:04 2004
-+++ mDNSCore/mDNSClientAPI.h	Fri Mar 19 15:26:43 2004
-@@ -618,9 +618,12 @@
- typedef unsigned char  mDNSu8;
- typedef   signed short mDNSs16;
- typedef unsigned short mDNSu16;
--#if _LP64
-+#if defined(_LP64) || defined(__LP64__)
- typedef   signed int   mDNSs32;
- typedef unsigned int   mDNSu32;
-+#elif defined(_ILP64) || defined(__ILP64__)
-+typedef   signed int32 mDNSs32;
-+typedef unsigned int32 mDNSu32;
- #else
- typedef   signed long  mDNSs32;
- typedef unsigned long  mDNSu32;
diff --git a/net/mDNSResponder/files/patch-mDNSPosix::Makefile b/net/mDNSResponder/files/patch-mDNSPosix::Makefile
index 7609598edeb0..e69de29bb2d1 100644
--- a/net/mDNSResponder/files/patch-mDNSPosix::Makefile
+++ b/net/mDNSResponder/files/patch-mDNSPosix::Makefile
@@ -1,78 +0,0 @@
---- mDNSPosix/Makefile.old	Wed Mar  3 01:39:05 2004
-+++ mDNSPosix/Makefile	Wed Mar  3 01:54:39 2004
-@@ -137,6 +137,7 @@
- STRIP = strip -S 
- endif
- 
-+INSTBASE=/usr
- # Configure per-OS peculiarities
- ifeq ($(os),solaris)
- CFLAGS_OS = -DNOT_HAVE_DAEMON -DNOT_HAVE_SA_LEN -D_XPG4_2 -D__EXTENSIONS__ -DHAVE_BROKEN_RECVIF_NAME -lsocket -lnsl
-@@ -149,6 +150,11 @@
- LDCONFIG = ldconfig
- else
- ifeq ($(os),freebsd)
-+ifndef LOCALBASE
-+LOCALBASE=/usr/local
-+endif
-+INSTSCRIPT=mdns.sh
-+INSTBASE=$(LOCALBASE)
- CFLAGS_OS =
- LDCONFIG = ldconfig
- else
-@@ -177,6 +183,7 @@
- endif
- endif
- endif
-+INSTSCRIPT?=mdns
- 
- ifeq ($(HAVE_IPV6),1)
- CFLAGS_OS += -DHAVE_IPV6=1
-@@ -197,7 +204,7 @@
- RUNLEVELSCRIPTSDIR = /etc
- else
- # else install into /etc/rc.d/ (*BSD)
--STARTUPSCRIPTDIR = /etc/rc.d
-+STARTUPSCRIPTDIR = $(INSTBASE)/etc/rc.d
- endif
- endif
- 
-@@ -246,30 +253,30 @@
- #############################################################################
- 
- # The Install targets place built stuff in their proper places
--InstalledDaemon: /usr/sbin/mdnsd
-+InstalledDaemon: $(INSTBASE)/sbin/mdnsd
- 	@echo $< " installed"
- 
--InstalledLib: /usr/lib/libmdns.$(LDSUFFIX).$(LIBVERS) /usr/include/dns_sd.h
-+InstalledLib: $(INSTBASE)/lib/libmdns.$(LDSUFFIX).$(LIBVERS) $(INSTBASE)/include/dns_sd.h
- 	@echo $< " installed"
- 
--InstalledStartup: $(STARTUPSCRIPTDIR)/mdns
-+InstalledStartup: $(STARTUPSCRIPTDIR)/$(INSTSCRIPT)
- 	@echo $< " installed"
- 
--/usr/sbin/mdnsd: $(BUILDDIR)/mdnsd
-+$(INSTBASE)/sbin/mdnsd: $(BUILDDIR)/mdnsd
- 	$(CP) $< $@
- 
--/usr/lib/libmdns.$(LDSUFFIX).$(LIBVERS): $(BUILDDIR)/libmdns.$(LDSUFFIX)
-+$(INSTBASE)/lib/libmdns.$(LDSUFFIX).$(LIBVERS): $(BUILDDIR)/libmdns.$(LDSUFFIX)
- 	$(CP) $< $@
--	$(LN) $@ /usr/lib/libmdns.$(LDSUFFIX)
-+	$(LN) $@ $(INSTBASE)/lib/libmdns.$(LDSUFFIX)
- ifdef LDCONFIG
-     # -m means 'merge into existing database', -R means 'rescan directories'
- 	$(LDCONFIG) -mR
- endif
- 
--/usr/include/dns_sd.h: $(SHAREDDIR)/dns_sd.h
-+$(INSTBASE)/include/dns_sd.h: $(SHAREDDIR)/dns_sd.h
- 	$(CP) $< $@
- 
--$(STARTUPSCRIPTDIR)/mdns: mdnsd.sh $(STARTUPSCRIPTDIR)
-+$(STARTUPSCRIPTDIR)/$(INSTSCRIPT): mdnsd.sh $(STARTUPSCRIPTDIR)
- 	$(CP) $< $@
- 	chmod ugo+x $@
- ifdef RUNLEVELSCRIPTSDIR
diff --git a/net/mDNSResponder/files/patch-mDNSPosix::mDNSUNP.h b/net/mDNSResponder/files/patch-mDNSPosix::mDNSUNP.h
index 282672c92478..e69de29bb2d1 100644
--- a/net/mDNSResponder/files/patch-mDNSPosix::mDNSUNP.h
+++ b/net/mDNSResponder/files/patch-mDNSPosix::mDNSUNP.h
@@ -1,14 +0,0 @@
---- mDNSPosix/mDNSUNP.h.old	Fri Mar 19 15:34:56 2004
-+++ mDNSPosix/mDNSUNP.h	Fri Mar 19 15:38:28 2004
-@@ -67,7 +67,11 @@
- #ifndef __mDNSUNP_h
- #define __mDNSUNP_h
- 
-+#if defined(__FreeBSD__) && __FreeBSD_version >= 500000
- #include <stdint.h>
-+#elif !defined(__FreeBSD__)
-+#include <stdint.h>
-+#endif
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <net/if.h>
diff --git a/net/mDNSResponder/files/patch-mDNSShared::dns_sd.h b/net/mDNSResponder/files/patch-mDNSShared::dns_sd.h
index 60445de8e345..2f7bac6c1852 100644
--- a/net/mDNSResponder/files/patch-mDNSShared::dns_sd.h
+++ b/net/mDNSResponder/files/patch-mDNSShared::dns_sd.h
@@ -1,14 +1,10 @@
---- mDNSShared/dns_sd.h.old	Fri Mar 19 15:38:48 2004
-+++ mDNSShared/dns_sd.h	Fri Mar 19 15:38:58 2004
-@@ -46,7 +46,11 @@
+--- 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
+ #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>
- #include <sys/socket.h>
-+#if defined(__FreeBSD__) && __FreeBSD_version >= 500000
- #include <stdint.h>
-+#elif !defined(__FreeBSD__)
-+#include <stdint.h>
-+#endif
- #include <netinet/in.h>
- 
- 
diff --git a/net/mDNSResponder/pkg-plist b/net/mDNSResponder/pkg-plist
index e7e6547b3e21..b4c8ee542a49 100644
--- a/net/mDNSResponder/pkg-plist
+++ b/net/mDNSResponder/pkg-plist
@@ -5,6 +5,7 @@ bin/mDNSProxyResponderPosix
 bin/mDNSResponderPosix
 etc/rc.d/mdns.sh
 include/dns_sd.h
-lib/libmdns.so
-lib/libmdns.so.1
+lib/libdns_sd.so
+lib/libdns_sd.so.1
+sbin/dnsextd
 sbin/mdnsd