PERFORCE change 150295 for review

Warner Losh imp at FreeBSD.org
Mon Sep 22 19:35:29 UTC 2008


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

Change 150295 by imp at imp_paco-paco on 2008/09/22 19:35:11

	IFC @150286

Affected files ...

.. //depot/projects/arm/src/Makefile.inc1#39 integrate
.. //depot/projects/arm/src/ObsoleteFiles.inc#41 integrate
.. //depot/projects/arm/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c#2 integrate
.. //depot/projects/arm/src/crypto/openssl/FREEBSD-Xlist#3 delete
.. //depot/projects/arm/src/crypto/openssl/FREEBSD-upgrade#3 delete
.. //depot/projects/arm/src/etc/Makefile#12 integrate
.. //depot/projects/arm/src/etc/periodic/daily/Makefile#4 integrate
.. //depot/projects/arm/src/etc/periodic/monthly/Makefile#2 integrate
.. //depot/projects/arm/src/etc/periodic/security/Makefile#3 integrate
.. //depot/projects/arm/src/etc/periodic/weekly/Makefile#3 integrate
.. //depot/projects/arm/src/gnu/lib/libgcc/Makefile#8 integrate
.. //depot/projects/arm/src/gnu/lib/libgomp/Makefile#3 integrate
.. //depot/projects/arm/src/gnu/usr.bin/Makefile#10 integrate
.. //depot/projects/arm/src/lib/Makefile#14 integrate
.. //depot/projects/arm/src/lib/libarchive/archive.h#3 integrate
.. //depot/projects/arm/src/lib/libarchive/archive_entry.h#10 integrate
.. //depot/projects/arm/src/lib/libarchive/archive_read_support_format_mtree.c#4 integrate
.. //depot/projects/arm/src/lib/libarchive/test/test_read_format_mtree.c#4 integrate
.. //depot/projects/arm/src/lib/libc/gen/getosreldate.3#2 integrate
.. //depot/projects/arm/src/lib/libc/uuid/Symbol.map#4 integrate
.. //depot/projects/arm/src/lib/libpmc/pmc.3#7 integrate
.. //depot/projects/arm/src/lib/libpmc/pmc_allocate.3#2 integrate
.. //depot/projects/arm/src/lib/libpmc/pmc_capabilities.3#3 integrate
.. //depot/projects/arm/src/lib/libpmc/pmc_disable.3#2 integrate
.. //depot/projects/arm/src/lib/libpmc/pmc_start.3#2 integrate
.. //depot/projects/arm/src/libexec/Makefile#5 integrate
.. //depot/projects/arm/src/release/doc/zh_CN.GB2312/Makefile#3 integrate
.. //depot/projects/arm/src/release/doc/zh_CN.GB2312/errata/Makefile#3 integrate
.. //depot/projects/arm/src/release/doc/zh_CN.GB2312/errata/article.sgml#2 integrate
.. //depot/projects/arm/src/release/doc/zh_CN.GB2312/hardware/Makefile#3 integrate
.. //depot/projects/arm/src/release/doc/zh_CN.GB2312/hardware/article.sgml#2 integrate
.. //depot/projects/arm/src/release/doc/zh_CN.GB2312/readme/Makefile#2 integrate
.. //depot/projects/arm/src/release/doc/zh_CN.GB2312/readme/article.sgml#3 integrate
.. //depot/projects/arm/src/release/doc/zh_CN.GB2312/relnotes/Makefile#4 integrate
.. //depot/projects/arm/src/release/doc/zh_CN.GB2312/relnotes/article.sgml#2 integrate
.. //depot/projects/arm/src/release/doc/zh_CN.GB2312/share/sgml/catalog#2 integrate
.. //depot/projects/arm/src/release/doc/zh_CN.GB2312/share/sgml/release.dsl#2 integrate
.. //depot/projects/arm/src/sbin/Makefile#12 integrate
.. //depot/projects/arm/src/sbin/bsdlabel/bsdlabel.c#5 integrate
.. //depot/projects/arm/src/sbin/ifconfig/ifconfig.8#23 integrate
.. //depot/projects/arm/src/sbin/ifconfig/ifieee80211.c#13 integrate
.. //depot/projects/arm/src/sbin/ifconfig/regdomain.c#3 integrate
.. //depot/projects/arm/src/sbin/ipfw/ipfw2.c#18 integrate
.. //depot/projects/arm/src/sbin/mount_nfs/mount_nfs.c#9 integrate
.. //depot/projects/arm/src/share/Makefile#4 integrate
.. //depot/projects/arm/src/share/examples/drivers/make_pseudo_driver.sh#4 integrate
.. //depot/projects/arm/src/share/man/man4/age.4#2 integrate
.. //depot/projects/arm/src/share/man/man4/hwpmc.4#5 integrate
.. //depot/projects/arm/src/share/man/man4/snd_hda.4#13 integrate
.. //depot/projects/arm/src/share/man/man5/rc.conf.5#23 integrate
.. //depot/projects/arm/src/share/man/man9/Makefile#24 integrate
.. //depot/projects/arm/src/share/man/man9/priv.9#6 integrate
.. //depot/projects/arm/src/share/man/man9/suser.9#6 delete
.. //depot/projects/arm/src/share/man/man9/ucred.9#2 integrate
.. //depot/projects/arm/src/share/man/man9/vfs_suser.9#2 integrate
.. //depot/projects/arm/src/share/misc/committers-src.dot#11 integrate
.. //depot/projects/arm/src/share/mk/bsd.own.mk#21 integrate
.. //depot/projects/arm/src/sys/amd64/amd64/identcpu.c#16 integrate
.. //depot/projects/arm/src/sys/boot/Makefile#10 integrate
.. //depot/projects/arm/src/sys/boot/ofw/libofw/Makefile#4 integrate
.. //depot/projects/arm/src/sys/boot/ofw/libofw/ofw_console.c#5 integrate
.. //depot/projects/arm/src/sys/cam/cam.h#2 integrate
.. //depot/projects/arm/src/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#2 integrate
.. //depot/projects/arm/src/sys/cddl/compat/opensolaris/sys/atomic.h#3 integrate
.. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_ioctl.c#1 branch
.. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_ioctl.h#1 branch
.. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_misc.c#24 integrate
.. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_proto.h#30 integrate
.. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_syscall.h#30 integrate
.. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_syscalls.c#30 integrate
.. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_sysent.c#30 integrate
.. //depot/projects/arm/src/sys/compat/freebsd32/syscalls.master#31 integrate
.. //depot/projects/arm/src/sys/conf/files.amd64#35 integrate
.. //depot/projects/arm/src/sys/conf/files.ia64#13 integrate
.. //depot/projects/arm/src/sys/conf/files.mips#3 integrate
.. //depot/projects/arm/src/sys/conf/files.sparc64#18 integrate
.. //depot/projects/arm/src/sys/conf/ldscript.mips#3 integrate
.. //depot/projects/arm/src/sys/conf/options.mips#2 integrate
.. //depot/projects/arm/src/sys/conf/options.sparc64#5 integrate
.. //depot/projects/arm/src/sys/dev/acpica/acpi_quirk.c#4 integrate
.. //depot/projects/arm/src/sys/dev/ata/ata-chipset.c#49 integrate
.. //depot/projects/arm/src/sys/dev/ata/ata-pci.c#16 integrate
.. //depot/projects/arm/src/sys/dev/ata/ata-pci.h#32 integrate
.. //depot/projects/arm/src/sys/dev/ath/if_ath.c#38 integrate
.. //depot/projects/arm/src/sys/dev/ath/if_athvar.h#22 integrate
.. //depot/projects/arm/src/sys/dev/cxgb/cxgb_osdep.h#10 integrate
.. //depot/projects/arm/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#7 integrate
.. //depot/projects/arm/src/sys/dev/cxgb/ulp/tom/cxgb_defs.h#4 integrate
.. //depot/projects/arm/src/sys/dev/cxgb/ulp/tom/cxgb_tom.c#5 integrate
.. //depot/projects/arm/src/sys/dev/hwpmc/hwpmc_amd.c#5 integrate
.. //depot/projects/arm/src/sys/dev/hwpmc/hwpmc_mod.c#17 integrate
.. //depot/projects/arm/src/sys/dev/hwpmc/hwpmc_piv.c#7 integrate
.. //depot/projects/arm/src/sys/dev/hwpmc/hwpmc_ppro.c#3 integrate
.. //depot/projects/arm/src/sys/dev/jme/if_jme.c#3 integrate
.. //depot/projects/arm/src/sys/dev/jme/if_jmereg.h#3 integrate
.. //depot/projects/arm/src/sys/dev/pci/vga_pci.c#4 integrate
.. //depot/projects/arm/src/sys/dev/snp/snp.c#8 integrate
.. //depot/projects/arm/src/sys/dev/usb/if_zyd.c#10 integrate
.. //depot/projects/arm/src/sys/dev/usb/usbdevs#51 integrate
.. //depot/projects/arm/src/sys/fs/devfs/devfs_devs.c#13 integrate
.. //depot/projects/arm/src/sys/fs/devfs/devfs_vnops.c#25 integrate
.. //depot/projects/arm/src/sys/fs/fdescfs/fdesc_vnops.c#13 integrate
.. //depot/projects/arm/src/sys/fs/hpfs/hpfs_vnops.c#11 integrate
.. //depot/projects/arm/src/sys/fs/msdosfs/msdosfs_vnops.c#20 integrate
.. //depot/projects/arm/src/sys/fs/ntfs/ntfs_vnops.c#10 integrate
.. //depot/projects/arm/src/sys/fs/portalfs/portal_vnops.c#8 integrate
.. //depot/projects/arm/src/sys/fs/pseudofs/pseudofs_vnops.c#11 integrate
.. //depot/projects/arm/src/sys/fs/smbfs/smbfs_node.c#13 integrate
.. //depot/projects/arm/src/sys/fs/tmpfs/tmpfs_vnops.c#11 integrate
.. //depot/projects/arm/src/sys/fs/udf/udf_vnops.c#14 integrate
.. //depot/projects/arm/src/sys/geom/geom_io.c#11 integrate
.. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#9 integrate
.. //depot/projects/arm/src/sys/i386/i386/identcpu.c#27 integrate
.. //depot/projects/arm/src/sys/i386/i386/intr_machdep.c#17 integrate
.. //depot/projects/arm/src/sys/i386/i386/pmap.c#43 integrate
.. //depot/projects/arm/src/sys/i386/include/specialreg.h#14 integrate
.. //depot/projects/arm/src/sys/i386/xen/mp_machdep.c#2 integrate
.. //depot/projects/arm/src/sys/i386/xen/xen_machdep.c#4 integrate
.. //depot/projects/arm/src/sys/kern/kern_pmc.c#4 integrate
.. //depot/projects/arm/src/sys/kern/kern_priv.c#5 integrate
.. //depot/projects/arm/src/sys/kern/kern_syscalls.c#3 integrate
.. //depot/projects/arm/src/sys/kern/subr_clist.c#2 integrate
.. //depot/projects/arm/src/sys/kern/tty_pts.c#13 integrate
.. //depot/projects/arm/src/sys/kern/uipc_mqueue.c#20 integrate
.. //depot/projects/arm/src/sys/kern/vfs_cache.c#17 integrate
.. //depot/projects/arm/src/sys/kern/vfs_mount.c#43 integrate
.. //depot/projects/arm/src/sys/kern/vfs_vnops.c#24 integrate
.. //depot/projects/arm/src/sys/mips/adm5120/obio.c#3 integrate
.. //depot/projects/arm/src/sys/mips/conf/IDT#4 integrate
.. //depot/projects/arm/src/sys/mips/idt/obio.c#3 integrate
.. //depot/projects/arm/src/sys/mips/malta/gt_pci.c#3 integrate
.. //depot/projects/arm/src/sys/mips/mips/intr_machdep.c#3 integrate
.. //depot/projects/arm/src/sys/net/if_clone.c#7 integrate
.. //depot/projects/arm/src/sys/net/if_clone.h#4 integrate
.. //depot/projects/arm/src/sys/net/if_lagg.c#15 integrate
.. //depot/projects/arm/src/sys/net/route.c#14 integrate
.. //depot/projects/arm/src/sys/net/route.h#9 integrate
.. //depot/projects/arm/src/sys/net80211/ieee80211.h#12 integrate
.. //depot/projects/arm/src/sys/net80211/ieee80211_adhoc.c#3 integrate
.. //depot/projects/arm/src/sys/net80211/ieee80211_crypto.c#8 integrate
.. //depot/projects/arm/src/sys/net80211/ieee80211_crypto.h#8 integrate
.. //depot/projects/arm/src/sys/net80211/ieee80211_ddb.c#4 integrate
.. //depot/projects/arm/src/sys/net80211/ieee80211_freebsd.c#14 integrate
.. //depot/projects/arm/src/sys/net80211/ieee80211_freebsd.h#14 integrate
.. //depot/projects/arm/src/sys/net80211/ieee80211_hostap.c#3 integrate
.. //depot/projects/arm/src/sys/net80211/ieee80211_ht.c#7 integrate
.. //depot/projects/arm/src/sys/net80211/ieee80211_ht.h#7 integrate
.. //depot/projects/arm/src/sys/net80211/ieee80211_ioctl.c#23 integrate
.. //depot/projects/arm/src/sys/net80211/ieee80211_ioctl.h#14 integrate
.. //depot/projects/arm/src/sys/net80211/ieee80211_node.c#23 integrate
.. //depot/projects/arm/src/sys/net80211/ieee80211_node.h#12 integrate
.. //depot/projects/arm/src/sys/net80211/ieee80211_output.c#21 integrate
.. //depot/projects/arm/src/sys/net80211/ieee80211_sta.c#3 integrate
.. //depot/projects/arm/src/sys/net80211/ieee80211_var.h#21 integrate
.. //depot/projects/arm/src/sys/net80211/ieee80211_wds.c#3 integrate
.. //depot/projects/arm/src/sys/netgraph/ng_source.c#8 integrate
.. //depot/projects/arm/src/sys/netinet/ip_fw.h#17 integrate
.. //depot/projects/arm/src/sys/netinet6/udp6_usrreq.c#23 integrate
.. //depot/projects/arm/src/sys/netipx/ipx.c#5 integrate
.. //depot/projects/arm/src/sys/nfsclient/nfs_vnops.c#24 integrate
.. //depot/projects/arm/src/sys/nfsserver/nfs_serv.c#23 integrate
.. //depot/projects/arm/src/sys/powerpc/ofw/ofw_syscons.c#4 integrate
.. //depot/projects/arm/src/sys/powerpc/powerpc/cpu.c#7 integrate
.. //depot/projects/arm/src/sys/security/mac_bsdextended/mac_bsdextended.c#18 integrate
.. //depot/projects/arm/src/sys/sparc64/include/smp.h#8 integrate
.. //depot/projects/arm/src/sys/sparc64/include/tick.h#4 integrate
.. //depot/projects/arm/src/sys/sparc64/pci/psycho.c#17 integrate
.. //depot/projects/arm/src/sys/sparc64/pci/psychoreg.h#7 integrate
.. //depot/projects/arm/src/sys/sparc64/sparc64/genassym.c#13 integrate
.. //depot/projects/arm/src/sys/sparc64/sparc64/intr_machdep.c#11 integrate
.. //depot/projects/arm/src/sys/sparc64/sparc64/mp_machdep.c#13 integrate
.. //depot/projects/arm/src/sys/sparc64/sparc64/tick.c#10 integrate
.. //depot/projects/arm/src/sys/sys/clist.h#3 integrate
.. //depot/projects/arm/src/sys/sys/mount.h#26 integrate
.. //depot/projects/arm/src/sys/sys/param.h#50 integrate
.. //depot/projects/arm/src/sys/sys/pmckern.h#4 integrate
.. //depot/projects/arm/src/sys/sys/priv.h#10 integrate
.. //depot/projects/arm/src/sys/sys/sysent.h#11 integrate
.. //depot/projects/arm/src/sys/sys/ttydisc.h#3 integrate
.. //depot/projects/arm/src/sys/ufs/ufs/ufs_vnops.c#25 integrate
.. //depot/projects/arm/src/sys/vm/vm_mmap.c#18 integrate
.. //depot/projects/arm/src/sys/vm/vm_pageout.c#18 integrate
.. //depot/projects/arm/src/tools/build/options/WITHOUT_ACCT#1 branch
.. //depot/projects/arm/src/tools/build/options/WITHOUT_AMD#1 branch
.. //depot/projects/arm/src/tools/build/options/WITHOUT_APM#1 branch
.. //depot/projects/arm/src/tools/build/options/WITHOUT_AT#1 branch
.. //depot/projects/arm/src/tools/build/options/WITHOUT_CTM#1 branch
.. //depot/projects/arm/src/tools/build/options/WITHOUT_FREEBSD_UPDATE#1 branch
.. //depot/projects/arm/src/tools/build/options/WITHOUT_IPFW#1 branch
.. //depot/projects/arm/src/tools/build/options/WITHOUT_JAIL#1 branch
.. //depot/projects/arm/src/tools/build/options/WITHOUT_LEGACY_CONSOLE#1 branch
.. //depot/projects/arm/src/tools/build/options/WITHOUT_LOCATE#1 branch
.. //depot/projects/arm/src/tools/build/options/WITHOUT_MAIL#1 branch
.. //depot/projects/arm/src/tools/build/options/WITHOUT_MAKE#1 branch
.. //depot/projects/arm/src/tools/build/options/WITHOUT_NDIS#1 branch
.. //depot/projects/arm/src/tools/build/options/WITHOUT_NETGRAPH#1 branch
.. //depot/projects/arm/src/tools/build/options/WITHOUT_NTP#1 branch
.. //depot/projects/arm/src/tools/build/options/WITHOUT_PKGTOOLS#1 branch
.. //depot/projects/arm/src/tools/build/options/WITHOUT_PMC#1 branch
.. //depot/projects/arm/src/tools/build/options/WITHOUT_PORTSNAP#1 branch
.. //depot/projects/arm/src/tools/build/options/WITHOUT_PPP#1 branch
.. //depot/projects/arm/src/tools/build/options/WITHOUT_QUOTAS#1 branch
.. //depot/projects/arm/src/tools/build/options/WITHOUT_ROUTED#1 branch
.. //depot/projects/arm/src/tools/build/options/WITHOUT_SLIP#1 branch
.. //depot/projects/arm/src/tools/build/options/WITHOUT_SYSINSTALL#1 branch
.. //depot/projects/arm/src/tools/build/options/WITHOUT_TELNET#1 branch
.. //depot/projects/arm/src/tools/build/options/WITHOUT_TEXTPROC#1 branch
.. //depot/projects/arm/src/tools/build/options/WITHOUT_WIRELESS#1 branch
.. //depot/projects/arm/src/tools/tools/nanobsd/nanobsd.sh#14 integrate
.. //depot/projects/arm/src/tools/tools/net80211/scripts/config#2 integrate
.. //depot/projects/arm/src/usr.bin/Makefile#16 integrate
.. //depot/projects/arm/src/usr.bin/ar/Makefile#4 integrate
.. //depot/projects/arm/src/usr.bin/ar/acplex.l#1 branch
.. //depot/projects/arm/src/usr.bin/ar/acpyacc.y#1 branch
.. //depot/projects/arm/src/usr.bin/ar/ar.c#4 integrate
.. //depot/projects/arm/src/usr.bin/ar/ar.h#3 integrate
.. //depot/projects/arm/src/usr.bin/ar/write.c#5 integrate
.. //depot/projects/arm/src/usr.bin/netstat/Makefile#6 integrate
.. //depot/projects/arm/src/usr.bin/netstat/main.c#9 integrate
.. //depot/projects/arm/src/usr.bin/netstat/netstat.h#9 integrate
.. //depot/projects/arm/src/usr.sbin/Makefile#22 integrate
.. //depot/projects/arm/src/usr.sbin/pmcstat/pmcstat.8#6 integrate
.. //depot/projects/arm/src/usr.sbin/pmcstat/pmcstat.c#6 integrate

