Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 20 Nov 2002 16:38:29 -0800 (PST)
From:      Peter Wemm <peter@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 21320 for review
Message-ID:  <200211210038.gAL0cTv7016761@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=21320

Change 21320 by peter@peter_daintree on 2002/11/20 16:37:32

	IFC @21318

Affected files ...

.. //depot/projects/hammer/etc/mtree/BSD.usr.dist#4 integrate
.. //depot/projects/hammer/etc/periodic/security/700.kernelmsg#4 integrate
.. //depot/projects/hammer/etc/periodic/security/security.functions#2 integrate
.. //depot/projects/hammer/games/fortune/datfiles/freebsd-tips#4 integrate
.. //depot/projects/hammer/games/fortune/datfiles/startrek#2 integrate
.. //depot/projects/hammer/gnu/usr.bin/man/Makefile#2 integrate
.. //depot/projects/hammer/gnu/usr.bin/man/makewhatis/Makefile#2 delete
.. //depot/projects/hammer/gnu/usr.bin/man/makewhatis/makewhatis.1#3 delete
.. //depot/projects/hammer/gnu/usr.bin/man/makewhatis/makewhatis.local.8#2 delete
.. //depot/projects/hammer/gnu/usr.bin/man/makewhatis/makewhatis.local.sh#2 delete
.. //depot/projects/hammer/gnu/usr.bin/man/makewhatis/makewhatis.perl#2 delete
.. //depot/projects/hammer/include/Makefile#7 integrate
.. //depot/projects/hammer/include/uuid.h#1 branch
.. //depot/projects/hammer/kerberos5/usr.bin/krb5-config/Makefile#4 integrate
.. //depot/projects/hammer/lib/libc/Makefile#4 integrate
.. //depot/projects/hammer/lib/libc/Makefile.inc#3 delete
.. //depot/projects/hammer/lib/libc/alpha/gen/Makefile.inc#2 integrate
.. //depot/projects/hammer/lib/libc/alpha/gen/makecontext.c#2 integrate
.. //depot/projects/hammer/lib/libc/compat-43/Makefile.inc#2 integrate
.. //depot/projects/hammer/lib/libc/db/Makefile.inc#2 integrate
.. //depot/projects/hammer/lib/libc/db/btree/Makefile.inc#2 integrate
.. //depot/projects/hammer/lib/libc/db/db/Makefile.inc#2 integrate
.. //depot/projects/hammer/lib/libc/db/hash/Makefile.inc#2 integrate
.. //depot/projects/hammer/lib/libc/db/man/Makefile.inc#2 integrate
.. //depot/projects/hammer/lib/libc/db/mpool/Makefile.inc#2 integrate
.. //depot/projects/hammer/lib/libc/db/recno/Makefile.inc#2 integrate
.. //depot/projects/hammer/lib/libc/gen/Makefile.inc#5 integrate
.. //depot/projects/hammer/lib/libc/gen/sysconf.c#4 integrate
.. //depot/projects/hammer/lib/libc/gmon/Makefile.inc#2 integrate
.. //depot/projects/hammer/lib/libc/i386/gen/Makefile.inc#3 integrate
.. //depot/projects/hammer/lib/libc/i386/sys/Makefile.inc#2 integrate
.. //depot/projects/hammer/lib/libc/ia64/gen/Makefile.inc#2 integrate
.. //depot/projects/hammer/lib/libc/locale/Makefile.inc#7 integrate
.. //depot/projects/hammer/lib/libc/net/Makefile.inc#2 integrate
.. //depot/projects/hammer/lib/libc/nls/Makefile.inc#2 integrate
.. //depot/projects/hammer/lib/libc/posix1e/Makefile.inc#4 integrate
.. //depot/projects/hammer/lib/libc/quad/Makefile.inc#2 integrate
.. //depot/projects/hammer/lib/libc/regex/Makefile.inc#2 integrate
.. //depot/projects/hammer/lib/libc/rpc/Makefile.inc#3 integrate
.. //depot/projects/hammer/lib/libc/sparc64/fpu/Makefile.inc#2 integrate
.. //depot/projects/hammer/lib/libc/stdio/Makefile.inc#6 integrate
.. //depot/projects/hammer/lib/libc/stdlib/Makefile.inc#5 integrate
.. //depot/projects/hammer/lib/libc/stdtime/Makefile.inc#2 integrate
.. //depot/projects/hammer/lib/libc/string/Makefile.inc#4 integrate
.. //depot/projects/hammer/lib/libc/sys/Makefile.inc#5 integrate
.. //depot/projects/hammer/lib/libc/sys/select.2#2 integrate
.. //depot/projects/hammer/lib/libc/uuid/Makefile.inc#2 integrate
.. //depot/projects/hammer/lib/libc/uuid/uuid.h#2 delete
.. //depot/projects/hammer/lib/libc/xdr/Makefile.inc#3 integrate
.. //depot/projects/hammer/lib/libc/yp/Makefile.inc#2 integrate
.. //depot/projects/hammer/lib/libc_r/arch/ia64/_atomic_lock.S#2 integrate
.. //depot/projects/hammer/lib/libdisk/disk.c#7 integrate
.. //depot/projects/hammer/lib/libpam/modules/pam_lastlog/pam_lastlog.c#2 integrate
.. //depot/projects/hammer/lib/libpthread/arch/i386/i386/thr_enter_uts.S#2 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_kern.c#3 integrate
.. //depot/projects/hammer/lib/libutil/logout.c#2 integrate
.. //depot/projects/hammer/lib/libutil/logwtmp.c#2 integrate
.. //depot/projects/hammer/libexec/ftpd/logwtmp.c#2 integrate
.. //depot/projects/hammer/libexec/rtld-elf/alpha/reloc.c#2 integrate
.. //depot/projects/hammer/libexec/rtld-elf/alpha/rtld_machdep.h#2 integrate
.. //depot/projects/hammer/libexec/rtld-elf/i386/reloc.c#2 integrate
.. //depot/projects/hammer/libexec/rtld-elf/i386/rtld_machdep.h#2 integrate
.. //depot/projects/hammer/libexec/rtld-elf/ia64/reloc.c#3 integrate
.. //depot/projects/hammer/libexec/rtld-elf/ia64/rtld_machdep.h#2 integrate
.. //depot/projects/hammer/libexec/rtld-elf/rtld.c#3 integrate
.. //depot/projects/hammer/libexec/rtld-elf/sparc64/reloc.c#3 integrate
.. //depot/projects/hammer/libexec/rtld-elf/sparc64/rtld_machdep.h#3 integrate
.. //depot/projects/hammer/libexec/rtld-elf/sparc64/rtld_start.S#2 integrate
.. //depot/projects/hammer/release/Makefile#9 integrate
.. //depot/projects/hammer/release/doc/de_DE.ISO8859-1/hardware/common/dev.sgml#5 integrate
.. //depot/projects/hammer/release/doc/de_DE.ISO8859-1/installation/common/install.sgml#4 integrate
.. //depot/projects/hammer/release/doc/de_DE.ISO8859-1/installation/sparc64/article.sgml#3 integrate
.. //depot/projects/hammer/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml#6 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#8 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/installation/common/install.sgml#3 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/installation/sparc64/article.sgml#2 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#10 integrate
.. //depot/projects/hammer/release/doc/ja_JP.eucJP/Makefile#2 integrate
.. //depot/projects/hammer/release/doc/ja_JP.eucJP/early-adopter/Makefile#1 branch
.. //depot/projects/hammer/release/doc/ja_JP.eucJP/early-adopter/article.sgml#1 branch
.. //depot/projects/hammer/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#2 integrate
.. //depot/projects/hammer/release/ia64/boot_crunch.conf#3 integrate
.. //depot/projects/hammer/release/pc98/drivers.conf#4 integrate
.. //depot/projects/hammer/release/picobsd/mfs_tree/etc/rc#2 integrate
.. //depot/projects/hammer/release/scripts/print-cdrom-packages.sh#5 integrate
.. //depot/projects/hammer/sbin/devd/devd.8#3 integrate
.. //depot/projects/hammer/sbin/devd/devd.conf#2 integrate
.. //depot/projects/hammer/sbin/devd/devd.conf.5#2 integrate
.. //depot/projects/hammer/sbin/disklabel/disklabel.c#6 integrate
.. //depot/projects/hammer/sbin/dumpfs/dumpfs.c#5 integrate
.. //depot/projects/hammer/sbin/gbde/gbde.8#3 integrate
.. //depot/projects/hammer/sbin/newfs/mkfs.c#5 integrate
.. //depot/projects/hammer/sbin/quotacheck/quotacheck.c#3 integrate
.. //depot/projects/hammer/share/man/man4/ng_bluetooth.4#1 branch
.. //depot/projects/hammer/share/man/man4/ng_bt3c.4#1 branch
.. //depot/projects/hammer/share/man/man4/ng_btsocket.4#1 branch
.. //depot/projects/hammer/share/man/man4/ng_h4.4#1 branch
.. //depot/projects/hammer/share/man/man4/ng_hci.4#1 branch
.. //depot/projects/hammer/share/man/man4/ng_l2cap.4#1 branch
.. //depot/projects/hammer/share/man/man4/ng_ubt.4#1 branch
.. //depot/projects/hammer/share/man/man7/release.7#4 integrate
.. //depot/projects/hammer/share/man/man9/Makefile#5 integrate
.. //depot/projects/hammer/share/man/man9/mac_biba.9#1 branch
.. //depot/projects/hammer/share/man/man9/zone.9#2 integrate
.. //depot/projects/hammer/sys/alpha/alpha/machdep.c#6 integrate
.. //depot/projects/hammer/sys/alpha/alpha/pmap.c#8 integrate
.. //depot/projects/hammer/sys/alpha/include/cpu.h#3 integrate
.. //depot/projects/hammer/sys/alpha/include/fpu.h#2 integrate
.. //depot/projects/hammer/sys/alpha/include/signal.h#4 integrate
.. //depot/projects/hammer/sys/alpha/include/ucontext.h#3 integrate
.. //depot/projects/hammer/sys/conf/files#11 integrate
.. //depot/projects/hammer/sys/conf/options#10 integrate
.. //depot/projects/hammer/sys/conf/options.alpha#4 integrate
.. //depot/projects/hammer/sys/conf/options.i386#4 integrate
.. //depot/projects/hammer/sys/conf/options.ia64#4 integrate
.. //depot/projects/hammer/sys/conf/options.pc98#5 integrate
.. //depot/projects/hammer/sys/conf/options.powerpc#3 integrate
.. //depot/projects/hammer/sys/conf/options.sparc64#2 integrate
.. //depot/projects/hammer/sys/conf/options.x86_64#4 integrate
.. //depot/projects/hammer/sys/dev/ofw/ofw_console.c#2 integrate
.. //depot/projects/hammer/sys/dev/pcic/i82365.c#3 integrate
.. //depot/projects/hammer/sys/dev/sab/sab.c#3 integrate
.. //depot/projects/hammer/sys/dev/usb/ucom.c#2 integrate
.. //depot/projects/hammer/sys/dev/usb/uftdi.c#2 integrate
.. //depot/projects/hammer/sys/dev/usb/uplcom.c#2 integrate
.. //depot/projects/hammer/sys/dev/usb/uvscom.c#2 integrate
.. //depot/projects/hammer/sys/geom/geom_dump.c#8 integrate
.. //depot/projects/hammer/sys/geom/geom_pc98.c#7 integrate
.. //depot/projects/hammer/sys/geom/geom_slice.c#6 integrate
.. //depot/projects/hammer/sys/i386/i386/machdep.c#10 integrate
.. //depot/projects/hammer/sys/i386/include/signal.h#5 integrate
.. //depot/projects/hammer/sys/i386/include/ucontext.h#5 integrate
.. //depot/projects/hammer/sys/i386/isa/npx.c#7 integrate
.. //depot/projects/hammer/sys/ia64/ia32/ia32_proto.h#4 integrate
.. //depot/projects/hammer/sys/ia64/ia32/ia32_syscall.h#4 integrate
.. //depot/projects/hammer/sys/ia64/ia32/ia32_sysent.c#5 integrate
.. //depot/projects/hammer/sys/ia64/ia32/syscalls.master#7 integrate
.. //depot/projects/hammer/sys/ia64/ia64/clock.c#3 integrate
.. //depot/projects/hammer/sys/ia64/ia64/machdep.c#7 integrate
.. //depot/projects/hammer/sys/ia64/ia64/pmap.c#7 integrate
.. //depot/projects/hammer/sys/ia64/include/_types.h#2 integrate
.. //depot/projects/hammer/sys/kern/init_sysent.c#9 integrate
.. //depot/projects/hammer/sys/kern/kern_clock.c#4 integrate
.. //depot/projects/hammer/sys/kern/kern_context.c#1 branch
.. //depot/projects/hammer/sys/kern/kern_exec.c#7 integrate
.. //depot/projects/hammer/sys/kern/kern_exit.c#7 integrate
.. //depot/projects/hammer/sys/kern/kern_fork.c#7 integrate
.. //depot/projects/hammer/sys/kern/kern_linker.c#4 integrate
.. //depot/projects/hammer/sys/kern/kern_mac.c#9 integrate
.. //depot/projects/hammer/sys/kern/kern_shutdown.c#4 integrate
.. //depot/projects/hammer/sys/kern/kern_thread.c#13 integrate
.. //depot/projects/hammer/sys/kern/link_elf.c#8 integrate
.. //depot/projects/hammer/sys/kern/syscalls.c#9 integrate
.. //depot/projects/hammer/sys/kern/syscalls.master#9 integrate
.. //depot/projects/hammer/sys/kern/vfs_aio.c#7 integrate
.. //depot/projects/hammer/sys/kern/vfs_bio.c#9 integrate
.. //depot/projects/hammer/sys/modules/netgraph/bluetooth/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/netgraph/bluetooth/bluetooth/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/netgraph/bluetooth/bt3c/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/netgraph/bluetooth/h4/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/netgraph/bluetooth/hci/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/netgraph/bluetooth/l2cap/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/netgraph/bluetooth/socket/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/netgraph/bluetooth/ubt/Makefile#1 branch
.. //depot/projects/hammer/sys/net/bpf.c#7 integrate
.. //depot/projects/hammer/sys/net/if.c#4 integrate
.. //depot/projects/hammer/sys/net/if_ethersubr.c#9 integrate
.. //depot/projects/hammer/sys/net/raw_cb.c#2 integrate
.. //depot/projects/hammer/sys/net/raw_usrreq.c#2 integrate
.. //depot/projects/hammer/sys/net/route.c#2 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/common/ng_bluetooth.c#1 branch
.. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#1 branch
.. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_var.h#1 branch
.. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/h4/TODO#1 branch
.. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#1 branch
.. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/h4/ng_h4_prse.h#1 branch
.. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/h4/ng_h4_var.h#1 branch
.. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/ubt/TODO#1 branch
.. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#1 branch
.. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#1 branch
.. //depot/projects/hammer/sys/netgraph/bluetooth/hci/TODO#1 branch
.. //depot/projects/hammer/sys/netgraph/bluetooth/hci/ng_hci_cmds.c#1 branch
.. //depot/projects/hammer/sys/netgraph/bluetooth/hci/ng_hci_cmds.h#1 branch
.. //depot/projects/hammer/sys/netgraph/bluetooth/hci/ng_hci_evnt.c#1 branch
.. //depot/projects/hammer/sys/netgraph/bluetooth/hci/ng_hci_evnt.h#1 branch
.. //depot/projects/hammer/sys/netgraph/bluetooth/hci/ng_hci_main.c#1 branch
.. //depot/projects/hammer/sys/netgraph/bluetooth/hci/ng_hci_misc.c#1 branch
.. //depot/projects/hammer/sys/netgraph/bluetooth/hci/ng_hci_misc.h#1 branch
.. //depot/projects/hammer/sys/netgraph/bluetooth/hci/ng_hci_prse.h#1 branch
.. //depot/projects/hammer/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c#1 branch
.. //depot/projects/hammer/sys/netgraph/bluetooth/hci/ng_hci_ulpi.h#1 branch
.. //depot/projects/hammer/sys/netgraph/bluetooth/hci/ng_hci_var.h#1 branch
.. //depot/projects/hammer/sys/netgraph/bluetooth/include/ng_bluetooth.h#1 branch
.. //depot/projects/hammer/sys/netgraph/bluetooth/include/ng_bt3c.h#1 branch
.. //depot/projects/hammer/sys/netgraph/bluetooth/include/ng_btsocket.h#1 branch
.. //depot/projects/hammer/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h#1 branch
.. //depot/projects/hammer/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h#1 branch
.. //depot/projects/hammer/sys/netgraph/bluetooth/include/ng_h4.h#1 branch
.. //depot/projects/hammer/sys/netgraph/bluetooth/include/ng_hci.h#1 branch
.. //depot/projects/hammer/sys/netgraph/bluetooth/include/ng_l2cap.h#1 branch
.. //depot/projects/hammer/sys/netgraph/bluetooth/include/ng_ubt.h#1 branch
.. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/TODO#1 branch
.. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c#1 branch
.. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h#1 branch
.. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c#1 branch
.. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.h#1 branch
.. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c#1 branch
.. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.h#1 branch
.. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c#1 branch
.. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c#1 branch
.. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h#1 branch
.. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_prse.h#1 branch
.. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c#1 branch
.. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.h#1 branch
.. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h#1 branch
.. //depot/projects/hammer/sys/netgraph/bluetooth/socket/TODO#1 branch
.. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket.c#1 branch
.. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#1 branch
.. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#1 branch
.. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#1 branch
.. //depot/projects/hammer/sys/netinet/igmp.c#3 integrate
.. //depot/projects/hammer/sys/netinet/ip_fw2.c#6 integrate
.. //depot/projects/hammer/sys/netinet/ip_input.c#6 integrate
.. //depot/projects/hammer/sys/netinet/ip_mroute.c#6 integrate
.. //depot/projects/hammer/sys/netinet/ip_mroute.h#2 integrate
.. //depot/projects/hammer/sys/netinet/ip_output.c#7 integrate
.. //depot/projects/hammer/sys/netinet/ip_var.h#5 integrate
.. //depot/projects/hammer/sys/netinet/raw_ip.c#6 integrate
.. //depot/projects/hammer/sys/netinet/udp_usrreq.c#5 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_lock.c#3 integrate
.. //depot/projects/hammer/sys/pc98/i386/machdep.c#8 integrate
.. //depot/projects/hammer/sys/pc98/pc98/fd.c#5 integrate
.. //depot/projects/hammer/sys/posix4/ksched.c#4 integrate
.. //depot/projects/hammer/sys/posix4/p1003_1b.c#2 integrate
.. //depot/projects/hammer/sys/posix4/posix4.h#3 integrate
.. //depot/projects/hammer/sys/posix4/posix4_mib.c#4 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/machdep.c#6 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/autoconf.c#3 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/machdep.c#7 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/mp_machdep.c#4 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/pmap.c#7 integrate
.. //depot/projects/hammer/sys/sys/kse.h#5 integrate
.. //depot/projects/hammer/sys/sys/mac.h#7 integrate
.. //depot/projects/hammer/sys/sys/mac_policy.h#7 integrate
.. //depot/projects/hammer/sys/sys/proc.h#11 integrate
.. //depot/projects/hammer/sys/sys/select.h#4 integrate
.. //depot/projects/hammer/sys/sys/syscall.h#9 integrate
.. //depot/projects/hammer/sys/sys/syscall.mk#9 integrate
.. //depot/projects/hammer/sys/sys/sysproto.h#9 integrate
.. //depot/projects/hammer/sys/sys/ucontext.h#5 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_snapshot.c#6 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_softdep.c#5 integrate
.. //depot/projects/hammer/sys/vm/swap_pager.c#6 integrate
.. //depot/projects/hammer/sys/vm/uma_core.c#7 integrate
.. //depot/projects/hammer/sys/vm/vm_fault.c#5 integrate
.. //depot/projects/hammer/sys/vm/vm_object.c#7 integrate
.. //depot/projects/hammer/sys/vm/vm_page.c#5 integrate
.. //depot/projects/hammer/sys/vm/vm_page.h#6 integrate
.. //depot/projects/hammer/sys/vm/vm_pageout.c#9 integrate
.. //depot/projects/hammer/sys/vm/vnode_pager.c#6 integrate
.. //depot/projects/hammer/tools/KSE/ksetest/kse_asm.S#4 integrate
.. //depot/projects/hammer/usr.bin/bluetooth/Makefile#1 branch
.. //depot/projects/hammer/usr.bin/bluetooth/btsockstat/Makefile#1 branch
.. //depot/projects/hammer/usr.bin/bluetooth/btsockstat/btsockstat.1#1 branch
.. //depot/projects/hammer/usr.bin/bluetooth/btsockstat/btsockstat.c#1 branch
.. //depot/projects/hammer/usr.bin/calendar/calendar.1#3 integrate
.. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.all#2 integrate
.. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.holiday#4 integrate
.. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.southafrica#1 branch
.. //depot/projects/hammer/usr.bin/makewhatis/Makefile#2 integrate
.. //depot/projects/hammer/usr.bin/makewhatis/makewhatis.local.8#1 branch
.. //depot/projects/hammer/usr.bin/makewhatis/makewhatis.local.sh#1 branch
.. //depot/projects/hammer/usr.bin/telnet/commands.c#4 integrate
.. //depot/projects/hammer/usr.bin/who/who.c#2 integrate
.. //depot/projects/hammer/usr.bin/xinstall/xinstall.c#4 integrate
.. //depot/projects/hammer/usr.sbin/bluetooth/Makefile#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/bt3cfw/Makefile#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/bt3cfw/bt3cfw.8#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/bt3cfw/bt3cfw.c#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/hccontrol/Makefile#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/hccontrol/hccontrol.8#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/hccontrol/hccontrol.c#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/hccontrol/hccontrol.h#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/hccontrol/info.c#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/hccontrol/link_control.c#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/hccontrol/link_policy.c#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/hccontrol/node.c#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/hccontrol/send_recv.c#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/hccontrol/status.c#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/hccontrol/util.c#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/hcseriald/Makefile#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/hcseriald/hcseriald.8#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/hcseriald/hcseriald.c#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/l2control/Makefile#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/l2control/l2cap.c#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/l2control/l2control.8#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/l2control/l2control.c#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/l2control/l2control.h#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/l2ping/Makefile#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/l2ping/l2ping.8#1 branch
.. //depot/projects/hammer/usr.sbin/bluetooth/l2ping/l2ping.c#1 branch
.. //depot/projects/hammer/usr.sbin/ntp/Makefile#2 integrate
.. //depot/projects/hammer/usr.sbin/ntp/Makefile.inc#2 integrate
.. //depot/projects/hammer/usr.sbin/ppp/physical.c#3 integrate
.. //depot/projects/hammer/usr.sbin/pppd/auth.c#2 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/disks.c#6 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/index.c#3 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/install.c#6 integrate

