5 files changed, 61 insertions, 110 deletions

diff --git a/net/mDNSResponder/Makefile b/net/mDNSResponder/Makefile
index ed45b0630362..d8079db6e4fe 100644
--- a/net/mDNSResponder/Makefile
+++ b/net/mDNSResponder/Makefile
@@ -2,12 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	mDNSResponder
-PORTVERSION=	333.10
+PORTVERSION=	379.38.1
 CATEGORIES=	net dns
-MASTER_SITES=	http://opensource.apple.com/tarballs/mDNSResponder/
+MASTER_SITES=	http://opensource.apple.com/tarballs/${PORTNAME}/
 
 MAINTAINER=	sunpoet@FreeBSD.org
-COMMENT=	Apple's mDNSResponder
+COMMENT=	Bonjour (zero-configuration networking) by Apple
 
 LICENSE=	AL2 BSD
 LICENSE_COMB=	dual
@@ -17,8 +17,7 @@ CONFLICTS=	avahi-libdns-[0-9]*
 BUILD_WRKSRC=	${WRKSRC}/mDNSPosix
 INSTALL_WRKSRC=	${WRKSRC}/mDNSPosix
 MAKE_ARGS=	os=freebsd LOCALBASE=${PREFIX} MANPATH=${MANPREFIX}/man
-USES=		bison
-USE_GMAKE=	yes
+USES=		bison gmake
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	mdnsd
 
@@ -32,27 +31,19 @@ PLIST_FILES=	bin/dns-sd ${EXTRA_BIN} \
 		lib/libdns_sd.so lib/libdns_sd.so.1 \
 		sbin/mdnsd ${EXTRA_SBIN}
 
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "alpha"
-BROKEN=		Does not compile on alpha
-.endif
+NOT_FOR_ARCHS=	alpha
+NOT_FOR_ARCHS_REASON=	does not compile
 
 post-patch:
 	@${REINPLACE_CMD} -e '/	cc / s|cc|$${CC}|' ${WRKSRC}/Clients/Makefile
-	@${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
+	@${REINPLACE_CMD} -e 's|-lpthread|-pthread|g; s|mDNSResponder.8|mDNSResponderPosix.8|g' ${WRKSRC}/mDNSPosix/Makefile
+	@${MV} ${WRKSRC}/mDNSShared/mDNSResponder.8 ${WRKSRC}/mDNSShared/mDNSResponderPosix.8
 
 post-install:
-	@cd ${INSTALL_WRKSRC}/build/prod && \
+	cd ${WRKSRC}/mDNSPosix/build/prod/ && \
 		${INSTALL_PROGRAM} ${EXTRA_BIN:T} ${PREFIX}/bin/ && \
 		${INSTALL_PROGRAM} ${EXTRA_SBIN:T} ${PREFIX}/sbin/
-	@cd ${WRKSRC}/mDNSShared/ && \
+	cd ${WRKSRC}/mDNSShared/ && \
 		${INSTALL_MAN} ${EXTRA_MAN8} ${MAN8PREFIX}/man/man8/
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/mDNSResponder/distinfo b/net/mDNSResponder/distinfo
index 5e32c6c4d53b..bab1a9e00938 100644
--- a/net/mDNSResponder/distinfo
+++ b/net/mDNSResponder/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mDNSResponder-333.10.tar.gz) = 3624e39022c9210b819e94423c02f9ae12550cc21511ca979ab87e0c2212967b
-SIZE (mDNSResponder-333.10.tar.gz) = 1937483
+SHA256 (mDNSResponder-379.38.1.tar.gz) = 33d8d92ef956e94217850daac9464884a1317b4a0114be02eced450502159f9e
+SIZE (mDNSResponder-379.38.1.tar.gz) = 2035352
diff --git a/net/mDNSResponder/files/patch-mDNSPosix_Makefile b/net/mDNSResponder/files/patch-mDNSPosix_Makefile
index 26830c18a350..1aae208c8ab2 100644
--- a/net/mDNSResponder/files/patch-mDNSPosix_Makefile
+++ b/net/mDNSResponder/files/patch-mDNSPosix_Makefile
@@ -1,5 +1,5 @@
---- mDNSPosix/Makefile.orig	2009-08-11 09:13:47.000000000 +0800
-+++ mDNSPosix/Makefile	2011-06-21 10:22:59.016198425 +0800
+--- mDNSPosix/Makefile.orig	2011-11-03 08:23:39.000000000 +0800
++++ mDNSPosix/Makefile	2013-08-16 22:56:35.265791824 +0800
 @@ -54,7 +54,7 @@
  SHAREDDIR ?= ../mDNSShared
  JDK = /usr/jdk
@@ -9,16 +9,16 @@
  BISON = @bison
  FLEX = @flex
  LD = ld -shared
-@@ -118,7 +118,7 @@
+@@ -122,7 +122,7 @@
+ # If not already defined, set LOCALBASE to /usr/local
  LOCALBASE?=/usr/local
  INSTBASE=$(LOCALBASE)
- STARTUPSCRIPTNAME=mdns.sh
--CFLAGS_OS =
-+CFLAGS_OS = -DTARGET_OS_FREEBSD
+-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
  # This appies only to FreeBSD -- "man cc" on FreeBSD says:
-@@ -211,7 +211,7 @@
+@@ -216,7 +216,7 @@
  
  all: setup Daemon libdns_sd Clients SAClient SAResponder SAProxyResponder Identify NetMonitor dnsextd $(OPTIONALTARG)
  
@@ -27,7 +27,7 @@
  
  # 'setup' sets up the build directory structure the way we want
  setup:
