From owner-svn-ports-all@FreeBSD.ORG  Sat Sep 21 21:31:57 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id F1ED37A2;
 Sat, 21 Sep 2013 21:31:56 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id DF40C29BE;
 Sat, 21 Sep 2013 21:31:56 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8LLVufB083040;
 Sat, 21 Sep 2013 21:31:56 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8LLVuaX083039;
 Sat, 21 Sep 2013 21:31:56 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Message-Id: <201309212131.r8LLVuaX083039@svn.freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Sat, 21 Sep 2013 21:31:56 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r327842 - head
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 21 Sep 2013 21:31:57 -0000

Author: bdrewery
Date: Sat Sep 21 21:31:56 2013
New Revision: 327842
URL: http://svnweb.freebsd.org/changeset/ports/327842

Log:
  - Recommend only enabling WITH_SSP for /usr/ports as it will
    break with /usr/src 'make installworld' due to some of those
    Makefiles having WITHOUT_SSP hardcoded in them, causing an error
    that both can't be defined.

Modified:
  head/UPDATING

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Sat Sep 21 20:39:37 2013	(r327841)
+++ head/UPDATING	Sat Sep 21 21:31:56 2013	(r327842)
@@ -28,6 +28,10 @@ you update your ports collection, before
   Optional Stack Protector [1] support has been added with the WITH_SSP
   knob.
 
+  .if !empty(.CURDIR:M/usr/ports*)
+  WITH_SSP=	yes
+  .endif
+
   This currently is only supported on FreeBSD 10 amd64/i386 and earlier
   releases on amd64 only.