Differences ...

==== //depot/projects/hammer/etc/mtree/BSD.usr.dist#4 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.268 2002/10/25 22:00:34 ache Exp $
+# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.269 2002/11/15 18:44:09 ru Exp $
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
@@ -96,8 +96,6 @@
                 ..
                 13.rcs
                 ..
-                14.sccs
-                ..
                 15.yacc
                 ..
                 16.lex

==== //depot/projects/hammer/etc/periodic/security/700.kernelmsg#4 (text+ko) ====

@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: src/etc/periodic/security/700.kernelmsg,v 1.6 2002/10/25 15:14:16 thomas Exp $
+# $FreeBSD: src/etc/periodic/security/700.kernelmsg,v 1.7 2002/11/16 14:57:12 thomas Exp $
 #
 
 # Show kernel log messages
@@ -44,7 +44,7 @@
 
 case "$daily_status_security_kernelmsg_enable" in
     [Yy][Ee][Ss])
-	dmesg 2>/dev/null > ${TMP} |
+	dmesg 2>/dev/null |
 	    check_diff new_only dmesg - "${host} kernel log messages:"
 	rc=$?;;
     *)	rc=0;;

==== //depot/projects/hammer/etc/periodic/security/security.functions#2 (text+ko) ====

@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: src/etc/periodic/security/security.functions,v 1.1 2002/10/25 15:14:16 thomas Exp $
+# $FreeBSD: src/etc/periodic/security/security.functions,v 1.2 2002/11/16 14:58:39 thomas Exp $
 #
 
 #
