From owner-p4-projects@FreeBSD.ORG  Mon Jun  2 23:13:09 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5842A1065672; Mon,  2 Jun 2008 23:13:09 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D9818106566B
	for <perforce@freebsd.org>; Mon,  2 Jun 2008 23:13:08 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id D98BA8FC15
	for <perforce@freebsd.org>; Mon,  2 Jun 2008 23:13:08 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m52ND8bF026589
	for <perforce@freebsd.org>; Mon, 2 Jun 2008 23:13:08 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m52ND8tF026587
	for perforce@freebsd.org; Mon, 2 Jun 2008 23:13:08 GMT
	(envelope-from jb@freebsd.org)
Date: Mon, 2 Jun 2008 23:13:08 GMT
Message-Id: <200806022313.m52ND8tF026587@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 142774 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: Mon, 02 Jun 2008 23:13:09 -0000

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

Change 142774 by jb@freebsd3 on 2008/06/02 23:12:31

	Merging this file from current wasn't a good idea.

Affected files ...

.. //depot/projects/dtrace7/src/share/mk/bsd.own.mk#8 edit

Differences ...

==== //depot/projects/dtrace7/src/share/mk/bsd.own.mk#8 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/mk/bsd.own.mk,v 1.75 2008/05/26 10:39:52 bz Exp $
+# $FreeBSD: src/share/mk/bsd.own.mk,v 1.67.2.4 2008/01/28 08:42:15 dougb Exp $
 #
 # The include file <bsd.own.mk> set common variables for owner,
 # group, mode, and directories. Defaults are in brackets.
@@ -162,6 +162,8 @@
 NLSGRP?=	${SHAREGRP}
 NLSMODE?=	${NOBINMODE}
 
+DEFAULT_THREAD_LIB?=	libthr
+
 INCLUDEDIR?=	/usr/include
 
 # Common variables
@@ -229,6 +231,7 @@
     GPIB \
     GROFF \
     HTML \
+    I4B \
     INET6 \
     INFO \
     IPFILTER \
@@ -315,6 +318,7 @@
     GPIB \
     GROFF \
     HTML \
+    I4B \
     INET6 \
     INFO \
     INSTALLLIB \
@@ -324,6 +328,7 @@
     KVM \
     LIB32 \
     LIBPTHREAD \
+    LIBKSE \
     LIBTHR \
     LOCALES \
     LPR \
@@ -354,8 +359,8 @@
     TOOLCHAIN \
     USB \
     WPA_SUPPLICANT_EAPOL \
-    ZFS \
-    ZONEINFO
+    ZONEINFO \
+    ZFS
 .if defined(WITH_${var}) && defined(WITHOUT_${var})
 .error WITH_${var} and WITHOUT_${var} can't both be set.
 .endif
@@ -394,10 +399,11 @@
 # Order is somewhat important.
 #
 .if ${MK_LIBPTHREAD} == "no"
+MK_LIBKSE:=	no
 MK_LIBTHR:=	no
 .endif
 
-.if ${MK_LIBTHR} == "no"
+.if ${MK_LIBKSE} == "no" && ${MK_LIBTHR} == "no"
 MK_BIND:=	no
 .endif