From owner-svn-src-all@FreeBSD.ORG  Wed Aug 12 12:00:23 2009
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3557B1065692;
	Wed, 12 Aug 2009 12:00:23 +0000 (UTC)
	(envelope-from cperciva@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1E5438FC50;
	Wed, 12 Aug 2009 12:00:23 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n7CC0NAh063444;
	Wed, 12 Aug 2009 12:00:23 GMT
	(envelope-from cperciva@svn.freebsd.org)
Received: (from cperciva@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n7CC0NaM063442;
	Wed, 12 Aug 2009 12:00:23 GMT
	(envelope-from cperciva@svn.freebsd.org)
Message-Id: <200908121200.n7CC0NaM063442@svn.freebsd.org>
From: Colin Percival <cperciva@FreeBSD.org>
Date: Wed, 12 Aug 2009 12:00:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-other@freebsd.org
X-SVN-Group: stable-other
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r196130 - in stable/8/usr.sbin/ntp: . scripts
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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, 12 Aug 2009 12:00:24 -0000

Author: cperciva
Date: Wed Aug 12 12:00:22 2009
New Revision: 196130
URL: http://svn.freebsd.org/changeset/base/196130

Log:
  Merge r196128 to stable/8.
  
  Approved by:	re (rwatson)

Modified:
  stable/8/usr.sbin/ntp/   (props changed)
  stable/8/usr.sbin/ntp/scripts/mkver

Modified: stable/8/usr.sbin/ntp/scripts/mkver
==============================================================================
--- stable/8/usr.sbin/ntp/scripts/mkver	Wed Aug 12 12:00:21 2009	(r196129)
+++ stable/8/usr.sbin/ntp/scripts/mkver	Wed Aug 12 12:00:22 2009	(r196130)
@@ -23,8 +23,6 @@ case "" in
  *)  ConfStr="${ConfStr}-r" ;;
 esac
 
-ConfStr="$ConfStr `LC_ALL=C date`"
-
 if [ ! -f .version ]; then
   echo 0 > .version
 fi