Differences ...

==== //depot/projects/arm/src/Makefile.inc1#39 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.610 2008/08/19 14:23:26 jhb Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.611 2008/09/19 16:14:42 obrien Exp $
 #
 # Make command line options:
 #	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -27,6 +27,10 @@
 
 .include <bsd.own.mk>
 
+.if ${MACHINE_ARCH} == "mips"
+MK_RESCUE=no	# not yet
+.endif
+
 # We must do share/info early so that installation of info `dir'
 # entries works correctly.  Do it first since it is less likely to
 # grow dependencies on include and lib than vice versa.

==== //depot/projects/arm/src/ObsoleteFiles.inc#41 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.160 2008/09/14 17:49:46 antoine Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.162 2008/09/21 16:11:11 antoine Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,6 +14,9 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20080917: removal of manpage for axed kernel primitive suser(9)
+OLD_FILES+=usr/share/man/man9/suser.9.gz
+OLD_FILES+=usr/share/man/man9/suser_cred.9.gz
 # 20080913: pax removed from rescue
 OLD_FILES+=rescue/pax
 # 20080823: removal of unneeded pt_chown, to implement grantpt(3)

==== //depot/projects/arm/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c#2 (text+ko) ====

@@ -306,7 +306,7 @@
 	case sizeof (double):
 		return (dt_printf(dtp, fp, format,
 		    *((double *)addr) / n));