@@ -63,7 +63,7 @@
     cp ${tmpf} ${LOG}/${label}.today || rc=3
   fi
 
-  if ! cmp ${LOG}/${label}.today ${tmpf} >/dev/null; then
+  if ! cmp -s ${LOG}/${label}.today ${tmpf} >/dev/null; then
     [ $rc -lt 1 ] && rc=1
     echo ""
     echo "${msg}"

==== //depot/projects/hammer/games/fortune/datfiles/freebsd-tips#4 (text+ko) ====

@@ -1,5 +1,5 @@
 This fortune brought to you by:
-$FreeBSD: src/games/fortune/datfiles/freebsd-tips,v 1.28 2002/10/20 13:41:44 tom Exp $
+$FreeBSD: src/games/fortune/datfiles/freebsd-tips,v 1.29 2002/11/16 13:24:44 joerg Exp $
 %
 Having trouble using fetch through a firewall? Try setting the environment
 variable FTP_PASSIVE_MODE to yes, and see fetch(3) for more details.
@@ -44,7 +44,7 @@
 %
 You can disable tcsh's terminal beep if you `set nobeep'.
 %
-If you `set watch (0 any any)' in tcsh, you will be notified when
+If you `set watch = (0 any any)' in tcsh, you will be notified when
 someone logs in or out of your system.
 %
 Nice tcsh prompt: set prompt = '%m %# '

