From owner-svn-ports-head@FreeBSD.ORG Mon Dec 22 08:30:01 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A4A9C4B9; Mon, 22 Dec 2014 08:30:01 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 76F032E13; Mon, 22 Dec 2014 08:30:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBM8U1dY095209; Mon, 22 Dec 2014 08:30:01 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBM8U1r2095198; Mon, 22 Dec 2014 08:30:01 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201412220830.sBM8U1r2095198@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Mon, 22 Dec 2014 08:30:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r375215 - in head/net/ntp: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Dec 2014 08:30:01 -0000 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)