From owner-svn-src-head@FreeBSD.ORG  Fri Dec  2 09:09:54 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C87F2106564A;
	Fri,  2 Dec 2011 09:09:54 +0000 (UTC)
	(envelope-from fjoe@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B81BB8FC18;
	Fri,  2 Dec 2011 09:09:54 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pB299sso084592;
	Fri, 2 Dec 2011 09:09:54 GMT (envelope-from fjoe@svn.freebsd.org)
Received: (from fjoe@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pB299sFk084589;
	Fri, 2 Dec 2011 09:09:54 GMT (envelope-from fjoe@svn.freebsd.org)
Message-Id: <201112020909.pB299sFk084589@svn.freebsd.org>
From: Max Khon <fjoe@FreeBSD.org>
Date: Fri, 2 Dec 2011 09:09:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r228196 - in head: share/mk tools/build/options
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Dec 2011 09:09:54 -0000

Author: fjoe
Date: Fri Dec  2 09:09:54 2011
New Revision: 228196
URL: http://svn.freebsd.org/changeset/base/228196

Log:
  Revert to conservative defaults. WITH_PROFILE is a default now.
  
  NO_PROFILE overrides in Makefile.inc1 and bsd.own.m are left intact
  so that the reversal to the WITHOUT_PROFILE will be easier in future.

Added:
  head/tools/build/options/WITHOUT_PROFILE
     - copied, changed from r228148, head/tools/build/options/WITH_PROFILE
Deleted:
  head/tools/build/options/WITH_PROFILE
Modified:
  head/share/mk/bsd.own.mk

Modified: head/share/mk/bsd.own.mk
==============================================================================
--- head/share/mk/bsd.own.mk	Fri Dec  2 02:19:03 2011	(r228195)
+++ head/share/mk/bsd.own.mk	Fri Dec  2 09:09:54 2011	(r228196)
@@ -383,6 +383,7 @@ __DEFAULT_YES_OPTIONS = \
     PMC \
     PORTSNAP \
     PPP \
+    PROFILE \
     QUOTAS \
     RCMDS \
     RCS \
@@ -418,8 +419,7 @@ __DEFAULT_NO_OPTIONS = \
     ICONV \
     IDEA \
     LIBCPLUSPLUS \
-    OFED \
-    PROFILE
+    OFED
 
 #
 # Default behaviour of some options depends on the architecture.  Unfortunately

Copied and modified: head/tools/build/options/WITHOUT_PROFILE (from r228148, head/tools/build/options/WITH_PROFILE)
==============================================================================
--- head/tools/build/options/WITH_PROFILE	Tue Nov 29 21:28:48 2011	(r228148, copy source)
+++ head/tools/build/options/WITHOUT_PROFILE	Fri Dec  2 09:09:54 2011	(r228196)
@@ -1,2 +1,2 @@
 .\" $FreeBSD$
-Set to build profiled libraries.
+Set to avoid compiling profiled libraries.