==== //depot/projects/hammer/games/fortune/datfiles/startrek#2 (text+ko) ====

@@ -1,3 +1,4 @@
+%% $FreeBSD: src/games/fortune/datfiles/startrek,v 1.2 2002/11/17 09:53:11 schweikh Exp $
 A father doesn't destroy his children.
 		-- Lt. Carolyn Palamas, "Who Mourns for Adonais?",
 		   stardate 3468.1.
@@ -628,7 +629,7 @@
 		-- Bailey, "The Corbomite Maneuver", stardate 1514.2
 %
 "We have the right to survive!"
-"Not be killing others."
+"Not by killing others."
 		-- Deela and Kirk, "Wink of An Eye", stardate 5710.5
 %
 We Klingons believe as you do -- the sick should die.  Only the strong

==== //depot/projects/hammer/gnu/usr.bin/man/Makefile#2 (text+ko) ====

@@ -1,10 +1,10 @@
-# Master Makefile for man, manpath, apropos, whatis, and makewhatis
+# Master Makefile for man, manpath, apropos, and whatis
 #
 # You may distribute under the terms of the GNU General Public
 # License as specified in the README file that comes with the man 1.0
 # distribution.
 #
-# $FreeBSD: src/gnu/usr.bin/man/Makefile,v 1.5 2002/05/18 19:47:57 markm Exp $
+# $FreeBSD: src/gnu/usr.bin/man/Makefile,v 1.6 2002/11/18 10:25:27 ru Exp $
 #
 
 SUBDIR = lib man manpath apropos

==== //depot/projects/hammer/include/Makefile#7 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 1/4/94
-# $FreeBSD: src/include/Makefile,v 1.185 2002/10/24 15:25:37 rwatson Exp $
+# $FreeBSD: src/include/Makefile,v 1.186 2002/11/18 07:34:56 marcel Exp $
 #
 # Doing a make install builds /usr/include
 #
@@ -9,20 +9,16 @@
 CLEANFILES= osreldate.h version vers.c
 SUBDIR= arpa protocols rpcsvc rpc
 INCS=	a.out.h ar.h assert.h bitstring.h complex.h cpio.h ctype.h db.h \
