From owner-svn-src-all@FreeBSD.ORG  Wed Oct  2 21:47:26 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 7AEA366A;
 Wed,  2 Oct 2013 21:47:26 +0000 (UTC)
 (envelope-from roberto@FreeBSD.org)
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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6721B2C7E;
 Wed,  2 Oct 2013 21:47:26 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r92LlQso081804;
 Wed, 2 Oct 2013 21:47:26 GMT (envelope-from roberto@svn.freebsd.org)
Received: (from roberto@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r92LlQSf081800;
 Wed, 2 Oct 2013 21:47:26 GMT (envelope-from roberto@svn.freebsd.org)
Message-Id: <201310022147.r92LlQSf081800@svn.freebsd.org>
From: Ollivier Robert <roberto@FreeBSD.org>
Date: Wed, 2 Oct 2013 21:47:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r256009 - in head/usr.sbin/ntp: . libparse
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 02 Oct 2013 21:47:26 -0000

Author: roberto
Date: Wed Oct  2 21:47:25 2013
New Revision: 256009
URL: http://svnweb.freebsd.org/changeset/base/256009

Log:
  Meinberg clocks support was inadvertently removed during the last vendor
  import.  Add it back.
  
  PR:		bin/182545
  Submitted by:	Joerg Pulz <Joerg.Pulz@frm2.tum.de>
  Approved by:	re (delphij)
  MFC after:	1 week

Modified:
  head/usr.sbin/ntp/config.h
  head/usr.sbin/ntp/libparse/Makefile

Modified: head/usr.sbin/ntp/config.h
==============================================================================
--- head/usr.sbin/ntp/config.h	Wed Oct  2 20:44:36 2013	(r256008)
+++ head/usr.sbin/ntp/config.h	Wed Oct  2 21:47:25 2013	(r256009)
@@ -84,7 +84,7 @@
 #define CLOCK_LOCAL 1
 
 /* Meinberg clocks */
-/* #undef CLOCK_MEINBERG */
+#define CLOCK_MEINBERG 1
 
 /* Magnavox MX4200 GPS receiver */
 /* #undef CLOCK_MX4200 */

Modified: head/usr.sbin/ntp/libparse/Makefile
==============================================================================
--- head/usr.sbin/ntp/libparse/Makefile	Wed Oct  2 20:44:36 2013	(r256008)
+++ head/usr.sbin/ntp/libparse/Makefile	Wed Oct  2 21:47:25 2013	(r256009)
@@ -9,7 +9,7 @@ SRCS=	clk_computime.c	clk_dcf7000.c	clk_
 	clk_rawdcf.c	clk_rcc8000.c	clk_schmid.c	clk_trimtaip.c \
 	clk_trimtsip.c	clk_varitext.c	clk_wharton.c	data_mbg.c \
 	info_trimble.c	parse.c		parse_conf.c	trim_info.c \
-	binio.c gpstolfp.c
+	binio.c gpstolfp.c ieee754io.c mfp_mul.c
 
 CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../