From owner-p4-projects@FreeBSD.ORG  Fri Jun 15 16:13:12 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C9F3816A479; Fri, 15 Jun 2007 16:13:11 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 8FCC816A477
	for <perforce@freebsd.org>; Fri, 15 Jun 2007 16:13:11 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 80FCA13C4B0
	for <perforce@freebsd.org>; Fri, 15 Jun 2007 16:13:11 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5FGDBS8083691
	for <perforce@freebsd.org>; Fri, 15 Jun 2007 16:13:11 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5FGDBKB083683
	for perforce@freebsd.org; Fri, 15 Jun 2007 16:13:11 GMT
	(envelope-from gabor@freebsd.org)
Date: Fri, 15 Jun 2007 16:13:11 GMT
Message-Id: <200706151613.l5FGDBKB083683@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gabor@freebsd.org using -f
From: Gabor Kovesdan <gabor@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 121701 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 15 Jun 2007 16:13:12 -0000

http://perforce.freebsd.org/chv.cgi?CH=121701

Change 121701 by gabor@gabor_server on 2007/06/15 16:12:52

	Change OSVERSION handling here, as well. This change was forgotten when
	I was working on the DESTDIR support last summer.
	
	Reported by:	kris

Affected files ...

.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.subdir.mk#9 edit

Differences ...

==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.subdir.mk#9 (text+ko) ====

@@ -58,10 +58,12 @@
 OSREL!=	/usr/bin/uname -r | sed -e 's/[-(].*//'
 .endif
 .if !defined(OSVERSION)
-.if exists(/sbin/sysctl)
-OSVERSION!= /sbin/sysctl -n kern.osreldate
+.if exists(/usr/include/sys/param.h)
+OSVERSION!=	${AWK} '/^\#define __FreeBSD_version/ {print $$3}' < /usr/include/sys/param.h
+.elif exists(/usr/src/sys/sys/param.h)
+OSVERSION!=	${AWK} '/^\#define __FreeBSD_version/ {print $$3}' < /usr/src/sys/sys/param.h
 .else
-OSVERSION!= /usr/sbin/sysctl -n kern.osreldate
+OSVERSION!=	${SYSCTL} -n kern.osreldate
 .endif
 .endif
 .endif