svn commit: r460673 - in head/net/ntp-devel: . files

[Cy Schubert]

Author: cy
Date: Fri Feb  2 07:00:18 2018
New Revision: 460673
URL: https://svnweb.freebsd.org/changeset/ports/460673

Log:
  Fix RIPENCC TRIMBLE driver compile error.
  
  PR:		223819

Added:
  head/net/ntp-devel/files/patch-ntpd__refclock__ripencc.c   (contents, props changed)
Modified:
  head/net/ntp-devel/Makefile

Modified: head/net/ntp-devel/Makefile
==============================================================================
--- head/net/ntp-devel/Makefile	Fri Feb  2 06:58:33 2018	(r460672)
+++ head/net/ntp-devel/Makefile	Fri Feb  2 07:00:18 2018	(r460673)
@@ -3,7 +3,7 @@
 
 PORTNAME=	ntp
 PORTVERSION=	4.3.93
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-dev/ \
 		http://archive.ntp.org/ntp4/ntp-dev/

Added: head/net/ntp-devel/files/patch-ntpd__refclock__ripencc.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/ntp-devel/files/patch-ntpd__refclock__ripencc.c	Fri Feb  2 07:00:18 2018	(r460673)
@@ -0,0 +1,38 @@
+--- ntpd/refclock_ripencc.c.orig	2014-12-18 18:42:01.000000000 -0800
++++ ntpd/refclock_ripencc.c	2017-11-23 19:41:57.473988000 -0800
+@@ -1517,7 +1517,7 @@
+ 
+ 	record_clock_stats(&peer->srcadr, logbuf);
+ 
+-	if (!utcflags & UTCF_UTC_AVAIL)
++	if (!(utcflags & UTCF_UTC_AVAIL))
+ 		return(-1);
+ 
+ 	/* poll for UTC parameters once and then if UTC flag changed */
+@@ -3442,7 +3442,7 @@
+ 	    status1, status2;
+ 	const char
+ 	    *text;
+-	static const char const
++	static const char
+ 	    *sc_text[] = {
+ 		"Doing position fixes",
+ 		"Don't have GPS time yet",
+@@ -4442,8 +4442,6 @@
+ 		known = TRUE;
+ 	}
+ 	if (known == FALSE) pbuf += sprintf(pbuf, "No known");
+-	reserved = reserved;
+-
+ }
+ 
+ /* 0x8F */
+@@ -5059,7 +5057,7 @@
+ 	{
+ 		for (i=0; i<8; i++)
+ 		{
+-			if (Flags&(1<<i)) pbuf += sprintf(pbuf, LeapStatusText[i]);
++			if (Flags&(1<<i)) pbuf += sprintf(pbuf, " %s", LeapStatusText[i]);
+ 		}
+ 	}
+ 	else