From owner-svn-src-head@FreeBSD.ORG  Sat May 10 16:38:46 2014
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:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 47AF4478;
 Sat, 10 May 2014 16:38:46 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 35721216;
 Sat, 10 May 2014 16:38:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4AGckdv006947;
 Sat, 10 May 2014 16:38:46 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4AGckAJ006946;
 Sat, 10 May 2014 16:38:46 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201405101638.s4AGckAJ006946@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Sat, 10 May 2014 16:38:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r265837 - head
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18
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/options/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: Sat, 10 May 2014 16:38:46 -0000

Author: imp
Date: Sat May 10 16:38:45 2014
New Revision: 265837
URL: http://svnweb.freebsd.org/changeset/base/265837

Log:
  We haven't done anything with _UPGRADING in ~forever (was present, but
  not needed, in FreeBSD 6.x, and has been absent in newer versions).
  This was needed to upgrade from 3.x -> 4.x, once upon a time.

Modified:
  head/Makefile

Modified: head/Makefile
==============================================================================
--- head/Makefile	Sat May 10 16:38:37 2014	(r265836)
+++ head/Makefile	Sat May 10 16:38:45 2014	(r265837)
@@ -327,7 +327,7 @@ MMAKEENV=	MAKEOBJDIRPREFIX=${MYMAKE:H} \
 		DESTDIR= \
 		INSTALL="sh ${.CURDIR}/tools/install.sh"
 MMAKE=		${MMAKEENV} ${MAKE} \
-		-D_UPGRADING -DNO_MAN -DNO_SHARED \
+		-DNO_MAN -DNO_SHARED \
 		-DNO_CPU_CFLAGS -DNO_WERROR \
 		DESTDIR= PROGNAME=${MYMAKE:T}