PERFORCE change 89807 for review

[soc-andrew]

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

Change 89807 by soc-andrew at soc-andrew_serv on 2006/01/17 00:07:12

	Catch up to head

Affected files ...

.. //depot/projects/soc2005/bsdinstaller/src/Makefile.inc1#9 integrate
.. //depot/projects/soc2005/bsdinstaller/src/lib/Makefile#7 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#24 integrate
.. //depot/projects/soc2005/bsdinstaller/src/release/doc/share/misc/dev.archlist.txt#7 integrate

Differences ...

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

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.531 2005/12/07 22:55:29 obrien Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.534 2006/01/02 17:52:16 dfr Exp $
 #
 # Make command line options:
 #	-DNO_DYNAMICROOT do not link /bin and /sbin dynamically
@@ -966,7 +966,6 @@
 
 .if !defined(NO_KERBEROS) && !defined(NO_CRYPT) && !defined(NO_OPENSSL)
 _prebuild_libs+=	kerberos5/lib/libasn1
-_prebuild_libs+=	kerberos5/lib/libgssapi
 _prebuild_libs+=	kerberos5/lib/libkrb5
 _prebuild_libs+=	kerberos5/lib/libroken
 _generic_libs+=	kerberos5/lib
@@ -977,7 +976,7 @@
 		lib/libncurses lib/libnetgraph lib/libopie lib/libpam \
 		lib/libradius \
 		lib/libsbuf lib/libtacplus lib/libutil \
-		lib/libz lib/msun
+		lib/libz lib/msun lib/libgssapi
 
 lib/libopie__L lib/libtacplus__L: lib/libmd__L
 
@@ -991,9 +990,7 @@
 _prebuild_libs+=	secure/lib/libssh
 secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L
 .if !defined(NO_KERBEROS)
-secure/lib/libssh__L: kerberos5/lib/libgssapi__L kerberos5/lib/libkrb5__L \
-    kerberos5/lib/libasn1__L lib/libcom_err__L lib/libmd__L \
-    kerberos5/lib/libroken__L
+secure/lib/libssh__L: lib/libgssapi__L
 .endif
 .endif
 .endif

==== //depot/projects/soc2005/bsdinstaller/src/lib/Makefile#7 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/Makefile,v 1.208 2005/10/27 03:09:20 davidxu Exp $
+# $FreeBSD: src/lib/Makefile,v 1.209 2005/12/29 14:40:20 dfr Exp $
 
 # To satisfy shared library or ELF linkage when only the libraries being
 # built are visible:
@@ -28,7 +28,7 @@
 	libbegemot ${_libbluetooth} libbsnmp libbz2 libc ${_libc_r} \
 	libcalendar libcam libcompat libdevinfo libdevstat ${_libdisk} \
 	libedit libexpat libfetch libform libftpio libgeom ${_libgpib} \
-	${_libio} libipsec \
+	libgssapi ${_libio} libipsec \
 	libipx libkiconv libmagic libmemstat libmenu ${_libmilter} ${_libmp} \
 	${_libncp} ${_libngatm} libopie libpam libpanel libpcap \
 	libpmc ${_libpthread} ${_libsdp} ${_libsm} ${_libsmb} ${_libsmdb} \

==== //depot/projects/soc2005/bsdinstaller/src/release/Makefile#24 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/Makefile,v 1.893 2005/12/15 01:14:35 iedowse Exp $
+# $FreeBSD: src/release/Makefile,v 1.896 2006/01/04 18:02:56 jhb Exp $
 #
 # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \
 #     [RELEASETAG=tag]
@@ -35,6 +35,10 @@
 # be copied; cvs update will be used instead.
 #EXTSRCDIR=/usr/src
 #
+# To use a checked-out ports collection directory instead of
+# checking out from a local CVS repository, set this option.
+#EXTPORTSDIR=/usr/ports
+#
 # To add other options to the CVS subcommands (co,up), set
 #CVSCMDARGS="-D '01/01/2002 00:00:00 UTC'"
 #
@@ -215,6 +219,12 @@
 MFSLABEL=		auto
 SEPARATE_LIVEFS=
 .elif ${TARGET_ARCH} == "amd64"
+MAKE_FLOPPIES=		true
+FLOPPYSIZE=		1440
+FLOPPYSPLITSIZE=	1392
+FLOPPYINODE=		40000
+FLOPPYLABEL=		fd1440
+BOOTINODE=		80000
 MFSSIZE=		4096
 MFSINODE=		8192
 MFSLABEL=		auto
@@ -384,9 +394,15 @@
 .endif
 	rm -rf ${CHROOTDIR}/usr/ports
 .if !defined(NOPORTSATALL)
+.if defined(EXTPORTSDIR)
+	cd ${CHROOTDIR}/usr && cp -R -H ${EXTPORTSDIR} ports
+	# If there are distfiles downloaded removing them
+	rm -rf ports/distfiles/*
+.else
 	cd ${CHROOTDIR}/usr && ${CVSPREFIX} cvs -R ${CVSARGS} -d ${CVSROOT} \
 	    co ${CVSCMDARGS} ${CVS_PORTSARGS} ${RELEASEPORTSMODULE}
 .endif
+.endif
 .if !defined(NODOC)
 	rm -rf ${CHROOTDIR}/usr/doc
 .if defined(EXTDOCDIR)
@@ -415,7 +431,7 @@
 	    update ${CVSCMDARGS} -P -d -r ${RELEASETAG}
 .endif
 	rm -f ${CHROOTDIR}/tmp/.world_done 
-.if !defined(NOPORTS)
+.if !defined(NOPORTS) && !defined(EXTPORTSDIR)
 	cd ${CHROOTDIR}/usr/ports && ${CVSPREFIX} cvs -R ${CVSARGS} -q \
 	    update ${CVSCMDARGS} -P -d
 	rm -f ${CHROOTDIR}/tmp/.skip_ports_index
@@ -1322,6 +1338,9 @@
 .if !exists(${ACPI_KO})
 	@echo 'mfsroot_before="read -p \"Insert boot floppy and press Enter\""' >> ${IMAGEDIR}/boot/loader.conf
 .endif
+.if defined(SPLIT_MFSROOT)
+	@echo 'mfsroot_after="read -p \"Insert boot floppy and press Enter\""' >> ${IMAGEDIR}/boot/loader.conf
+.endif
 .if ${TARGET_ARCH} == "i386" && ${AUTO_KEYBOARD_DETECT}
 	@echo "-P" >> ${IMAGEDIR}/boot.config
 .endif

==== //depot/projects/soc2005/bsdinstaller/src/release/doc/share/misc/dev.archlist.txt#7 (text+ko) ====

@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.72 2005/11/28 16:53:16 brueffer Exp $
+# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.74 2005/12/28 08:35:30 simon Exp $
 #
 
 #
@@ -49,7 +49,7 @@
 aue	i386,pc98,ia64,amd64
 awi	i386,pc98,amd64
 axe	i386,pc98,amd64
-bge	i386,pc98,ia64,amd64
+bge	i386,pc98,sparc64,ia64,amd64
 bktr	i386,pc98
 bt	i386,amd64
 cdce	i386,pc98,ia64,amd64
@@ -131,7 +131,7 @@
 sr	i386
 ste	i386,pc98,alpha,amd64
 stg	i386,pc98
-ti	i386,pc98,amd64
+ti	i386,pc98,amd64,sparc64
 tl	i386,pc98,alpha,amd64
 trm	i386,amd64
 twa	i386,amd64