-	dirent.h \
-	dlfcn.h elf.h elf-hints.h err.h fnmatch.h fmtmsg.h fstab.h \
-	fts.h getopt.h glob.h grp.h \
-	hesiod.h histedit.h ieeefp.h ifaddrs.h inttypes.h iso646.h kenv.h \
-	langinfo.h \
-	libgen.h limits.h link.h locale.h malloc.h memory.h monetary.h mpool.h \
-	ndbm.h netconfig.h netdb.h nl_types.h nlist.h nsswitch.h objformat.h \
-	paths.h pthread.h pthread_np.h pwd.h \
-	ranlib.h readpassphrase.h regex.h regexp.h resolv.h rune.h runetype.h \
-	search.h setjmp.h sgtty.h \
-	signal.h stab.h stdbool.h stddef.h stdio.h stdlib.h strhash.h \
-	string.h stringlist.h strings.h sysexits.h tar.h time.h timeconv.h \
-	timers.h ttyent.h ulimit.h unistd.h utime.h utmp.h vis.h wchar.h \
-	wctype.h
+	dirent.h dlfcn.h elf.h elf-hints.h err.h fmtmsg.h fnmatch.h fstab.h \
+	fts.h getopt.h glob.h grp.h hesiod.h histedit.h ieeefp.h ifaddrs.h \
+	inttypes.h iso646.h kenv.h langinfo.h libgen.h limits.h link.h \
+	locale.h malloc.h memory.h monetary.h mpool.h ndbm.h netconfig.h \
+	netdb.h nl_types.h nlist.h nsswitch.h objformat.h paths.h pthread.h \
+	pthread_np.h pwd.h ranlib.h readpassphrase.h regex.h regexp.h \
+	resolv.h rune.h runetype.h search.h setjmp.h sgtty.h signal.h stab.h \
+	stdbool.h stddef.h stdio.h stdlib.h strhash.h string.h stringlist.h \
+	strings.h sysexits.h tar.h time.h timeconv.h timers.h ttyent.h \
+	ulimit.h unistd.h utime.h utmp.h uuid.h vis.h wchar.h wctype.h
 
 MHDRS=	float.h floatingpoint.h stdarg.h varargs.h
 

==== //depot/projects/hammer/kerberos5/usr.bin/krb5-config/Makefile#4 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/kerberos5/usr.bin/krb5-config/Makefile,v 1.7 2002/09/19 12:59:18 nectar Exp $
+# $FreeBSD: src/kerberos5/usr.bin/krb5-config/Makefile,v 1.8 2002/11/16 02:23:17 nectar Exp $
 
 SCRIPTS=	krb5-config
 MAN=		krb5-config.1
@@ -15,6 +15,7 @@
 		-e "s,@LIB_dbopen\@,,g" \
 		-e "s,@LIB_des_appl\@,-lcrypto,g" \
 		-e "s,@LIBS\@,-lcom_err,g" \
+		-e "s,@INCLUDE_des@,,g" \
 		${.ALLSRC} > ${.TARGET}
 	chmod +x ${.TARGET}
 

==== //depot/projects/hammer/lib/libc/Makefile#4 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 2/3/94
-# $FreeBSD: src/lib/libc/Makefile,v 1.36 2002/10/11 22:38:16 peter Exp $
+# $FreeBSD: src/lib/libc/Makefile,v 1.37 2002/11/18 09:50:54 ru Exp $
 #
 # All library objects contain FreeBSD revision strings by default; they may be
 # excluded as a space-saving measure.  To produce a library that does
@@ -16,10 +16,65 @@
 INSTALL_PIC_ARCHIVE=	yes
 PRECIOUSLIB=	yes
 
+# Define (empty) variables so that make doesn't give substitution
+# errors if the included makefiles don't change these:
+MDSRCS=
+MISRCS=
+MDASM=
+MIASM=
+NOASM=
+
 #
-# Include make rules that are shared with libc_r.
+# If there is a machine dependent makefile, use it:
 #
-.include "${.CURDIR}/Makefile.inc"
+.if exists(${.CURDIR}/${MACHINE_ARCH}/Makefile.inc)
+.include "${.CURDIR}/${MACHINE_ARCH}/Makefile.inc"
+.endif
+
+.include "${.CURDIR}/db/Makefile.inc"
+.include "${.CURDIR}/compat-43/Makefile.inc"
+.include "${.CURDIR}/gen/Makefile.inc"
+.if ${MACHINE_ARCH} != "powerpc"
+.include "${.CURDIR}/gmon/Makefile.inc"
+.endif
+.include "${.CURDIR}/locale/Makefile.inc"
+.include "${.CURDIR}/net/Makefile.inc"
+.include "${.CURDIR}/nls/Makefile.inc"
+.include "${.CURDIR}/posix1e/Makefile.inc"
+.if !defined(NO_QUAD)
+.include "${.CURDIR}/quad/Makefile.inc"
+.endif
+.include "${.CURDIR}/regex/Makefile.inc"
+.include "${.CURDIR}/stdio/Makefile.inc"
+.include "${.CURDIR}/stdlib/Makefile.inc"
+.include "${.CURDIR}/stdtime/Makefile.inc"
+.include "${.CURDIR}/string/Makefile.inc"
+.include "${.CURDIR}/sys/Makefile.inc"
+.include "${.CURDIR}/rpc/Makefile.inc"
+.include "${.CURDIR}/uuid/Makefile.inc"
+.include "${.CURDIR}/xdr/Makefile.inc"
+.if !defined(NO_YP_LIBC)
+CFLAGS+= -DYP
+.include "${.CURDIR}/yp/Makefile.inc"
+.endif
+.if !defined(NO_HESIOD_LIBC)
+CFLAGS+= -DHESIOD
+.endif
+
+# If there are no machine dependent sources, append all the
+# machine-independent sources:
+.if empty(MDSRCS)
+SRCS+=	${MISRCS}
+.else
+# Append machine-dependent sources, then append machine-independent sources
+# for which there is no machine-dependent variant.
+SRCS+=	${MDSRCS}
+.for _src in ${MISRCS}
+.if ${MDSRCS:R:M${_src:R}} == ""
+SRCS+=	${_src}
+.endif
+.endfor
+.endif
 
 KQSRCS=	adddi3.c anddi3.c ashldi3.c ashrdi3.c cmpdi2.c divdi3.c iordi3.c \
 	lshldi3.c lshrdi3.c moddi3.c muldi3.c negdi2.c notdi2.c qdivrem.c \

==== //depot/projects/hammer/lib/libc/alpha/gen/Makefile.inc#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libc/alpha/gen/Makefile.inc,v 1.9 2002/03/21 06:45:32 peter Exp $
+# $FreeBSD: src/lib/libc/alpha/gen/Makefile.inc,v 1.11 2002/11/18 09:50:54 ru Exp $
 
 SRCS+=	_setjmp.S fabs.S frexp.c infinity.c isinf.c ldexp.c modf.c setjmp.S
 SRCS+=	flt_rounds.c fpgetmask.c fpgetround.c fpgetsticky.c fpsetmask.c \
@@ -8,40 +8,40 @@
 SRCS+=	__divqu.S __divq.S __divlu.S __divl.S
 SRCS+=	__remqu.S __remq.S __remlu.S __reml.S
 SRCS+=	rfork_thread.S
-SRCS+=	_ctx_start.S getcontext.S makecontext.c swapcontext.c
+SRCS+=	_ctx_start.S makecontext.c
 
 CLEANFILES+=	__divqu.S __divq.S __divlu.S __divl.S
 CLEANFILES+=	__remqu.S __remq.S __remlu.S __reml.S
 
 
-__divqu.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4
+__divqu.S: ${.CURDIR}/alpha/gen/divrem.m4
 	m4 -DNAME=__divqu -DOP=div -DS=false -DWORDSIZE=64 \
 		${.ALLSRC} > ${.TARGET}
 
