Date: Mon, 18 Jan 2010 21:25:06 GMT From: Alexander Motin <mav@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 173339 for review Message-ID: <201001182125.o0ILP6dS028973@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/chv.cgi?CH=173339 Change 173339 by mav@mav_mavbook on 2010/01/18 21:25:05 IFC Affected files ... .. //depot/projects/scottl-camlock/src/Makefile.inc1#13 integrate .. //depot/projects/scottl-camlock/src/ObsoleteFiles.inc#23 integrate .. //depot/projects/scottl-camlock/src/UPDATING#27 integrate .. //depot/projects/scottl-camlock/src/bin/cp/cp.1#3 integrate .. //depot/projects/scottl-camlock/src/bin/cp/cp.c#3 integrate .. //depot/projects/scottl-camlock/src/bin/cp/utils.c#5 integrate .. //depot/projects/scottl-camlock/src/bin/csh/config.h#3 integrate .. //depot/projects/scottl-camlock/src/bin/csh/config_p.h#3 integrate .. //depot/projects/scottl-camlock/src/bin/date/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/bin/date/date.c#4 integrate .. //depot/projects/scottl-camlock/src/bin/pax/gen_subs.c#2 integrate .. //depot/projects/scottl-camlock/src/bin/pkill/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/contrib/groff/font/devutf8/R.proto#3 integrate .. //depot/projects/scottl-camlock/src/contrib/groff/tmac/an-old.tmac#2 integrate .. //depot/projects/scottl-camlock/src/contrib/groff/tmac/doc-common#3 integrate .. //depot/projects/scottl-camlock/src/contrib/groff/tmac/doc-old.tmac#2 integrate .. //depot/projects/scottl-camlock/src/contrib/groff/tmac/doc-syms#4 integrate .. //depot/projects/scottl-camlock/src/contrib/groff/tmac/doc.tmac#2 integrate .. //depot/projects/scottl-camlock/src/contrib/groff/tmac/groff_mdoc.man#3 integrate .. //depot/projects/scottl-camlock/src/contrib/telnet/telnetd/sys_term.c#4 integrate .. //depot/projects/scottl-camlock/src/contrib/telnet/telnetd/telnetd.c#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/config.h#5 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/defines.h#4 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/loginrec.c#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/sshd.c#5 integrate .. //depot/projects/scottl-camlock/src/etc/defaults/rc.conf#14 integrate .. //depot/projects/scottl-camlock/src/etc/mtree/BSD.include.dist#7 integrate .. //depot/projects/scottl-camlock/src/etc/namedb/named.conf#4 integrate .. //depot/projects/scottl-camlock/src/etc/newsyslog.conf#3 integrate .. //depot/projects/scottl-camlock/src/etc/periodic/monthly/200.accounting#2 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/cleanvar#4 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/var#4 integrate .. //depot/projects/scottl-camlock/src/etc/rc.firewall#8 integrate .. //depot/projects/scottl-camlock/src/gnu/usr.bin/groff/tmac/mdoc.local#6 integrate .. //depot/projects/scottl-camlock/src/include/Makefile#10 integrate .. //depot/projects/scottl-camlock/src/include/unistd.h#5 integrate .. //depot/projects/scottl-camlock/src/include/utmp.h#3 integrate .. //depot/projects/scottl-camlock/src/include/utmpx.h#1 branch .. //depot/projects/scottl-camlock/src/lib/libc/gen/Makefile.inc#9 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/Symbol.map#10 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/getttyent.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/getutxent.3#1 branch .. //depot/projects/scottl-camlock/src/lib/libc/gen/getutxent.c#1 branch .. //depot/projects/scottl-camlock/src/lib/libc/gen/opendir.c#4 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/pututxline.c#1 branch .. //depot/projects/scottl-camlock/src/lib/libc/gen/scandir.c#4 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/sem_new.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/ttyname.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/ttyslot.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/uname.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/utxdb.c#1 branch .. //depot/projects/scottl-camlock/src/lib/libc/gen/utxdb.h#1 branch .. //depot/projects/scottl-camlock/src/lib/libgeom/geom_util.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libgeom/geom_xml2tree.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libgeom/libgeom.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libgeom/libgeom.h#3 integrate .. //depot/projects/scottl-camlock/src/lib/libopie/Makefile#5 integrate .. //depot/projects/scottl-camlock/src/lib/libopie/config.h#2 integrate .. //depot/projects/scottl-camlock/src/lib/libpam/modules/pam_krb5/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/lib/libpam/modules/pam_lastlog/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/lib/libpam/modules/pam_lastlog/pam_lastlog.c#6 integrate .. //depot/projects/scottl-camlock/src/lib/libstand/bzipfs.c#4 integrate .. //depot/projects/scottl-camlock/src/lib/libulog/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/lib/libulog/Symbol.map#3 integrate .. //depot/projects/scottl-camlock/src/lib/libulog/ulog.h#3 integrate .. //depot/projects/scottl-camlock/src/lib/libulog/ulog_getutxent.3#2 delete .. //depot/projects/scottl-camlock/src/lib/libulog/ulog_getutxent.c#3 delete .. //depot/projects/scottl-camlock/src/lib/libulog/ulog_internal.h#2 delete .. //depot/projects/scottl-camlock/src/lib/libulog/ulog_login.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libulog/ulog_login.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libulog/ulog_login_pseudo.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libulog/ulog_pututxline.c#3 delete .. //depot/projects/scottl-camlock/src/lib/libulog/ulog_setutxfile.3#3 delete .. //depot/projects/scottl-camlock/src/lib/libulog/ulog_util.c#2 delete .. //depot/projects/scottl-camlock/src/lib/libulog/utempter.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libulog/utempter_add_record.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libutil/Makefile#5 integrate .. //depot/projects/scottl-camlock/src/lib/libutil/libutil.h#4 integrate .. //depot/projects/scottl-camlock/src/lib/libutil/login.3#2 delete .. //depot/projects/scottl-camlock/src/lib/libutil/login.c#2 delete .. //depot/projects/scottl-camlock/src/lib/libutil/login_tty.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libutil/logout.3#2 delete .. //depot/projects/scottl-camlock/src/lib/libutil/logout.c#2 delete .. //depot/projects/scottl-camlock/src/lib/libutil/logwtmp.3#2 delete .. //depot/projects/scottl-camlock/src/lib/libutil/logwtmp.c#3 delete .. //depot/projects/scottl-camlock/src/libexec/comsat/comsat.c#4 integrate .. //depot/projects/scottl-camlock/src/libexec/ftpd/ftpd.c#3 integrate .. //depot/projects/scottl-camlock/src/libexec/ftpd/logwtmp.c#2 integrate .. //depot/projects/scottl-camlock/src/libexec/getty/ttys.5#3 integrate .. //depot/projects/scottl-camlock/src/libexec/rlogind/rlogind.c#2 integrate .. //depot/projects/scottl-camlock/src/libexec/rpc.rusersd/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/libexec/rpc.rusersd/rusers_proc.c#3 integrate .. //depot/projects/scottl-camlock/src/libexec/talkd/Makefile#5 integrate .. //depot/projects/scottl-camlock/src/libexec/talkd/process.c#4 integrate .. //depot/projects/scottl-camlock/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#5 integrate .. //depot/projects/scottl-camlock/src/sbin/adjkerntz/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/sbin/geom/class/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/sbin/geom/class/mountver/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sbin/geom/class/mountver/geom_mountver.c#1 branch .. //depot/projects/scottl-camlock/src/sbin/geom/class/mountver/gmountver.8#1 branch .. //depot/projects/scottl-camlock/src/sbin/geom/core/geom.8#4 integrate .. //depot/projects/scottl-camlock/src/sbin/geom/core/geom.c#5 integrate .. //depot/projects/scottl-camlock/src/sbin/ifconfig/Makefile#7 integrate .. //depot/projects/scottl-camlock/src/sbin/ifconfig/af_inet.c#4 integrate .. //depot/projects/scottl-camlock/src/sbin/init/Makefile#5 integrate .. //depot/projects/scottl-camlock/src/sbin/init/init.c#5 integrate .. //depot/projects/scottl-camlock/src/sbin/kldconfig/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sbin/kldload/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sbin/kldstat/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sbin/mdconfig/mdconfig.c#3 integrate .. //depot/projects/scottl-camlock/src/sbin/natd/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sbin/natd/natd.c#4 integrate .. //depot/projects/scottl-camlock/src/sbin/newfs/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/sbin/reboot/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/sbin/reboot/reboot.c#6 integrate .. //depot/projects/scottl-camlock/src/sbin/setkey/setkey.8#3 integrate .. //depot/projects/scottl-camlock/src/sbin/swapon/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/sbin/tunefs/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/Makefile#19 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/acpi.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/acpi_asus.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/aue.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/axe.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/cdce.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/dc.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/epair.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/gif.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/hme.4#4 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/ipwfw.4#1 branch .. //depot/projects/scottl-camlock/src/share/man/man4/iwifw.4#1 branch .. //depot/projects/scottl-camlock/src/share/man/man4/lge.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/mac.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/man4.i386/vpd.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/man4.sparc64/ebus.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/mpt.4#5 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/ndis.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/nge.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/pcm.4#9 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/pcn.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/psm.4#4 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/pts.4#4 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/ral.4#5 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/re.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/rl.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/rue.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/rum.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/sf.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/siba.4#1 branch .. //depot/projects/scottl-camlock/src/share/man/man4/sis.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/sk.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/smbus.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/snd_uaudio.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/ste.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/sysmouse.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/targ.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/udav.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/uhso.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/ural.4#4 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/urio.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/urtw.4#5 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/vr.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/wi.4#4 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/wlan.4#4 integrate .. //depot/projects/scottl-camlock/src/share/man/man5/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man5/src.conf.5#5 integrate .. //depot/projects/scottl-camlock/src/share/man/man5/utmp.5#2 delete .. //depot/projects/scottl-camlock/src/share/man/man7/release.7#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/Makefile#14 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/ifnet.9#4 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/mac.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/namei.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/pci.9#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/sysctl.9#3 integrate .. //depot/projects/scottl-camlock/src/share/mk/bsd.dep.mk#3 integrate .. //depot/projects/scottl-camlock/src/share/mk/bsd.own.mk#5 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/local_apic.c#25 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/conf/XENHVM#4 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/apicvar.h#18 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/isa/clock.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/busdma_machdep.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/boot/forth/loader.conf#23 integrate .. //depot/projects/scottl-camlock/src/sys/boot/ia64/efi/main.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/boot/ia64/efi/version#4 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_ioctl.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_misc.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_uid16.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files#62 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.pc98#19 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options.i386#12 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options.pc98#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_ec.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bge/if_bge.c#34 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bge/if_bgereg.h#22 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cs/if_cs.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cs/if_csreg.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/brgphy.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/miidevs#16 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/sndstat.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/sndstat.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/net/uhso.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdevs#40 integrate .. //depot/projects/scottl-camlock/src/sys/fs/ext2fs/ext2_alloc.c#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/ext2fs/ext2_balloc.c#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/ext2fs/ext2_bmap.c#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/ext2fs/ext2_dinode.h#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/ext2fs/ext2_dir.h#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/ext2fs/ext2_extern.h#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/ext2fs/ext2_inode.c#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/ext2fs/ext2_inode_cnv.c#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/ext2fs/ext2_lookup.c#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/ext2fs/ext2_mount.h#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/ext2fs/ext2_readwrite.c#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/ext2fs/ext2_subr.c#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/ext2fs/ext2_vfsops.c#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/ext2fs/ext2_vnops.c#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/ext2fs/ext2fs.h#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/ext2fs/fs.h#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/ext2fs/inode.h#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/tmpfs/tmpfs.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/fs/tmpfs/tmpfs_vfsops.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/geom/geom_dump.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/geom/mountver/g_mountver.c#1 branch .. //depot/projects/scottl-camlock/src/sys/geom/mountver/g_mountver.h#1 branch .. //depot/projects/scottl-camlock/src/sys/gnu/fs/ext2fs/COPYRIGHT.INFO#2 delete .. //depot/projects/scottl-camlock/src/sys/gnu/fs/ext2fs/ext2_alloc.c#3 delete .. //depot/projects/scottl-camlock/src/sys/gnu/fs/ext2fs/ext2_balloc.c#3 delete .. //depot/projects/scottl-camlock/src/sys/gnu/fs/ext2fs/ext2_bitops.h#4 delete .. //depot/projects/scottl-camlock/src/sys/gnu/fs/ext2fs/ext2_bmap.c#3 delete .. //depot/projects/scottl-camlock/src/sys/gnu/fs/ext2fs/ext2_extern.h#2 delete .. //depot/projects/scottl-camlock/src/sys/gnu/fs/ext2fs/ext2_fs.h#4 delete .. //depot/projects/scottl-camlock/src/sys/gnu/fs/ext2fs/ext2_fs_sb.h#4 delete .. //depot/projects/scottl-camlock/src/sys/gnu/fs/ext2fs/ext2_inode.c#5 delete .. //depot/projects/scottl-camlock/src/sys/gnu/fs/ext2fs/ext2_inode_cnv.c#3 delete .. //depot/projects/scottl-camlock/src/sys/gnu/fs/ext2fs/ext2_linux_balloc.c#2 delete .. //depot/projects/scottl-camlock/src/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c#4 delete .. //depot/projects/scottl-camlock/src/sys/gnu/fs/ext2fs/ext2_lookup.c#7 delete .. //depot/projects/scottl-camlock/src/sys/gnu/fs/ext2fs/ext2_mount.h#2 delete .. //depot/projects/scottl-camlock/src/sys/gnu/fs/ext2fs/ext2_readwrite.c#2 delete .. //depot/projects/scottl-camlock/src/sys/gnu/fs/ext2fs/ext2_subr.c#2 delete .. //depot/projects/scottl-camlock/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#11 delete .. //depot/projects/scottl-camlock/src/sys/gnu/fs/ext2fs/ext2_vnops.c#11 delete .. //depot/projects/scottl-camlock/src/sys/gnu/fs/ext2fs/fs.h#4 delete .. //depot/projects/scottl-camlock/src/sys/gnu/fs/ext2fs/i386-bitops.h#2 delete .. //depot/projects/scottl-camlock/src/sys/gnu/fs/ext2fs/inode.h#3 delete .. //depot/projects/scottl-camlock/src/sys/gnu/fs/reiserfs/reiserfs_fs.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/local_apic.c#26 integrate .. //depot/projects/scottl-camlock/src/sys/i386/ibcs2/ibcs2_misc.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/apicvar.h#18 integrate .. //depot/projects/scottl-camlock/src/sys/i386/isa/clock.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/efi.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/iodev_machdep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/include/efi.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/include/iodev.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_jail.c#30 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_prot.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/kern/tty_inq.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/tty_pts.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_subr.c#30 integrate .. //depot/projects/scottl-camlock/src/sys/modules/Makefile#41 integrate .. //depot/projects/scottl-camlock/src/sys/modules/ext2fs/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/sys/modules/geom/Makefile#10 integrate .. //depot/projects/scottl-camlock/src/sys/modules/geom/geom_mountver/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/net/if.c#41 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_bridge.c#28 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_lagg.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_var.h#31 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_vlan.c#26 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_mesh.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_eiface.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_ether.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_fec.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in_pcb.c#29 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw2.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_auth.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_auth.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_constants.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_header.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_indata.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_indata.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_input.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_os_bsd.h#17 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_output.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_pcb.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_structs.h#14 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_sysctl.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_uio.h#16 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_usrreq.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctputil.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_var.h#27 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/in6_proto.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/in6_src.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/cbus/clock.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/conf/DEFAULTS#12 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/conf/NOTES#13 integrate .. //depot/projects/scottl-camlock/src/sys/sys/jail.h#15 integrate .. //depot/projects/scottl-camlock/src/sys/sys/param.h#39 integrate .. //depot/projects/scottl-camlock/src/sys/sys/vnode.h#24 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_pageout.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vnode_pager.c#16 integrate .. //depot/projects/scottl-camlock/src/tools/build/mk/OptionalObsoleteFiles.inc#6 integrate .. //depot/projects/scottl-camlock/src/usr.bin/Makefile#5 integrate .. //depot/projects/scottl-camlock/src/usr.bin/brandelf/brandelf.1#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/chpass/chpass.1#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/elfdump/elfdump.1#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/finger/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/finger/finger.c#5 integrate .. //depot/projects/scottl-camlock/src/usr.bin/finger/lprint.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/finger/net.c#5 integrate .. //depot/projects/scottl-camlock/src/usr.bin/finger/sprint.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/finger/util.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/getent/getent.1#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/getent/getent.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/last/last.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/locale/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/systat/Makefile#6 integrate .. //depot/projects/scottl-camlock/src/usr.bin/systat/vmstat.c#5 integrate .. //depot/projects/scottl-camlock/src/usr.bin/users/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/users/users.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/w/Makefile#5 integrate .. //depot/projects/scottl-camlock/src/usr.bin/w/w.c#7 integrate .. //depot/projects/scottl-camlock/src/usr.bin/wall/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/wall/wall.c#5 integrate .. //depot/projects/scottl-camlock/src/usr.bin/who/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/who/who.c#5 integrate .. //depot/projects/scottl-camlock/src/usr.bin/whois/whois.1#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/whois/whois.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/write/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/write/write.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/wtmpcvt/Makefile#1 branch .. //depot/projects/scottl-camlock/src/usr.bin/wtmpcvt/wtmpcvt.1#1 branch .. //depot/projects/scottl-camlock/src/usr.bin/wtmpcvt/wtmpcvt.c#1 branch .. //depot/projects/scottl-camlock/src/usr.sbin/ac/ac.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/adduser/adduser.sh#4 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/faithd/faithd.8#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/jail/jail.8#10 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/lastlogin/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/lastlogin/lastlogin.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/mergemaster/mergemaster.8#5 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/mergemaster/mergemaster.sh#7 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/ppp/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/ppp/id.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/ppp/id.h#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/ppp/physical.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/ppp/physical.h#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/rwhod/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/rwhod/rwhod.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/smbmsg/smbmsg.8#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/syslogd/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/syslogd/syslogd.c#5 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/timed/timed/master.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/timed/timed/slave.c#3 integrate Differences ... ==== //depot/projects/scottl-camlock/src/Makefile.inc1#13 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.636 2009/12/31 00:07:26 ed Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.637 2010/01/14 23:27:23 jilles Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -1266,7 +1266,7 @@ fi; \ done # Remove catpages without corresponding manpages. - @3<&0; \ + @exec 3<&0; \ find ${DESTDIR}/usr/share/man/cat* ! -type d | \ sed -ep -e's:${DESTDIR}/usr/share/man/cat:${DESTDIR}/usr/share/man/man:' | \ while read catpage; do \ ==== //depot/projects/scottl-camlock/src/ObsoleteFiles.inc#23 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.218 2010/01/05 02:37:59 davidxu Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.222 2010/01/14 05:35:32 ed 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,23 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20100114: removal of ttyslot(3) +OLD_FILES+=usr/share/man/man3/ttyslot.3.gz +# 20100113: remove utmp.h, replace it by utmpx.h +OLD_FILES+=usr/share/man/man3/login.3.gz +OLD_FILES+=usr/share/man/man3/logout.3.gz +OLD_FILES+=usr/share/man/man3/logwtmp.3.gz +OLD_FILES+=usr/share/man/man3/ulog_endutxent.3.gz +OLD_FILES+=usr/share/man/man3/ulog_getutxent.3.gz +OLD_FILES+=usr/share/man/man3/ulog_getutxline.3.gz +OLD_FILES+=usr/share/man/man3/ulog_getutxuser.3.gz +OLD_FILES+=usr/share/man/man3/ulog_pututxline.3.gz +OLD_FILES+=usr/share/man/man3/ulog_setutxent.3.gz +OLD_FILES+=usr/share/man/man3/ulog_setutxfile.3.gz +OLD_FILES+=usr/share/man/man5/lastlog.5.gz +OLD_FILES+=usr/share/man/man5/utmp.5.gz +OLD_FILES+=usr/share/man/man5/wtmp.5.gz +OLD_LIBS+=lib/libutil.so.8 # 20100105: new userland semaphore implementation OLD_FILES+=usr/include/sys/semaphore.h # 20100103: ntptrace(8) removed ==== //depot/projects/scottl-camlock/src/UPDATING#27 (text+ko) ==== @@ -22,6 +22,25 @@ machines to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20100113: + The utmp user accounting database has been replaced with utmpx, + the user accounting interface standardized by POSIX. + Unfortunately the semantics of utmp and utmpx don't match, + making it practically impossible to support both interfaces. + The user accounting database is used by tools like finger(1), + last(1), talk(1), w(1) and ac(8). + + All applications in the base system use utmpx. This means only + local binaries (e.g. from the ports tree) may still use these + utmp database files. These applications must be rebuilt to make + use of utmpx. + + After the system has been upgraded, it is safe to remove the old + log files (/var/run/utmp, /var/log/lastlog and /var/log/wtmp*), + assuming their contents is of no importance anymore. Old wtmp + databases can only be used by last(1) and ac(8) after they have + been converted to the new format using wtmpcvt(1). + 20100108: Introduce the kernel thread "deadlock resolver" (which can be enabled via the DEADLKRES option, see NOTES for more details) and the @@ -1094,4 +1113,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.651 2010/01/09 01:46:38 attilio Exp $ +$FreeBSD: src/UPDATING,v 1.653 2010/01/14 20:58:45 ed Exp $ ==== //depot/projects/scottl-camlock/src/bin/cp/cp.1#3 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)cp.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/cp/cp.1,v 1.40 2008/03/10 19:58:41 jhb Exp $ +.\" $FreeBSD: src/bin/cp/cp.1,v 1.41 2010/01/17 09:37:31 gavin Exp $ .\" -.Dd October 27, 2006 +.Dd January 17, 2010 .Dt CP 1 .Os .Sh NAME @@ -45,7 +45,7 @@ .Op Fl H | Fl L | Fl P .Oc .Op Fl f | i | n -.Op Fl alpv +.Op Fl alpvx .Ar source_file target_file .Nm .Oo @@ -53,7 +53,7 @@ .Op Fl H | Fl L | Fl P .Oc .Op Fl f | i | n -.Op Fl alpv +.Op Fl alpvx .Ar source_file ... target_directory .Sh DESCRIPTION In the first synopsis form, the @@ -183,6 +183,8 @@ Cause .Nm to be verbose, showing files as they are copied. +.It Fl x +File system mount points are not traversed. .El .Pp For each destination file that already exists, its contents are ==== //depot/projects/scottl-camlock/src/bin/cp/cp.c#3 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.60 2008/03/10 19:58:41 jhb Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.61 2010/01/17 09:37:31 gavin Exp $"); /* * Cp copies source files to target files. @@ -101,8 +101,9 @@ int Hflag, Lflag, Pflag, ch, fts_options, r, have_trailing_slash; char *target; + fts_options = FTS_NOCHDIR | FTS_PHYSICAL; Hflag = Lflag = Pflag = 0; - while ((ch = getopt(argc, argv, "HLPRafilnprv")) != -1) + while ((ch = getopt(argc, argv, "HLPRafilnprvx")) != -1) switch (ch) { case 'H': Hflag = 1; @@ -150,6 +151,9 @@ case 'v': vflag = 1; break; + case 'x': + fts_options |= FTS_XDEV; + break; default: usage(); break; @@ -160,7 +164,6 @@ if (argc < 2) usage(); - fts_options = FTS_NOCHDIR | FTS_PHYSICAL; if (Rflag && rflag) errx(1, "the -R and -r options may not be specified together"); if (rflag) ==== //depot/projects/scottl-camlock/src/bin/cp/utils.c#5 (text+ko) ==== @@ -33,7 +33,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.59 2009/09/02 08:08:57 trasz Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.60 2010/01/17 09:37:31 gavin Exp $"); #include <sys/types.h> #include <sys/acl.h> @@ -518,8 +518,8 @@ { (void)fprintf(stderr, "%s\n%s\n", -"usage: cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpv] source_file target_file", -" cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpv] source_file ... " +"usage: cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpvx] source_file target_file", +" cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpvx] source_file ... " "target_directory"); exit(EX_USAGE); } ==== //depot/projects/scottl-camlock/src/bin/csh/config.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/bin/csh/config.h,v 1.15 2007/05/16 21:22:38 mp Exp $ */ +/* $FreeBSD: src/bin/csh/config.h,v 1.16 2010/01/13 17:49:35 ed Exp $ */ /* config.h. Generated by configure. */ /* config.h.in. Generated from configure.in by autoheader. */ @@ -54,7 +54,7 @@ #define HAVE_GETPWENT 1 /* Define to 1 if you have the `getutent' function. */ -/* #undef HAVE_GETUTENT */ +#define HAVE_GETUTENT 1 /* Define if you have the iconv() function. */ /* #undef HAVE_ICONV */ @@ -130,10 +130,10 @@ #define HAVE_STRUCT_UTMP_UT_HOST 1 /* Define to 1 if `ut_tv' is member of `struct utmp'. */ -/* #undef HAVE_STRUCT_UTMP_UT_TV */ +#define HAVE_STRUCT_UTMP_UT_TV 1 /* Define to 1 if `ut_user' is member of `struct utmp'. */ -/* #undef HAVE_STRUCT_UTMP_UT_USER */ +#define HAVE_STRUCT_UTMP_UT_USER 1 /* Define to 1 if `ut_xtime' is member of `struct utmp'. */ /* #undef HAVE_STRUCT_UTMP_UT_XTIME */ @@ -159,10 +159,10 @@ #define HAVE_UNISTD_H 1 /* Define to 1 if you have the <utmpx.h> header file. */ -/* #undef HAVE_UTMPX_H */ +#define HAVE_UTMPX_H 1 /* Define to 1 if you have the <utmp.h> header file. */ -#define HAVE_UTMP_H 1 +/* #undef HAVE_UTMP_H */ /* Define to 1 if you have the <wchar.h> header file. */ #define HAVE_WCHAR_H 1 ==== //depot/projects/scottl-camlock/src/bin/csh/config_p.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/bin/csh/config_p.h,v 1.14 2007/05/16 21:22:38 mp Exp $ */ +/* $FreeBSD: src/bin/csh/config_p.h,v 1.15 2010/01/13 17:49:35 ed Exp $ */ /* * config.h -- configure various defines for tcsh * @@ -85,6 +85,7 @@ /* Use LC_MESSAGES locale category to open the message catalog */ #define MCLoadBySet NL_CAT_LOCALE #define BUFSIZE 8192 +#define UTMPX_FILE "/var/run/utx.active" #endif #if defined(__bsdi__) ==== //depot/projects/scottl-camlock/src/bin/date/Makefile#3 (text+ko) ==== @@ -1,9 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/date/Makefile,v 1.12 2009/12/05 20:09:50 ed Exp $ +# $FreeBSD: src/bin/date/Makefile,v 1.13 2010/01/13 17:56:54 ed Exp $ PROG= date SRCS= date.c netdate.c vary.c -DPADD= ${LIBULOG} -LDADD= -lulog .include <bsd.prog.mk> ==== //depot/projects/scottl-camlock/src/bin/date/date.c#4 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/date/date.c,v 1.49 2009/12/05 20:09:50 ed Exp $"); +__FBSDID("$FreeBSD: src/bin/date/date.c,v 1.50 2010/01/13 17:56:54 ed Exp $"); #include <sys/param.h> #include <sys/time.h> @@ -52,9 +52,8 @@ #include <stdlib.h> #include <string.h> #include <syslog.h> -#define _ULOG_POSIX_NAMES -#include <ulog.h> #include <unistd.h> +#include <utmpx.h> #include "extern.h" #include "vary.h" ==== //depot/projects/scottl-camlock/src/bin/pax/gen_subs.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/pax/gen_subs.c,v 1.23 2004/04/06 20:06:48 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/gen_subs.c,v 1.24 2010/01/13 17:56:54 ed Exp $"); #include <sys/types.h> #include <sys/time.h> @@ -45,7 +45,6 @@ #include <langinfo.h> #include <stdint.h> #include <stdio.h> -#include <utmp.h> #include <unistd.h> #include <stdlib.h> #include <string.h> @@ -66,10 +65,6 @@ #define OLDFRMTM "%b %e %Y" #define CURFRMTD "%e %b %H:%M" #define OLDFRMTD "%e %b %Y" -#ifndef UT_NAMESIZE -#define UT_NAMESIZE 8 -#endif -#define UT_GRPSIZE 6 static int d_first = -1; @@ -116,9 +111,8 @@ */ if (strftime(f_date,DATELEN,timefrmt,localtime(&(sbp->st_mtime))) == 0) f_date[0] = '\0'; - (void)fprintf(fp, "%s%2u %-*s %-*s ", f_mode, sbp->st_nlink, - UT_NAMESIZE, name_uid(sbp->st_uid, 1), UT_GRPSIZE, - name_gid(sbp->st_gid, 1)); + (void)fprintf(fp, "%s%2u %-12s %-12s ", f_mode, sbp->st_nlink, + name_uid(sbp->st_uid, 1), name_gid(sbp->st_gid, 1)); /* * print device id's for devices, or sizes for other nodes ==== //depot/projects/scottl-camlock/src/bin/pkill/Makefile#2 (text+ko) ==== @@ -1,8 +1,7 @@ # $NetBSD: Makefile,v 1.1 2002/03/01 11:21:58 ad Exp $ -# $FreeBSD: src/bin/pkill/Makefile,v 1.1 2008/08/31 14:27:59 yar Exp $ +# $FreeBSD: src/bin/pkill/Makefile,v 1.2 2010/01/17 21:56:27 ed Exp $ PROG= pkill -WARNS?= 5 DPADD= ${LIBKVM} LDADD= -lkvm ==== //depot/projects/scottl-camlock/src/contrib/groff/font/devutf8/R.proto#3 (text+ko) ==== @@ -726,7 +726,7 @@ product 24 0 0x220F coproduct 24 0 0x2210 sum 24 0 0x2211 -\- 24 0 0x002D +\- 24 0 0x2212 mi " -+ 24 0 0x2213 ** 24 0 0x2217 ==== //depot/projects/scottl-camlock/src/contrib/groff/tmac/an-old.tmac#2 (text+ko) ==== @@ -630,6 +630,18 @@ . hy \n[HY] .\} . +.\" For UTF-8, map some characters conservatively for the sake +.\" of easy cut and paste. +. +.if '\*[.T]'utf8' \{\ +. rchar \- - ' ` +. +. char \- \N'45' +. char - \N'45' +. char ' \N'39' +. char ` \N'96' +.\} +. .\" Load local modifications. .mso man.local . ==== //depot/projects/scottl-camlock/src/contrib/groff/tmac/doc-common#3 (text+ko) ==== @@ -46,6 +46,7 @@ .nr %Q 1 .nr %R 1 .nr %T 1 +.nr %U 1 .nr %V 1 .nr Ac 3 .nr Ad 12n @@ -77,6 +78,7 @@ .nr Dq 12n .nr Ds 6n\" many manpages still use this as a -width value .nr Dv 12n +.nr Dx 1 .nr Ec 3 .nr Ef 8n\" ? .nr Ek 8n\" ? @@ -219,6 +221,7 @@ .\" NS doc-document-title .\" NS doc-section .\" NS doc-volume +.\" NS doc-command-name .\" NS .\" NS local variables: .\" NS doc-volume-as-XXX @@ -319,6 +322,7 @@ . ds doc-document-title UNTITLED . ds doc-volume LOCAL . ds doc-section Null +. ds doc-command-name . . if !"\$1"" \ . ds doc-document-title "\$1 @@ -357,6 +361,12 @@ . if !"\$3"" \ . if "\*[doc-volume]"LOCAL" \ . ds doc-volume \$3 +. +. if !\n[cR] \ +. if \n[nl] \{\ + . doc-setup-header +. bp +. \} .. . . @@ -379,6 +389,7 @@ .\" NS .\" NS modifies: .\" NS doc-operating-system +.\" NS doc-command-name .\" NS .\" NS local variables: .\" NS doc-operating-system-XXX-XXX @@ -435,9 +446,14 @@ .ds doc-operating-system-NetBSD-2.0 2.0 .ds doc-operating-system-NetBSD-2.0.1 2.0.1 .ds doc-operating-system-NetBSD-2.0.2 2.0.2 +.ds doc-operating-system-NetBSD-2.0.3 2.0.3 .ds doc-operating-system-NetBSD-2.1 2.1 .ds doc-operating-system-NetBSD-3.0 3.0 +.ds doc-operating-system-NetBSD-3.0.1 3.0.1 +.ds doc-operating-system-NetBSD-3.0.2 3.0.2 +.ds doc-operating-system-NetBSD-3.1 3.1 .ds doc-operating-system-NetBSD-4.0 4.0 +.ds doc-operating-system-NetBSD-4.0.1 4.0.1 . .ds doc-operating-system-FreeBSD-1.0 1.0 .ds doc-operating-system-FreeBSD-1.1 1.1 @@ -486,23 +502,48 @@ .ds doc-operating-system-FreeBSD-6.0 6.0 .ds doc-operating-system-FreeBSD-6.1 6.1 .ds doc-operating-system-FreeBSD-6.2 6.2 +.ds doc-operating-system-FreeBSD-6.3 6.3 +.ds doc-operating-system-FreeBSD-6.4 6.4 .ds doc-operating-system-FreeBSD-7.0 7.0 +.ds doc-operating-system-FreeBSD-7.1 7.1 . -.ds doc-operating-system-Darwin-8.0.0 8.0.0 -.ds doc-operating-system-Darwin-8.1.0 8.1.0 -.ds doc-operating-system-Darwin-8.2.0 8.2.0 -.ds doc-operating-system-Darwin-8.3.0 8.3.0 -.ds doc-operating-system-Darwin-8.4.0 8.4.0 -.ds doc-operating-system-Darwin-8.5.0 8.5.0 +.ds doc-operating-system-Darwin-8.0.0 8.0.0 +.ds doc-operating-system-Darwin-8.1.0 8.1.0 +.ds doc-operating-system-Darwin-8.2.0 8.2.0 +.ds doc-operating-system-Darwin-8.3.0 8.3.0 +.ds doc-operating-system-Darwin-8.4.0 8.4.0 +.ds doc-operating-system-Darwin-8.5.0 8.5.0 +.ds doc-operating-system-Darwin-8.6.0 8.6.0 +.ds doc-operating-system-Darwin-8.7.0 8.7.0 +.ds doc-operating-system-Darwin-8.8.0 8.8.0 +.ds doc-operating-system-Darwin-8.9.0 8.9.0 +.ds doc-operating-system-Darwin-8.10.0 8.10.0 +.ds doc-operating-system-Darwin-8.11.0 8.11.0 +.ds doc-operating-system-Darwin-9.0.0 9.0.0 +.ds doc-operating-system-Darwin-9.1.0 9.1.0 +.ds doc-operating-system-Darwin-9.2.0 9.2.0 +.ds doc-operating-system-Darwin-9.3.0 9.3.0 +.ds doc-operating-system-Darwin-9.4.0 9.4.0 +.ds doc-operating-system-Darwin-9.5.0 9.5.0 +.ds doc-operating-system-Darwin-9.6.0 9.6.0 . -.ds doc-operating-system-DragonFly-1.0 1.0 -.ds doc-operating-system-DragonFly-1.1 1.1 -.ds doc-operating-system-DragonFly-1.2 1.2 -.ds doc-operating-system-DragonFly-1.3 1.3 -.ds doc-operating-system-DragonFly-1.4 1.4 -.ds doc-operating-system-DragonFly-1.5 1.5 +.ds doc-operating-system-DragonFly-1.0 1.0 +.ds doc-operating-system-DragonFly-1.1 1.1 +.ds doc-operating-system-DragonFly-1.2 1.2 +.ds doc-operating-system-DragonFly-1.3 1.3 +.ds doc-operating-system-DragonFly-1.4 1.4 +.ds doc-operating-system-DragonFly-1.5 1.5 +.ds doc-operating-system-DragonFly-1.6 1.6 +.ds doc-operating-system-DragonFly-1.8 1.8 +.ds doc-operating-system-DragonFly-1.8.1 1.8.1 +.ds doc-operating-system-DragonFly-1.10 1.10 +.ds doc-operating-system-DragonFly-1.12 1.12 +.ds doc-operating-system-DragonFly-1.12.2 1.12.2 +.ds doc-operating-system-DragonFly-2.0 2.0 . .de Os +. ds doc-command-name +. . ie "\$1"" \ . ds doc-operating-system "\*[doc-default-operating-system] . el \{ .ie "\$1"ATT" \{\ @@ -563,6 +604,7 @@ .\" NS .\" NS modifies: .\" NS doc-date-string +.\" NS doc-command-name .\" NS .\" NS local variables: .\" NS doc-date-XXX @@ -583,6 +625,8 @@ .ds doc-date-12 December . .de Dd +. ds doc-command-name +. . ie \n[.$] \{\ . ie (\n[.$] == 3) \ . ds doc-date-string \$1\~\$2 \$3 @@ -1128,6 +1172,8 @@ . tm doc-reference-title-count == \n[doc-reference-title-count] . tm doc-reference-title-name == `\*[doc-reference-title-name]' . tm doc-reference-title-name-for-book == `\*[doc-reference-title-name-for-book]' +. tm doc-url-count == \n[doc-url-count] +. tm doc-url-name == `\*[doc-url-name]' . tm doc-volume-count == \n[doc-volume-count] . tm doc-volume-name == `\*[doc-volume-name]' . tm doc-have-author == \n[doc-have-author] ==== //depot/projects/scottl-camlock/src/contrib/groff/tmac/doc-old.tmac#2 (text+ko) ==== @@ -40,7 +40,7 @@ .ds aD \fI .\" Argument Reference Style .ds aR \f(CO -.\" Interactive Comand Modifier (flag) +.\" Interactive Command Modifier (flag) .ds cM \f(CB .\" Emphasis (in the English sense - usually italics) .ds eM \fI ==== //depot/projects/scottl-camlock/src/contrib/groff/tmac/doc-syms#4 (text+ko) ==== @@ -651,6 +651,8 @@ .\" X/Open .ds doc-str-St--susv2 Version\~2 of the Single \*[doc-Tn-font-size]UNIX\*[doc-str-St] Specification .as doc-str-St--susv2 " (\*[Lq]\*[doc-Tn-font-size]SUSv2\*[doc-str-St]\*[Rq]) +.ds doc-str-St--susv3 Version\~3 of the Single \*[doc-Tn-font-size]UNIX\*[doc-str-St] Specification +.as doc-str-St--susv3 " (\*[Lq]\*[doc-Tn-font-size]SUSv3\*[doc-str-St]\*[Rq]) .ds doc-str-St--svid4 System\~V Interface Definition, Fourth Edition .as doc-str-St--svid4 " (\*[Lq]\*[doc-Tn-font-size]SVID\*[doc-str-St]\^4\*[Rq]) .ds doc-str-St--xbd5 \*[doc-Tn-font-size]X/Open\*[doc-str-St] System Interface Definitions Issue\~5 @@ -777,7 +779,6 @@ .ds doc-str-Lb-librt \*[Px] \*[doc-str-Lb]Real-time Library (librt, \-lrt) .ds doc-str-Lb-libtermcap Termcap Access Library (libtermcap, \-ltermcap) .ds doc-str-Lb-libusbhid USB Human Interface Devices Library (libusbhid, \-lusbhid) -.ds doc-str-Lb-libulog User Login Record Library (libulog, \-lulog) .ds doc-str-Lb-libutil System Utilities Library (libutil, \-lutil) .ds doc-str-Lb-libx86_64 x86_64 Architecture Library (libx86_64, \-lx86_64) .ds doc-str-Lb-libz Compression Library (libz, \-lz) ==== //depot/projects/scottl-camlock/src/contrib/groff/tmac/doc.tmac#2 (text+ko) ==== @@ -356,10 +356,10 @@ . ds doc-macro-name Fl . doc-parse-args \$@ . -. if !\n[.$] \{\ -. \" no arguments +. \" no arguments +. if !\n[.$] \ . nop \|\-\|\f[]\s[0] -. \}\} +. \} . . if !\n[doc-arg-limit] \ . return @@ -481,8 +481,8 @@ . el \{\ . nr doc-reg-dpr \n[doc-arg-ptr] . +. \" the `\%' prevents hyphenation on a dash (`-') . ie (\n[doc-reg-dpr1] == 2) \ -. \" the `\%' prevents hyphenation on a dash (`-') . nop \%\*[doc-str-dpr]\&\c . el \{\ . \" punctuation character @@ -595,10 +595,10 @@ . ds doc-macro-name Ar . doc-parse-args \$@ . -. if !\n[.$] \{\ -. \" no argument +. \" no argument +. if !\n[.$] \ . nop \)\*[doc-str-Ar-default]\&\f[]\s[0] -. \}\} +. \} . . if !\n[doc-arg-limit] \ . return @@ -1034,10 +1034,10 @@ . ds doc-macro-name Pa . doc-parse-args \$@ . -. if !\n[.$] \{\ -. \" default value +. \" default value +. if !\n[.$] \ . nop \*[doc-Pa-font]~\f[]\s[0] -. \}\} +. \} . . if !\n[doc-arg-limit] \ . return @@ -3430,6 +3430,8 @@ . nr doc-reference-title-count-saved \n[doc-reference-title-count] . ds doc-reference-title-name-saved "\*[doc-reference-title-name] . ds doc-reference-title-name-for-book-saved "\*[doc-reference-title-name-for-book] +. nr doc-url-count-saved \n[doc-url-count] +. ds doc-url-name-saved "\*[doc-url-name] . nr doc-volume-count-saved \n[doc-volume-count] . ds doc-volume-name-saved "\*[doc-volume-name] . nr doc-have-author-saved \n[doc-have-author] @@ -3570,6 +3572,8 @@ . nr doc-reference-title-count \n[doc-reference-title-count-saved] >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001182125.o0ILP6dS028973>