From owner-p4-projects@FreeBSD.ORG  Thu Dec  8 05:05:22 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AC80316A422; Thu,  8 Dec 2005 05:05:21 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 6C26B16A41F
	for <perforce@freebsd.org>; Thu,  8 Dec 2005 05:05:21 +0000 (GMT)
	(envelope-from soc-andrew@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8A87D43D55
	for <perforce@freebsd.org>; Thu,  8 Dec 2005 05:05:14 +0000 (GMT)
	(envelope-from soc-andrew@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jB8559st044490
	for <perforce@freebsd.org>; Thu, 8 Dec 2005 05:05:09 GMT
	(envelope-from soc-andrew@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jB85599L044487
	for perforce@freebsd.org; Thu, 8 Dec 2005 05:05:09 GMT
	(envelope-from soc-andrew@freebsd.org)
Date: Thu, 8 Dec 2005 05:05:09 GMT
Message-Id: <200512080505.jB85599L044487@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	soc-andrew@freebsd.org using -f
From: soc-andrew <soc-andrew@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 87876 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: Thu, 08 Dec 2005 05:05:22 -0000

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

Change 87876 by soc-andrew@soc-andrew_serv on 2005/12/08 05:05:05

	Last IFC before the BETA-2 build

Affected files ...

.. //depot/projects/soc2005/bsdinstaller/src/Makefile.inc1#8 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/scripts/package-split.py#3 integrate

Differences ...

==== //depot/projects/soc2005/bsdinstaller/src/Makefile.inc1#8 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.530 2005/12/07 20:01:12 ru Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.531 2005/12/07 22:55:29 obrien Exp $
 #
 # Make command line options:
 #	-DNO_DYNAMICROOT do not link /bin and /sbin dynamically
@@ -209,10 +209,10 @@
 # 32 bit world
 LIB32TMP=	${OBJTREE}${.CURDIR}/lib32
 
-.if empty(CPUTYPE)
+.if empty(TARGET_CPUTYPE)
 LIB32CPUTYPE=	k8
 .else
-LIB32CPUTYPE=	${CPUTYPE}
+LIB32CPUTYPE=	${TARGET_CPUTYPE}
 .endif
 LIB32PREFLAGS=	-m32 -march=${LIB32CPUTYPE} -mfancy-math-387 -DCOMPAT_32BIT
 LIB32POSTFLAGS=	-I${LIB32TMP}/usr/include \

==== //depot/projects/soc2005/bsdinstaller/src/release/scripts/package-split.py#3 (text+ko) ====

@@ -7,7 +7,7 @@
 #
 # Usage: package-split.py <INDEX> <master INDEX>
 #
-# $FreeBSD: src/release/scripts/package-split.py,v 1.7 2005/11/03 00:23:13 kensmith Exp $
+# $FreeBSD: src/release/scripts/package-split.py,v 1.9 2005/12/07 22:25:12 obrien Exp $
 
 import os
 import sys
@@ -70,7 +70,6 @@
             'mail/popd',
             'mail/xfmail',
             'mail/postfix',
-            'misc/bsdiff',
             'net/cvsup',
             'net/cvsup-without-gui',
             'net/rsync',
@@ -87,7 +86,6 @@
             'shells/zsh',
             'security/freebsd-update',
             'security/sudo',
-            'sysutils/portsnap',
             'sysutils/portupgrade',
             'www/links',
             'www/lynx',