-#if !defined(__arm__) && !defined(__powerpc__)
+#if !defined(__arm__) && !defined(__powerpc__) && !defined(__mips__)
 	case sizeof (long double):
 		return (dt_printf(dtp, fp, format,
 		    *((long double *)addr) / ldn));

==== //depot/projects/arm/src/etc/Makefile#12 (text+ko) ====

@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.11 (Berkeley) 5/21/91
-# $FreeBSD: src/etc/Makefile,v 1.368 2008/05/26 10:39:45 bz Exp $
+# $FreeBSD: src/etc/Makefile,v 1.370 2008/09/22 15:37:47 sam Exp $
 
 .include <bsd.own.mk>
 
@@ -7,22 +7,19 @@
 SUBDIR=	sendmail
 .endif
 
-BIN1=	amd.map apmd.conf auth.conf \
+BIN1=	auth.conf \
 	crontab csh.cshrc csh.login csh.logout devd.conf devfs.conf \
-	ddb.conf dhclient.conf disktab fbtab freebsd-update.conf \
+	ddb.conf dhclient.conf disktab fbtab \
 	ftpusers gettytab group \
-	hosts hosts.allow hosts.equiv hosts.lpd \
+	hosts hosts.allow hosts.equiv \
 	inetd.conf libalias.conf login.access login.conf mac.conf motd \
 	netconfig network.subr networks newsyslog.conf nsswitch.conf \
