PERFORCE change 67809 for review

Peter Wemm peter at FreeBSD.org
Tue Dec 28 14:02:48 PST 2004


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

Change 67809 by peter at peter_daintree on 2004/12/28 22:02:28

	IFC @67807

Affected files ...

.. //depot/projects/hammer/Makefile#29 integrate
.. //depot/projects/hammer/Makefile.inc1#82 integrate
.. //depot/projects/hammer/UPDATING#70 integrate
.. //depot/projects/hammer/UPDATING.64BTT#5 delete
.. //depot/projects/hammer/bin/Makefile.inc#8 integrate
.. //depot/projects/hammer/bin/ed/Makefile#9 integrate
.. //depot/projects/hammer/bin/ps/ps.1#19 integrate
.. //depot/projects/hammer/bin/rmail/Makefile#5 integrate
.. //depot/projects/hammer/contrib/bind9/FREEBSD-Upgrade#3 integrate
.. //depot/projects/hammer/contrib/file/ChangeLog#2 integrate
.. //depot/projects/hammer/contrib/file/LEGAL.NOTICE#3 integrate
.. //depot/projects/hammer/contrib/file/Magdir/animation#4 integrate
.. //depot/projects/hammer/contrib/file/Magdir/archive#5 integrate
.. //depot/projects/hammer/contrib/file/Magdir/audio#5 integrate
.. //depot/projects/hammer/contrib/file/Magdir/console#3 integrate
.. //depot/projects/hammer/contrib/file/Magdir/elf#5 integrate
.. //depot/projects/hammer/contrib/file/Magdir/esri#1 branch
.. //depot/projects/hammer/contrib/file/Magdir/filesystems#5 integrate
.. //depot/projects/hammer/contrib/file/Magdir/linux#4 integrate
.. //depot/projects/hammer/contrib/file/Magdir/msdos#4 integrate
.. //depot/projects/hammer/contrib/file/Magdir/os9#2 integrate
.. //depot/projects/hammer/contrib/file/Magdir/perl#3 integrate
.. //depot/projects/hammer/contrib/file/Magdir/plan9#2 integrate
.. //depot/projects/hammer/contrib/file/Magdir/sinclair#2 integrate
.. //depot/projects/hammer/contrib/file/Magdir/sniffer#3 integrate
.. //depot/projects/hammer/contrib/file/Magdir/tex#3 integrate
.. //depot/projects/hammer/contrib/file/Magdir/virtutech#1 branch
.. //depot/projects/hammer/contrib/file/Magdir/xo65#1 branch
.. //depot/projects/hammer/contrib/file/Makefile.am#5 integrate
.. //depot/projects/hammer/contrib/file/Makefile.in#5 integrate
.. //depot/projects/hammer/contrib/file/PORTING#1 branch
.. //depot/projects/hammer/contrib/file/aclocal.m4#5 integrate
.. //depot/projects/hammer/contrib/file/apprentice.c#5 integrate
.. //depot/projects/hammer/contrib/file/ascmagic.c#5 integrate
.. //depot/projects/hammer/contrib/file/compress.c#4 integrate
.. //depot/projects/hammer/contrib/file/config.h.in#5 integrate
.. //depot/projects/hammer/contrib/file/configure#5 integrate
.. //depot/projects/hammer/contrib/file/configure.in#5 integrate
.. //depot/projects/hammer/contrib/file/file.c#5 integrate
.. //depot/projects/hammer/contrib/file/file.h#5 integrate
.. //depot/projects/hammer/contrib/file/fsmagic.c#4 integrate
.. //depot/projects/hammer/contrib/file/funcs.c#2 integrate
.. //depot/projects/hammer/contrib/file/install-sh#2 integrate
.. //depot/projects/hammer/contrib/file/is_tar.c#4 integrate
.. //depot/projects/hammer/contrib/file/magic.c#2 integrate
.. //depot/projects/hammer/contrib/file/magic.h#2 integrate
.. //depot/projects/hammer/contrib/file/magic.mime#5 integrate
.. //depot/projects/hammer/contrib/file/mkinstalldirs#2 integrate
.. //depot/projects/hammer/contrib/file/names.h#4 integrate
.. //depot/projects/hammer/contrib/file/patchlevel.h#5 integrate
.. //depot/projects/hammer/contrib/file/print.c#5 integrate
.. //depot/projects/hammer/contrib/file/readelf.c#5 integrate
.. //depot/projects/hammer/contrib/file/readelf.h#4 integrate
.. //depot/projects/hammer/contrib/file/softmagic.c#5 integrate
.. //depot/projects/hammer/contrib/file/tar.h#3 integrate
.. //depot/projects/hammer/contrib/file/test.c#2 integrate
.. //depot/projects/hammer/contrib/groff/tmac/doc-common#10 integrate
.. //depot/projects/hammer/etc/Makefile#35 integrate
.. //depot/projects/hammer/etc/defaults/Makefile#4 integrate
.. //depot/projects/hammer/etc/defaults/rc.conf#45 integrate
.. //depot/projects/hammer/etc/devd.conf#17 integrate
.. //depot/projects/hammer/etc/isdn/Makefile#4 integrate
.. //depot/projects/hammer/etc/mtree/BSD.include.dist#28 integrate
.. //depot/projects/hammer/etc/mtree/Makefile#4 integrate
.. //depot/projects/hammer/etc/namedb/Makefile#3 integrate
.. //depot/projects/hammer/etc/pam.d/Makefile#6 integrate
.. //depot/projects/hammer/etc/periodic/Makefile.inc#2 integrate
.. //depot/projects/hammer/etc/rc.d/jail#12 integrate
.. //depot/projects/hammer/etc/rc.d/named#10 integrate
.. //depot/projects/hammer/etc/rc.d/ppp-user#7 integrate
.. //depot/projects/hammer/etc/rc.shutdown#8 integrate
.. //depot/projects/hammer/games/factor/Makefile#6 integrate
.. //depot/projects/hammer/games/fortune/datfiles/fortunes#33 integrate
.. //depot/projects/hammer/games/fortune/unstr/Makefile#3 integrate
.. //depot/projects/hammer/games/ppt/Makefile#4 integrate
.. //depot/projects/hammer/games/primes/Makefile#3 integrate
.. //depot/projects/hammer/gnu/Makefile.inc#3 integrate
.. //depot/projects/hammer/gnu/lib/libdialog/Makefile#5 integrate
.. //depot/projects/hammer/gnu/lib/libg2c/Makefile#6 integrate
.. //depot/projects/hammer/gnu/lib/libgcc/Makefile#12 integrate
.. //depot/projects/hammer/gnu/lib/libgcov/Makefile#3 integrate
.. //depot/projects/hammer/gnu/lib/libobjc/Makefile#9 integrate
.. //depot/projects/hammer/gnu/usr.bin/binutils/ar/Makefile#4 integrate
.. //depot/projects/hammer/gnu/usr.bin/binutils/as/Makefile#6 integrate
.. //depot/projects/hammer/gnu/usr.bin/binutils/gdb/Makefile#13 integrate
.. //depot/projects/hammer/gnu/usr.bin/binutils/gdbreplay/Makefile#3 integrate
.. //depot/projects/hammer/gnu/usr.bin/binutils/ld/Makefile#8 integrate
.. //depot/projects/hammer/gnu/usr.bin/binutils/ranlib/Makefile#5 integrate
.. //depot/projects/hammer/gnu/usr.bin/cc/c++/Makefile#5 integrate
.. //depot/projects/hammer/gnu/usr.bin/cc/c++filt/Makefile#7 integrate
.. //depot/projects/hammer/gnu/usr.bin/cc/cc/Makefile#4 integrate
.. //depot/projects/hammer/gnu/usr.bin/cc/cc1/Makefile#6 integrate
.. //depot/projects/hammer/gnu/usr.bin/cc/cc1obj/Makefile#5 integrate
.. //depot/projects/hammer/gnu/usr.bin/cc/cc1plus/Makefile#7 integrate
.. //depot/projects/hammer/gnu/usr.bin/cc/collect2/Makefile#4 integrate
.. //depot/projects/hammer/gnu/usr.bin/cc/f771/Makefile#6 integrate
.. //depot/projects/hammer/gnu/usr.bin/cc/include/Makefile#7 integrate
.. //depot/projects/hammer/gnu/usr.bin/cc/protoize/Makefile#2 integrate
.. //depot/projects/hammer/gnu/usr.bin/cvs/cvs/Makefile#10 integrate
.. //depot/projects/hammer/gnu/usr.bin/dialog/TESTS/Makefile#3 integrate
.. //depot/projects/hammer/gnu/usr.bin/gdb/Makefile.inc#6 integrate
.. //depot/projects/hammer/gnu/usr.bin/gdb/gdbtui/Makefile#5 integrate
.. //depot/projects/hammer/gnu/usr.bin/groff/font/devX100-12/Makefile#2 integrate
.. //depot/projects/hammer/gnu/usr.bin/groff/font/devX100/Makefile#2 integrate
.. //depot/projects/hammer/gnu/usr.bin/groff/font/devX75-12/Makefile#2 integrate
.. //depot/projects/hammer/gnu/usr.bin/groff/font/devX75/Makefile#2 integrate
.. //depot/projects/hammer/gnu/usr.bin/groff/src/devices/grohtml/Makefile#5 integrate
.. //depot/projects/hammer/gnu/usr.bin/groff/src/preproc/html/Makefile#5 integrate
.. //depot/projects/hammer/gnu/usr.bin/groff/tmac/mdoc.local#18 integrate
.. //depot/projects/hammer/gnu/usr.bin/texinfo/infokey/Makefile#3 integrate
.. //depot/projects/hammer/include/arpa/Makefile#3 integrate
.. //depot/projects/hammer/include/protocols/Makefile#3 integrate
.. //depot/projects/hammer/installworld_newk#2 delete
.. //depot/projects/hammer/installworld_oldk#2 delete
.. //depot/projects/hammer/kerberos5/Makefile.inc#11 integrate
.. //depot/projects/hammer/kerberos5/libexec/ipropd-master/Makefile#8 integrate
.. //depot/projects/hammer/kerberos5/libexec/ipropd-slave/Makefile#8 integrate
.. //depot/projects/hammer/kerberos5/tools/asn1_compile/Makefile#2 integrate
.. //depot/projects/hammer/kerberos5/tools/make-print-version/Makefile#2 integrate
.. //depot/projects/hammer/kerberos5/tools/make-roken/Makefile#2 integrate
.. //depot/projects/hammer/kerberos5/usr.bin/ksu/Makefile#7 integrate
.. //depot/projects/hammer/lib/Makefile#46 integrate
.. //depot/projects/hammer/lib/bind/config.mk#5 integrate
.. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_bzip2.c#6 integrate
.. //depot/projects/hammer/lib/libarchive/archive_read_support_format_tar.c#18 integrate
.. //depot/projects/hammer/lib/libarchive/archive_string.c#6 integrate
.. //depot/projects/hammer/lib/libarchive/archive_string.h#5 integrate
.. //depot/projects/hammer/lib/libarchive/archive_write_set_format_pax.c#16 integrate
.. //depot/projects/hammer/lib/libarchive/libarchive-formats.5#3 integrate
.. //depot/projects/hammer/lib/libbsnmp/modules/Makefile#3 integrate
.. //depot/projects/hammer/lib/libc/gen/signal.3#8 integrate
.. //depot/projects/hammer/lib/libc/gen/sigsetops.3#4 integrate
.. //depot/projects/hammer/lib/libc/gen/syslog.c#7 integrate
.. //depot/projects/hammer/lib/libc/sys/_exit.2#3 integrate
.. //depot/projects/hammer/lib/libc/sys/acct.2#6 integrate
.. //depot/projects/hammer/lib/libc/sys/adjtime.2#3 integrate
.. //depot/projects/hammer/lib/libc/sys/aio_suspend.2#5 integrate
.. //depot/projects/hammer/lib/libc/sys/getitimer.2#5 integrate
.. //depot/projects/hammer/lib/libc/sys/recv.2#7 integrate
.. //depot/projects/hammer/lib/libc/sys/select.2#9 integrate
.. //depot/projects/hammer/lib/libc_r/Makefile#9 integrate
.. //depot/projects/hammer/lib/libcompat/Makefile#4 integrate
.. //depot/projects/hammer/lib/libcrypt/Makefile#6 integrate
.. //depot/projects/hammer/lib/libdisk/Makefile#9 integrate
.. //depot/projects/hammer/lib/libdisk/disk.c#20 integrate
.. //depot/projects/hammer/lib/libfetch/Makefile#10 integrate
.. //depot/projects/hammer/lib/libio/Makefile#3 integrate
.. //depot/projects/hammer/lib/libipsec/Makefile#5 integrate
.. //depot/projects/hammer/lib/libmagic/config.h#2 integrate
.. //depot/projects/hammer/lib/libmilter/Makefile#4 integrate
.. //depot/projects/hammer/lib/libncp/Makefile#3 integrate
.. //depot/projects/hammer/lib/libncurses/Makefile#15 integrate
.. //depot/projects/hammer/lib/libpam/libpam/Makefile#14 integrate
.. //depot/projects/hammer/lib/libpam/modules/Makefile.inc#5 integrate
.. //depot/projects/hammer/lib/libpam/modules/modules.inc#10 integrate
.. //depot/projects/hammer/lib/libpcap/Makefile#6 integrate
.. //depot/projects/hammer/lib/libpcap/config.h#3 integrate
.. //depot/projects/hammer/lib/libpthread/pthread.map#12 integrate
.. //depot/projects/hammer/lib/libpthread/sys/thr_error.c#5 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_cancel.c#15 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_clean.c#3 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_concurrency.c#7 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_cond.c#17 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_create.c#18 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_fork.c#5 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_init.c#18 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_kern.c#35 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_mutex.c#15 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_once.c#4 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_private.h#31 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_sem.c#5 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_sig.c#25 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_sigsuspend.c#12 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_spinlock.c#11 integrate
.. //depot/projects/hammer/lib/libradius/Makefile#7 integrate
.. //depot/projects/hammer/lib/librpcsvc/Makefile#7 integrate
.. //depot/projects/hammer/lib/libsm/Makefile#6 integrate
.. //depot/projects/hammer/lib/libsmb/Makefile#5 integrate
.. //depot/projects/hammer/lib/libstand/Makefile#11 integrate
.. //depot/projects/hammer/lib/libtelnet/Makefile#6 integrate
.. //depot/projects/hammer/lib/libutil/_secure_path.c#3 integrate
.. //depot/projects/hammer/lib/libwrap/Makefile#7 integrate
.. //depot/projects/hammer/lib/liby/Makefile#5 integrate
.. //depot/projects/hammer/lib/msun/bsdsrc/b_exp.c#3 integrate
.. //depot/projects/hammer/lib/msun/bsdsrc/b_log.c#3 integrate
.. //depot/projects/hammer/lib/msun/bsdsrc/b_tgamma.c#2 integrate
.. //depot/projects/hammer/lib/msun/bsdsrc/mathimpl.h#3 integrate
.. //depot/projects/hammer/libexec/Makefile#26 integrate
.. //depot/projects/hammer/libexec/bootpd/bootpgw/Makefile#3 integrate
.. //depot/projects/hammer/libexec/ftpd/Makefile#6 integrate
.. //depot/projects/hammer/libexec/ftpd/ftpd.c#24 integrate
.. //depot/projects/hammer/libexec/lukemftpd/Makefile#10 integrate
.. //depot/projects/hammer/libexec/pt_chown/Makefile#3 integrate
.. //depot/projects/hammer/libexec/save-entropy/Makefile#3 integrate
.. //depot/projects/hammer/libexec/tcpd/Makefile#4 integrate
.. //depot/projects/hammer/libexec/telnetd/Makefile#5 integrate
.. //depot/projects/hammer/release/Makefile#66 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#68 integrate
.. //depot/projects/hammer/release/doc/share/misc/dev.archlist.txt#18 integrate
.. //depot/projects/hammer/release/doc/share/misc/man2hwnotes.pl#6 integrate
.. //depot/projects/hammer/release/picobsd/bridge/crunch.conf#5 integrate
.. //depot/projects/hammer/release/picobsd/build/picobsd#4 integrate
.. //depot/projects/hammer/release/picobsd/tinyware/aps/Makefile#3 integrate
.. //depot/projects/hammer/release/picobsd/tinyware/help/Makefile#3 integrate
.. //depot/projects/hammer/release/picobsd/tinyware/login/Makefile#4 integrate
.. //depot/projects/hammer/release/picobsd/tinyware/msg/Makefile#3 integrate
.. //depot/projects/hammer/release/picobsd/tinyware/ns/Makefile#3 integrate
.. //depot/projects/hammer/release/picobsd/tinyware/oinit/Makefile#3 integrate
.. //depot/projects/hammer/release/picobsd/tinyware/passwd/Makefile#3 integrate
.. //depot/projects/hammer/release/picobsd/tinyware/simple_httpd/Makefile#3 integrate
.. //depot/projects/hammer/release/picobsd/tinyware/sps/Makefile#3 integrate
.. //depot/projects/hammer/release/picobsd/tinyware/view/Makefile#3 integrate
.. //depot/projects/hammer/release/picobsd/tinyware/vm/Makefile#3 integrate
.. //depot/projects/hammer/rescue/rescue/Makefile#20 integrate
.. //depot/projects/hammer/sbin/Makefile#32 integrate
.. //depot/projects/hammer/sbin/Makefile.inc#7 integrate
.. //depot/projects/hammer/sbin/atm/atmconfig/Makefile#6 integrate
.. //depot/projects/hammer/sbin/devd/Makefile#6 integrate
.. //depot/projects/hammer/sbin/dhclient/dhcpctl/Makefile#3 integrate
.. //depot/projects/hammer/sbin/dhclient/omapip/Makefile#3 integrate
.. //depot/projects/hammer/sbin/geom/class/mirror/geom_mirror.c#4 integrate
.. //depot/projects/hammer/sbin/geom/class/raid3/geom_raid3.c#7 integrate
.. //depot/projects/hammer/sbin/geom/core/Makefile#4 integrate
.. //depot/projects/hammer/sbin/geom/core/geom.c#5 integrate
.. //depot/projects/hammer/sbin/growfs/growfs.8#7 integrate
.. //depot/projects/hammer/sbin/gvinum/Makefile#3 integrate
.. //depot/projects/hammer/sbin/init/Makefile#5 integrate
.. //depot/projects/hammer/sbin/mca/Makefile#4 integrate
.. //depot/projects/hammer/sbin/mdconfig/mdconfig.c#15 integrate
.. //depot/projects/hammer/sbin/mknod/mknod.8#9 integrate
.. //depot/projects/hammer/sbin/mount/mount.8#14 integrate
.. //depot/projects/hammer/sbin/mount_cd9660/Makefile#4 integrate
.. //depot/projects/hammer/sbin/mount_msdosfs/Makefile#4 integrate
.. //depot/projects/hammer/sbin/mount_ntfs/Makefile#4 integrate
.. //depot/projects/hammer/sbin/mount_udf/Makefile#4 integrate
.. //depot/projects/hammer/sbin/mount_ufs/Makefile#2 integrate
.. //depot/projects/hammer/sbin/rtsol/Makefile#6 integrate
.. //depot/projects/hammer/secure/Makefile#6 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/Makefile#14 integrate
.. //depot/projects/hammer/secure/lib/libssh/Makefile#9 integrate
.. //depot/projects/hammer/secure/lib/libssl/Makefile#7 integrate
.. //depot/projects/hammer/secure/usr.sbin/sshd/Makefile#10 integrate
.. //depot/projects/hammer/share/dict/Makefile#3 integrate
.. //depot/projects/hammer/share/doc/IPv6/Makefile#3 integrate
.. //depot/projects/hammer/share/doc/bind9/Makefile#3 integrate
.. //depot/projects/hammer/share/examples/FreeBSD_version/Makefile#2 integrate
.. //depot/projects/hammer/share/examples/Makefile#8 integrate
.. //depot/projects/hammer/share/examples/autofs/driver/Makefile#4 integrate
.. //depot/projects/hammer/share/examples/cvsup/ports-supfile#8 integrate
.. //depot/projects/hammer/share/examples/etc/make.conf#31 integrate
.. //depot/projects/hammer/share/examples/find_interface/Makefile#2 integrate
.. //depot/projects/hammer/share/examples/ipfilter/Makefile#3 integrate
.. //depot/projects/hammer/share/examples/isdn/v21/Makefile#4 integrate
.. //depot/projects/hammer/share/examples/kld/cdev/test/Makefile#3 integrate
.. //depot/projects/hammer/share/examples/kld/syscall/test/Makefile#3 integrate
.. //depot/projects/hammer/share/examples/libvgl/Makefile#4 integrate
.. //depot/projects/hammer/share/examples/perfmon/Makefile#2 integrate
.. //depot/projects/hammer/share/examples/pf/Makefile#3 integrate
.. //depot/projects/hammer/share/examples/ppi/Makefile#3 integrate
.. //depot/projects/hammer/share/examples/ppp/ppp.conf.isdn#3 integrate
.. //depot/projects/hammer/share/examples/ppp/ppp.conf.sample#6 integrate
.. //depot/projects/hammer/share/examples/ppp/ppp.conf.span-isp#4 integrate
.. //depot/projects/hammer/share/examples/ppp/ppp.conf.span-isp.working#3 integrate
.. //depot/projects/hammer/share/examples/smbfs/Makefile#3 integrate
.. //depot/projects/hammer/share/examples/smbfs/print/Makefile#3 integrate
.. //depot/projects/hammer/share/info/Makefile#3 integrate
.. //depot/projects/hammer/share/man/Makefile#4 integrate
.. //depot/projects/hammer/share/man/man3/Makefile#9 integrate
.. //depot/projects/hammer/share/man/man4/Makefile#60 integrate
.. //depot/projects/hammer/share/man/man4/aac.4#9 integrate
.. //depot/projects/hammer/share/man/man4/acpi.4#29 integrate
.. //depot/projects/hammer/share/man/man4/altq.4#5 integrate
.. //depot/projects/hammer/share/man/man4/ata.4#11 integrate
.. //depot/projects/hammer/share/man/man4/ath.4#20 integrate
.. //depot/projects/hammer/share/man/man4/atkbd.4#4 integrate
.. //depot/projects/hammer/share/man/man4/aue.4#8 integrate
.. //depot/projects/hammer/share/man/man4/bge.4#12 integrate
.. //depot/projects/hammer/share/man/man4/bpf.4#7 integrate
.. //depot/projects/hammer/share/man/man4/de.4#7 integrate
.. //depot/projects/hammer/share/man/man4/divert.4#7 integrate
.. //depot/projects/hammer/share/man/man4/ef.4#3 integrate
.. //depot/projects/hammer/share/man/man4/firewire.4#7 integrate
.. //depot/projects/hammer/share/man/man4/fwe.4#4 integrate
.. //depot/projects/hammer/share/man/man4/fwip.4#2 integrate
.. //depot/projects/hammer/share/man/man4/fwohci.4#7 integrate
.. //depot/projects/hammer/share/man/man4/lp.4#4 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/cs.4#3 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/ndis.4#7 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/ray.4#3 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/wl.4#3 integrate
.. //depot/projects/hammer/share/man/man4/man4.sparc64/Makefile#2 integrate
.. //depot/projects/hammer/share/man/man4/man4.sparc64/snd_audiocs.4#1 branch
.. //depot/projects/hammer/share/man/man4/mpt.4#5 integrate
.. //depot/projects/hammer/share/man/man4/netgraph.4#8 integrate
.. //depot/projects/hammer/share/man/man4/ng_bt3c.4#8 integrate
.. //depot/projects/hammer/share/man/man4/ng_etf.4#3 integrate
.. //depot/projects/hammer/share/man/man4/ng_netflow.4#2 integrate
.. //depot/projects/hammer/share/man/man4/ng_source.4#4 integrate
.. //depot/projects/hammer/share/man/man4/pccbb.4#6 integrate
.. //depot/projects/hammer/share/man/man4/polling.4#13 integrate
.. //depot/projects/hammer/share/man/man4/pst.4#3 integrate
.. //depot/projects/hammer/share/man/man4/random.4#8 integrate
.. //depot/projects/hammer/share/man/man4/smp.4#8 integrate
.. //depot/projects/hammer/share/man/man4/snd_maestro.4#1 branch
.. //depot/projects/hammer/share/man/man4/snd_maestro3.4#2 integrate
.. //depot/projects/hammer/share/man/man4/ti.4#9 integrate
.. //depot/projects/hammer/share/man/man4/txp.4#4 integrate
.. //depot/projects/hammer/share/man/man4/ubser.4#4 integrate
.. //depot/projects/hammer/share/man/man4/umass.4#14 integrate
.. //depot/projects/hammer/share/man/man4/vlan.4#9 integrate
.. //depot/projects/hammer/share/man/man4/vpo.4#6 integrate
.. //depot/projects/hammer/share/man/man4/wi.4#19 integrate
.. //depot/projects/hammer/share/man/man4/xl.4#8 integrate
.. //depot/projects/hammer/share/man/man5/make.conf.5#30 integrate
.. //depot/projects/hammer/share/man/man5/rc.conf.5#45 integrate
.. //depot/projects/hammer/share/man/man7/hier.7#23 integrate
.. //depot/projects/hammer/share/man/man7/ports.7#11 integrate
.. //depot/projects/hammer/share/man/man7/release.7#23 integrate
.. //depot/projects/hammer/share/man/man8/picobsd.8#5 integrate
.. //depot/projects/hammer/share/man/man9/Makefile#46 integrate
.. //depot/projects/hammer/share/man/man9/kernel_mount.9#1 branch
.. //depot/projects/hammer/share/misc/Makefile#4 integrate
.. //depot/projects/hammer/share/misc/bsd-family-tree#22 integrate
.. //depot/projects/hammer/share/mk/Makefile#5 integrate
.. //depot/projects/hammer/share/mk/bsd.README#7 integrate
.. //depot/projects/hammer/share/mk/bsd.compat.mk#1 branch
.. //depot/projects/hammer/share/mk/bsd.dep.mk#10 integrate
.. //depot/projects/hammer/share/mk/bsd.doc.mk#3 integrate
.. //depot/projects/hammer/share/mk/bsd.info.mk#4 integrate
.. //depot/projects/hammer/share/mk/bsd.init.mk#2 integrate
.. //depot/projects/hammer/share/mk/bsd.lib.mk#21 integrate
.. //depot/projects/hammer/share/mk/bsd.libnames.mk#25 integrate
.. //depot/projects/hammer/share/mk/bsd.man.mk#6 integrate
.. //depot/projects/hammer/share/mk/bsd.obj.mk#6 integrate
.. //depot/projects/hammer/share/mk/bsd.pkg.mk#1 branch
.. //depot/projects/hammer/share/mk/bsd.prog.mk#12 integrate
.. //depot/projects/hammer/share/mk/sys.mk#18 integrate
.. //depot/projects/hammer/share/security/Makefile#4 integrate
.. //depot/projects/hammer/share/sendmail/Makefile#5 integrate
.. //depot/projects/hammer/share/skel/Makefile#4 integrate
.. //depot/projects/hammer/share/snmp/mibs/Makefile#3 integrate
.. //depot/projects/hammer/share/syscons/fonts/Makefile#6 integrate
.. //depot/projects/hammer/share/syscons/keymaps/Makefile#12 integrate
.. //depot/projects/hammer/sys/alpha/alpha/machdep.c#29 integrate
.. //depot/projects/hammer/sys/alpha/alpha/pmap.c#40 integrate
.. //depot/projects/hammer/sys/amd64/amd64/pmap.c#120 integrate
.. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#60 integrate
.. //depot/projects/hammer/sys/amd64/isa/isa.c#12 integrate
.. //depot/projects/hammer/sys/arm/arm/intr.c#6 integrate
.. //depot/projects/hammer/sys/arm/arm/pmap.c#14 integrate
.. //depot/projects/hammer/sys/arm/arm/swtch.S#10 integrate
.. //depot/projects/hammer/sys/arm/conf/SIMICS#6 integrate
.. //depot/projects/hammer/sys/arm/include/atomic.h#4 integrate
.. //depot/projects/hammer/sys/arm/sa11x0/assabet_machdep.c#7 integrate
.. //depot/projects/hammer/sys/arm/sa11x0/sa11x0_irqhandler.c#3 integrate
.. //depot/projects/hammer/sys/arm/xscale/i80321/i80321_pci.c#2 integrate
.. //depot/projects/hammer/sys/boot/Makefile#15 integrate
.. //depot/projects/hammer/sys/boot/alpha/boot1/Makefile#5 integrate
.. //depot/projects/hammer/sys/boot/alpha/cdboot/Makefile#3 integrate
.. //depot/projects/hammer/sys/boot/alpha/common/Makefile.common#5 integrate
.. //depot/projects/hammer/sys/boot/alpha/netboot/Makefile#3 integrate
.. //depot/projects/hammer/sys/boot/arc/loader/Makefile#2 integrate
.. //depot/projects/hammer/sys/boot/i386/boot0/Makefile#8 integrate
.. //depot/projects/hammer/sys/boot/i386/btx/btx/Makefile#5 integrate
.. //depot/projects/hammer/sys/boot/i386/btx/btxldr/Makefile#7 integrate
.. //depot/projects/hammer/sys/boot/i386/btx/lib/Makefile#5 integrate
.. //depot/projects/hammer/sys/boot/i386/cdboot/Makefile#5 integrate
.. //depot/projects/hammer/sys/boot/i386/kgzldr/Makefile#7 integrate
.. //depot/projects/hammer/sys/boot/i386/loader/Makefile#10 integrate
.. //depot/projects/hammer/sys/boot/i386/mbr/Makefile#6 integrate
.. //depot/projects/hammer/sys/boot/ia64/efi/Makefile#2 integrate
.. //depot/projects/hammer/sys/boot/ia64/ski/Makefile#3 integrate
.. //depot/projects/hammer/sys/boot/pc98/boot0.5/Makefile#3 integrate
.. //depot/projects/hammer/sys/boot/pc98/boot0/Makefile#3 integrate
.. //depot/projects/hammer/sys/boot/pc98/boot2/Makefile#7 integrate
.. //depot/projects/hammer/sys/boot/pc98/btx/btx/Makefile#5 integrate
.. //depot/projects/hammer/sys/boot/pc98/btx/btxldr/Makefile#5 integrate
.. //depot/projects/hammer/sys/boot/pc98/btx/lib/Makefile#5 integrate
.. //depot/projects/hammer/sys/boot/pc98/kgzldr/Makefile#7 integrate
.. //depot/projects/hammer/sys/boot/pc98/loader/Makefile#8 integrate
.. //depot/projects/hammer/sys/boot/powerpc/loader/Makefile#9 integrate
.. //depot/projects/hammer/sys/boot/sparc64/boot1/Makefile#3 integrate
.. //depot/projects/hammer/sys/boot/sparc64/loader/Makefile#8 integrate
.. //depot/projects/hammer/sys/conf/NOTES#75 integrate
.. //depot/projects/hammer/sys/conf/files#98 integrate
.. //depot/projects/hammer/sys/conf/files.amd64#61 integrate
.. //depot/projects/hammer/sys/conf/majors#26 integrate
.. //depot/projects/hammer/sys/contrib/ipfilter/netinet/fil.c#7 integrate
.. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_auth.c#5 integrate
.. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_compat.h#7 integrate
.. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_fil.c#13 integrate
.. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_fil.h#6 integrate
.. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_frag.c#5 integrate
.. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_log.c#6 integrate
.. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_nat.c#5 integrate
.. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_nat.h#5 integrate
.. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_proxy.c#4 integrate
.. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_state.c#6 integrate
.. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_state.h#4 integrate
.. //depot/projects/hammer/sys/contrib/ipfilter/netinet/mlfk_ipl.c#5 integrate
.. //depot/projects/hammer/sys/contrib/pf/net/pf.c#18 integrate
.. //depot/projects/hammer/sys/crypto/rijndael/Makefile#3 integrate
.. //depot/projects/hammer/sys/dev/aac/aac_pci.c#18 integrate
.. //depot/projects/hammer/sys/dev/acpi_support/acpi_asus.c#2 integrate
.. //depot/projects/hammer/sys/dev/acpi_support/acpi_ibm.c#2 integrate
.. //depot/projects/hammer/sys/dev/acpi_support/acpi_panasonic.c#2 integrate
.. //depot/projects/hammer/sys/dev/acpi_support/acpi_sony.c#3 integrate
.. //depot/projects/hammer/sys/dev/acpi_support/acpi_toshiba.c#2 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi.c#51 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_cmbat.c#21 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_ec.c#27 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_pci_link.c#26 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_pcib.c#23 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_pcib_pci.c#9 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_powerres.c#14 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_resource.c#16 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpivar.h#37 integrate
.. //depot/projects/hammer/sys/dev/aic7xxx/aicasm/Makefile#7 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#50 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-lowlevel.c#24 integrate
.. //depot/projects/hammer/sys/dev/ath/ath_rate/amrr/amrr.c#2 integrate
.. //depot/projects/hammer/sys/dev/ath/ath_rate/onoe/onoe.c#3 integrate
.. //depot/projects/hammer/sys/dev/ath/if_ath.c#24 integrate
.. //depot/projects/hammer/sys/dev/bge/if_bge.c#40 integrate
.. //depot/projects/hammer/sys/dev/bge/if_bgereg.h#20 integrate
.. //depot/projects/hammer/sys/dev/bktr/bktr_card.c#7 integrate
.. //depot/projects/hammer/sys/dev/bktr/bktr_card.h#4 integrate
.. //depot/projects/hammer/sys/dev/bktr/bktr_tuner.c#5 integrate
.. //depot/projects/hammer/sys/dev/bktr/bktr_tuner.h#2 integrate
.. //depot/projects/hammer/sys/dev/bktr/msp34xx.c#5 integrate
.. //depot/projects/hammer/sys/dev/cp/if_cp.c#13 integrate
.. //depot/projects/hammer/sys/dev/ctau/if_ct.c#15 integrate
.. //depot/projects/hammer/sys/dev/cx/if_cx.c#22 integrate
.. //depot/projects/hammer/sys/dev/drm/drm_sysctl.h#7 integrate
.. //depot/projects/hammer/sys/dev/fb/vga.c#19 integrate
.. //depot/projects/hammer/sys/dev/fxp/if_fxp.c#38 integrate
.. //depot/projects/hammer/sys/dev/hptmv/entry.c#3 integrate
.. //depot/projects/hammer/sys/dev/ida/ida.c#12 integrate
.. //depot/projects/hammer/sys/dev/ida/ida_pci.c#9 integrate
.. //depot/projects/hammer/sys/dev/ida/idavar.h#6 integrate
.. //depot/projects/hammer/sys/dev/kbd/atkbd.c#10 integrate
.. //depot/projects/hammer/sys/dev/kbd/atkbdreg.h#2 integrate
.. //depot/projects/hammer/sys/dev/kbd/kbd.c#10 integrate
.. //depot/projects/hammer/sys/dev/md/md.c#45 integrate
.. //depot/projects/hammer/sys/dev/mpt/mpt_pci.c#9 integrate
.. //depot/projects/hammer/sys/dev/nmdm/nmdm.c#17 integrate
.. //depot/projects/hammer/sys/dev/ofw/ofw_disk.c#11 integrate
.. //depot/projects/hammer/sys/dev/patm/genrtab/Makefile#4 integrate
.. //depot/projects/hammer/sys/dev/pccbb/pccbb_pci.c#3 integrate
.. //depot/projects/hammer/sys/dev/pccbb/pccbbdevid.h#8 integrate
.. //depot/projects/hammer/sys/dev/random/randomdev.c#20 integrate
.. //depot/projects/hammer/sys/dev/random/randomdev_soft.c#9 integrate
.. //depot/projects/hammer/sys/dev/snp/snp.c#15 integrate
.. //depot/projects/hammer/sys/dev/sound/usb/uaudio.c#3 integrate
.. //depot/projects/hammer/sys/dev/sound/usb/uaudio.h#2 integrate
.. //depot/projects/hammer/sys/dev/sound/usb/uaudio_pcm.c#6 integrate
.. //depot/projects/hammer/sys/dev/sound/usb/uaudioreg.h#3 integrate
.. //depot/projects/hammer/sys/dev/twe/twe.c#11 integrate
.. //depot/projects/hammer/sys/dev/twe/tweio.h#5 integrate
.. //depot/projects/hammer/sys/dev/usb/ehci.c#17 integrate
.. //depot/projects/hammer/sys/dev/usb/ohci.c#18 integrate
.. //depot/projects/hammer/sys/dev/usb/ugen.c#24 integrate
.. //depot/projects/hammer/sys/dev/usb/uhid.c#17 integrate
.. //depot/projects/hammer/sys/dev/usb/ukbd.c#11 integrate
.. //depot/projects/hammer/sys/dev/usb/umodem.c#8 integrate
.. //depot/projects/hammer/sys/dev/usb/ums.c#14 integrate
.. //depot/projects/hammer/sys/dev/usb/uplcom.c#14 integrate
.. //depot/projects/hammer/sys/dev/usb/urio.c#9 integrate
.. //depot/projects/hammer/sys/dev/usb/usb.c#13 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdevs#54 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdi.h#6 integrate
.. //depot/projects/hammer/sys/dev/usb/uscanner.c#20 integrate
.. //depot/projects/hammer/sys/dev/vkbd/vkbd.c#2 integrate
.. //depot/projects/hammer/sys/dev/wi/if_wi.c#31 integrate
.. //depot/projects/hammer/sys/fs/devfs/devfs_vnops.c#22 integrate
.. //depot/projects/hammer/sys/fs/fifofs/fifo_vnops.c#26 integrate
.. //depot/projects/hammer/sys/fs/ntfs/ntfs_vfsops.c#19 integrate
.. //depot/projects/hammer/sys/geom/bde/g_bde_lock.c#7 integrate
.. //depot/projects/hammer/sys/geom/geom.h#33 integrate
.. //depot/projects/hammer/sys/geom/mirror/g_mirror.c#16 integrate
.. //depot/projects/hammer/sys/geom/mirror/g_mirror.h#4 integrate
.. //depot/projects/hammer/sys/geom/mirror/g_mirror_ctl.c#2 integrate
.. //depot/projects/hammer/sys/geom/raid3/g_raid3.c#12 integrate
.. //depot/projects/hammer/sys/geom/raid3/g_raid3.h#5 integrate
.. //depot/projects/hammer/sys/geom/raid3/g_raid3_ctl.c#4 integrate
.. //depot/projects/hammer/sys/gnu/ext2fs/ext2_vnops.c#19 integrate
.. //depot/projects/hammer/sys/i386/i386/intr_machdep.c#15 integrate
.. //depot/projects/hammer/sys/i386/i386/local_apic.c#10 integrate
.. //depot/projects/hammer/sys/i386/i386/mp_machdep.c#38 integrate
.. //depot/projects/hammer/sys/i386/i386/pmap.c#65 integrate
.. //depot/projects/hammer/sys/i386/i386/vm_machdep.c#37 integrate
.. //depot/projects/hammer/sys/i386/include/apicreg.h#3 integrate
.. //depot/projects/hammer/sys/i386/include/apicvar.h#10 integrate
.. //depot/projects/hammer/sys/i386/include/intr_machdep.h#5 integrate
.. //depot/projects/hammer/sys/i386/isa/isa.c#6 integrate
.. //depot/projects/hammer/sys/i386/pci/pci_cfgreg.c#20 integrate
.. //depot/projects/hammer/sys/ia64/ia64/pmap.c#41 integrate
.. //depot/projects/hammer/sys/isa/isa_common.c#12 integrate
.. //depot/projects/hammer/sys/isa/isa_common.h#3 integrate
.. //depot/projects/hammer/sys/isa/pnp.c#6 integrate
.. //depot/projects/hammer/sys/isa/pnpvar.h#2 integrate
.. //depot/projects/hammer/sys/kern/init_sysent.c#38 integrate
.. //depot/projects/hammer/sys/kern/kern_clock.c#22 integrate
.. //depot/projects/hammer/sys/kern/kern_descrip.c#41 integrate
.. //depot/projects/hammer/sys/kern/kern_exec.c#41 integrate
.. //depot/projects/hammer/sys/kern/kern_fork.c#47 integrate
.. //depot/projects/hammer/sys/kern/kern_kse.c#17 integrate
.. //depot/projects/hammer/sys/kern/kern_sig.c#52 integrate
.. //depot/projects/hammer/sys/kern/kern_subr.c#20 integrate
.. //depot/projects/hammer/sys/kern/kern_switch.c#37 integrate
.. //depot/projects/hammer/sys/kern/kern_synch.c#46 integrate
.. //depot/projects/hammer/sys/kern/kern_thread.c#73 integrate
.. //depot/projects/hammer/sys/kern/kern_umtx.c#15 integrate
.. //depot/projects/hammer/sys/kern/sched_4bsd.c#33 integrate
.. //depot/projects/hammer/sys/kern/sched_ule.c#53 integrate
.. //depot/projects/hammer/sys/kern/subr_disk.c#12 integrate
.. //depot/projects/hammer/sys/kern/subr_trap.c#29 integrate
.. //depot/projects/hammer/sys/kern/subr_witness.c#37 integrate
.. //depot/projects/hammer/sys/kern/syscalls.c#37 integrate
.. //depot/projects/hammer/sys/kern/syscalls.master#37 integrate
.. //depot/projects/hammer/sys/kern/tty.c#40 integrate
.. //depot/projects/hammer/sys/kern/tty_pty.c#24 integrate
.. //depot/projects/hammer/sys/kern/uipc_mbuf.c#23 integrate
.. //depot/projects/hammer/sys/kern/uipc_sem.c#9 integrate
.. //depot/projects/hammer/sys/kern/uipc_socket.c#47 integrate
.. //depot/projects/hammer/sys/kern/uipc_socket2.c#29 integrate
.. //depot/projects/hammer/sys/kern/uipc_usrreq.c#28 integrate
.. //depot/projects/hammer/sys/kern/vfs_mount.c#45 integrate
.. //depot/projects/hammer/sys/kern/vfs_subr.c#66 integrate
.. //depot/projects/hammer/sys/modules/Makefile#63 integrate
.. //depot/projects/hammer/sys/modules/acpi/acpi_asus/Makefile#5 integrate
.. //depot/projects/hammer/sys/modules/acpi/acpi_ibm/Makefile#2 integrate
.. //depot/projects/hammer/sys/modules/acpi/acpi_video/Makefile#4 integrate
.. //depot/projects/hammer/sys/modules/cp/Makefile#3 integrate
.. //depot/projects/hammer/sys/modules/if_gif/Makefile#5 integrate
.. //depot/projects/hammer/sys/modules/ipfilter/Makefile#5 integrate
.. //depot/projects/hammer/sys/modules/netgraph/Makefile#13 integrate
.. //depot/projects/hammer/sys/modules/netgraph/fec/sample_startup#2 delete
.. //depot/projects/hammer/sys/modules/pf/Makefile#6 integrate
.. //depot/projects/hammer/sys/modules/sppp/Makefile#2 integrate
.. //depot/projects/hammer/sys/modules/wlan_ccmp/Makefile#2 integrate
.. //depot/projects/hammer/sys/net/bpf.c#25 integrate
.. //depot/projects/hammer/sys/net/if_sppp.h#3 integrate
.. //depot/projects/hammer/sys/net/if_spppfr.c#1 branch
.. //depot/projects/hammer/sys/net/if_spppsubr.c#18 integrate
.. //depot/projects/hammer/sys/net/if_tap.c#19 integrate
.. //depot/projects/hammer/sys/net/if_tun.c#22 integrate
.. //depot/projects/hammer/sys/net/ppp_tty.c#10 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_crypto_ccmp.c#2 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_crypto_tkip.c#2 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_freebsd.c#2 integrate
.. //depot/projects/hammer/sys/netgraph/netflow/netflow.c#3 integrate
.. //depot/projects/hammer/sys/netgraph/ng_base.c#23 integrate
.. //depot/projects/hammer/sys/netgraph/ng_bridge.c#13 integrate
.. //depot/projects/hammer/sys/netgraph/ng_device.c#13 integrate
.. //depot/projects/hammer/sys/netgraph/ng_sample.c#6 integrate
.. //depot/projects/hammer/sys/netinet/ip_output.c#42 integrate
.. //depot/projects/hammer/sys/netinet/tcp_input.c#42 integrate
.. //depot/projects/hammer/sys/netinet/tcp_subr.c#35 integrate
.. //depot/projects/hammer/sys/netinet/tcp_timer.c#14 integrate
.. //depot/projects/hammer/sys/netinet/tcp_var.h#20 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs.h#15 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_bio.c#28 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_nfsiod.c#9 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_vfsops.c#33 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_vnops.c#32 integrate
.. //depot/projects/hammer/sys/nfsclient/nfsnode.h#12 integrate
.. //depot/projects/hammer/sys/pc98/pc98/fd.c#26 integrate
.. //depot/projects/hammer/sys/pci/if_sk.c#32 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/pmap.c#31 integrate
.. //depot/projects/hammer/sys/sparc64/include/ver.h#3 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/identcpu.c#6 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/pmap.c#30 integrate
.. //depot/projects/hammer/sys/sys/bio.h#15 integrate
.. //depot/projects/hammer/sys/sys/filedesc.h#13 integrate
.. //depot/projects/hammer/sys/sys/ktr.h#9 integrate
.. //depot/projects/hammer/sys/sys/mdioctl.h#9 integrate
.. //depot/projects/hammer/sys/sys/mouse.h#4 integrate
.. //depot/projects/hammer/sys/sys/proc.h#72 integrate
.. //depot/projects/hammer/sys/sys/syscall.h#36 integrate
.. //depot/projects/hammer/sys/sys/syscall.mk#36 integrate
.. //depot/projects/hammer/sys/sys/sysproto.h#36 integrate
.. //depot/projects/hammer/sys/sys/umtx.h#5 integrate
.. //depot/projects/hammer/sys/sys/vnode.h#40 integrate
.. //depot/projects/hammer/sys/tools/vnode_if.awk#8 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_vnops.c#29 integrate
.. //depot/projects/hammer/sys/ufs/ufs/ufs_extattr.c#13 integrate
.. //depot/projects/hammer/sys/ufs/ufs/ufs_vnops.c#26 integrate
.. //depot/projects/hammer/sys/vm/uma.h#8 integrate
.. //depot/projects/hammer/sys/vm/uma_core.c#34 integrate
.. //depot/projects/hammer/sys/vm/uma_dbg.c#10 integrate
.. //depot/projects/hammer/sys/vm/uma_dbg.h#4 integrate
.. //depot/projects/hammer/sys/vm/uma_int.h#13 integrate
.. //depot/projects/hammer/sys/vm/vm_fault.c#27 integrate
.. //depot/projects/hammer/sys/vm/vm_map.c#45 integrate
.. //depot/projects/hammer/sys/vm/vm_meter.c#13 integrate
.. //depot/projects/hammer/sys/vm/vm_object.c#46 integrate
.. //depot/projects/hammer/sys/vm/vm_page.c#39 integrate
.. //depot/projects/hammer/sys/vm/vm_page.h#20 integrate
.. //depot/projects/hammer/sys/vm/vnode_pager.c#27 integrate
.. //depot/projects/hammer/tools/KSE/ksetest/Makefile#4 integrate
.. //depot/projects/hammer/tools/KSE/rr/Makefile#2 integrate
.. //depot/projects/hammer/tools/diag/dumpvfscache/Makefile#4 integrate
.. //depot/projects/hammer/tools/diag/localeck/Makefile#3 integrate
.. //depot/projects/hammer/tools/regression/aio/aiotest/Makefile#2 integrate
.. //depot/projects/hammer/tools/regression/fsx/Makefile#3 integrate
.. //depot/projects/hammer/tools/regression/gaithrstress/Makefile#3 integrate
.. //depot/projects/hammer/tools/regression/geom/ConfCmp/Makefile#5 integrate
.. //depot/projects/hammer/tools/regression/geom/MdLoad/Makefile#4 integrate
.. //depot/projects/hammer/tools/regression/geom_mirror/test-1.sh#2 integrate
.. //depot/projects/hammer/tools/regression/geom_mirror/test-2.sh#2 integrate
.. //depot/projects/hammer/tools/regression/geom_mirror/test-3.sh#2 integrate
.. //depot/projects/hammer/tools/regression/geom_mirror/test-4.sh#2 integrate
.. //depot/projects/hammer/tools/regression/geom_mirror/test-5.sh#2 integrate
.. //depot/projects/hammer/tools/regression/geom_mirror/test-6.sh#2 integrate
.. //depot/projects/hammer/tools/regression/geom_mirror/test-7.sh#2 integrate
.. //depot/projects/hammer/tools/regression/geom_raid3/test-12.sh#2 integrate
.. //depot/projects/hammer/tools/regression/ia64_unaligned/Makefile#3 integrate
.. //depot/projects/hammer/tools/regression/include/tgmath/Makefile#3 integrate
.. //depot/projects/hammer/tools/regression/netatalk/simple_send/Makefile#3 integrate
.. //depot/projects/hammer/tools/regression/netinet/ipsockopt/Makefile#3 integrate
.. //depot/projects/hammer/tools/regression/netinet/tcpconnect/Makefile#3 integrate
.. //depot/projects/hammer/tools/regression/netinet/tcpfullwindowrst/Makefile#2 integrate
.. //depot/projects/hammer/tools/regression/netinet/tcpstream/Makefile#3 integrate
.. //depot/projects/hammer/tools/regression/nfsmmap/test1/Makefile#3 integrate
.. //depot/projects/hammer/tools/regression/nfsmmap/test2/Makefile#3 integrate
.. //depot/projects/hammer/tools/regression/p1003_1b/Makefile#4 integrate
.. //depot/projects/hammer/tools/regression/pipe/Makefile#3 integrate
.. //depot/projects/hammer/tools/regression/security/access/Makefile#3 integrate
.. //depot/projects/hammer/tools/regression/security/proc_to_proc/Makefile#3 integrate
.. //depot/projects/hammer/tools/regression/sockets/accept_fd_leak/Makefile#3 integrate
.. //depot/projects/hammer/tools/regression/sockets/accf_data_attach/Makefile#3 integrate
.. //depot/projects/hammer/tools/regression/sockets/kqueue/Makefile#3 integrate
.. //depot/projects/hammer/tools/regression/sockets/listenclose/Makefile#2 integrate
.. //depot/projects/hammer/tools/regression/sockets/socketpair/Makefile#3 integrate
.. //depot/projects/hammer/tools/regression/sysvmsg/Makefile#3 integrate
.. //depot/projects/hammer/tools/regression/sysvsem/Makefile#3 integrate
.. //depot/projects/hammer/tools/regression/sysvshm/Makefile#3 integrate
.. //depot/projects/hammer/tools/regression/tls/libxx/Makefile#3 integrate
.. //depot/projects/hammer/tools/regression/tls/libyy/Makefile#3 integrate
.. //depot/projects/hammer/tools/regression/tls/ttls1/Makefile#4 integrate
.. //depot/projects/hammer/tools/regression/tls/ttls2/Makefile#4 integrate
.. //depot/projects/hammer/tools/sched/schedgraph.py#1 branch
.. //depot/projects/hammer/tools/test/malloc/Makefile#3 integrate
.. //depot/projects/hammer/tools/test/ppsapi/Makefile#4 integrate
.. //depot/projects/hammer/tools/tools/aac/Makefile#3 integrate
.. //depot/projects/hammer/tools/tools/find-sb/Makefile#2 integrate
.. //depot/projects/hammer/tools/tools/gdb_regofs/Makefile#3 integrate
.. //depot/projects/hammer/tools/tools/ifinfo/Makefile#2 integrate
.. //depot/projects/hammer/tools/tools/kttcp/kttcp.c#2 integrate
.. //depot/projects/hammer/tools/tools/kttcp/sys/kttcp.c#3 integrate
.. //depot/projects/hammer/tools/tools/ministat/Makefile#5 integrate
.. //depot/projects/hammer/tools/tools/nanobsd/Customize/comconsole#2 integrate
.. //depot/projects/hammer/tools/tools/nanobsd/make.conf#10 integrate
.. //depot/projects/hammer/tools/tools/netrate/Makefile.inc#1 branch
.. //depot/projects/hammer/tools/tools/netrate/netblast/Makefile#3 integrate
.. //depot/projects/hammer/tools/tools/netrate/netreceive/Makefile#3 integrate
.. //depot/projects/hammer/tools/tools/netrate/netsend/Makefile#4 integrate
.. //depot/projects/hammer/tools/tools/netrate/netsend/netsend.c#6 integrate
.. //depot/projects/hammer/tools/tools/pirtool/Makefile#3 integrate
.. //depot/projects/hammer/tools/tools/recoverdisk/Makefile#3 integrate
.. //depot/projects/hammer/tools/tools/syscall_timing/Makefile#3 integrate
.. //depot/projects/hammer/usr.bin/Makefile#39 integrate
.. //depot/projects/hammer/usr.bin/alias/Makefile#3 integrate
.. //depot/projects/hammer/usr.bin/bzip2recover/Makefile#3 integrate
.. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.freebsd#29 integrate
.. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.music#3 integrate
.. //depot/projects/hammer/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.musik#3 integrate
.. //depot/projects/hammer/usr.bin/catman/Makefile#2 integrate
.. //depot/projects/hammer/usr.bin/catman/catman.1#3 integrate
.. //depot/projects/hammer/usr.bin/catman/catman.c#8 integrate
.. //depot/projects/hammer/usr.bin/dirname/Makefile#3 integrate
.. //depot/projects/hammer/usr.bin/elf2aout/Makefile#4 integrate
.. //depot/projects/hammer/usr.bin/fetch/Makefile#7 integrate
.. //depot/projects/hammer/usr.bin/file/config.h#5 integrate
.. //depot/projects/hammer/usr.bin/file/file.1#6 integrate
.. //depot/projects/hammer/usr.bin/file/magic.5#5 integrate
.. //depot/projects/hammer/usr.bin/lessecho/Makefile#2 integrate
.. //depot/projects/hammer/usr.bin/lex/lib/Makefile#3 integrate
.. //depot/projects/hammer/usr.bin/limits/limits.c#3 integrate
.. //depot/projects/hammer/usr.bin/locate/bigram/Makefile#3 integrate
.. //depot/projects/hammer/usr.bin/locate/code/Makefile#3 integrate
.. //depot/projects/hammer/usr.bin/make/Makefile#13 integrate
.. //depot/projects/hammer/usr.bin/make/arch.c#9 integrate
.. //depot/projects/hammer/usr.bin/make/compat.c#12 integrate
.. //depot/projects/hammer/usr.bin/make/cond.c#12 integrate
.. //depot/projects/hammer/usr.bin/make/dir.c#11 integrate
.. //depot/projects/hammer/usr.bin/make/dir.h#6 integrate
.. //depot/projects/hammer/usr.bin/make/for.c#10 integrate
.. //depot/projects/hammer/usr.bin/make/job.c#17 integrate
.. //depot/projects/hammer/usr.bin/make/lst.h#7 integrate
.. //depot/projects/hammer/usr.bin/make/lst.lib/lstConcat.c#7 integrate
.. //depot/projects/hammer/usr.bin/make/lst.lib/lstDestroy.c#7 integrate
.. //depot/projects/hammer/usr.bin/make/lst.lib/lstDupl.c#8 integrate
.. //depot/projects/hammer/usr.bin/make/lst.lib/lstInit.c#6 delete
.. //depot/projects/hammer/usr.bin/make/main.c#24 integrate
.. //depot/projects/hammer/usr.bin/make/make.c#9 integrate
.. //depot/projects/hammer/usr.bin/make/make.h#6 integrate
.. //depot/projects/hammer/usr.bin/make/nonints.h#9 integrate
.. //depot/projects/hammer/usr.bin/make/parse.c#20 integrate
.. //depot/projects/hammer/usr.bin/make/str.c#9 integrate
.. //depot/projects/hammer/usr.bin/make/suff.c#11 integrate
.. //depot/projects/hammer/usr.bin/make/targ.c#10 integrate
.. //depot/projects/hammer/usr.bin/make/var.c#16 integrate
.. //depot/projects/hammer/usr.bin/rev/rev.c#4 integrate
.. //depot/projects/hammer/usr.bin/tar/Makefile#9 integrate
.. //depot/projects/hammer/usr.bin/tar/bsdtar.c#21 integrate
.. //depot/projects/hammer/usr.bin/tar/bsdtar_platform.h#6 integrate
.. //depot/projects/hammer/usr.bin/tar/configure.ac.in#2 integrate
.. //depot/projects/hammer/usr.bin/tar/fts.c#3 integrate
.. //depot/projects/hammer/usr.bin/tar/matching.c#8 integrate
.. //depot/projects/hammer/usr.bin/telnet/Makefile#5 integrate
.. //depot/projects/hammer/usr.bin/unexpand/Makefile#3 integrate
.. //depot/projects/hammer/usr.bin/uudecode/Makefile#3 integrate
.. //depot/projects/hammer/usr.bin/vgrind/RETEST/Makefile#3 integrate
.. //depot/projects/hammer/usr.bin/wc/Makefile#2 integrate
.. //depot/projects/hammer/usr.bin/wc/wc.c#4 integrate
.. //depot/projects/hammer/usr.bin/xlint/lint2/Makefile#2 integrate
.. //depot/projects/hammer/usr.sbin/Makefile#59 integrate
.. //depot/projects/hammer/usr.sbin/arp/arp.c#9 integrate
.. //depot/projects/hammer/usr.sbin/bluetooth/bthidd/Makefile#4 integrate
.. //depot/projects/hammer/usr.sbin/boot0cfg/boot0cfg.c#8 integrate
.. //depot/projects/hammer/usr.sbin/bootparamd/callbootd/Makefile#5 integrate
.. //depot/projects/hammer/usr.sbin/burncd/burncd.8#10 integrate
.. //depot/projects/hammer/usr.sbin/burncd/burncd.c#9 integrate
.. //depot/projects/hammer/usr.sbin/config/config.8#7 integrate
.. //depot/projects/hammer/usr.sbin/crunch/examples/Makefile#3 integrate
.. //depot/projects/hammer/usr.sbin/ctm/ctm_dequeue/Makefile#3 integrate
.. //depot/projects/hammer/usr.sbin/ctm/ctm_smail/Makefile#3 integrate
.. //depot/projects/hammer/usr.sbin/ctm/mkCTM/Makefile#4 integrate
.. //depot/projects/hammer/usr.sbin/fwcontrol/fwcontrol.8#10 integrate
.. //depot/projects/hammer/usr.sbin/lpr/filters.ru/koi2855/Makefile#4 integrate
.. //depot/projects/hammer/usr.sbin/lpr/filters.ru/koi2alt/Makefile#4 integrate
.. //depot/projects/hammer/usr.sbin/lpr/filters/Makefile#4 integrate
.. //depot/projects/hammer/usr.sbin/lpr/lpd/printjob.c#4 integrate
.. //depot/projects/hammer/usr.sbin/mount_smbfs/Makefile#4 integrate
.. //depot/projects/hammer/usr.sbin/mrouted/testrsrr/Makefile#3 integrate
.. //depot/projects/hammer/usr.sbin/nologin/Makefile#3 integrate
.. //depot/projects/hammer/usr.sbin/ntp/Makefile#6 integrate
.. //depot/projects/hammer/usr.sbin/ntp/Makefile.inc#6 integrate
.. //depot/projects/hammer/usr.sbin/ntp/ntp-keygen/Makefile#4 integrate
.. //depot/projects/hammer/usr.sbin/ntp/ntpd/Makefile#7 integrate
.. //depot/projects/hammer/usr.sbin/ntp/ntpdate/Makefile#4 integrate
.. //depot/projects/hammer/usr.sbin/ntp/ntpdc/Makefile#5 integrate
.. //depot/projects/hammer/usr.sbin/ntp/ntpq/Makefile#6 integrate
.. //depot/projects/hammer/usr.sbin/ntp/ntptime/Makefile#3 integrate
.. //depot/projects/hammer/usr.sbin/ntp/ntptrace/Makefile#4 integrate
.. //depot/projects/hammer/usr.sbin/ntp/sntp/Makefile#3 integrate
.. //depot/projects/hammer/usr.sbin/pccard/Makefile.inc#2 integrate
.. //depot/projects/hammer/usr.sbin/pcvt/Misc/Doc/Makefile#3 integrate
.. //depot/projects/hammer/usr.sbin/pcvt/Misc/Etc/Makefile#3 integrate
.. //depot/projects/hammer/usr.sbin/pcvt/Misc/Makefile#3 integrate
.. //depot/projects/hammer/usr.sbin/pcvt/demo/Makefile#3 integrate
.. //depot/projects/hammer/usr.sbin/pcvt/kbdio/Makefile#3 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/Makefile#5 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/Makefile.inc#4 integrate
.. //depot/projects/hammer/usr.sbin/ppp/Makefile#10 integrate
.. //depot/projects/hammer/usr.sbin/ppp/command.c#12 integrate
.. //depot/projects/hammer/usr.sbin/ppp/lcp.c#4 integrate
.. //depot/projects/hammer/usr.sbin/ppp/lcp.h#2 integrate
.. //depot/projects/hammer/usr.sbin/ppp/lqr.c#4 integrate
.. //depot/projects/hammer/usr.sbin/ppp/main.c#5 integrate
.. //depot/projects/hammer/usr.sbin/ppp/ppp.8.m4#14 integrate
.. //depot/projects/hammer/usr.sbin/pppctl/pppctl.c#4 integrate
.. //depot/projects/hammer/usr.sbin/pppd/Makefile#7 integrate
.. //depot/projects/hammer/usr.sbin/repquota/repquota.c#6 integrate
.. //depot/projects/hammer/usr.sbin/rpc.ypupdated/Makefile#6 integrate
.. //depot/projects/hammer/usr.sbin/sendmail/Makefile#12 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/Makefile#8 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/devices.c#14 integrate
.. //depot/projects/hammer/usr.sbin/tcpdchk/Makefile#4 integrate
.. //depot/projects/hammer/usr.sbin/tcpdmatch/Makefile#3 integrate
.. //depot/projects/hammer/usr.sbin/tcpdump/tcpdump/Makefile#8 integrate
.. //depot/projects/hammer/usr.sbin/traceroute/Makefile#2 integrate
.. //depot/projects/hammer/usr.sbin/vnconfig/Makefile#3 integrate

