From owner-svn-src-all@FreeBSD.ORG  Mon Oct 24 20:52:41 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D8006106564A;
	Mon, 24 Oct 2011 20:52:41 +0000 (UTC)
	(envelope-from obrien@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C7C088FC1A;
	Mon, 24 Oct 2011 20:52:41 +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 p9OKqfaY062269;
	Mon, 24 Oct 2011 20:52:41 GMT (envelope-from obrien@svn.freebsd.org)
Received: (from obrien@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9OKqfwj062265;
	Mon, 24 Oct 2011 20:52:41 GMT (envelope-from obrien@svn.freebsd.org)
Message-Id: <201110242052.p9OKqfwj062265@svn.freebsd.org>
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Mon, 24 Oct 2011 20:52:41 +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: r226702 - in head: contrib/gcc gnu/usr.bin/cc
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 24 Oct 2011 20:52:41 -0000

Author: obrien
Date: Mon Oct 24 20:52:41 2011
New Revision: 226702
URL: http://svn.freebsd.org/changeset/base/226702

Log:
  * Don't give the impression that this compiler is GPLv3.
    (It is "well known" that GCC 4.2.2 is GPLv3.)
  * Don't give the impression that this compiler isn't "trustable".
  * Fix dependency nit.

Modified:
  head/contrib/gcc/BASE-VER
  head/contrib/gcc/DEV-PHASE
  head/gnu/usr.bin/cc/Makefile.ver

Modified: head/contrib/gcc/BASE-VER
==============================================================================
--- head/contrib/gcc/BASE-VER	Mon Oct 24 20:48:02 2011	(r226701)
+++ head/contrib/gcc/BASE-VER	Mon Oct 24 20:52:41 2011	(r226702)
@@ -1 +1 @@
-4.2.2
+4.2.1

Modified: head/contrib/gcc/DEV-PHASE
==============================================================================
--- head/contrib/gcc/DEV-PHASE	Mon Oct 24 20:48:02 2011	(r226701)
+++ head/contrib/gcc/DEV-PHASE	Mon Oct 24 20:52:41 2011	(r226702)
@@ -1 +1 @@
-prerelease
+patched

Modified: head/gnu/usr.bin/cc/Makefile.ver
==============================================================================
--- head/gnu/usr.bin/cc/Makefile.ver	Mon Oct 24 20:48:02 2011	(r226701)
+++ head/gnu/usr.bin/cc/Makefile.ver	Mon Oct 24 20:52:41 2011	(r226702)
@@ -4,7 +4,7 @@ BASEVER!=	cat ${GCCDIR}/BASE-VER
 DATESTAMP!=	cat ${GCCDIR}/DATESTAMP
 DEVPHASE!=	cat ${GCCDIR}/DEV-PHASE
 
-version.o:	version.c
+version.o: version.c ${GCCDIR}/BASE-VER ${GCCDIR}/DATESTAMP ${GCCDIR}/DEV-PHASE
 	${CC} ${CFLAGS} -DBASEVER=\"${BASEVER}\" \
 		-DDATESTAMP=\"\ ${DATESTAMP}\" \
 		-DDEVPHASE=\"\ ${DEVPHASE}\" -c ${.IMPSRC}