-	portsnap.conf pf.os phones profile protocols \
+	phones profile protocols \
 	rc rc.bsdextended rc.firewall rc.firewall6 rc.initdiskless \
 	rc.sendmail rc.shutdown \
-	rc.subr regdomain.xml remote rpc services shells \
-	snmpd.config sysctl.conf syslog.conf \
-	etc.${MACHINE_ARCH}/ttys \
-	${.CURDIR}/../gnu/usr.bin/man/manpath/manpath.config \
-	${.CURDIR}/../usr.bin/mail/misc/mail.rc \
-	${.CURDIR}/../usr.bin/locate/locate/locate.rc
+	rc.subr remote rpc services shells \
+	sysctl.conf syslog.conf \
+	etc.${MACHINE_ARCH}/ttys
 
 OPENBSMDIR=			${.CURDIR}/../contrib/openbsm
 BSM_ETC_OPEN_FILES=		${OPENBSMDIR}/etc/audit_class \
@@ -32,12 +29,38 @@
 BSM_ETC_EXEC_FILES=		${OPENBSMDIR}/etc/audit_warn
 BSM_ETC_DIR=			${DESTDIR}/etc/security
 
+# NB: keep these sorted by MK_* knobs
+
+.if ${MK_AMD} != "no"
+BIN1+= amd.map
+.endif
+
+.if ${MK_APM} != "no"
+BIN1+= apmd.conf
+.endif
+
+.if ${MK_BSNMP} != "no"
+BIN1+= snmpd.config
+.endif
+
+.if ${MK_FREEBSD_UPDATE} != "no"
+BIN1+= freebsd-update.conf
+.endif
+
+.if ${MK_LOCATE} != "no"
+BIN1+=	${.CURDIR}/../usr.bin/locate/locate/locate.rc
+.endif
+
 .if ${MK_LPR} != "no"
-BIN1+=	printcap
+BIN1+=	hosts.lpd printcap
+.endif
+
+.if ${MK_MAIL} != "no"
+BIN1+=	${.CURDIR}/../usr.bin/mail/misc/mail.rc
 .endif
 