Differences ...

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

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile,v 1.311 2004/12/07 14:41:16 harti Exp $
+# $FreeBSD: src/Makefile,v 1.315 2004/12/21 09:59:39 ru Exp $
 #
 # The user-driven targets are:
 #
@@ -86,9 +86,9 @@
 
 PATH=	/sbin:/bin:/usr/sbin:/usr/bin
 MAKEOBJDIRPREFIX?=	/usr/obj
-_MAKEOBJDIRPREFIX!= /usr/bin/env -i \
-		PATH=${PATH} MAKEFLAGS="${.MAKEFLAGS}" ${MAKE} \
-		-f /dev/null -V MAKEOBJDIRPREFIX dummy
+_MAKEOBJDIRPREFIX!= /usr/bin/env -i PATH=${PATH} ${MAKE} \
+    ${.MAKEFLAGS:MMAKEOBJDIRPREFIX=*} \
+    -f /dev/null -V MAKEOBJDIRPREFIX dummy
 .if !empty(_MAKEOBJDIRPREFIX)
 .error MAKEOBJDIRPREFIX can only be set in environment, not as a global\
 	(in /etc/make.conf) or command-line variable.
@@ -232,7 +232,7 @@
 		INSTALL="sh ${.CURDIR}/tools/install.sh"
 MMAKE=		${MMAKEENV} make \
 		-D_UPGRADING \
