Index: head/net/openntpd/Makefile
===================================================================
--- head/net/openntpd/Makefile	(revision 416519)
+++ head/net/openntpd/Makefile	(revision 416520)
@@ -1,44 +1,43 @@
 # $FreeBSD$
 
 PORTNAME=	openntpd
-PORTVERSION=	5.9p1
-PORTREVISION=	1
+PORTVERSION=	6.0p1
 PORTEPOCH=	2
 CATEGORIES=	net
 MASTER_SITES=	OPENBSD/OpenNTPD
 
 MAINTAINER=	naddy@FreeBSD.org
 COMMENT=	Network Time Protocol (NTP) daemon
 
 LICENSE=	ISCL
 
 USERS=		_ntp
 GROUPS=		_ntp
 
 USE_RC_SUBR=	openntpd
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-silent-rules
 
 OPTIONS_DEFINE=		RESSL
 RESSL_DESC=		SSL/TLS support via LibreSSL
 
 OPTIONS_DEFAULT=	RESSL
 
 # Requires libtls from LibreSSL
 RESSL_USE=		openssl=yes
 RESSL_VARS=		with_openssl_port=yes \
 			openssl_port=security/libressl
 RESSL_CONFIGURE_WITH=	cacert=${LOCALBASE}/etc/ssl/cert.pem
 RESSL_CPPFLAGS=		-I${LOCALBASE}/include
 RESSL_LDFLAGS=		-L${LOCALBASE}/lib
 RESSL_RUN_DEPENDS=	ca_root_nss>=0:security/ca_root_nss
 
 pre-build:
 	${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' \
 	    ${WRKSRC}/src/ntpd.conf.5 ${WRKSRC}/src/ntpd.8
 
 post-install:
 	cd ${STAGEDIR}${PREFIX}/etc && ${MV} ntpd.conf ntpd.conf.sample
 
 .include <bsd.port.mk>
Index: head/net/openntpd/distinfo
===================================================================
--- head/net/openntpd/distinfo	(revision 416519)
+++ head/net/openntpd/distinfo	(revision 416520)
@@ -1,2 +1,3 @@
-SHA256 (openntpd-5.9p1.tar.gz) = 200c04056d4d6441653cac71d515611f3903aa7b15b8f5661a40dab3fb3697b3
-SIZE (openntpd-5.9p1.tar.gz) = 432844
+TIMESTAMP = 1465311084
+SHA256 (openntpd-6.0p1.tar.gz) = b1ab80094788912adb12b33cb1f251cc58db39294c1b5c6376972f5f7ba577e8
+SIZE (openntpd-6.0p1.tar.gz) = 432696
Index: head/net/openntpd/files/patch-src_constraint.c
===================================================================
--- head/net/openntpd/files/patch-src_constraint.c	(revision 416519)
+++ head/net/openntpd/files/patch-src_constraint.c	(nonexistent)
@@ -1,11 +0,0 @@
---- src/constraint.c.orig	2016-03-28 13:51:51 UTC
-+++ src/constraint.c
-@@ -905,7 +905,7 @@ httpsdate_request(struct httpsdate *http
- 		 * or ANSI C's asctime() - the latter doesn't include
- 		 * the timezone which is required here.
- 		 */
--		if (strptime(p, "%a, %d %h %Y %T %Z",
-+		if (strptime(p, "%a, %d %h %Y %T GMT",
- 		    &httpsdate->tls_tm) == NULL) {
- 			log_warnx("unsupported date format");
- 			free(line);

Property changes on: head/net/openntpd/files/patch-src_constraint.c
___________________________________________________________________
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/openntpd/files/patch-include_signal.h
===================================================================
--- head/net/openntpd/files/patch-include_signal.h	(revision 416519)
+++ head/net/openntpd/files/patch-include_signal.h	(nonexistent)
@@ -1,10 +0,0 @@
---- include/signal.h.orig	2015-05-04 09:54:32 UTC
-+++ include/signal.h
-@@ -8,3 +8,7 @@
- #ifndef SIGINFO
- #define SIGINFO SIGUSR1
- #endif
-+
-+#ifndef _NSIG
-+#define _NSIG NSIG
-+#endif

Property changes on: head/net/openntpd/files/patch-include_signal.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/openntpd/files/patch-src_ntpd.8
===================================================================
--- head/net/openntpd/files/patch-src_ntpd.8	(revision 416519)
+++ head/net/openntpd/files/patch-src_ntpd.8	(revision 416520)
@@ -1,61 +1,61 @@
---- src/ntpd.8.orig	2016-03-28 13:51:51 UTC
+--- src/ntpd.8.orig	2016-05-30 22:50:02 UTC
 +++ src/ntpd.8
 @@ -56,7 +56,7 @@ Use
  .Ar file
  as the configuration file,
  instead of the default
 -.Pa /etc/ntpd.conf .
 +.Pa %%PREFIX%%/etc/ntpd.conf .
  .It Fl n
  Configtest mode.
  Only check the configuration file for validity.
 @@ -99,19 +99,19 @@ will be logged.
  After the local clock is synchronized,
  .Nm
  adjusts the clock frequency using the
 -.Xr adjfreq 2
 +.Xr ntp_adjtime 2
  system call to compensate for systematic drift.
  .Pp
  .Nm
  is usually started at boot time, and can be enabled by
  setting
 -.Va ntpd_flags
 +.Va openntpd_flags
  in
 -.Pa /etc/rc.conf.local .
 +.Pa /etc/rc.conf .
  See
  .Xr rc 8
  and
 -.Xr rc.conf 8
 +.Xr rc.conf 5
  for more information on the boot process
  and enabling daemons.
  .Pp
 @@ -124,8 +124,8 @@ and its initial clock drift from
  .Pa /var/db/ntpd.drift .
  Clock drift is periodically written to the drift file thereafter.
  .Sh FILES
 -.Bl -tag -width "/var/db/ntpd.driftXXX" -compact
 -.It Pa /etc/ntpd.conf
 +.Bl -tag -width "%%PREFIX%%/etc/ntpd.confXXX" -compact
 +.It Pa %%PREFIX%%/etc/ntpd.conf
  Default configuration file.
  .It Pa /var/db/ntpd.drift
  Drift file.
 @@ -135,12 +135,12 @@ Socket file for communication with
  .El
  .Sh SEE ALSO
  .Xr date 1 ,
 -.Xr adjfreq 2 ,
  .Xr adjtime 2 ,
 +.Xr ntp_adjtime 2 ,
  .Xr ntpd.conf 5 ,
 +.Xr rc.conf 5 ,
  .Xr ntpctl 8 ,
  .Xr rc 8 ,
 -.Xr rc.conf 8 ,
  .Xr rdate 8
  .Sh STANDARDS
  .Rs
Index: head/net/openntpd/files/patch-src_ntpd.conf.5
===================================================================
--- head/net/openntpd/files/patch-src_ntpd.conf.5	(revision 416519)
+++ head/net/openntpd/files/patch-src_ntpd.conf.5	(revision 416520)
@@ -1,13 +1,13 @@
---- src/ntpd.conf.5.orig	2016-03-28 13:51:51 UTC
+--- src/ntpd.conf.5.orig	2016-05-30 22:50:02 UTC
 +++ src/ntpd.conf.5
 @@ -218,8 +218,8 @@ constraints from "https://www.google.com
  .Ed
  .El
  .Sh FILES
 -.Bl -tag -width "/etc/ntpd.confXXX" -compact
 -.It Pa /etc/ntpd.conf
 +.Bl -tag -width "%%PREFIX%%/etc/ntpd.confXXX" -compact
 +.It Pa %%PREFIX%%/etc/ntpd.conf
  default
  .Xr ntpd 8
  configuration file
Index: head/net/openntpd/files/patch-src_server.c
===================================================================
--- head/net/openntpd/files/patch-src_server.c	(revision 416519)
+++ head/net/openntpd/files/patch-src_server.c	(revision 416520)
@@ -1,47 +1,76 @@
---- src/server.c.orig	2016-03-28 13:51:51 UTC
+--- src/server.c.orig	2016-05-30 22:50:02 UTC
 +++ src/server.c
-@@ -36,14 +36,14 @@ setup_listeners(struct servent *se, stru
+@@ -35,8 +35,8 @@ setup_listeners(struct servent *se, stru
+ 	struct listen_addr	*la, *nla, *lap;
  	struct ifaddrs		*ifa, *ifap;
  	struct sockaddr		*sa;
- #ifdef SO_RTABLE
+-#ifdef SO_RTABLE
 -	struct if_data		*ifd;
++#ifdef SO_SETFIB
 +	struct ifreq		 ifr;
  #endif
  	u_int8_t		*a6;
  	size_t			 sa6len = sizeof(struct in6_addr);
- 	u_int			 new_cnt = 0;
- 	int			 tos = IPTOS_LOWDELAY;
- #ifdef SO_RTABLE
+@@ -45,8 +45,8 @@ setup_listeners(struct servent *se, stru
+ #ifdef IPV6_V6ONLY
+ 	int			 on = 1;
+ #endif
+-#ifdef SO_RTABLE
 -	int			 rdomain = 0;
++#ifdef SO_SETFIB
 +	int			 rdomain, fd;
  #endif
  
  	TAILQ_FOREACH(lap, &lconf->listen_addrs, entry) {
-@@ -56,16 +56,21 @@ setup_listeners(struct servent *se, stru
+@@ -59,16 +59,20 @@ setup_listeners(struct servent *se, stru
  				sa = ifap->ifa_addr;
  				if (sa == NULL || SA_LEN(sa) == 0)
  					continue;
 -#ifdef SO_RTABLE
 -				if (sa->sa_family == AF_LINK) {
 -					ifd = ifap->ifa_data;
 -					rdomain = ifd->ifi_rdomain;
 -				}
 -#endif
  				if (sa->sa_family != AF_INET &&
  				    sa->sa_family != AF_INET6)
  					continue;
- #ifdef SO_RTABLE
+-#ifdef SO_RTABLE
++#ifdef SO_SETFIB
 +				strlcpy(ifr.ifr_name, ifap->ifa_name,
 +				    sizeof(ifr.ifr_name));
 +
 +				fd = socket(AF_INET, SOCK_DGRAM, 0);
-+				if (ioctl(fd, SIOCGIFRDOMAIN,
-+				    (caddr_t)&ifr) == -1)
++				if (ioctl(fd, SIOCGIFFIB, (caddr_t)&ifr) == -1)
 +					rdomain = 0;
 +				else
-+					rdomain = ifr.ifr_rdomainid;
++					rdomain = ifr.ifr_fib;
 +				close(fd);
 +
  				if (lap->rtable != -1 && rdomain != lap->rtable)
  					continue;
  #endif
+@@ -90,7 +94,7 @@ setup_listeners(struct servent *se, stru
+ 					fatal("setup_listeners calloc");
+ 
+ 				memcpy(&la->sa, sa, SA_LEN(sa));
+-#ifdef SO_RTABLE
++#ifdef SO_SETFIB
+ 				la->rtable = rdomain;
+ #endif
+ 
+@@ -143,11 +147,11 @@ setup_listeners(struct servent *se, stru
+ 			log_warn("setsockopt IPV6_V6ONLY");
+ #endif
+ 
+-#ifdef SO_RTABLE
++#ifdef SO_SETFIB
+ 		if (la->rtable != -1 &&
+-		    setsockopt(la->fd, SOL_SOCKET, SO_RTABLE, &la->rtable,
++		    setsockopt(la->fd, SOL_SOCKET, SO_SETFIB, &la->rtable,
+ 		    sizeof(la->rtable)) == -1)
+-			fatal("setup_listeners setsockopt SO_RTABLE");
++			fatal("setup_listeners setsockopt SO_SETFIB");
+ #endif
+ 
+ 		if (bind(la->fd, (struct sockaddr *)&la->sa,