PERFORCE change 93753 for review
Peter Wemm
peter at FreeBSD.org
Tue Mar 21 22:05:55 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=93753
Change 93753 by peter at peter_melody on 2006/03/21 22:05:39
IFC @93746
Affected files ...
.. //depot/projects/hammer/Makefile#38 integrate
.. //depot/projects/hammer/Makefile.inc1#114 integrate
.. //depot/projects/hammer/UPDATING#93 integrate
.. //depot/projects/hammer/bin/Makefile#5 integrate
.. //depot/projects/hammer/bin/Makefile.inc#9 integrate
.. //depot/projects/hammer/bin/csh/Makefile#10 integrate
.. //depot/projects/hammer/bin/ed/Makefile#10 integrate
.. //depot/projects/hammer/contrib/bind9/FREEBSD-Upgrade#8 integrate
.. //depot/projects/hammer/contrib/libbegemot/rpoll.man#2 integrate
.. //depot/projects/hammer/contrib/pf/pflogd/pflogd.c#8 integrate
.. //depot/projects/hammer/contrib/tcsh/FREEBSD-Xlist#3 integrate
.. //depot/projects/hammer/crypto/openssh/FREEBSD-upgrade#10 integrate
.. //depot/projects/hammer/etc/Makefile#49 integrate
.. //depot/projects/hammer/etc/devd.conf#26 integrate
.. //depot/projects/hammer/etc/hosts.allow#5 integrate
.. //depot/projects/hammer/etc/mtree/BSD.include.dist#39 integrate
.. //depot/projects/hammer/etc/mtree/Makefile#5 integrate
.. //depot/projects/hammer/etc/rc.d/Makefile#47 integrate
.. //depot/projects/hammer/etc/rc.d/kernel#1 branch
.. //depot/projects/hammer/etc/rc.d/nsswitch#5 integrate
.. //depot/projects/hammer/etc/rc.d/syscons#9 integrate
.. //depot/projects/hammer/games/factor/Makefile#8 integrate
.. //depot/projects/hammer/gnu/lib/Makefile#4 integrate
.. //depot/projects/hammer/gnu/lib/libdialog/Makefile#9 integrate
.. //depot/projects/hammer/gnu/lib/libg2c/Makefile#9 integrate
.. //depot/projects/hammer/gnu/lib/libgcc/Makefile#13 integrate
.. //depot/projects/hammer/gnu/lib/libgcov/Makefile#4 integrate
.. //depot/projects/hammer/gnu/lib/libobjc/Makefile#15 integrate
.. //depot/projects/hammer/gnu/usr.bin/Makefile#14 integrate
.. //depot/projects/hammer/gnu/usr.bin/bc/Makefile#4 integrate
.. //depot/projects/hammer/gnu/usr.bin/cc/Makefile#5 integrate
.. //depot/projects/hammer/gnu/usr.bin/cc/cc_tools/Makefile#20 integrate
.. //depot/projects/hammer/gnu/usr.bin/cvs/cvs/Makefile#13 integrate
.. //depot/projects/hammer/gnu/usr.bin/dialog/Makefile#4 integrate
.. //depot/projects/hammer/include/Makefile#55 integrate
.. //depot/projects/hammer/include/arpa/inet.h#3 integrate
.. //depot/projects/hammer/include/arpa/nameser.h#3 integrate
.. //depot/projects/hammer/include/arpa/nameser_compat.h#2 integrate
.. //depot/projects/hammer/include/netdb.h#15 integrate
.. //depot/projects/hammer/include/resolv.h#9 integrate
.. //depot/projects/hammer/kerberos5/Makefile#7 integrate
.. //depot/projects/hammer/kerberos5/lib/libgssapi/Makefile#7 integrate
.. //depot/projects/hammer/lib/Makefile#57 integrate
.. //depot/projects/hammer/lib/bind/bind/Makefile#5 integrate
.. //depot/projects/hammer/lib/bind/bind9/Makefile#5 integrate
.. //depot/projects/hammer/lib/bind/config.mk#8 integrate
.. //depot/projects/hammer/lib/bind/dns/Makefile#6 integrate
.. //depot/projects/hammer/lib/bind/isc/Makefile#6 integrate
.. //depot/projects/hammer/lib/bind/isccc/Makefile#5 integrate
.. //depot/projects/hammer/lib/bind/isccfg/Makefile#5 integrate
.. //depot/projects/hammer/lib/bind/lwres/Makefile#6 integrate
.. //depot/projects/hammer/lib/libarchive/Makefile#33 integrate
.. //depot/projects/hammer/lib/libarchive/archive.h.in#11 integrate
.. //depot/projects/hammer/lib/libarchive/archive_entry.c#23 integrate
.. //depot/projects/hammer/lib/libarchive/archive_entry.h#16 integrate
.. //depot/projects/hammer/lib/libarchive/archive_read_extract.c#26 integrate
.. //depot/projects/hammer/lib/libarchive/archive_read_support_format_cpio.c#15 integrate
.. //depot/projects/hammer/lib/libarchive/archive_read_support_format_iso9660.c#9 integrate
.. //depot/projects/hammer/lib/libarchive/archive_read_support_format_tar.c#26 integrate
.. //depot/projects/hammer/lib/libarchive/archive_write_set_format_pax.c#26 integrate
.. //depot/projects/hammer/lib/libarchive/tar.5#12 integrate
.. //depot/projects/hammer/lib/libc/Makefile#24 integrate
.. //depot/projects/hammer/lib/libc/alpha/Makefile.inc#5 integrate
.. //depot/projects/hammer/lib/libc/amd64/Makefile.inc#6 integrate
.. //depot/projects/hammer/lib/libc/ia64/Makefile.inc#5 integrate
.. //depot/projects/hammer/lib/libc/include/isc/eventlib.h#1 branch
.. //depot/projects/hammer/lib/libc/include/port_after.h#1 branch
.. //depot/projects/hammer/lib/libc/include/port_before.h#1 branch
.. //depot/projects/hammer/lib/libc/include/resolv_mt.h#1 branch
.. //depot/projects/hammer/lib/libc/inet/Makefile.inc#1 branch
.. //depot/projects/hammer/lib/libc/inet/Symbol.map#1 branch
.. //depot/projects/hammer/lib/libc/inet/inet_addr.c#1 branch
.. //depot/projects/hammer/lib/libc/inet/inet_cidr_ntop.c#1 branch
.. //depot/projects/hammer/lib/libc/inet/inet_cidr_pton.c#1 branch
.. //depot/projects/hammer/lib/libc/inet/inet_lnaof.c#1 branch
.. //depot/projects/hammer/lib/libc/inet/inet_makeaddr.c#1 branch
.. //depot/projects/hammer/lib/libc/inet/inet_net_ntop.c#1 branch
.. //depot/projects/hammer/lib/libc/inet/inet_net_pton.c#1 branch
.. //depot/projects/hammer/lib/libc/inet/inet_neta.c#1 branch
.. //depot/projects/hammer/lib/libc/inet/inet_netof.c#1 branch
.. //depot/projects/hammer/lib/libc/inet/inet_network.c#1 branch
.. //depot/projects/hammer/lib/libc/inet/inet_ntoa.c#1 branch
.. //depot/projects/hammer/lib/libc/inet/inet_ntop.c#1 branch
.. //depot/projects/hammer/lib/libc/inet/inet_pton.c#1 branch
.. //depot/projects/hammer/lib/libc/inet/nsap_addr.c#1 branch
.. //depot/projects/hammer/lib/libc/isc/Makefile.inc#1 branch
.. //depot/projects/hammer/lib/libc/isc/ev_streams.c#1 branch
.. //depot/projects/hammer/lib/libc/isc/ev_timers.c#1 branch
.. //depot/projects/hammer/lib/libc/isc/eventlib_p.h#1 branch
.. //depot/projects/hammer/lib/libc/nameser/Makefile.inc#1 branch
.. //depot/projects/hammer/lib/libc/nameser/Symbol.map#1 branch
.. //depot/projects/hammer/lib/libc/nameser/ns_name.c#1 branch
.. //depot/projects/hammer/lib/libc/nameser/ns_netint.c#1 branch
.. //depot/projects/hammer/lib/libc/nameser/ns_parse.c#1 branch
.. //depot/projects/hammer/lib/libc/nameser/ns_print.c#1 branch
.. //depot/projects/hammer/lib/libc/nameser/ns_samedomain.c#1 branch
.. //depot/projects/hammer/lib/libc/nameser/ns_ttl.c#1 branch
.. //depot/projects/hammer/lib/libc/net/Makefile.inc#14 integrate
.. //depot/projects/hammer/lib/libc/net/Symbol.map#2 integrate
.. //depot/projects/hammer/lib/libc/net/getaddrinfo.c#26 integrate
.. //depot/projects/hammer/lib/libc/net/gethostbydns.c#12 integrate
.. //depot/projects/hammer/lib/libc/net/gethostbyht.c#4 integrate
.. //depot/projects/hammer/lib/libc/net/gethostbynis.c#6 integrate
.. //depot/projects/hammer/lib/libc/net/gethostnamadr.c#5 integrate
.. //depot/projects/hammer/lib/libc/net/getnetbydns.c#8 integrate
.. //depot/projects/hammer/lib/libc/net/getnetbyht.c#6 integrate
.. //depot/projects/hammer/lib/libc/net/getnetbynis.c#5 integrate
.. //depot/projects/hammer/lib/libc/net/herror.c#3 delete
.. //depot/projects/hammer/lib/libc/net/inet_addr.c#2 delete
.. //depot/projects/hammer/lib/libc/net/inet_lnaof.c#2 delete
.. //depot/projects/hammer/lib/libc/net/inet_makeaddr.c#2 delete
.. //depot/projects/hammer/lib/libc/net/inet_net_ntop.c#3 delete
.. //depot/projects/hammer/lib/libc/net/inet_net_pton.c#4 delete
.. //depot/projects/hammer/lib/libc/net/inet_neta.c#3 delete
.. //depot/projects/hammer/lib/libc/net/inet_netof.c#2 delete
.. //depot/projects/hammer/lib/libc/net/inet_network.c#2 delete
.. //depot/projects/hammer/lib/libc/net/inet_ntoa.c#2 delete
.. //depot/projects/hammer/lib/libc/net/inet_ntop.c#3 delete
.. //depot/projects/hammer/lib/libc/net/inet_pton.c#4 delete
.. //depot/projects/hammer/lib/libc/net/name6.c#20 integrate
.. //depot/projects/hammer/lib/libc/net/netdb_private.h#5 integrate
.. //depot/projects/hammer/lib/libc/net/ns_name.c#3 delete
.. //depot/projects/hammer/lib/libc/net/ns_netint.c#2 delete
.. //depot/projects/hammer/lib/libc/net/ns_parse.c#2 delete
.. //depot/projects/hammer/lib/libc/net/ns_print.c#2 delete
.. //depot/projects/hammer/lib/libc/net/ns_ttl.c#3 delete
.. //depot/projects/hammer/lib/libc/net/nsap_addr.c#2 delete
.. //depot/projects/hammer/lib/libc/net/res_comp.c#4 delete
.. //depot/projects/hammer/lib/libc/net/res_config.h#2 integrate
.. //depot/projects/hammer/lib/libc/net/res_data.c#2 delete
.. //depot/projects/hammer/lib/libc/net/res_debug.c#4 delete
.. //depot/projects/hammer/lib/libc/net/res_init.c#6 delete
.. //depot/projects/hammer/lib/libc/net/res_mkquery.c#3 delete
.. //depot/projects/hammer/lib/libc/net/res_mkupdate.c#4 integrate
.. //depot/projects/hammer/lib/libc/net/res_query.c#7 delete
.. //depot/projects/hammer/lib/libc/net/res_send.c#8 delete
.. //depot/projects/hammer/lib/libc/net/res_send_private.h#2 delete
.. //depot/projects/hammer/lib/libc/net/res_update.c#3 integrate
.. //depot/projects/hammer/lib/libc/net/res_update.h#1 branch
.. //depot/projects/hammer/lib/libc/resolv/Makefile.inc#1 branch
.. //depot/projects/hammer/lib/libc/resolv/Symbol.map#1 branch
.. //depot/projects/hammer/lib/libc/resolv/h_errno.c#1 branch
.. //depot/projects/hammer/lib/libc/resolv/herror.c#1 branch
.. //depot/projects/hammer/lib/libc/resolv/mtctxres.c#1 branch
.. //depot/projects/hammer/lib/libc/resolv/res_comp.c#1 branch
.. //depot/projects/hammer/lib/libc/resolv/res_data.c#1 branch
.. //depot/projects/hammer/lib/libc/resolv/res_debug.c#1 branch
.. //depot/projects/hammer/lib/libc/resolv/res_debug.h#1 branch
.. //depot/projects/hammer/lib/libc/resolv/res_init.c#1 branch
.. //depot/projects/hammer/lib/libc/resolv/res_mkquery.c#1 branch
.. //depot/projects/hammer/lib/libc/resolv/res_private.h#1 branch
.. //depot/projects/hammer/lib/libc/resolv/res_query.c#1 branch
.. //depot/projects/hammer/lib/libc/resolv/res_send.c#1 branch
.. //depot/projects/hammer/lib/libc/resolv/res_state.c#1 branch
.. //depot/projects/hammer/lib/libc/sparc64/Makefile.inc#5 integrate
.. //depot/projects/hammer/lib/libc/stdlib/malloc.3#9 integrate
.. //depot/projects/hammer/lib/libc/stdlib/malloc.c#24 integrate
.. //depot/projects/hammer/lib/libc/stdlib/strtonum.3#2 integrate
.. //depot/projects/hammer/lib/libc_r/Makefile#12 integrate
.. //depot/projects/hammer/lib/libcrypt/Makefile#9 integrate
.. //depot/projects/hammer/lib/libfetch/Makefile#13 integrate
.. //depot/projects/hammer/lib/libgpib/Makefile#4 integrate
.. //depot/projects/hammer/lib/libio/Makefile#4 integrate
.. //depot/projects/hammer/lib/libipsec/Makefile#8 integrate
.. //depot/projects/hammer/lib/libmilter/Makefile#5 integrate
.. //depot/projects/hammer/lib/libncp/Makefile#7 integrate
.. //depot/projects/hammer/lib/libncurses/Makefile#18 integrate
.. //depot/projects/hammer/lib/libpam/modules/Makefile.inc#6 integrate
.. //depot/projects/hammer/lib/libpam/modules/modules.inc#11 integrate
.. //depot/projects/hammer/lib/libpam/modules/pam_nologin/pam_nologin.c#2 integrate
.. //depot/projects/hammer/lib/libpam/modules/pam_unix/Makefile#4 integrate
.. //depot/projects/hammer/lib/libpcap/Makefile#9 integrate
.. //depot/projects/hammer/lib/libpmc/libpmc.c#6 integrate
.. //depot/projects/hammer/lib/libpmc/pmc.3#9 integrate
.. //depot/projects/hammer/lib/libpthread/Makefile#20 integrate
.. //depot/projects/hammer/lib/libradius/Makefile#11 integrate
.. //depot/projects/hammer/lib/librpcsvc/Makefile#9 integrate
.. //depot/projects/hammer/lib/librt/Makefile#2 integrate
.. //depot/projects/hammer/lib/libsm/Makefile#9 integrate
.. //depot/projects/hammer/lib/libsmb/Makefile#9 integrate
.. //depot/projects/hammer/lib/libtelnet/Makefile#7 integrate
.. //depot/projects/hammer/lib/libthr/Makefile#16 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_init.c#21 integrate
.. //depot/projects/hammer/lib/libwrap/Makefile#10 integrate
.. //depot/projects/hammer/libexec/Makefile#31 integrate
.. //depot/projects/hammer/libexec/ftpd/Makefile#7 integrate
.. //depot/projects/hammer/libexec/lukemftpd/Makefile#11 integrate
.. //depot/projects/hammer/libexec/tcpd/Makefile#6 integrate
.. //depot/projects/hammer/libexec/telnetd/Makefile#7 integrate
.. //depot/projects/hammer/release/Makefile#84 integrate
.. //depot/projects/hammer/release/picobsd/bridge/crunch.conf#7 integrate
.. //depot/projects/hammer/release/picobsd/tinyware/login/Makefile#5 integrate
.. //depot/projects/hammer/release/scripts/kernels-install.sh#2 integrate
.. //depot/projects/hammer/release/scripts/package-split.py#7 integrate
.. //depot/projects/hammer/rescue/librescue/Makefile#7 integrate
.. //depot/projects/hammer/rescue/rescue/Makefile#28 integrate
.. //depot/projects/hammer/sbin/Makefile#40 integrate
.. //depot/projects/hammer/sbin/Makefile.inc#8 integrate
.. //depot/projects/hammer/sbin/atacontrol/atacontrol.c#22 integrate
.. //depot/projects/hammer/sbin/geom/class/Makefile#8 integrate
.. //depot/projects/hammer/sbin/ggate/Makefile#3 integrate
.. //depot/projects/hammer/sbin/ifconfig/Makefile#8 integrate
.. //depot/projects/hammer/sbin/mount_nfs/mount_nfs.c#11 integrate
.. //depot/projects/hammer/secure/Makefile#7 integrate
.. //depot/projects/hammer/secure/Makefile.inc#5 integrate
.. //depot/projects/hammer/secure/lib/Makefile#8 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/Makefile#19 integrate
.. //depot/projects/hammer/secure/lib/libcrypto/Makefile.inc#10 integrate
.. //depot/projects/hammer/secure/lib/libssh/Makefile#15 integrate
.. //depot/projects/hammer/secure/libexec/Makefile#6 integrate
.. //depot/projects/hammer/secure/usr.bin/Makefile#7 integrate
.. //depot/projects/hammer/secure/usr.bin/ssh/Makefile#11 integrate
.. //depot/projects/hammer/secure/usr.sbin/Makefile#2 integrate
.. //depot/projects/hammer/secure/usr.sbin/sshd/Makefile#14 integrate
.. //depot/projects/hammer/share/Makefile#9 integrate
.. //depot/projects/hammer/share/doc/Makefile#4 integrate
.. //depot/projects/hammer/share/doc/smm/Makefile#3 integrate
.. //depot/projects/hammer/share/examples/Makefile#11 integrate
.. //depot/projects/hammer/share/examples/etc/make.conf#46 integrate
.. //depot/projects/hammer/share/examples/kld/syscall/test/Makefile#4 integrate
.. //depot/projects/hammer/share/man/Makefile#5 integrate
.. //depot/projects/hammer/share/man/man3/Makefile#15 integrate
.. //depot/projects/hammer/share/man/man4/ata.4#25 integrate
.. //depot/projects/hammer/share/man/man4/dcons.4#7 integrate
.. //depot/projects/hammer/share/man/man4/gre.4#6 integrate
.. //depot/projects/hammer/share/man/man4/ipw.4#10 integrate
.. //depot/projects/hammer/share/man/man4/iwi.4#12 integrate
.. //depot/projects/hammer/share/man/man5/Makefile#18 integrate
.. //depot/projects/hammer/share/man/man5/make.conf.5#44 integrate
.. //depot/projects/hammer/share/man/man5/nsswitch.conf.5#7 integrate
.. //depot/projects/hammer/share/man/man5/src.conf.5#1 branch
.. //depot/projects/hammer/share/man/man7/build.7#14 integrate
.. //depot/projects/hammer/share/man/man9/g_consumer.9#7 integrate
.. //depot/projects/hammer/share/man/man9/mbuf.9#25 integrate
.. //depot/projects/hammer/share/mk/Makefile#8 integrate
.. //depot/projects/hammer/share/mk/bsd.README#10 integrate
.. //depot/projects/hammer/share/mk/bsd.incs.mk#5 integrate
.. //depot/projects/hammer/share/mk/bsd.info.mk#8 integrate
.. //depot/projects/hammer/share/mk/bsd.lib.mk#27 integrate
.. //depot/projects/hammer/share/mk/bsd.libnames.mk#30 integrate
.. //depot/projects/hammer/share/mk/bsd.nls.mk#5 integrate
.. //depot/projects/hammer/share/mk/bsd.own.mk#8 integrate
.. //depot/projects/hammer/share/mk/bsd.prog.mk#17 integrate
.. //depot/projects/hammer/share/mk/version_gen.awk#1 branch
.. //depot/projects/hammer/sys/Makefile#11 integrate
.. //depot/projects/hammer/sys/alpha/linux/linux_dummy.c#5 integrate
.. //depot/projects/hammer/sys/alpha/linux/linux_proto.h#15 integrate
.. //depot/projects/hammer/sys/alpha/linux/linux_syscall.h#15 integrate
.. //depot/projects/hammer/sys/alpha/linux/linux_sysent.c#15 integrate
.. //depot/projects/hammer/sys/alpha/linux/linux_sysvec.c#15 integrate
.. //depot/projects/hammer/sys/alpha/linux/syscalls.master#15 integrate
.. //depot/projects/hammer/sys/amd64/amd64/io_apic.c#49 integrate
.. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#67 integrate
.. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#119 integrate
.. //depot/projects/hammer/sys/amd64/amd64/pmap.c#144 integrate
.. //depot/projects/hammer/sys/amd64/linux32/linux.h#2 integrate
.. //depot/projects/hammer/sys/amd64/linux32/linux32_proto.h#6 integrate
.. //depot/projects/hammer/sys/amd64/linux32/linux32_syscall.h#6 integrate
.. //depot/projects/hammer/sys/amd64/linux32/linux32_sysent.c#6 integrate
.. //depot/projects/hammer/sys/amd64/linux32/linux32_sysvec.c#12 integrate
.. //depot/projects/hammer/sys/amd64/linux32/syscalls.master#6 integrate
.. //depot/projects/hammer/sys/arm/at91/at91.c#2 integrate
.. //depot/projects/hammer/sys/arm/at91/at91_st.c#2 integrate
.. //depot/projects/hammer/sys/arm/at91/at91rm92reg.h#2 integrate
.. //depot/projects/hammer/sys/arm/at91/files.at91#2 integrate
.. //depot/projects/hammer/sys/arm/at91/if_ate.c#2 integrate
.. //depot/projects/hammer/sys/arm/at91/kb920x_machdep.c#2 integrate
.. //depot/projects/hammer/sys/arm/at91/ohci_atmelarm.c#1 branch
.. //depot/projects/hammer/sys/boot/Makefile#16 integrate
.. //depot/projects/hammer/sys/boot/alpha/common/Makefile.common#6 integrate
.. //depot/projects/hammer/sys/boot/i386/loader/Makefile#13 integrate
.. //depot/projects/hammer/sys/boot/ia64/efi/Makefile#3 integrate
.. //depot/projects/hammer/sys/boot/ia64/ski/Makefile#4 integrate
.. //depot/projects/hammer/sys/boot/pc98/loader/Makefile#11 integrate
.. //depot/projects/hammer/sys/boot/powerpc/loader/Makefile#10 integrate
.. //depot/projects/hammer/sys/boot/sparc64/loader/Makefile#9 integrate
.. //depot/projects/hammer/sys/cam/scsi/scsi_da.c#34 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_file.c#15 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_getcwd.c#14 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_ioctl.c#28 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_ipc.c#14 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_mib.c#8 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_misc.c#33 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_signal.c#13 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_socket.c#23 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_stats.c#25 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_sysctl.c#9 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_uid16.c#10 integrate
.. //depot/projects/hammer/sys/conf/files#139 integrate
.. //depot/projects/hammer/sys/conf/files.alpha#25 integrate
.. //depot/projects/hammer/sys/conf/files.sparc64#36 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-usb.c#2 integrate
.. //depot/projects/hammer/sys/dev/ata/atapi-fd.c#19 integrate
.. //depot/projects/hammer/sys/dev/atkbdc/psm.c#4 integrate
.. //depot/projects/hammer/sys/dev/bge/if_bge.c#66 integrate
.. //depot/projects/hammer/sys/dev/dc/if_dc.c#8 integrate
.. //depot/projects/hammer/sys/dev/dc/if_dcreg.h#4 integrate
.. //depot/projects/hammer/sys/dev/en/midway.c#25 integrate
.. //depot/projects/hammer/sys/dev/fatm/if_fatm.c#15 integrate
.. //depot/projects/hammer/sys/dev/hme/if_hme.c#27 integrate
.. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_mod.c#13 integrate
.. //depot/projects/hammer/sys/dev/mpt/mpt.c#13 integrate
.. //depot/projects/hammer/sys/dev/mpt/mpt_cam.c#6 integrate
.. //depot/projects/hammer/sys/dev/patm/if_patm_attach.c#11 integrate
.. //depot/projects/hammer/sys/dev/ral/rt2560.c#2 integrate
.. //depot/projects/hammer/sys/dev/ral/rt2661.c#2 integrate
.. //depot/projects/hammer/sys/dev/sound/isa/ad1816.c#14 integrate
.. //depot/projects/hammer/sys/dev/sound/pcm/dsp.c#27 integrate
.. //depot/projects/hammer/sys/dev/sound/pcm/mixer.c#20 integrate
.. //depot/projects/hammer/sys/dev/sound/pcm/sound.c#17 integrate
.. //depot/projects/hammer/sys/dev/sound/pcm/sound.h#18 integrate
.. //depot/projects/hammer/sys/dev/sound/pcm/vchan.c#12 integrate
.. //depot/projects/hammer/sys/dev/usb/ehci.c#25 integrate
.. //depot/projects/hammer/sys/dev/usb/umass.c#39 integrate
.. //depot/projects/hammer/sys/fs/fdescfs/fdesc_vnops.c#17 integrate
.. //depot/projects/hammer/sys/fs/fifofs/fifo_vnops.c#35 integrate
.. //depot/projects/hammer/sys/geom/mirror/g_mirror.c#30 integrate
.. //depot/projects/hammer/sys/geom/mirror/g_mirror.h#11 integrate
.. //depot/projects/hammer/sys/geom/mirror/g_mirror_ctl.c#9 integrate
.. //depot/projects/hammer/sys/geom/raid3/g_raid3.c#23 integrate
.. //depot/projects/hammer/sys/geom/raid3/g_raid3.h#12 integrate
.. //depot/projects/hammer/sys/geom/raid3/g_raid3_ctl.c#11 integrate
.. //depot/projects/hammer/sys/i386/i386/io_apic.c#20 integrate
.. //depot/projects/hammer/sys/i386/i386/local_apic.c#25 integrate
.. //depot/projects/hammer/sys/i386/i386/pmap.c#81 integrate
.. //depot/projects/hammer/sys/i386/linux/linux.h#5 integrate
.. //depot/projects/hammer/sys/i386/linux/linux_dummy.c#6 integrate
.. //depot/projects/hammer/sys/i386/linux/linux_proto.h#18 integrate
.. //depot/projects/hammer/sys/i386/linux/linux_syscall.h#18 integrate
.. //depot/projects/hammer/sys/i386/linux/linux_sysent.c#19 integrate
.. //depot/projects/hammer/sys/i386/linux/linux_sysvec.c#26 integrate
.. //depot/projects/hammer/sys/i386/linux/syscalls.master#18 integrate
.. //depot/projects/hammer/sys/kern/imgact_aout.c#16 integrate
.. //depot/projects/hammer/sys/kern/kern_descrip.c#57 integrate
.. //depot/projects/hammer/sys/kern/kern_environment.c#14 integrate
.. //depot/projects/hammer/sys/kern/kern_fork.c#54 integrate
.. //depot/projects/hammer/sys/kern/kern_mac.c#35 integrate
.. //depot/projects/hammer/sys/kern/kern_tc.c#21 integrate
.. //depot/projects/hammer/sys/kern/kern_thread.c#89 integrate
.. //depot/projects/hammer/sys/kern/uipc_mbuf.c#40 integrate
.. //depot/projects/hammer/sys/kern/uipc_socket.c#65 integrate
.. //depot/projects/hammer/sys/kern/uipc_socket2.c#40 integrate
.. //depot/projects/hammer/sys/kern/uipc_usrreq.c#40 integrate
.. //depot/projects/hammer/sys/kern/vfs_cluster.c#32 integrate
.. //depot/projects/hammer/sys/kern/vfs_subr.c#102 integrate
.. //depot/projects/hammer/sys/modules/Makefile#97 integrate
.. //depot/projects/hammer/sys/modules/acpi/acpi_video/Makefile#5 integrate
.. //depot/projects/hammer/sys/modules/ce/Makefile#3 integrate
.. //depot/projects/hammer/sys/modules/cp/Makefile#5 integrate
.. //depot/projects/hammer/sys/modules/dummynet/Makefile#4 integrate
.. //depot/projects/hammer/sys/modules/if_bridge/Makefile#3 integrate
.. //depot/projects/hammer/sys/modules/if_gif/Makefile#8 integrate
.. //depot/projects/hammer/sys/modules/ipfilter/Makefile#9 integrate
.. //depot/projects/hammer/sys/modules/ipfw/Makefile#7 integrate
.. //depot/projects/hammer/sys/modules/linux/Makefile#8 integrate
.. //depot/projects/hammer/sys/modules/netgraph/Makefile#19 integrate
.. //depot/projects/hammer/sys/modules/pf/Makefile#11 integrate
.. //depot/projects/hammer/sys/modules/pflog/Makefile#6 integrate
.. //depot/projects/hammer/sys/net/if.c#62 integrate
.. //depot/projects/hammer/sys/net/if_media.h#14 integrate
.. //depot/projects/hammer/sys/net/if_tap.c#28 integrate
.. //depot/projects/hammer/sys/net/route.h#15 integrate
.. //depot/projects/hammer/sys/net/rtsock.c#30 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_output.c#24 integrate
.. //depot/projects/hammer/sys/netatalk/ddp_pcb.c#7 integrate
.. //depot/projects/hammer/sys/netatalk/ddp_usrreq.c#15 integrate
.. //depot/projects/hammer/sys/netgraph/ng_tcpmss.c#2 integrate
.. //depot/projects/hammer/sys/netinet/in_pcb.h#25 integrate
.. //depot/projects/hammer/sys/netinet/ip_carp.c#19 integrate
.. //depot/projects/hammer/sys/netinet/ip_carp.h#2 integrate
.. //depot/projects/hammer/sys/netinet/ip_icmp.c#31 integrate
.. //depot/projects/hammer/sys/netinet/tcp_syncache.c#34 integrate
.. //depot/projects/hammer/sys/netinet6/in6.h#14 integrate
.. //depot/projects/hammer/sys/netinet6/in6_pcb.c#22 integrate
.. //depot/projects/hammer/sys/netinet6/nd6_rtr.c#14 integrate
.. //depot/projects/hammer/sys/netipsec/ipsec.h#9 integrate
.. //depot/projects/hammer/sys/netipsec/ipsec_mbuf.c#7 integrate
.. //depot/projects/hammer/sys/netipsec/xform_ah.c#7 integrate
.. //depot/projects/hammer/sys/netipsec/xform_esp.c#8 integrate
.. //depot/projects/hammer/sys/netipsec/xform_ipcomp.c#8 integrate
.. //depot/projects/hammer/sys/netnatm/natm.c#18 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_diskless.c#13 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_socket.c#35 integrate
.. //depot/projects/hammer/sys/security/audit/audit.c#2 integrate
.. //depot/projects/hammer/sys/security/audit/audit.h#2 integrate
.. //depot/projects/hammer/sys/security/audit/audit_arg.c#2 integrate
.. //depot/projects/hammer/sys/security/audit/audit_bsm.c#2 integrate
.. //depot/projects/hammer/sys/security/audit/audit_bsm_klib.c#2 integrate
.. //depot/projects/hammer/sys/security/audit/audit_ioctl.h#1 branch
.. //depot/projects/hammer/sys/security/audit/audit_pipe.c#2 integrate
.. //depot/projects/hammer/sys/security/audit/audit_private.h#2 integrate
.. //depot/projects/hammer/sys/security/audit/audit_syscalls.c#2 integrate
.. //depot/projects/hammer/sys/security/audit/audit_trigger.c#2 integrate
.. //depot/projects/hammer/sys/security/audit/audit_worker.c#1 branch
.. //depot/projects/hammer/sys/sys/event.h#14 integrate
.. //depot/projects/hammer/sys/sys/mbuf.h#52 integrate
.. //depot/projects/hammer/sys/sys/md5.h#5 integrate
.. //depot/projects/hammer/sys/sys/protosw.h#11 integrate
.. //depot/projects/hammer/sys/sys/socketvar.h#32 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_snapshot.c#42 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#58 integrate
.. //depot/projects/hammer/sys/ufs/ufs/ufs_vnops.c#41 integrate
.. //depot/projects/hammer/tools/build/options/WITHOUT_ACPI#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_ATM#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_AUDIT#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_AUTHPF#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_BIND#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_BIND_DNSSEC#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_BIND_ETC#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_BIND_LIBS_LWRES#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_BIND_MTREE#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_BIND_NAMED#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_BIND_UTILS#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_BLUETOOTH#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_BOOT#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_CALENDAR#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_CPP#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_CRYPT#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_CXX#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_DICT#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_DYNAMICROOT#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_EXAMPLES#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_FORTH#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_FORTRAN#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_FP_LIBC#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_GAMES#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_GCOV#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_GDB#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_GNU_SUPPORT#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_GPIB#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_GROFF#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_HTML#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_I4B#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_INET6#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_INET6_SUPPORT#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_INFO#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_IPFILTER#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_IPX#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_IPX_SUPPORT#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_KERBEROS#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_KERBEROS_SUPPORT#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_LIB32#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_LIBC_R#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_LIBPTHREAD#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_LIBTHR#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_LOCALES#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_LPR#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_MAILWRAPPER#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_MAN#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_NCP#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_NETCAT#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_NIS#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_NLS#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_NLS_CATALOGS#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_OBJC#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_OPENSSH#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_OPENSSL#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_PAM_SUPPORT#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_PCVT#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_PF#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_PROFILE#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_RCMDS#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_RCS#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_RESCUE#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_SENDMAIL#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_SETUID_LOGIN#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_SHAREDOCS#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_SYSCONS#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_TCSH#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_TOOLCHAIN#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_USB#1 branch
.. //depot/projects/hammer/tools/build/options/WITHOUT_WPA_SUPPLICANT_EAPOL#1 branch
.. //depot/projects/hammer/tools/build/options/WITH_BIND_LIBS#1 branch
.. //depot/projects/hammer/tools/build/options/WITH_HESIOD#1 branch
.. //depot/projects/hammer/tools/build/options/WITH_IDEA#1 branch
.. //depot/projects/hammer/tools/build/options/makeman#1 branch
.. //depot/projects/hammer/tools/lib32/README#3 delete
.. //depot/projects/hammer/tools/regression/aio/aiotest/Makefile#3 integrate
.. //depot/projects/hammer/tools/regression/aio/kqueue/Makefile#2 integrate
.. //depot/projects/hammer/tools/regression/aio/kqueue/lio/Makefile#3 integrate
.. //depot/projects/hammer/tools/regression/audit/audit_pipe_ioctl/Makefile#1 branch
.. //depot/projects/hammer/tools/regression/audit/audit_pipe_ioctl/audit_pipe_ioctl.c#1 branch
.. //depot/projects/hammer/tools/regression/lib/libc/resolv/Makefile#3 integrate
.. //depot/projects/hammer/tools/regression/mlock/Makefile#2 integrate
.. //depot/projects/hammer/tools/regression/netatalk/simple_send/simple_send.c#2 integrate
.. //depot/projects/hammer/tools/regression/netinet/msocket/Makefile#2 integrate
.. //depot/projects/hammer/tools/regression/netinet/msocket_ifnet_remove/Makefile#2 integrate
.. //depot/projects/hammer/tools/regression/netinet/tcpfullwindowrst/Makefile#3 integrate
.. //depot/projects/hammer/tools/regression/netinet/udpconnectjail/Makefile#3 integrate
.. //depot/projects/hammer/tools/regression/sockets/listenclose/Makefile#4 integrate
.. //depot/projects/hammer/tools/regression/sockets/reconnect/Makefile#3 integrate
.. //depot/projects/hammer/tools/regression/sockets/shutdown/Makefile#2 integrate
.. //depot/projects/hammer/tools/regression/sockets/sigpipe/Makefile#2 integrate
.. //depot/projects/hammer/tools/regression/tls/libxx/Makefile#4 integrate
.. //depot/projects/hammer/tools/regression/tls/libyy/Makefile#4 integrate
.. //depot/projects/hammer/tools/tools/ath/athdebug/Makefile#2 integrate
.. //depot/projects/hammer/tools/tools/ath/athstats/Makefile#2 integrate
.. //depot/projects/hammer/tools/tools/iwi/Makefile#2 integrate
.. //depot/projects/hammer/tools/tools/net80211/wlandebug/Makefile#2 integrate
.. //depot/projects/hammer/tools/tools/net80211/wlanstats/Makefile#2 integrate
.. //depot/projects/hammer/tools/tools/net80211/wlanwatch/Makefile#2 integrate
.. //depot/projects/hammer/tools/tools/netrate/juggle/Makefile#2 integrate
.. //depot/projects/hammer/tools/tools/tinderbox/tbmaster.pl#28 integrate
.. //depot/projects/hammer/tools/tools/umastat/Makefile#2 integrate
.. //depot/projects/hammer/usr.bin/Makefile#48 integrate
.. //depot/projects/hammer/usr.bin/basename/basename.1#4 integrate
.. //depot/projects/hammer/usr.bin/chkey/Makefile#5 integrate
.. //depot/projects/hammer/usr.bin/chpass/Makefile#5 integrate
.. //depot/projects/hammer/usr.bin/fetch/Makefile#8 integrate
.. //depot/projects/hammer/usr.bin/lex/lib/Makefile#4 integrate
.. //depot/projects/hammer/usr.bin/login/Makefile#6 integrate
.. //depot/projects/hammer/usr.bin/mkuzip/mkuzip.8#3 integrate
.. //depot/projects/hammer/usr.bin/netstat/Makefile#11 integrate
.. //depot/projects/hammer/usr.bin/newkey/Makefile#5 integrate
.. //depot/projects/hammer/usr.bin/passwd/Makefile#3 integrate
.. //depot/projects/hammer/usr.bin/systat/systat.1#8 integrate
.. //depot/projects/hammer/usr.bin/systat/vmstat.c#8 integrate
.. //depot/projects/hammer/usr.bin/tar/Makefile#16 integrate
.. //depot/projects/hammer/usr.bin/tar/bsdtar.c#27 integrate
.. //depot/projects/hammer/usr.bin/tar/bsdtar.h#14 integrate
.. //depot/projects/hammer/usr.bin/tar/bsdtar_platform.h#12 integrate
.. //depot/projects/hammer/usr.bin/tar/getdate.y#4 integrate
.. //depot/projects/hammer/usr.bin/tar/read.c#16 integrate
.. //depot/projects/hammer/usr.bin/tar/tree.c#4 integrate
.. //depot/projects/hammer/usr.bin/tar/util.c#9 integrate
.. //depot/projects/hammer/usr.bin/tar/write.c#20 integrate
.. //depot/projects/hammer/usr.bin/telnet/Makefile#7 integrate
.. //depot/projects/hammer/usr.sbin/Makefile#73 integrate
.. //depot/projects/hammer/usr.sbin/amd/Makefile.inc#7 integrate
.. //depot/projects/hammer/usr.sbin/amd/amd/Makefile#7 integrate
.. //depot/projects/hammer/usr.sbin/amd/include/Makefile#3 integrate
.. //depot/projects/hammer/usr.sbin/bluetooth/bthidd/Makefile#5 integrate
.. //depot/projects/hammer/usr.sbin/bluetooth/bthidd/client.c#3 integrate
.. //depot/projects/hammer/usr.sbin/bluetooth/bthidd/hid.c#4 integrate
.. //depot/projects/hammer/usr.sbin/bluetooth/bthidd/server.c#4 integrate
.. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/server.c#3 integrate
.. //depot/projects/hammer/usr.sbin/bootparamd/bootparamd/Makefile#6 integrate
.. //depot/projects/hammer/usr.sbin/bsnmpd/modules/Makefile#3 integrate
.. //depot/projects/hammer/usr.sbin/jail/jail.8#29 integrate
.. //depot/projects/hammer/usr.sbin/mailwrapper/Makefile#4 integrate
.. //depot/projects/hammer/usr.sbin/ntp/Makefile#7 integrate
.. //depot/projects/hammer/usr.sbin/ntp/Makefile.inc#8 integrate
.. //depot/projects/hammer/usr.sbin/ntp/doc/Makefile#5 integrate
.. //depot/projects/hammer/usr.sbin/ntp/ntp-keygen/Makefile#6 integrate
.. //depot/projects/hammer/usr.sbin/ntp/ntpd/Makefile#8 integrate
.. //depot/projects/hammer/usr.sbin/ntp/ntpdc/Makefile#6 integrate
.. //depot/projects/hammer/usr.sbin/ntp/ntpq/Makefile#7 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/Makefile#6 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/Makefile.inc#6 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/sign/sign.c#4 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/sign/x509.c#4 integrate
.. //depot/projects/hammer/usr.sbin/portsnap/portsnap/portsnap.sh#5 integrate
.. //depot/projects/hammer/usr.sbin/ppp/Makefile#11 integrate
.. //depot/projects/hammer/usr.sbin/pppd/Makefile#8 integrate
.. //depot/projects/hammer/usr.sbin/rpcbind/Makefile#4 integrate
.. //depot/projects/hammer/usr.sbin/sendmail/Makefile#15 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/keymap.c#3 integrate
.. //depot/projects/hammer/usr.sbin/tcpdchk/Makefile#5 integrate
.. //depot/projects/hammer/usr.sbin/tcpdmatch/Makefile#4 integrate
.. //depot/projects/hammer/usr.sbin/tcpdump/tcpdump/Makefile#11 integrate
.. //depot/projects/hammer/usr.sbin/vnconfig/Makefile#4 integrate
.. //depot/projects/hammer/usr.sbin/wpa/wpa_supplicant/Makefile#6 integrate
Differences ...
==== //depot/projects/hammer/Makefile#38 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile,v 1.326 2006/03/01 13:07:17 yar Exp $
+# $FreeBSD: src/Makefile,v 1.328 2006/03/18 14:30:23 ru Exp $
#
# The user-driven targets are:
#
@@ -73,10 +73,11 @@
hierarchy install installcheck installkernel installkernel.debug\
reinstallkernel reinstallkernel.debug installworld \
kernel-toolchain libraries lint maninstall \
- obj objlink regress rerelease tags toolchain update \
+ obj objlink regress rerelease showconfig tags toolchain update \
_worldtmp _legacy _bootstrap-tools _cleanobj _obj \
_build-tools _cross-tools _includes _libraries _depend \
build32 distribute32 install32
+TGTS+= ${SUBDIR_TARGETS}
BITGTS= files includes
BITGTS:=${BITGTS} ${BITGTS:S/^/build/} ${BITGTS:S/^/install/}
==== //depot/projects/hammer/Makefile.inc1#114 (text+ko) ====
@@ -1,21 +1,10 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.537 2006/03/09 12:55:02 keramida Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.543 2006/03/20 14:24:56 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
# -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_NLS do not build Native Language Support files
-# -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
# -DNO_KERNELDEPEND do not run ${MAKE} depend in ${MAKE} buildkernel
@@ -34,6 +23,8 @@
# /usr/share/mk. These include:
# obj depend all install clean cleandepend cleanobj
+.include <bsd.own.mk>
+
# We must do share/info early so that installation of info `dir'
# entries works correctly. Do it first since it is less likely to
# grow dependencies on include and lib than vice versa.
@@ -46,18 +37,18 @@
# We must do etc last for install/distribute to work.
#
SUBDIR= share/info include lib libexec bin
-.if !defined(NO_GAMES)
+.if ${MK_GAMES} != "no"
SUBDIR+=games
.endif
SUBDIR+=gnu
-.if !defined(NO_KERBEROS) && !defined(NO_CRYPT) && !defined(NO_OPENSSL)
+.if ${MK_KERBEROS} != "no"
SUBDIR+=kerberos5
.endif
-.if !defined(NO_RESCUE)
+.if ${MK_RESCUE} != "no"
SUBDIR+=rescue
.endif
SUBDIR+=sbin
-.if !defined(NO_CRYPT)
+.if ${MK_CRYPT} != "no"
SUBDIR+=secure
.endif
.if !defined(NO_SHARE)
@@ -88,8 +79,8 @@
CVS?= cvs
CVSFLAGS?= -A -P -d -I!
-SUP?= /usr/local/bin/cvsup
-SUPFLAGS?= -g -L 2 -P -
+SUP?= /usr/bin/csup
+SUPFLAGS?= -g -L 2
.if defined(SUPHOST)
SUPFLAGS+= -h ${SUPHOST}
.endif
@@ -186,8 +177,9 @@
${BMAKEENV} ${MAKE} -f Makefile.inc1 \
DESTDIR= \
BOOTSTRAPPING=${OSRELDATE} \
- -DNO_HTML -DNO_INFO -DNO_LINT -DNO_MAN -DNO_NLS -DNO_PIC \
- -DNO_PROFILE -DNO_SHARED -DNO_CPU_CFLAGS -DNO_WARNS
+ -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT -DWITHOUT_MAN \
+ -DWITHOUT_NLS -DNO_PIC -DWITHOUT_PROFILE -DNO_SHARED \
+ -DNO_CPU_CFLAGS -DNO_WARNS
# build-tools stage
TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \
@@ -196,7 +188,8 @@
BOOTSTRAPPING=${OSRELDATE} -DNO_LINT -DNO_CPU_CFLAGS -DNO_WARNS
# cross-tools stage
-XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} -DNO_FORTRAN -DNO_GDB
+XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \
+ -DWITHOUT_FORTRAN -DWITHOUT_GDB
# world stage
WMAKEENV= ${CROSSENV} \
@@ -241,7 +234,8 @@
SHLIBDIR=/usr/lib32
LIB32MAKE= ${LIB32MAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT \
- -DNO_BIND -DNO_MAN -DNO_NLS -DNO_INFO -DNO_HTML
+ -DWITHOUT_BIND -DWITHOUT_MAN -DWITHOUT_NLS -DWITHOUT_INFO \
+ -DWITHOUT_HTML
LIB32IMAKE= ${LIB32MAKE:NINSTALL=*} -DNO_INCS
.endif
@@ -318,7 +312,7 @@
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
-p ${WORLDTMP}/usr/include >/dev/null
ln -sf ${.CURDIR}/sys ${WORLDTMP}
-.if defined(WITH_BIND_LIBS) && !defined(NO_BIND)
+.if ${MK_BIND_LIBS} != "no"
mtree -deU -f ${.CURDIR}/etc/mtree/BIND.include.dist \
-p ${WORLDTMP}/usr/include >/dev/null
.endif
@@ -375,8 +369,8 @@
@echo ">>> stage 4.2: building libraries"
@echo "--------------------------------------------------------------"
${_+_}cd ${.CURDIR}; \
- ${WMAKE} -DNO_FSCHG -DNO_HTML -DNO_INFO -DNO_LINT -DNO_MAN \
- -DNO_NLS -DNO_PROFILE libraries
+ ${WMAKE} -DNO_FSCHG -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT \
+ -DWITHOUT_MAN -DWITHOUT_NLS -DWITHOUT_PROFILE libraries
_depend:
@echo
@echo "--------------------------------------------------------------"
@@ -405,7 +399,7 @@
-p ${LIB32TMP}/usr/include >/dev/null
mkdir -p ${WORLDTMP}
ln -sf ${.CURDIR}/sys ${WORLDTMP}
-.if !defined(NO_KERBEROS) && !defined(NO_CRYPT) && !defined(NO_OPENSSL)
+.if ${MK_KERBEROS} != "no"
.for _t in obj depend all
cd ${.CURDIR}/kerberos5/tools; \
MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} DESTDIR= ${_t}
@@ -422,11 +416,11 @@
${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t}
cd ${.CURDIR}/usr.bin/gcore; \
${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t}
-.if !defined(NO_CRYPT)
+.if ${MK_CRYPT} != "no"
cd ${.CURDIR}/secure/lib; \
${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t}
.endif
-.if !defined(NO_KERBEROS) && !defined(NO_CRYPT) && !defined(NO_OPENSSL)
+.if ${MK_KERBEROS} != "no"
cd ${.CURDIR}/kerberos5/lib; \
${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t}
.endif
@@ -460,7 +454,7 @@
.endif
cd ${.CURDIR}/lib; ${LIB32IMAKE} ${.TARGET:S/32$//}
cd ${.CURDIR}/gnu/lib; ${LIB32IMAKE} ${.TARGET:S/32$//}
-.if !defined(NO_CRYPT)
+.if ${MK_CRYPT} != "no"
cd ${.CURDIR}/secure/lib; ${LIB32IMAKE} ${.TARGET:S/32$//}
.endif
cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIB32IMAKE} ${.TARGET:S/32$//}
@@ -478,7 +472,7 @@
WMAKE_TGTS+= _cross-tools
.endif
WMAKE_TGTS+= _includes _libraries _depend everything
-.if ${TARGET_ARCH} == "amd64" && !defined(NO_LIB32)
+.if ${TARGET_ARCH} == "amd64" && ${MK_LIB32} != "no"
WMAKE_TGTS+= build32
.endif
@@ -519,11 +513,11 @@
#
CHECK_UIDS=
CHECK_GIDS= audit
-.if !defined(NO_SENDMAIL)
+.if ${MK_SENDMAIL} != "no"
CHECK_UIDS+= smmsp
CHECK_GIDS+= smmsp
.endif
-.if !defined(NO_PF)
+.if ${MK_PF} != "no"
CHECK_UIDS+= proxy
CHECK_GIDS+= proxy authpf
.endif
@@ -579,7 +573,7 @@
@echo ">>> Installing everything"
@echo "--------------------------------------------------------------"
${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install
-.if ${TARGET_ARCH} == "amd64" && !defined(NO_LIB32)
+.if ${TARGET_ARCH} == "amd64" && ${MK_LIB32} != "no"
${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install32
.endif
@@ -588,7 +582,7 @@
@echo ">>> Distributing everything"
@echo "--------------------------------------------------------------"
${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 distribute
-.if ${TARGET_ARCH} == "amd64" && !defined(NO_LIB32)
+.if ${TARGET_ARCH} == "amd64" && ${MK_LIB32} != "no"
${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 distribute32 DISTRIBUTION=lib32
.endif
@@ -794,11 +788,11 @@
#
# bootstrap-tools: Build tools needed for compatibility
#
-.if !defined(NO_GAMES)
+.if ${MK_GAMES} != "no"
_strfile= games/fortune/strfile
.endif
-.if !defined(NO_CXX)
+.if ${MK_CXX} != "no"
_gperf= gnu/usr.bin/gperf
.if ${BOOTSTRAPPING} < 700004
_groff= gnu/usr.bin/groff
@@ -827,7 +821,7 @@
_mklocale= usr.bin/mklocale
.endif
-.if !defined(NO_RESCUE) && \
+.if ${MK_RESCUE} != "no" && \
${BOOTSTRAPPING} < 600008
_crunchgen= usr.sbin/crunch/crunchgen
.endif
@@ -877,11 +871,11 @@
_share= share/syscons/scrnmaps
.endif
-.if !defined(NO_KERBEROS) && !defined(NO_CRYPT) && !defined(NO_OPENSSL)
+.if ${MK_KERBEROS} != "no"
_kerberos5_tools= kerberos5/tools
.endif
-.if !defined(NO_RESCUE)
+.if ${MK_RESCUE} != "no"
_rescue= rescue/rescue
.endif
@@ -918,7 +912,7 @@
.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
_btxld= usr.sbin/btxld
.endif
-.if !defined(NO_RESCUE) || defined(RELEASEDIR)
+.if ${MK_RESCUE} != "no" || defined(RELEASEDIR)
_crunchide= usr.sbin/crunch/crunchide
.endif
.if ${TARGET_ARCH} == "alpha"
@@ -981,7 +975,11 @@
_generic_libs= gnu/lib
-.if !defined(NO_KERBEROS) && !defined(NO_CRYPT) && !defined(NO_OPENSSL)
+.if ${MK_IPX} != "no"
+_prebuild_libs+= lib/libipx
+.endif
+
+.if ${MK_KERBEROS} != "no"
_prebuild_libs+= kerberos5/lib/libasn1
_prebuild_libs+= kerberos5/lib/libkrb5
_prebuild_libs+= kerberos5/lib/libroken
@@ -989,7 +987,7 @@
.endif
_prebuild_libs+= lib/libbz2 lib/libcom_err lib/libcrypt lib/libexpat \
- lib/libipx lib/libkiconv lib/libkvm lib/libmd \
+ lib/libkiconv lib/libkvm lib/libmd \
lib/libncurses lib/libnetgraph lib/libopie lib/libpam \
lib/libradius \
lib/libsbuf lib/libtacplus lib/libutil \
@@ -999,14 +997,14 @@
_generic_libs+= lib
-.if !defined(NO_CRYPT)
-.if !defined(NO_OPENSSL)
+.if ${MK_CRYPT} != "no"
+.if ${MK_OPENSSL} != "no"
_prebuild_libs+= secure/lib/libcrypto secure/lib/libssl
lib/libradius__L secure/lib/libssl__L: secure/lib/libcrypto__L
-.if !defined(NO_OPENSSH)
+.if ${MK_OPENSSH} != "no"
_prebuild_libs+= secure/lib/libssh
secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L
-.if !defined(NO_KERBEROS)
+.if ${MK_KERBEROS} != "no"
secure/lib/libssh__L: lib/libgssapi__L
.endif
.endif
@@ -1014,17 +1012,17 @@
_generic_libs+= secure/lib
.endif
-.if defined(NO_CRYPT) || defined(NO_OPENSSL)
+.if ${MK_OPENSSL} == "no"
lib/libradius__L: lib/libmd__L
.endif
-.if !defined(NO_NIS)
+.if ${MK_NIS} != "no"
_prebuild_libs+= lib/libypclnt
.endif
_generic_libs+= usr.bin/lex/lib
-.if ${MACHINE_ARCH} == "i386"
+.if ${MACHINE} == "i386"
_generic_libs+= usr.sbin/pcvt/keycap
.endif
@@ -1192,3 +1190,8 @@
.endif
+#
+# showconfig - show build configuration.
+#
+showconfig:
+ @${MAKE} -n -f bsd.own.mk -V dummy -dg1 | grep ^MK_ | sort
==== //depot/projects/hammer/UPDATING#93 (text+ko) ====
@@ -21,6 +21,19 @@
developers choose to disable these features on build machines
to maximize performance.
+20060317:
+ Most world/kernel related NO_* build options changed names.
+ New knobs have common prefixes WITHOUT_*/WITH_* (modelled
+ after FreeBSD ports) and should be set in /etc/src.conf
+ (the src.conf(5) manpage is provided). Full backwards
+ compatibility is maintained for the time being though it's
+ highly recommended to start moving old options out of the
+ system-wide /etc/make.conf file into the new /etc/src.conf
+ while also properly renaming them. More conversions will
+ likely follow. Posting to current@:
+
+ http://lists.freebsd.org/pipermail/freebsd-current/2006-March/061725.html
+
20060305:
The NETSMBCRYPTO kernel option has been retired because its
functionality is always included in NETSMB and smbfs.ko now.
@@ -530,4 +543,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.443 2006/03/10 18:40:31 imp Exp $
+$FreeBSD: src/UPDATING,v 1.444 2006/03/21 10:10:05 ru Exp $
==== //depot/projects/hammer/bin/Makefile#5 (text+ko) ====
@@ -1,5 +1,7 @@
# From: @(#)Makefile 8.1 (Berkeley) 5/31/93
-# $FreeBSD: src/bin/Makefile,v 1.25 2005/03/02 11:53:21 trhodes Exp $
+# $FreeBSD: src/bin/Makefile,v 1.26 2006/03/17 18:54:20 ru Exp $
+
+.include <bsd.own.mk>
SUBDIR= cat \
chflags \
@@ -37,15 +39,15 @@
sync \
test
-.if !defined(NO_RCMDS)
+.if ${MK_RCMDS} != "no"
_rcp= rcp
.endif
-.if !defined(NO_SENDMAIL)
+.if ${MK_SENDMAIL} != "no"
_rmail= rmail
.endif
-.if !defined(NO_TCSH)
+.if ${MK_TCSH} != "no"
_csh= csh
.endif
==== //depot/projects/hammer/bin/Makefile.inc#9 (text+ko) ====
@@ -1,9 +1,11 @@
# @(#)Makefile.inc 8.1 (Berkeley) 5/31/93
-# $FreeBSD: src/bin/Makefile.inc,v 1.22 2004/12/21 09:59:40 ru Exp $
+# $FreeBSD: src/bin/Makefile.inc,v 1.23 2006/03/17 18:54:20 ru Exp $
+
+.include <bsd.own.mk>
BINDIR?= /bin
WARNS?= 6
-.if defined(NO_DYNAMICROOT)
+.if ${MK_DYNAMICROOT} == "no"
NO_SHARED?= YES
.endif
==== //depot/projects/hammer/bin/csh/Makefile#10 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/bin/csh/Makefile,v 1.38 2006/02/19 06:40:29 ume Exp $
+# $FreeBSD: src/bin/csh/Makefile,v 1.40 2006/03/19 19:10:39 ru Exp $
# @(#)Makefile 8.1 (Berkeley) 5/31/93
#
# C Shell with process control; VM/UNIX VAX Makefile
@@ -6,6 +6,8 @@
#
# To profile, put -DPROF in DEFS and -pg in CFLAGS, and recompile.
+.include <bsd.own.mk>
+
TCSHDIR= ${.CURDIR}/../../contrib/tcsh
.PATH: ${TCSHDIR}
@@ -45,7 +47,7 @@
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list