-		-DNOMAN -DNOSHARED \
+		-DNOMAN -DNO_MAN -DNOSHARED -DNO_SHARED \
 		-DNO_CPU_CFLAGS -DNO_WERROR
 
 make: .PHONY

==== //depot/projects/hammer/Makefile.inc1#82 (text+ko) ====

@@ -1,19 +1,19 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.459 2004/12/01 23:23:14 peter Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.471 2004/12/22 22:00:01 ru Exp $
 #
 # Make command line options:
 #	-DNO_DYNAMICROOT do not link /bin and /sbin dynamically
 #	-DNO_KERBEROS Do not build Heimdal (Kerberos 5)
 #	-DNO_RESCUE do not build rescue binaries
-#	-DNOCLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
-#	-DNOCLEAN do not clean at all
-#	-DNOCRYPT will prevent building of crypt versions
-#	-DNOMAN do not build the manual pages
-#	-DNOPROFILE do not build profiled libraries
-#	-DNOGAMES do not go into games subdir
-#	-DNOSHARE do not go into share subdir
-#	-DNOINFO do not make or install info files
-#	-DNOLIBC_R do not build libc_r.
+#	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
+#	-DNO_CLEAN do not clean at all
+#	-DNO_CRYPT will prevent building of crypt versions
+#	-DNO_MAN do not build the manual pages
+#	-DNO_PROFILE do not build profiled libraries
+#	-DNO_GAMES do not go into games subdir
+#	-DNO_SHARE do not go into share subdir
+#	-DNO_INFO do not make or install info files
+#	-DNO_LIBC_R do not build libc_r.
 #	-DNO_FORTRAN do not build g77 and related libraries.
 #	-DNO_KERNELCONFIG do not run config in ${MAKE} buildkernel
 #	-DNO_KERNELCLEAN do not run ${MAKE} clean in ${MAKE} buildkernel
