From owner-svn-src-stable-9@FreeBSD.ORG Fri Oct 11 18:19:09 2013 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 12F5597C; Fri, 11 Oct 2013 18:19:09 +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 EC0372903; Fri, 11 Oct 2013 18:19:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9BIJ8YV027460; Fri, 11 Oct 2013 18:19:08 GMT (envelope-from roberto@svn.freebsd.org) Received: (from roberto@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9BIJ8Ml027458; Fri, 11 Oct 2013 18:19:08 GMT (envelope-from roberto@svn.freebsd.org) Message-Id: <201310111819.r9BIJ8Ml027458@svn.freebsd.org> From: Ollivier Robert Date: Fri, 11 Oct 2013 18:19:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r256324 - in stable/9/usr.sbin/ntp: . libparse X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Oct 2013 18:19:09 -0000 Author: roberto Date: Fri Oct 11 18:19:08 2013 New Revision: 256324 URL: http://svnweb.freebsd.org/changeset/base/256324 Log: MFC r256009: Meinberg clocks support was inadvertently removed during the last vendor import. Add it back. Modified: stable/9/usr.sbin/ntp/config.h stable/9/usr.sbin/ntp/libparse/Makefile Directory Properties: stable/9/usr.sbin/ntp/ (props changed) Modified: stable/9/usr.sbin/ntp/config.h ============================================================================== --- stable/9/usr.sbin/ntp/config.h Fri Oct 11 18:14:49 2013 (r256323) +++ stable/9/usr.sbin/ntp/config.h Fri Oct 11 18:19:08 2013 (r256324) @@ -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: stable/9/usr.sbin/ntp/libparse/Makefile ============================================================================== --- stable/9/usr.sbin/ntp/libparse/Makefile Fri Oct 11 18:14:49 2013 (r256323) +++ stable/9/usr.sbin/ntp/libparse/Makefile Fri Oct 11 18:19:08 2013 (r256324) @@ -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}/../