From owner-freebsd-stable@FreeBSD.ORG  Fri Jan  6 18:22:07 2012
Return-Path: <owner-freebsd-stable@FreeBSD.ORG>
Delivered-To: stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 729141065751;
	Fri,  6 Jan 2012 18:22:07 +0000 (UTC)
	(envelope-from pinter@tresorium.hu)
Received: from mail-ee0-f54.google.com (mail-ee0-f54.google.com [74.125.83.54])
	by mx1.freebsd.org (Postfix) with ESMTP id CB14A8FC20;
	Fri,  6 Jan 2012 18:22:06 +0000 (UTC)
Received: by eekc50 with SMTP id c50so1442170eek.13
	for <multiple recipients>; Fri, 06 Jan 2012 10:22:05 -0800 (PST)
Received: by 10.14.125.210 with SMTP id z58mr2604447eeh.100.1325872242590;
	Fri, 06 Jan 2012 09:50:42 -0800 (PST)
Received: from peonia (peonia.teteny.elte.hu. [157.181.96.25])
	by mx.google.com with ESMTPS id e12sm99713469eea.5.2012.01.06.09.50.40
	(version=TLSv1/SSLv3 cipher=OTHER);
	Fri, 06 Jan 2012 09:50:41 -0800 (PST)
From: Oliver Pinter <pinter@tresorium.hu>
Organization: Tresorium Ltd.
To: stable@freebsd.org
Date: Fri, 6 Jan 2012 18:50:33 +0100
User-Agent: KMail/1.9.10
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_pRzBPReUZlYSbPc"
Message-Id: <201201061850.33863.pinter@tresorium.hu>
Cc: current@freebsd.org
Subject: [RFC] fix git detection code in newvers.sh when svn installed
X-BeenThere: freebsd-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Production branch of FreeBSD source code <freebsd-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>, 
	<mailto:freebsd-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-stable>
List-Post: <mailto:freebsd-stable@freebsd.org>
List-Help: <mailto:freebsd-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
	<mailto:freebsd-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 06 Jan 2012 18:22:07 -0000

--Boundary-00=_pRzBPReUZlYSbPc
Content-Type: text/plain;
  charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Hi All!

When svn installed and the source stored in git, then now the version 
detection failed. The attached patch fixed this situation.


-- 
Oliver Pinter
(Tresorium)

--Boundary-00=_pRzBPReUZlYSbPc
Content-Type: text/x-diff; charset="iso 8859-15";
	name="20120103121800-fix-newvers-sh-git.diff"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
	filename="20120103121800-fix-newvers-sh-git.diff"

=46rom a84c998c251a83ba3fa3c734b7fbc6fe1af17c6a Mon Sep 17 00:00:00 2001
=46rom: Oliver Pinter <oliver.pntr@gmail.com>
Date: Tue, 3 Jan 2012 12:17:43 +0100
Subject: [PATCH] fix git detection code in newvers.sh

Signed-off-by: Oliver Pinter <oliver.pntr@gmail.com>

diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index c6184a8..b015735 100644
=2D-- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -92,6 +92,9 @@ for dir in /bin /usr/bin /usr/local/bin; do
 		svnversion=3D${dir}/svnversion
 		break
 	fi
+done
+
+for dir in /bin /usr/bin /usr/local/bin; do
 	if [ -d "${SYSDIR}/../.git" -a -x "${dir}/git" ] ; then
 		git_cmd=3D"${dir}/git --git-dir=3D${SYSDIR}/../.git"
 		break

--Boundary-00=_pRzBPReUZlYSbPc--