@@ -27,7 +27,7 @@
 # The intended user-driven targets are:
 # buildworld  - rebuild *everything*, including glue to help do upgrades
 # installworld- install everything built by "buildworld"
-# update      - convenient way to update your source tree (eg: sup/cvs)
+# update      - convenient way to update your source tree (eg: cvsup/cvs)
 #
 # Standard targets (not defined here) are documented in the makefiles in
 # /usr/share/mk.  These include:
@@ -45,21 +45,21 @@
 # We must do etc last for install/distribute to work.
 #
 SUBDIR=	share/info include lib libexec bin
-.if !defined(NOGAMES)
+.if !defined(NO_GAMES)
 SUBDIR+=games
 .endif
 SUBDIR+=gnu
-.if !defined(NO_KERBEROS) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.if !defined(NO_KERBEROS) && !defined(NO_CRYPT) && !defined(NO_OPENSSL)
 SUBDIR+=kerberos5
 .endif
 .if !defined(NO_RESCUE)
 SUBDIR+=rescue
 .endif
 SUBDIR+=sbin
-.if !defined(NOCRYPT)
+.if !defined(NO_CRYPT)
 SUBDIR+=secure
 .endif
-.if !defined(NOSHARE)
+.if !defined(NO_SHARE)
 SUBDIR+=share
 .endif
 SUBDIR+=sys usr.bin usr.sbin etc
