From owner-p4-projects@FreeBSD.ORG  Thu Jun 22 13:06:08 2006
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 2E51816A47B; Thu, 22 Jun 2006 13:06:08 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id D8B1C16A479
	for <perforce@FreeBSD.org>; Thu, 22 Jun 2006 13:06:07 +0000 (UTC)
	(envelope-from gabor@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 60F8F43D8B
	for <perforce@FreeBSD.org>; Thu, 22 Jun 2006 13:06:03 +0000 (GMT)
	(envelope-from gabor@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5MD63B0064407
	for <perforce@FreeBSD.org>; Thu, 22 Jun 2006 13:06:03 GMT
	(envelope-from gabor@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5MD635X064404
	for perforce@freebsd.org; Thu, 22 Jun 2006 13:06:03 GMT
	(envelope-from gabor@FreeBSD.org)
Date: Thu, 22 Jun 2006 13:06:03 GMT
Message-Id: <200606221306.k5MD635X064404@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 99805 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: Thu, 22 Jun 2006 13:06:08 -0000

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

Change 99805 by gabor@spitfire on 2006/06/22 13:05:50

	Try to get OSVERSION from userland if possible, since userland
	has more impact on the ports as kernel does and this approach also
	fixes issues when we have a kernel and a jail with different
	OSVERSIONs and issues with DESTDIR.  If getting OSVERSION from
	userland is impossible it is still got from the kernel.

Affected files ...

.. //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#4 edit

Differences ...

==== //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#4 (text+ko) ====

@@ -1137,13 +1137,18 @@
 OSREL!=	${UNAME} -r | ${SED} -e 's/[-(].*//'
 .endif
 
-### FIXME: OSVERSION in DESTDIR and in jail
-
 # Get __FreeBSD_version
 .if !defined(OSVERSION)
-OSVERSION!=	${SYSCTL} -n kern.osreldate
+.if exists(${DESTDIR}/usr/include/sys/param.h)
+OSVERSION!=     ${AWK} '/^\#define __FreeBSD_version/ {print $$3}' < ${DESTDIR}/usr/include/sys/param.h
+.elif exists(${DESTDIR}/usr/src/sys/sys/param.h)
+OSVERSION!=     ${AWK} '/^\#define __FreeBSD_version/ {print $$3}' < ${DESTDIR}/usr/src/sys/sys/param.h
+.else
+OSVERSION!=     /sbin/sysctl -n kern.osreldate
+.endif
 .endif
 
+
 # Get the object format.
 .if !defined(PORTOBJFORMAT)
 PORTOBJFORMAT!=		${TEST} -x /usr/bin/objformat && /usr/bin/objformat || ${ECHO_CMD} aout