-.if ${MK_NS_CACHING} != "no"
-BIN1+= nscd.conf
+.if ${MK_MAN} != "no"
+BIN1+=	${.CURDIR}/../gnu/usr.bin/man/manpath/manpath.config
 .endif
 
 .if ${MK_OPENSSH} != "no"
@@ -49,6 +72,22 @@
 SSL=	${.CURDIR}/../crypto/openssl/apps/openssl.cnf
 .endif
 
+.if ${MK_NS_CACHING} != "no"
+BIN1+= nscd.conf
+.endif
+
+.if ${MK_PORTSNAP} != "no"
+BIN1+= portsnap.conf
+.endif
+
+.if ${MK_PF} != "no"
+BIN1+= pf.os
+.endif
+
+.if ${MK_WIRELESS} != "no"
+BIN1+= regdomain.xml
+.endif
+
 # -rwxr-xr-x root:wheel, for the new cron root:wheel
 BIN2=	netstart pccard_ether rc.suspend rc.resume
 
@@ -112,7 +151,9 @@
 		master.passwd nsmb.conf opieaccess ${DESTDIR}/etc; \
 	    pwd_mkdb ${PWD_MKDB_ENDIAN} -i -p -d ${DESTDIR}/etc \
 		${DESTDIR}/etc/master.passwd
+.if ${MK_BLUETOOTH} != "no"
 	${_+_}cd ${.CURDIR}/bluetooth; ${MAKE} install
+.endif
 	${_+_}cd ${.CURDIR}/defaults; ${MAKE} install
 	${_+_}cd ${.CURDIR}/gss; ${MAKE} install
 	${_+_}cd ${.CURDIR}/periodic; ${MAKE} install
@@ -164,8 +205,11 @@
 	    ln ${DESTDIR}/root/.profile ${DESTDIR}/.profile
 	cd ${.CURDIR}/mtree; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
 	    ${MTREE} ${DESTDIR}/etc/mtree
+.if ${MK_PPP} != "no"
 	cd ${.CURDIR}/ppp; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \
 	    ${PPPCNF} ${DESTDIR}/etc/ppp