-@@ -252,10 +252,10 @@
+@@ -259,10 +259,10 @@
  	@$(LD) $(LINKOPTS) -o $@ $+
  	@$(STRIP) $@
  
@@ -40,16 +40,7 @@
  	@$(MAKE) -C ../Clients
  
  # nss_mdns target builds the Name Service Switch module
-@@ -330,7 +330,7 @@
- 	cp $< $@
- 	chmod 444 $@
- 
--$(MANPATH)/man8/mdnsd.8: $(SHAREDDIR)/mDNSResponder.8
-+$(MANPATH)/man8/mdnsd.8: $(SHAREDDIR)/mDNSResponderPosix.8
- 	cp $< $@
- 	chmod 444 $@
- 
-@@ -482,6 +482,8 @@
+@@ -490,6 +490,8 @@
  $(BUILDDIR)/dnsextd:                 $(DNSEXTDOBJ) $(OBJDIR)/dnsextd.c.threadsafe.o
  	$(CC) $+ -o $@ $(LINKOPTS) $(LINKOPTS_PTHREAD)
  
diff --git a/net/mDNSResponder/files/patch-mDNSPosix_mDNSPosix.c b/net/mDNSResponder/files/patch-mDNSPosix_mDNSPosix.c
index f8b448b6a7b9..cdce4c1dcc2f 100644
--- a/net/mDNSResponder/files/patch-mDNSPosix_mDNSPosix.c
+++ b/net/mDNSResponder/files/patch-mDNSPosix_mDNSPosix.c
@@ -1,19 +1,40 @@
---- mDNSPosix/mDNSPosix.c.orig	2011-04-07 06:48:43.000000000 +0800
-+++ mDNSPosix/mDNSPosix.c	2011-08-28 22:14:54.089049545 +0800
-@@ -487,7 +487,7 @@
- 	{
- 	char line[256];
- 	char nameserver[16];
--	char keyword[10];
-+	char keyword[11];
- 	int  numOfServers = 0;
- 	FILE *fp = fopen(filePath, "r");
- 	if (fp == NULL) return -1;
-@@ -506,6 +506,7 @@
- 			numOfServers++;
- 			}
- 		}  
-+	fclose(fp);
- 	return (numOfServers > 0) ? 0 : -1;
- 	}
+--- mDNSPosix/mDNSPosix.c.orig	2012-04-18 07:01:01.000000000 +0800
++++ mDNSPosix/mDNSPosix.c	2013-08-16 23:04:31.089791517 +0800
+@@ -503,6 +503,7 @@
+             numOfServers++;
+         }
+     }
++    fclose(fp);
+     return (numOfServers > 0) ? 0 : -1;
+ }
  
+@@ -708,7 +709,13 @@
+     {
+         struct ipv6_mreq imr6;
+         struct sockaddr_in6 bindAddr6;
+-    #if defined(IPV6_PKTINFO)
++    #if defined(IPV6_RECVPKTINFO)
++        if (err == 0)
++        {
++            err = setsockopt(*sktPtr, IPPROTO_IPV6, IPV6_RECVPKTINFO, &kOn, sizeof(kOn));
++            if (err < 0) { err = errno; perror("setsockopt - IPV6_RECVPKTINFO"); }
++        }
++    #elif defined(IPV6_PKTINFO)
+         if (err == 0)
+         {
+             err = setsockopt(*sktPtr, IPPROTO_IPV6, IPV6_2292_PKTINFO, &kOn, sizeof(kOn));
+@@ -717,7 +724,13 @@
+     #else
+         #warning This platform has no way to get the destination interface information for IPv6 -- will only work for single-homed hosts
+     #endif
+-    #if defined(IPV6_HOPLIMIT)
++    #if defined(IPV6_RECVHOPLIMIT)
++        if (err == 0)
++        {
++            err = setsockopt(*sktPtr, IPPROTO_IPV6, IPV6_RECVHOPLIMIT, &kOn, sizeof(kOn));
++            if (err < 0) { err = errno; perror("setsockopt - IPV6_RECVHOPLIMIT"); }
++        }
++    #elif defined(IPV6_HOPLIMIT)
+         if (err == 0)
+         {
+             err = setsockopt(*sktPtr, IPPROTO_IPV6, IPV6_2292_HOPLIMIT, &kOn, sizeof(kOn));
diff --git a/net/mDNSResponder/files/patch-mDNSShared__CommonServices.h b/net/mDNSResponder/files/patch-mDNSShared__CommonServices.h
deleted file mode 100644
index 98c9e318d054..000000000000
--- a/net/mDNSResponder/files/patch-mDNSShared__CommonServices.h
+++ /dev/null
@@ -1,52 +0,0 @@
---- mDNSShared/CommonServices.h.orig	2009-08-11 09:13:47.000000000 +0800
-+++ mDNSShared/CommonServices.h	2011-01-11 11:51:28.000000000 +0800
-@@ -54,6 +54,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 ) )
-@@ -90,7 +99,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
-@@ -179,6 +188,15 @@
- 	#include	<libkern/OSTypes.h>
- 	#include	<sys/types.h>
- 	
-+#elif( TARGET_OS_FREEBSD )
-+
-+	// FreeBSD
-+	#include	<stdint.h>
-+	#include	<pthread.h>
-+	#include	<netinet/in.h>
-+	#include	<arpa/inet.h>
-+	#include	<sys/socket.h>
-+
- #elif( TARGET_OS_LINUX )
- 	
- 	// Linux
-@@ -455,7 +473,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