@@ -76,7 +76,7 @@
 SUBDIR=		${SUBDIR_OVERRIDE}
 .endif
 
-.if defined(NOCLEANDIR)
+.if defined(NO_CLEANDIR)
 CLEANDIR=	clean cleandepend
 .else
 CLEANDIR=	cleandir
@@ -112,8 +112,8 @@
 .else
 _TARGET_CPUTYPE=dummy
 .endif
-_CPUTYPE!=	MAKEFLAGS= ${MAKE} -f /dev/null -m ${.CURDIR}/share/mk \
-		CPUTYPE=${_TARGET_CPUTYPE} -V CPUTYPE
+_CPUTYPE!=	MAKEFLAGS= CPUTYPE=${_TARGET_CPUTYPE} ${MAKE} \
+		-f /dev/null -m ${.CURDIR}/share/mk -V CPUTYPE
 .if ${_CPUTYPE} != ${_TARGET_CPUTYPE}
 .error CPUTYPE global should be set with ?=.
 .endif
@@ -182,14 +182,14 @@
 		${BMAKEENV} ${MAKE} -f Makefile.inc1 \
 		DESTDIR= \
 		BOOTSTRAPPING=${OSRELDATE} \
-		-DNOHTML -DNOINFO -DNOLINT -DNOMAN -DNOPIC -DNOPROFILE \
-		-DNOSHARED -DNO_CPU_CFLAGS -DNO_WARNS
+		-DNO_HTML -DNO_INFO -DNO_LINT -DNO_MAN -DNO_PIC -DNO_PROFILE \
+		-DNO_SHARED -DNO_CPU_CFLAGS -DNO_WARNS
 
 # build-tools stage
 TMAKE=		MAKEOBJDIRPREFIX=${OBJTREE} \
 		${BMAKEENV} ${MAKE} -f Makefile.inc1 \
 		DESTDIR= \