+.endif
+.if ${MK_MAIL} != "no"
 	cd ${.CURDIR}/mail; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
 	    ${ETCMAIL} ${DESTDIR}/etc/mail
 	@if [ -d ${DESTDIR}/etc/mail -a -f ${DESTDIR}/etc/mail/aliases -a \
@@ -173,6 +217,7 @@
 		set -x; \
 		ln -s mail/aliases ${DESTDIR}/etc/aliases; \
 	fi
+.endif
 	${INSTALL} -o ${BINOWN} -g operator -m 664 /dev/null \
 	    ${DESTDIR}/etc/dumpdates
 	${INSTALL} -o nobody -g ${BINGRP} -m 644 /dev/null \

==== //depot/projects/arm/src/etc/periodic/daily/Makefile#4 (text+ko) ====

@@ -1,15 +1,11 @@
-# $FreeBSD: src/etc/periodic/daily/Makefile,v 1.16 2007/05/14 17:34:59 maxim Exp $
+# $FreeBSD: src/etc/periodic/daily/Makefile,v 1.17 2008/09/21 22:02:26 sam Exp $
+
+.include <bsd.own.mk>
 
 FILES=	100.clean-disks \
 	110.clean-tmps \
 	120.clean-preserve \
-	130.clean-msgs \
-	140.clean-rwho \
-	150.clean-hoststat \
 	200.backup-passwd \
-	210.backup-aliases \
-	300.calendar \
-	310.accounting \
 	330.news \
 	400.status-disks \
 	404.status-zfs \
@@ -19,13 +15,42 @@
 	408.status-gstripe \
 	409.status-gconcat \
 	420.status-network \
-	430.status-rwho \
+	450.status-security \
+	999.local
+
+# NB: keep these sorted by MK_* knobs
+
+.if ${MK_ACCT} != "no"
+FILES+=	310.accounting
+.endif
+
+.if ${MK_BIND_NAMED} != "no"
+FILES+=	470.status-named
+.endif
+
+.if ${MK_CALENDAR} != "no"
+FILES+=	300.calendar
+.endif
+
+.if ${MK_MAIL} != "no"
+FILES+=	130.clean-msgs
+.endif
+
+.if ${MK_NTP} != "no"
+FILES+=	480.status-ntpd
+.endif
+
+.if ${MK_RCMDS} != "no"
+FILES+=	140.clean-rwho \
+	430.status-rwho
+.endif
+
+.if ${MK_SENDMAIL} != "no"
+FILES+=	150.clean-hoststat \
+	210.backup-aliases \
 	440.status-mailq \
-	450.status-security \
 	460.status-mail-rejects \
-	470.status-named \
-	480.status-ntpd \
-	500.queuerun \
-	999.local
+	500.queuerun
+.endif
 
 .include <bsd.prog.mk>

==== //depot/projects/arm/src/etc/periodic/monthly/Makefile#2 (text+ko) ====

@@ -1,6 +1,13 @@
-# $FreeBSD: src/etc/periodic/monthly/Makefile,v 1.3 2002/07/18 12:32:57 ru Exp $
+# $FreeBSD: src/etc/periodic/monthly/Makefile,v 1.4 2008/09/21 22:02:26 sam Exp $
+
+.include <bsd.own.mk>
+
+FILES=	999.local
+
+# NB: keep these sorted by MK_* knobs
 
-FILES=	200.accounting \
-	999.local
+.if ${MK_ACCT} != "no"
+FILES+=	200.accounting
+.endif
 
 .include <bsd.prog.mk>

==== //depot/projects/arm/src/etc/periodic/security/Makefile#3 (text+ko) ====

@@ -1,17 +1,30 @@
-# $FreeBSD: src/etc/periodic/security/Makefile,v 1.6 2006/08/25 07:34:36 trhodes Exp $
+# $FreeBSD: src/etc/periodic/security/Makefile,v 1.7 2008/09/21 22:02:26 sam Exp $
+
+.include <bsd.own.mk>
 
 FILES=	100.chksetuid \
 	200.chkmounts \
 	300.chkuid0 \
 	400.passwdless \
 	410.logincheck \
-	500.ipfwdenied \
-	510.ipfdenied \
-	520.pfdenied \
-	550.ipfwlimit \
 	700.kernelmsg \
 	800.loginfail \
 	900.tcpwrap \
 	security.functions
 
+# NB: keep these sorted by MK_* knobs
+
+.if ${MK_IPFILTER} != "no"
+FILES+=	510.ipfdenied
+.endif
+
+.if ${MK_IPFW} != "no"
+FILES+=	500.ipfwdenied \
+	550.ipfwlimit
+.endif
+
+.if ${MK_PF} != "no"
+FILES+=	520.pfdenied
+.endif
+
 .include <bsd.prog.mk>

==== //depot/projects/arm/src/etc/periodic/weekly/Makefile#3 (text+ko) ====

@@ -1,10 +1,22 @@
-# $FreeBSD: src/etc/periodic/weekly/Makefile,v 1.9 2006/08/29 08:49:57 ru Exp $
+# $FreeBSD: src/etc/periodic/weekly/Makefile,v 1.10 2008/09/21 22:02:26 sam Exp $
+
+.include <bsd.own.mk>
 
-FILES=	310.locate \
-	320.whatis \
-	330.catman \
-	340.noid \
-	400.status-pkg \
+FILES=	340.noid \
 	999.local
 
+# NB: keep these sorted by MK_* knobs
+
+.if ${MK_LOCATE} != "no"
+FILES+=	310.locate
+.endif
+
+.if ${MK_MAN} != "no"
+FILES+=	320.whatis 330.catman
+.endif
+
+.if ${MK_PKGTOOLS} != "no"
+FLES+=	400.status-pkg
+.endif
+
 .include <bsd.prog.mk>

==== //depot/projects/arm/src/gnu/lib/libgcc/Makefile#8 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.60 2008/09/01 18:46:03 obrien Exp $
+# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.62 2008/09/19 03:09:36 imp Exp $
 GCCDIR=	${.CURDIR}/../../../contrib/gcc
 GCCLIB=	${.CURDIR}/../../../contrib/gcclibs
 
@@ -173,8 +173,8 @@
 #
 # Floating point emulation functions
 #
-.if ${TARGET_ARCH} == "armNOT_YET" || ${TARGET_ARCH} == "powerpc" || \
-    ${TARGET_ARCH} == "sparc64" || ${TARGET_ARCH} == "mips"
+.if ${TARGET_ARCH} == "armNOT_YET" || ${TARGET_ARCH} == "mips" || \
+    ${TARGET_ARCH} == "powerpc" || ${TARGET_ARCH} == "sparc64"
 
 FPBIT_CFLAGS =	-DFINE_GRAINED_LIBRARIES -DFLOAT
 DPBIT_CFLAGS =	-DFINE_GRAINED_LIBRARIES

==== //depot/projects/arm/src/gnu/lib/libgomp/Makefile#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/lib/libgomp/Makefile,v 1.3 2008/09/01 18:46:03 obrien Exp $
+# $FreeBSD: src/gnu/lib/libgomp/Makefile,v 1.4 2008/09/19 02:30:22 imp Exp $
 
 GCCDIR=	${.CURDIR}/../../../contrib/gcc
 GCCLIB=	${.CURDIR}/../../../contrib/gcclibs
@@ -24,7 +24,7 @@
 
 # Target-specific OpenMP configuration
 .if ${MACHINE_ARCH} == arm || ${MACHINE_ARCH} == i386 || \
-    ${MACHINE_ARCH} == powerpc || ${MACHINE_ARCH} == mips
+    ${MACHINE_ARCH} == mips || ${MACHINE_ARCH} == powerpc
 OMP_LOCK_ALIGN	=	4
 OMP_LOCK_KIND=		4
 OMP_LOCK_SIZE=		4

==== //depot/projects/arm/src/gnu/usr.bin/Makefile#10 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/Makefile,v 1.98 2008/09/01 18:18:19 obrien Exp $
+# $FreeBSD: src/gnu/usr.bin/Makefile,v 1.99 2008/09/21 22:02:26 sam Exp $
 
 .include <bsd.own.mk>
 
@@ -46,12 +46,16 @@
 _grep=		grep
 .endif
 
+.if ${MK_INFO} != "no"
+_texinfo=	texinfo
+.endif
+
 .if ${MK_MAN} != "no"
 _man=		man
 .endif
 
-.if ${MK_INFO} != "no"
-_texinfo=	texinfo
+.if ${MK_RCS} != "no"
+_rcs=		rcs
 .endif
 
 .if ${MK_TOOLCHAIN} != "no"
@@ -61,8 +65,5 @@
 _gdb=		gdb
 .endif
 .endif
-.if ${MK_RCS} != "no"
-_rcs=		rcs
-.endif
 
 .include <bsd.subdir.mk>

==== //depot/projects/arm/src/lib/Makefile#14 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/Makefile,v 1.232 2008/08/06 14:02:05 dfr Exp $
+# $FreeBSD: src/lib/Makefile,v 1.233 2008/09/21 22:02:26 sam Exp $
 
 .include <bsd.own.mk>
 
@@ -27,17 +27,17 @@
 # Otherwise, the SUBDIR list should be in alphabetical order.
 
 SUBDIR=	${_csu} libc libbsm libcom_err libcrypt libelf libkvm msun libmd \
-	ncurses libnetgraph libradius librpcsvc libsbuf libtacplus libutil \
-	${_libypclnt} libalias libarchive ${_libatm} \
-	libbegemot ${_libbluetooth} libbsnmp libbz2 \
+	ncurses ${_libnetgraph} libradius librpcsvc libsbuf \
+	libtacplus libutil ${_libypclnt} libalias libarchive ${_libatm} \
+	libbegemot ${_libbluetooth} ${_libbsnmp} libbz2 \
 	libcalendar libcam libcompat libdevinfo libdevstat libdisk \
 	libdwarf libedit libexpat libfetch libftpio libgeom ${_libgpib} \
 	${_libgssapi} ${_librpcsec_gss} libipsec \
 	${_libipx} libkiconv libmemstat ${_libmilter} ${_libmp} \
 	${_libncp} ${_libngatm} libopie libpam libpcap \
-	libpmc libproc librt ${_libsdp} ${_libsm} ${_libsmb} \
+	${_libpmc} libproc librt ${_libsdp} ${_libsm} ${_libsmb} \
 	${_libsmdb} \
-	${_libsmutil} libstand libtelnet ${_libthr} libthread_db libufs \
+	${_libsmutil} libstand ${_libtelnet} ${_libthr} libthread_db libufs \
 	libugidfw ${_libusbhid} ${_libvgl} libwrap liby libz ${_bind}
 
 .if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf)
