PERFORCE change 87876 for review

[soc-andrew]

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

Change 87876 by soc-andrew at 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',