-__divq.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4
+__divq.S: ${.CURDIR}/alpha/gen/divrem.m4
 	m4 -DNAME=__divq -DOP=div -DS=true -DWORDSIZE=64 \
 		${.ALLSRC} > ${.TARGET}
 
-__divlu.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4
+__divlu.S: ${.CURDIR}/alpha/gen/divrem.m4
 	m4 -DNAME=__divlu -DOP=div -DS=false -DWORDSIZE=32 \
 		${.ALLSRC} > ${.TARGET}
 
-__divl.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4
+__divl.S: ${.CURDIR}/alpha/gen/divrem.m4
 	m4 -DNAME=__divl -DOP=div -DS=true -DWORDSIZE=32 \
 		${.ALLSRC} > ${.TARGET}
 
-__remqu.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4
+__remqu.S: ${.CURDIR}/alpha/gen/divrem.m4
 	m4 -DNAME=__remqu -DOP=rem -DS=false -DWORDSIZE=64 \
 		${.ALLSRC} > ${.TARGET}
 
-__remq.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4
+__remq.S: ${.CURDIR}/alpha/gen/divrem.m4
 	m4 -DNAME=__remq -DOP=rem -DS=true -DWORDSIZE=64 \
 		${.ALLSRC} > ${.TARGET}
 
-__remlu.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4
+__remlu.S: ${.CURDIR}/alpha/gen/divrem.m4
 	m4 -DNAME=__remlu -DOP=rem -DS=false -DWORDSIZE=32 \
 		${.ALLSRC} > ${.TARGET}
 
-__reml.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4
+__reml.S: ${.CURDIR}/alpha/gen/divrem.m4
 	m4 -DNAME=__reml -DOP=rem -DS=true -DWORDSIZE=32 \
 		${.ALLSRC} > ${.TARGET}

==== //depot/projects/hammer/lib/libc/alpha/gen/makecontext.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/alpha/gen/makecontext.c,v 1.1 2002/01/10 02:40:53 deischen Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/alpha/gen/makecontext.c,v 1.2 2002/11/16 06:39:10 deischen Exp $");
 
 #include <sys/param.h>
 #include <sys/signal.h>
@@ -90,7 +90,7 @@
 	 * Make sure the context is valid.  For now, we only allow
 	 * trapframe format contexts to be used for makecontext.
 	 */