@@ -48,6 +48,8 @@
 _csu=csu
 .endif
 
+# NB: keep these sorted by MK_* knobs
+
 .if ${MK_ATM} != "no"
 _libngatm=	libngatm
 .endif
@@ -61,6 +63,14 @@
 _libsdp=	libsdp
 .endif
 
+.if ${MK_BSNMP} != "no"
+_libbsnmp=	libbsnmp
+.endif
+
+.if ${MK_GPIB} != "no"
+_libgpib=	libgpib
+.endif
+
 .if ${MK_GSSAPI} != "no"
 _libgssapi=	libgssapi
 _librpcsec_gss=	librpcsec_gss
@@ -70,6 +80,18 @@
 _libipx=	libipx
 .endif
 
+.if ${MK_LIBTHR} != "no"
+_libthr=	libthr
+.endif
+
+.if ${MK_NETGRAPH} != "no"
+_libnetgraph=	libnetgraph
+.endif
+
+.if ${MK_NIS} != "no"
+_libypclnt=	libypclnt
+.endif
+
 .if ${MACHINE_ARCH} == "i386"
 .if ${MK_NCP} != "no"
 _libncp=	libncp
@@ -82,17 +104,6 @@
 _libsmb=	libsmb
 .endif
 
-.if ${MK_SENDMAIL} != "no"
-_libmilter=	libmilter
-_libsm=		libsm
-_libsmdb=	libsmdb
-_libsmutil=	libsmutil
-.endif
-
-.if ${MK_OPENSSL} != "no"
-_libmp=		libmp
-.endif
-
 .if ${MACHINE_ARCH} == "amd64"
 .if ${MK_NCP} != "no"
 _libncp=	libncp
@@ -104,20 +115,27 @@
 _libsmb=	libsmb
 .endif
 
-.if ${MK_LIBTHR} != "no"
-_libthr=	libthr
+.if ${MK_OPENSSL} != "no"
+_libmp=		libmp
+.endif
+
+.if ${MK_PMC} != "no"
+_libpmc=	libpmc
 .endif
 
-.if ${MK_USB} != "no"
-_libusbhid=	libusbhid
+.if ${MK_SENDMAIL} != "no"
+_libmilter=	libmilter
+_libsm=		libsm
+_libsmdb=	libsmdb
+_libsmutil=	libsmutil
 .endif
 
-.if ${MK_NIS} != "no"
-_libypclnt=	libypclnt
+.if ${MK_TELNET} != "no"
+_libtelnet=	libtelnet
 .endif
 
-.if ${MK_GPIB} != "no"
-_libgpib=	libgpib
+.if ${MK_USB} != "no"
+_libusbhid=	libusbhid
 .endif
 
 .include <bsd.subdir.mk>

==== //depot/projects/arm/src/lib/libarchive/archive.h#3 (text+ko) ====

@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/lib/libarchive/archive.h,v 1.19 2008/08/31 07:21:46 kientzle Exp $
+ * $FreeBSD: src/lib/libarchive/archive.h,v 1.21 2008/09/18 04:19:06 kientzle Exp $
  */
 
 #ifndef ARCHIVE_H_INCLUDED
@@ -46,11 +46,13 @@
 /* Get appropriate definitions of standard POSIX-style types. */
 /* These should match the types used in 'struct stat' */
 #ifdef _WIN32
+#define	__LA_INT64_T	__int64
 #define	__LA_SSIZE_T	long
 #define	__LA_UID_T	unsigned int
 #define	__LA_GID_T	unsigned int
 #else
 #include <unistd.h>  /* ssize_t, uid_t, and gid_t */
+#define	__LA_INT64_T	int64_t
 #define	__LA_SSIZE_T	ssize_t
 #define	__LA_UID_T	uid_t
 #define	__LA_GID_T	gid_t
@@ -247,8 +249,6 @@
 #define	ARCHIVE_FORMAT_AR_GNU			(ARCHIVE_FORMAT_AR | 1)
 #define	ARCHIVE_FORMAT_AR_BSD			(ARCHIVE_FORMAT_AR | 2)
 #define	ARCHIVE_FORMAT_MTREE			0x80000
-#define	ARCHIVE_FORMAT_MTREE_V1			(ARCHIVE_FORMAT_MTREE | 1)
-#define	ARCHIVE_FORMAT_MTREE_V2			(ARCHIVE_FORMAT_MTREE | 2)
 
 /*-
  * Basic outline for reading an archive:
@@ -330,7 +330,7 @@
  * Retrieve the byte offset in UNCOMPRESSED data where last-read
  * header started.
  */
-__LA_DECL int64_t		 archive_read_header_position(struct archive *);
+__LA_DECL __LA_INT64_T		 archive_read_header_position(struct archive *);
 
 /* Read data from the body of an entry.  Similar to read(2). */
 __LA_DECL __LA_SSIZE_T		 archive_read_data(struct archive *, void *, size_t);
@@ -567,9 +567,9 @@
  * the struct archive object:
  */
 /* Bytes written after compression or read before decompression. */
-__LA_DECL int64_t	 archive_position_compressed(struct archive *);
+__LA_DECL __LA_INT64_T	 archive_position_compressed(struct archive *);
 /* Bytes written to compressor or read from decompressor. */
-__LA_DECL int64_t	 archive_position_uncompressed(struct archive *);
+__LA_DECL __LA_INT64_T	 archive_position_uncompressed(struct archive *);
 
 __LA_DECL const char	*archive_compression_name(struct archive *);
 __LA_DECL int		 archive_compression(struct archive *);

==== //depot/projects/arm/src/lib/libarchive/archive_entry.h#10 (text+ko) ====

@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/lib/libarchive/archive_entry.h,v 1.28 2008/09/01 04:54:29 kientzle Exp $
+ * $FreeBSD: src/lib/libarchive/archive_entry.h,v 1.29 2008/09/18 04:19:06 kientzle Exp $
  */
 
 #ifndef ARCHIVE_ENTRY_H_INCLUDED
@@ -43,12 +43,14 @@
 /* Get appropriate definitions of standard POSIX-style types. */
 /* These should match the types used in 'struct stat' */
 #ifdef _WIN32