-		BOOTSTRAPPING=${OSRELDATE} -DNOLINT -DNO_CPU_CFLAGS -DNO_WARNS
+		BOOTSTRAPPING=${OSRELDATE} -DNO_LINT -DNO_CPU_CFLAGS -DNO_WARNS
 
 # cross-tools stage
 XMAKE=		TOOLS_PREFIX=${WORLDTMP} ${BMAKE} -DNO_FORTRAN -DNO_GDB
@@ -231,7 +231,7 @@
 		SHLIBDIR=/usr/lib32
 
 LIB32MAKE=	${LIB32MAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT \
-		-DNO_BIND -DNOMAN -DNODOC -DNOINFO -DNOHTML \
+		-DNO_BIND -DNO_MAN -DNO_INFO -DNO_HTML \
 		CC="cc ${LIB32CC}" \
 		CXX="c++ ${LIB32CXX}" \
 		OBJC="cc ${LIB32OBJC}" \
@@ -273,7 +273,7 @@
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Rebuilding the temporary build tree"
 	@echo "--------------------------------------------------------------"
-.if !defined(NOCLEAN)
+.if !defined(NO_CLEAN)
 	rm -rf ${WORLDTMP}
 .else
 	rm -rf ${WORLDTMP}/legacy/usr/include
@@ -327,7 +327,7 @@
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; ${BMAKE} bootstrap-tools
 _cleanobj:
-.if !defined(NOCLEAN)
+.if !defined(NO_CLEAN)
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 2.1: cleaning up the object tree"
@@ -364,7 +364,7 @@
 	@echo ">>> stage 4.2: building libraries"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; \
-	    ${WMAKE} -DNOFSCHG -DNOHTML -DNOINFO -DNOLINT -DNOMAN -DNOPROFILE \
+	    ${WMAKE} -DNO_FSCHG -DNO_HTML -DNO_INFO -DNO_LINT -DNO_MAN -DNO_PROFILE \
 	    libraries
 _depend:
 	@echo
@@ -393,7 +393,7 @@
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
 	    -p ${LIB32TMP}/usr/include >/dev/null
 	ln -sf ${.CURDIR}/sys ${WORLDTMP}
-.if !defined(NO_KERBEROS) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.if !defined(NO_KERBEROS) && !defined(NO_CRYPT) && !defined(NO_OPENSSL)
 .for _t in obj depend all
 	cd ${.CURDIR}/kerberos5/tools; \
 	    MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} ${_t}