-	else if (ucp->uc_mcontext.mc_format == __UC_REV0_SIGFRAME) {
+	else if (ucp->uc_mcontext.mc_format == _MC_REV0_SIGFRAME) {
 		/*
 		 * Alpha passes the first 6 parameters in registers and
 		 * remaining parameters on the stack.  Set up the context

==== //depot/projects/hammer/lib/libc/compat-43/Makefile.inc#2 (text+ko) ====

@@ -1,13 +1,12 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/2/93
-# $FreeBSD: src/lib/libc/compat-43/Makefile.inc,v 1.11 2001/03/27 17:26:46 ru Exp $
+# $FreeBSD: src/lib/libc/compat-43/Makefile.inc,v 1.12 2002/11/18 09:50:54 ru Exp $
 
 # compat-43 sources
-.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/compat-43 ${.CURDIR}/../libc/compat-43
+.PATH: ${.CURDIR}/${MACHINE_ARCH}/compat-43 ${.CURDIR}/compat-43
 
 SRCS+=	creat.c gethostid.c getwd.c killpg.c sethostid.c setpgrp.c \
 	setrgid.c setruid.c sigcompat.c
 
-.if ${LIB} == "c"
 MAN+=	creat.2 killpg.2 sigpause.2 sigsetmask.2 sigvec.2
 MAN+=	gethostid.3 setruid.3
 
@@ -16,4 +15,3 @@
 
 MLINKS+=sigsetmask.2 sigblock.2
 MLINKS+=sigsetmask.2 sigmask.2
-.endif

==== //depot/projects/hammer/lib/libc/db/Makefile.inc#2 (text+ko) ====

@@ -1,11 +1,11 @@
 #	from @(#)Makefile.inc	8.2 (Berkeley) 2/21/94
-# $FreeBSD: src/lib/libc/db/Makefile.inc,v 1.3 1999/08/27 23:58:15 peter Exp $
+# $FreeBSD: src/lib/libc/db/Makefile.inc,v 1.4 2002/11/18 09:50:54 ru Exp $
 #
 CFLAGS+=-D__DBINTERFACE_PRIVATE
 
-.include "${.CURDIR}/../libc/db/btree/Makefile.inc"
-.include "${.CURDIR}/../libc/db/db/Makefile.inc"
-.include "${.CURDIR}/../libc/db/hash/Makefile.inc"
-.include "${.CURDIR}/../libc/db/man/Makefile.inc"
-.include "${.CURDIR}/../libc/db/mpool/Makefile.inc"
-.include "${.CURDIR}/../libc/db/recno/Makefile.inc"
+.include "${.CURDIR}/db/btree/Makefile.inc"
+.include "${.CURDIR}/db/db/Makefile.inc"
+.include "${.CURDIR}/db/hash/Makefile.inc"
+.include "${.CURDIR}/db/man/Makefile.inc"
+.include "${.CURDIR}/db/mpool/Makefile.inc"
+.include "${.CURDIR}/db/recno/Makefile.inc"

==== //depot/projects/hammer/lib/libc/db/btree/Makefile.inc#2 (text+ko) ====

@@ -1,7 +1,7 @@
 #	from @(#)Makefile.inc	8.2 (Berkeley) 7/14/94
-# $FreeBSD: src/lib/libc/db/btree/Makefile.inc,v 1.3 1999/08/27 23:58:16 peter Exp $
+# $FreeBSD: src/lib/libc/db/btree/Makefile.inc,v 1.4 2002/11/18 09:50:54 ru Exp $
 
-.PATH: ${.CURDIR}/../libc/db/btree
+.PATH: ${.CURDIR}/db/btree
 
 SRCS+=	bt_close.c bt_conv.c bt_debug.c bt_delete.c bt_get.c bt_open.c \
 	bt_overflow.c bt_page.c bt_put.c bt_search.c bt_seq.c bt_split.c \

==== //depot/projects/hammer/lib/libc/db/db/Makefile.inc#2 (text+ko) ====

@@ -1,6 +1,6 @@
 #       from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/libc/db/db/Makefile.inc,v 1.3 1999/08/27 23:58:17 peter Exp $
+# $FreeBSD: src/lib/libc/db/db/Makefile.inc,v 1.4 2002/11/18 09:50:54 ru Exp $
 
-.PATH: ${.CURDIR}/../libc/db/db
+.PATH: ${.CURDIR}/db/db
 
 SRCS+=	db.c

==== //depot/projects/hammer/lib/libc/db/hash/Makefile.inc#2 (text+ko) ====

@@ -1,7 +1,7 @@
 #       from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/libc/db/hash/Makefile.inc,v 1.4 2001/05/15 07:08:17 ru Exp $
+# $FreeBSD: src/lib/libc/db/hash/Makefile.inc,v 1.5 2002/11/18 09:50:54 ru Exp $
 
-.PATH: ${.CURDIR}/../libc/db/hash
+.PATH: ${.CURDIR}/db/hash
 
 SRCS+=	hash.c hash_bigkey.c hash_buf.c hash_func.c hash_log2.c \
 	hash_page.c ndbm.c

==== //depot/projects/hammer/lib/libc/db/man/Makefile.inc#2 (text+ko) ====

@@ -1,9 +1,8 @@
 #       from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/libc/db/man/Makefile.inc,v 1.10 2001/03/27 17:26:46 ru Exp $
+# $FreeBSD: src/lib/libc/db/man/Makefile.inc,v 1.11 2002/11/18 09:50:54 ru Exp $
 
-.PATH: ${.CURDIR}/../libc/db/man
+.PATH: ${.CURDIR}/db/man
 
-.if ${LIB} == "c"
 MAN+=	btree.3 dbm.3 dbopen.3 hash.3 mpool.3 recno.3
 
 MLINKS+= dbm.3 dbm_clearerr.3
@@ -17,4 +16,3 @@
 MLINKS+= dbm.3 dbm_open.3
 MLINKS+= dbm.3 dbm_store.3
 MLINKS+= dbopen.3 db.3
-.endif

==== //depot/projects/hammer/lib/libc/db/mpool/Makefile.inc#2 (text+ko) ====

@@ -1,6 +1,6 @@
 #	from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/libc/db/mpool/Makefile.inc,v 1.3 1999/08/27 23:58:23 peter Exp $
+# $FreeBSD: src/lib/libc/db/mpool/Makefile.inc,v 1.4 2002/11/18 09:50:55 ru Exp $
 
-.PATH: ${.CURDIR}/../libc/db/mpool
+.PATH: ${.CURDIR}/db/mpool
 
 SRCS+=	mpool.c

==== //depot/projects/hammer/lib/libc/db/recno/Makefile.inc#2 (text+ko) ====

@@ -1,7 +1,7 @@
 #       from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/libc/db/recno/Makefile.inc,v 1.3 1999/08/27 23:58:25 peter Exp $
+# $FreeBSD: src/lib/libc/db/recno/Makefile.inc,v 1.4 2002/11/18 09:50:55 ru Exp $
 
-.PATH: ${.CURDIR}/../libc/db/recno
+.PATH: ${.CURDIR}/db/recno
 
 SRCS+=	rec_close.c rec_delete.c rec_get.c rec_open.c rec_put.c rec_search.c \
 	rec_seq.c rec_utils.c

==== //depot/projects/hammer/lib/libc/gen/Makefile.inc#5 (text+ko) ====

@@ -1,8 +1,8 @@
 #	@(#)Makefile.inc	8.6 (Berkeley) 5/4/95
-# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.97 2002/10/28 00:15:43 wollman Exp $
+# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.98 2002/11/18 09:50:55 ru Exp $
 
 # machine-independent gen sources
-.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/gen ${.CURDIR}/../libc/gen
+.PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen
 
 SRCS+=  __xuname.c _pthread_stubs.c _rand48.c _spinlock_stub.c _thread_init.c \
 	alarm.c arc4random.c assert.c basename.c check_utility_compat.c \
@@ -32,11 +32,10 @@
 	valloc.c vis.c wait.c wait3.c waitpid.c
 
 # machine-dependent gen sources
-.if exists(${.CURDIR}/../libc/${MACHINE_ARCH}/gen/Makefile.inc)
-.include "${.CURDIR}/../libc/${MACHINE_ARCH}/gen/Makefile.inc"
+.if exists(${.CURDIR}/${MACHINE_ARCH}/gen/Makefile.inc)
+.include "${.CURDIR}/${MACHINE_ARCH}/gen/Makefile.inc"
 .endif
 
-.if ${LIB} == "c"
 MAN+=	alarm.3 arc4random.3 \
 	basename.3 check_utility_compat.3 clock.3 \
 	confstr.3 ctermid.3 daemon.3 \
@@ -132,4 +131,3 @@
 MLINKS+=tzset.3 tzsetwall.3
 MLINKS+=unvis.3 strunvis.3 unvis.3 strunvisx.3
 MLINKS+=vis.3 strvis.3 vis.3 strvisx.3
-.endif

==== //depot/projects/hammer/lib/libc/gen/sysconf.c#4 (text+ko) ====

@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)sysconf.c	8.2 (Berkeley) 3/20/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/sysconf.c,v 1.17 2002/10/27 18:03:02 wollman Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/sysconf.c,v 1.20 2002/11/17 08:54:29 dougb Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
@@ -256,15 +256,15 @@
 	case _SC_AIO_LISTIO_MAX:
 		mib[0] = CTL_P1003_1B;
 		mib[1] = CTL_P1003_1B_AIO_LISTIO_MAX;
-		goto yesno;
+		break;
 	case _SC_AIO_MAX:
 		mib[0] = CTL_P1003_1B;
 		mib[1] = CTL_P1003_1B_AIO_MAX;
-		goto yesno;
+		break;
 	case _SC_AIO_PRIO_DELTA_MAX:
 		mib[0] = CTL_P1003_1B;
 		mib[1] = CTL_P1003_1B_AIO_PRIO_DELTA_MAX;
-		goto yesno;
+		break;
 	case _SC_DELAYTIMER_MAX:
 		mib[0] = CTL_P1003_1B;
 		mib[1] = CTL_P1003_1B_DELAYTIMER_MAX;

==== //depot/projects/hammer/lib/libc/gmon/Makefile.inc#2 (text+ko) ====

@@ -1,16 +1,14 @@
 #	from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/libc/gmon/Makefile.inc,v 1.8 2001/03/27 17:26:47 ru Exp $
+# $FreeBSD: src/lib/libc/gmon/Makefile.inc,v 1.9 2002/11/18 09:50:55 ru Exp $
 
 # gmon sources
-.PATH: ${.CURDIR}/../libc/gmon
+.PATH: ${.CURDIR}/gmon
 
 SRCS+=	gmon.c mcount.c
 
-.if ${LIB} == "c"
 MAN+=	moncontrol.3
 
 MLINKS+=moncontrol.3 monstartup.3
-.endif
 
 # mcount cannot be compiled with profiling
 mcount.po: mcount.o

==== //depot/projects/hammer/lib/libc/i386/gen/Makefile.inc#3 (text+ko) ====

@@ -1,6 +1,6 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/libc/i386/gen/Makefile.inc,v 1.17 2002/09/17 19:43:53 bde Exp $
+# $FreeBSD: src/lib/libc/i386/gen/Makefile.inc,v 1.18 2002/11/16 06:39:11 deischen Exp $
 
-SRCS+=	_ctx_start.S _setjmp.S alloca.S fabs.S frexp.c getcontext.S \
+SRCS+=	_ctx_start.S _setjmp.S alloca.S fabs.S frexp.c \
 	infinity.c isinf.c ldexp.c makecontext.c modf.S \
-	rfork_thread.S setjmp.S signalcontext.c sigsetjmp.S swapcontext.c
+	rfork_thread.S setjmp.S signalcontext.c sigsetjmp.S

==== //depot/projects/hammer/lib/libc/i386/sys/Makefile.inc#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #	from: Makefile.inc,v 1.1 1993/09/03 19:04:23 jtc Exp
-# $FreeBSD: src/lib/libc/i386/sys/Makefile.inc,v 1.24 2002/05/23 23:51:57 jake Exp $
+# $FreeBSD: src/lib/libc/i386/sys/Makefile.inc,v 1.25 2002/11/18 09:50:55 ru Exp $
 
 SRCS+=	i386_clr_watch.c i386_get_ioperm.c i386_get_ldt.c i386_set_ioperm.c \
 	i386_set_ldt.c i386_set_watch.c i386_vm86.c
@@ -14,11 +14,9 @@
 
 PSEUDO=	_getlogin.o _exit.o
 
-.if ${LIB} == "c"
 MAN+=	i386_get_ioperm.2 i386_get_ldt.2 i386_vm86.2
 MAN+=	i386_set_watch.3
 
 MLINKS+=i386_get_ioperm.2 i386_set_ioperm.2
 MLINKS+=i386_get_ldt.2 i386_set_ldt.2
 MLINKS+=i386_set_watch.3 i386_clr_watch.3
-.endif

==== //depot/projects/hammer/lib/libc/ia64/gen/Makefile.inc#2 (text+ko) ====

@@ -1,10 +1,9 @@
-# $FreeBSD: src/lib/libc/ia64/gen/Makefile.inc,v 1.4 2002/04/13 04:06:34 marcel Exp $
+# $FreeBSD: src/lib/libc/ia64/gen/Makefile.inc,v 1.5 2002/11/16 01:41:33 marcel Exp $
 
-SRCS+=	_setjmp.S fabs.S frexp.c infinity.c isinf.c ldexp.c modf.c setjmp.S
-SRCS+=	sigsetjmp.S fpsetmask.c fpgetmask.c
-SRCS+=	__divdi3.S __divsi3.S __moddi3.S __modsi3.S
-SRCS+=	__udivdi3.S __udivsi3.S __umoddi3.S __umodsi3.S
-SRCS+=	__divdf3.S __divsf3.S
+SRCS+=	__divdf3.S __divdi3.S __divsf3.S __divsi3.S __moddi3.S __modsi3.S \
+	__udivdi3.S __udivsi3.S __umoddi3.S __umodsi3.S _setjmp.S fabs.S \
+	fpgetmask.c fpsetmask.c frexp.c infinity.c isinf.c ldexp.c modf.c \
+	setjmp.S sigsetjmp.S
 
 # The following may go away if function _Unwind_FindTableEntry()
 # will be part of GCC.

==== //depot/projects/hammer/lib/libc/locale/Makefile.inc#7 (text+ko) ====

@@ -1,8 +1,8 @@
 #	from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/libc/locale/Makefile.inc,v 1.41 2002/10/10 22:56:18 tjr Exp $
+# $FreeBSD: src/lib/libc/locale/Makefile.inc,v 1.42 2002/11/18 09:50:55 ru Exp $
 
 # locale sources
-.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/locale ${.CURDIR}/../libc/locale
+.PATH: ${.CURDIR}/${MACHINE_ARCH}/locale ${.CURDIR}/locale
 
 SRCS+=	big5.c btowc.c collate.c collcmp.c euc.c fix_grouping.c frune.c \
 	isctype.c iswctype.c \
@@ -18,7 +18,6 @@
 	wcstoul.c wcstoull.c wcstoumax.c wctob.c wctomb.c wctrans.c wctype.c \
 	wcwidth.c
 
-.if ${LIB} == "c"
 MAN+=	btowc.3 \
 	ctype.3 digittoint.3 isalnum.3 isalpha.3 isascii.3 isblank.3 iscntrl.3 \
 	isdigit.3 isgraph.3 islower.3 isprint.3 ispunct.3 isspace.3 \
@@ -55,4 +54,3 @@
 	wcstol.3 wcstoimax.3 wcstol.3 wcstoumax.3
 MLINKS+=wctrans.3 towctrans.3
 MLINKS+=wctype.3 iswctype.3
-.endif

==== //depot/projects/hammer/lib/libc/net/Makefile.inc#2 (text+ko) ====

@@ -1,8 +1,8 @@
 #	from @(#)Makefile.inc	8.2 (Berkeley) 9/5/93
-# $FreeBSD: src/lib/libc/net/Makefile.inc,v 1.44 2002/07/15 19:58:56 ume Exp $
+# $FreeBSD: src/lib/libc/net/Makefile.inc,v 1.45 2002/11/18 09:50:55 ru Exp $
 
 # machine-independent net sources
-.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/net ${.CURDIR}/../libc/net
+.PATH: ${.CURDIR}/${MACHINE_ARCH}/net ${.CURDIR}/net
 
 SRCS+=	addr2ascii.c ascii2addr.c base64.c ether_addr.c getaddrinfo.c \
 	gethostbydns.c gethostbyht.c gethostbynis.c gethostnamadr.c \
@@ -37,11 +37,10 @@
 		sed -e '/YY_BUF_SIZE/s/16384/1024/' >${.TARGET}
 
 # machine-dependent net sources
-.if exists(${.CURDIR}/../libc/${MACHINE_ARCH}/net/Makefile.inc)
-.include "${.CURDIR}/../libc/${MACHINE_ARCH}/net/Makefile.inc"
+.if exists(${.CURDIR}/${MACHINE_ARCH}/net/Makefile.inc)
+.include "${.CURDIR}/${MACHINE_ARCH}/net/Makefile.inc"
 .endif
 
-.if ${LIB} == "c"
 MAN+=	addr2ascii.3 byteorder.3 ethers.3 getaddrinfo.3 gethostbyname.3 \
 	getifaddrs.3 getipnodebyname.3 \
 	getnameinfo.3 getnetent.3 getprotoent.3 getservent.3 hesiod.3 \
@@ -100,4 +99,3 @@
 	resolver.3 res_search.3 resolver.3 res_send.3 resolver.3 dn_skipname.3 \
 	resolver.3 ns_get16.3 resolver.3 ns_get32.3 \
 	resolver.3 ns_put16.3 resolver.3 ns_put32.3
-.endif

==== //depot/projects/hammer/lib/libc/nls/Makefile.inc#2 (text+ko) ====

@@ -1,10 +1,8 @@
 #	from $NetBSD: Makefile.inc,v 1.7 1995/02/27 13:06:20 cgd Exp $
-# $FreeBSD: src/lib/libc/nls/Makefile.inc,v 1.7 2001/03/27 17:26:48 ru Exp $
+# $FreeBSD: src/lib/libc/nls/Makefile.inc,v 1.8 2002/11/18 09:50:55 ru Exp $
 
-.PATH: ${.CURDIR}/../libc/nls
+.PATH: ${.CURDIR}/nls
 
 SRCS+=	msgcat.c
 
-.if ${LIB} == "c"
 MAN+=	catclose.3 catgets.3 catopen.3
-.endif

==== //depot/projects/hammer/lib/libc/posix1e/Makefile.inc#4 (text+ko) ====

@@ -1,8 +1,8 @@
-# $FreeBSD: src/lib/libc/posix1e/Makefile.inc,v 1.12 2002/11/06 03:38:47 rwatson Exp $
+# $FreeBSD: src/lib/libc/posix1e/Makefile.inc,v 1.13 2002/11/18 09:50:56 ru Exp $
 
 MAINTAINER=	rwatson@FreeBSD.org
 
-.PATH: ${.CURDIR}/../libc/posix1e

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

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200211210038.gAL0cTv7016761>