Index: head/net/ntp/Makefile
===================================================================
--- head/net/ntp/Makefile	(revision 375209)
+++ head/net/ntp/Makefile	(revision 375210)
@@ -1,71 +1,68 @@
 # Created by: andreas
 # $FreeBSD$
 
 PORTNAME=	ntp
 PORTVERSION=	4.2.8
+PORTREVISION=	1
 CATEGORIES=	net ipv6
 MASTER_SITES=	ftp://ftp.udel.edu/pub/ntp/ntp4/ \
 		http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ \
 		ftp://ftp.archive.de.uu.net/pub/unix/ntp/ntp4/ \
 		ftp://ftp.netlab.is.tsukuba.ac.jp/pub/network/ntp/ntp4/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/P/p/:S/.r/-RC/}
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	The Network Time Protocol Distribution
 
 GNU_CONFIGURE=	yes
 OPTIONS_SUB=	yes
 USES=		pathfix shebangfix libtool
 LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
 
 NTP_SHEBANG_FILES=	sbin/ntp-wait sbin/ntptrace
 
 .include "Makefile.inc"
 
 PERL_UTILS_USES=	perl5
 
 SSL_USE=		OPENSSL=yes
 SSL_CONFIGURE_OFF=	--without-crypto
 
 IPV6_CONFIGURE_ENABLE=	ipv6
 
 NTP_SIGND_CONFIGURE_ENABLE=	ntp-signd
 
 NTPSNMPD_LIB_DEPENDS=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
 NTPSNMPD_CONFIGURE_OFF=	--without-ntpsnmpd
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MSSL}
 CONFIGURE_ARGS+=	--with-openssl-incdir=${OPENSSLINC} \
 			--with-openssl-libdir=${OPENSSLLIB}
 .endif
 
 .for D in ${NTP_DRIVERS}
 .if ${PORT_OPTIONS:M${D}}
 CONFIGURE_ARGS+=	--enable-${D}
 .endif
 .endfor
 
-.if ${PORT_OPTIONS:MMX4200}
-BROKEN=		Fails to compile when MX4200 is enabled.
-.endif
- 
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}4
 
 # XXX Temporary hack. Remember to remove this next commit.
 post-extract:
 	@/usr/bin/touch ${WRKSRC}/scripts/build/checkHtmlFileDates
 	@${CHMOD} +x ${WRKSRC}/scripts/build/checkHtmlFileDates
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	@${INSTALL_DATA} ${WRKSRC}/conf/* ${STAGEDIR}${EXAMPLESDIR}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@${FIND} ${WRKSRC}/html -type f | ${XARGS} ${CHMOD} ${SHAREMODE}
 	@cd ${WRKSRC}/html && ${FIND} . -print | \
 		${CPIO} -pdu -R ${SHAREOWN}:${SHAREGRP} --quiet ${STAGEDIR}${DOCSDIR}
 	@cd ${STAGEDIR}${PREFIX}; \
 		${ECHO_CMD} ${NTP_SHEBANG_FILES} | ${XARGS} ${SED} -i '' ${_SHEBANG_REINPLACE_ARGS}
 
 .include <bsd.port.post.mk>
Index: head/net/ntp/files/patch-include__ntp_net.h
===================================================================
--- head/net/ntp/files/patch-include__ntp_net.h	(revision 375209)
+++ head/net/ntp/files/patch-include__ntp_net.h	(nonexistent)
@@ -1,28 +0,0 @@
---- include/ntp_net.h.orig	2014-12-19 03:56:52.000000000 -0800
-+++ include/ntp_net.h	2014-12-19 16:21:51.050264459 -0800
-@@ -5,6 +5,11 @@
- #ifndef NTP_NET_H
- #define NTP_NET_H
- 
-+/* XXX obtained from /usr/include/netinet6/in6.h */
-+#define s6_addr8  __u6_addr.__u6_addr8
-+#define s6_addr16 __u6_addr.__u6_addr16
-+#define s6_addr32 __u6_addr.__u6_addr32
-+
- #include <sys/types.h>
- #ifdef HAVE_SYS_SOCKET_H
- #include <sys/socket.h>
-@@ -29,6 +34,13 @@
- 	struct sockaddr		sa;
- 	struct sockaddr_in	sa4;
- 	struct sockaddr_in6	sa6;
-+/* XXX obtained from /usr/include/netinet6/in6.h */
-+	union {
-+		uint8_t         __u6_addr8[16];
-+		uint16_t        __u6_addr16[8];
-+		uint32_t        __u6_addr32[4];
-+	} __u6_addr;                    /* 128-bit IP6 address */
-+
- } sockaddr_u;
- 
- /*

Property changes on: head/net/ntp/files/patch-include__ntp_net.h
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/net/ntp/files/patch-ntpd__ntp_io.c
===================================================================
--- head/net/ntp/files/patch-ntpd__ntp_io.c	(nonexistent)
+++ head/net/ntp/files/patch-ntpd__ntp_io.c	(revision 375210)
@@ -0,0 +1,22 @@
+--- ntpd/ntp_io.c.orig	2014-12-19 03:56:55.000000000 -0800
++++ ntpd/ntp_io.c	2014-12-21 22:36:02.977441698 -0800
+@@ -3454,15 +3454,15 @@
+ 	if (AF_INET6 == itf->family) {
+ 		DPRINTF(1, ("Got an IPv6 packet, from <%s> (%d) to <%s> (%d)\n",
+ 			stoa(&rb->recv_srcadr),
+-			IN6_IS_ADDR_LOOPBACK(&rb->recv_srcadr),
++			IN6_IS_ADDR_LOOPBACK(&rb->recv_srcadr.sa6.sin6_addr),
+ 			stoa(&itf->sin),
+-			!IN6_IS_ADDR_LOOPBACK(&itf->sin)
++			!IN6_IS_ADDR_LOOPBACK(&itf->sin.sa6.sin6_addr)
+ 			));
+ 	}
+ 
+ 	if (   AF_INET6 == itf->family
+-	    && IN6_IS_ADDR_LOOPBACK(&rb->recv_srcadr)
+-	    && !IN6_IS_ADDR_LOOPBACK(&itf->sin)
++	    && IN6_IS_ADDR_LOOPBACK(&rb->recv_srcadr.sa6.sin6_addr)
++	    && !IN6_IS_ADDR_LOOPBACK(&itf->sin.sa6.sin6_addr)
+ 	   ) {
+ 		packets_dropped++;
+ 		DPRINTF(1, ("DROPPING that packet\n"));

Property changes on: head/net/ntp/files/patch-ntpd__ntp_io.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property