+#define	__LA_INT64_T	__int64
 #define	__LA_UID_T	unsigned int
 #define	__LA_GID_T	unsigned int
 #define	__LA_DEV_T	unsigned int
 #define	__LA_MODE_T	unsigned short
 #else
 #include <unistd.h>
+#define	__LA_INT64_T	int64_t
 #define	__LA_UID_T	uid_t
 #define	__LA_GID_T	gid_t
 #define	__LA_DEV_T	dev_t
@@ -200,7 +202,7 @@
 __LA_DECL dev_t		 archive_entry_rdevmajor(struct archive_entry *);
 __LA_DECL dev_t		 archive_entry_rdevminor(struct archive_entry *);
 __LA_DECL const char	*archive_entry_sourcepath(struct archive_entry *);
-__LA_DECL int64_t	 archive_entry_size(struct archive_entry *);
+__LA_DECL __LA_INT64_T	 archive_entry_size(struct archive_entry *);
 __LA_DECL int		 archive_entry_size_is_set(struct archive_entry *);
 __LA_DECL const char	*archive_entry_strmode(struct archive_entry *);
 __LA_DECL const char	*archive_entry_symlink(struct archive_entry *);
@@ -261,7 +263,7 @@
 __LA_DECL void	archive_entry_set_rdev(struct archive_entry *, dev_t);
 __LA_DECL void	archive_entry_set_rdevmajor(struct archive_entry *, dev_t);
 __LA_DECL void	archive_entry_set_rdevminor(struct archive_entry *, dev_t);
-__LA_DECL void	archive_entry_set_size(struct archive_entry *, int64_t);
+__LA_DECL void	archive_entry_set_size(struct archive_entry *, __LA_INT64_T);
 __LA_DECL void	archive_entry_unset_size(struct archive_entry *);
 __LA_DECL void	archive_entry_copy_sourcepath(struct archive_entry *, const char *);
 __LA_DECL void	archive_entry_set_symlink(struct archive_entry *, const char *);

==== //depot/projects/arm/src/lib/libarchive/archive_read_support_format_mtree.c#4 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_mtree.c,v 1.9 2008/06/21 19:06:37 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_mtree.c,v 1.10 2008/09/18 04:13:36 kientzle Exp $");
 
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
@@ -408,7 +408,7 @@
 	struct mtree_entry *last_entry;
 	int r;
 
-	mtree->archive_format = ARCHIVE_FORMAT_MTREE_V1;
+	mtree->archive_format = ARCHIVE_FORMAT_MTREE;
 	mtree->archive_format_name = "mtree";
 
 	global = NULL;

==== //depot/projects/arm/src/lib/libarchive/test/test_read_format_mtree.c#4 (text+ko) ====

@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_mtree.c,v 1.3 2008/09/01 05:38:33 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_mtree.c,v 1.4 2008/09/18 04:13:36 kientzle Exp $");
 
 /* Single entry with a hardlink. */
 static unsigned char archive[] = {
@@ -60,7 +60,7 @@
 	assertEqualIntA(a, ARCHIVE_OK,
 	    archive_read_open_memory(a, archive, sizeof(archive)));
 	assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
-	assertEqualInt(archive_format(a), ARCHIVE_FORMAT_MTREE_V1);
+	assertEqualInt(archive_format(a), ARCHIVE_FORMAT_MTREE);
 	assertEqualString(archive_entry_pathname(ae), "file");
 	assertEqualInt(archive_entry_uid(ae), 18);
 	assert(S_ISREG(archive_entry_mode(ae)));

==== //depot/projects/arm/src/lib/libc/gen/getosreldate.3#2 (text+ko) ====

@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/lib/libc/gen/getosreldate.3,v 1.3 2005/12/03 05:11:07 ambrisko Exp $
+.\" $FreeBSD: src/lib/libc/gen/getosreldate.3,v 1.4 2008/09/20 21:12:54 rodrigc Exp $
 .\"
 .Dd December 2, 2005
 .Dt GETOSRELDATE 3
@@ -34,7 +34,6 @@
 .Sh LIBRARY
 .Lb libc
 .Sh SYNOPSIS
-.In osreldate.h
 .Ft int
 .Fn getosreldate void
 .Sh DESCRIPTION

==== //depot/projects/arm/src/lib/libc/uuid/Symbol.map#4 (text) ====

@@ -1,5 +1,5 @@
 /*
- * $FreeBSD: src/lib/libc/uuid/Symbol.map,v 1.3 2008/09/15 23:54:55 emax Exp $
+ * $FreeBSD: src/lib/libc/uuid/Symbol.map,v 1.4 2008/09/19 15:52:56 emax Exp $
  */
 
 FBSD_1.0 {
@@ -11,6 +11,9 @@
 	uuid_create_nil;
 	uuid_create;
 	uuid_compare;
+};
+
+FBSD_1.1 {
 	uuid_enc_le;
 	uuid_dec_le;
 	uuid_enc_be;

==== //depot/projects/arm/src/lib/libpmc/pmc.3#7 (text+ko) ====

@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD: src/lib/libpmc/pmc.3,v 1.18 2008/09/16 16:58:24 jkoshy Exp $
+.\" $FreeBSD: src/lib/libpmc/pmc.3,v 1.22 2008/09/22 14:31:24 jkoshy Exp $
 .\"
 .Dd September 16, 2008
 .Os
@@ -129,58 +129,89 @@
 .Vt "enum pmc_cputype"
 enumeration.
 Supported CPUs include:
-.Bl -tag -width PMC_CPU_INTEL_PIII -compact
-.It PMC_CPU_AMD_K7
+.Bl -tag -width "Li PMC_CPU_INTEL_CORE2" -compact
+.It Li PMC_CPU_AMD_K7
 .Tn "AMD Athlon"
 CPUs.
-.It PMC_CPU_AMD_K8
+.It Li PMC_CPU_AMD_K8
 .Tn "AMD Athlon64"
 CPUs.
-.It PMC_CPU_INTEL_P5
+.It Li PMC_CPU_INTEL_ATOM
+.Tn Intel
+.Tn Atom
+CPUs and other CPUs conforming to version 3 of the

>>> TRUNCATED FOR MAIL (1000 lines) <<<


More information about the p4-projects mailing list