@@ -406,11 +406,11 @@
 	    ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t}
 	cd ${.CURDIR}/gnu/lib; \
 	    ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t}
-.if !defined(NOCRYPT)
+.if !defined(NO_CRYPT)
 	cd ${.CURDIR}/secure/lib; \
 	    ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t}
 .endif
-.if !defined(NO_KERBEROS) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.if !defined(NO_KERBEROS) && !defined(NO_CRYPT) && !defined(NO_OPENSSL)
 	cd ${.CURDIR}/kerberos5/lib; \
 	    ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t}
 .endif
@@ -436,7 +436,7 @@
 	mkdir -p ${DESTDIR}/usr/lib32	# XXX add to mtree
 	cd ${.CURDIR}/lib; ${LIB32MAKE} install
 	cd ${.CURDIR}/gnu/lib; ${LIB32MAKE} install
-.if !defined(NOCRYPT)
+.if !defined(NO_CRYPT)
 	cd ${.CURDIR}/secure/lib; ${LIB32MAKE} install
 .endif
 	cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIB32MAKE} install
@@ -666,7 +666,7 @@
 		    config ${CONFIGARGS} -d ${KRNLOBJDIR}/${_kernel} \
 			${KERNCONFDIR}/${_kernel}
 .endif
-.if !defined(NOCLEAN) && !defined(NO_KERNELCLEAN)
+.if !defined(NO_CLEAN) && !defined(NO_KERNELCLEAN)
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 2.1: cleaning up the object tree"
@@ -741,7 +741,7 @@
 #

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


More information about the p4-projects mailing list