svn commit: r375215 - in head/net/ntp: . files

[Cy Schubert]

Author: cy
Date: Mon Dec 22 08:30:00 2014
New Revision: 375215
URL: https://svnweb.freebsd.org/changeset/ports/375215
QAT: https://qat.redports.org/buildarchive/r375215/

Log:
  Unbreak MX4200.
  
  Submitted by:	delphij

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

Modified: head/net/ntp/Makefile
==============================================================================
--- head/net/ntp/Makefile	Mon Dec 22 08:18:25 2014	(r375214)
+++ head/net/ntp/Makefile	Mon Dec 22 08:30:00 2014	(r375215)
@@ -3,7 +3,7 @@
 
 PORTNAME=	ntp
 PORTVERSION=	4.2.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net ipv6
 MASTER_SITES=	ftp://ftp.udel.edu/pub/ntp/ntp4/ \
 		http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ \
@@ -48,10 +48,6 @@ 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.

Added: head/net/ntp/files/patch-ntpd__refclock__mx4200.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/ntp/files/patch-ntpd__refclock__mx4200.c	Mon Dec 22 08:30:00 2014	(r375215)
@@ -0,0 +1,25 @@
+--- ntpd/refclock_mx4200.c.orig	2014-12-19 11:56:52 UTC
++++ ntpd/refclock_mx4200.c
+@@ -1572,7 +1572,7 @@ mx4200_debug(struct peer *peer, char *fm
+ 		 * Print debug message to stdout
+ 		 * In the future, we may want to get get more creative...
+ 		 */
+-		mvprintf(fmt, ap);
++		vprintf(fmt, ap);
+ 
+ 		va_end(ap);
+ 	}
+@@ -1613,11 +1613,11 @@ mx4200_send(peer, fmt, va_alist)
+ 
+ 	cp = buf;
+ 	*cp++ = '$';
+-	n = VSNPRINTF((cp, sizeof(buf) - 1, fmt, ap));
++	n = vsnprintf(cp, sizeof(buf) - 1, fmt, ap);
+ 	ck = mx4200_cksum(cp, n);
+ 	cp += n;
+ 	++n;
+-	n += SNPRINTF((cp, sizeof(buf) - n - 5, "*%02X\r\n", ck));
++	n += snprintf(cp, sizeof(buf) - n - 5, "*%02X\r\n", ck);
+ 
+ 	m = write(pp->io.fd, buf, (unsigned)n);
+ 	if (m < 0)