Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 22 Dec 2004 04:05:50 GMT
From:      Sam Leffler <sam@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 67502 for review
Message-ID:  <200412220405.iBM45oFm005758@repoman.freebsd.org>

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

Change 67502 by sam@sam_ebb on 2004/12/22 04:05:42

	IFC @ 67501

Affected files ...

.. //depot/projects/wifi/Makefile#6 integrate
.. //depot/projects/wifi/Makefile.inc1#8 integrate
.. //depot/projects/wifi/UPDATING#8 integrate
.. //depot/projects/wifi/bin/Makefile.inc#2 integrate
.. //depot/projects/wifi/bin/ed/Makefile#2 integrate
.. //depot/projects/wifi/bin/rmail/Makefile#2 integrate
.. //depot/projects/wifi/contrib/bind9/FREEBSD-Upgrade#2 integrate
.. //depot/projects/wifi/etc/Makefile#2 integrate
.. //depot/projects/wifi/etc/defaults/Makefile#3 integrate
.. //depot/projects/wifi/etc/devd.conf#4 integrate
.. //depot/projects/wifi/etc/isdn/Makefile#2 integrate
.. //depot/projects/wifi/etc/mtree/Makefile#3 integrate
.. //depot/projects/wifi/etc/namedb/Makefile#3 integrate
.. //depot/projects/wifi/etc/pam.d/Makefile#3 integrate
.. //depot/projects/wifi/etc/periodic/Makefile.inc#2 integrate
.. //depot/projects/wifi/etc/rc.d/named#3 integrate
.. //depot/projects/wifi/games/factor/Makefile#2 integrate
.. //depot/projects/wifi/games/fortune/unstr/Makefile#3 integrate
.. //depot/projects/wifi/games/ppt/Makefile#3 integrate
.. //depot/projects/wifi/games/primes/Makefile#3 integrate
.. //depot/projects/wifi/gnu/Makefile.inc#3 integrate
.. //depot/projects/wifi/gnu/lib/libdialog/Makefile#2 integrate
.. //depot/projects/wifi/gnu/lib/libg2c/Makefile#2 integrate
.. //depot/projects/wifi/gnu/lib/libgcc/Makefile#3 integrate
.. //depot/projects/wifi/gnu/lib/libgcov/Makefile#3 integrate
.. //depot/projects/wifi/gnu/lib/libobjc/Makefile#3 integrate
.. //depot/projects/wifi/gnu/usr.bin/binutils/ar/Makefile#2 integrate
.. //depot/projects/wifi/gnu/usr.bin/binutils/as/Makefile#3 integrate
.. //depot/projects/wifi/gnu/usr.bin/binutils/gdb/Makefile#2 integrate
.. //depot/projects/wifi/gnu/usr.bin/binutils/gdbreplay/Makefile#3 integrate
.. //depot/projects/wifi/gnu/usr.bin/binutils/ld/Makefile#2 integrate
.. //depot/projects/wifi/gnu/usr.bin/binutils/ranlib/Makefile#2 integrate
.. //depot/projects/wifi/gnu/usr.bin/cc/c++/Makefile#3 integrate
.. //depot/projects/wifi/gnu/usr.bin/cc/c++filt/Makefile#4 integrate
.. //depot/projects/wifi/gnu/usr.bin/cc/cc/Makefile#2 integrate
.. //depot/projects/wifi/gnu/usr.bin/cc/cc1/Makefile#3 integrate
.. //depot/projects/wifi/gnu/usr.bin/cc/cc1obj/Makefile#3 integrate
.. //depot/projects/wifi/gnu/usr.bin/cc/cc1plus/Makefile#3 integrate
.. //depot/projects/wifi/gnu/usr.bin/cc/collect2/Makefile#2 integrate
.. //depot/projects/wifi/gnu/usr.bin/cc/f771/Makefile#2 integrate
.. //depot/projects/wifi/gnu/usr.bin/cc/include/Makefile#2 integrate
.. //depot/projects/wifi/gnu/usr.bin/cc/protoize/Makefile#2 integrate
.. //depot/projects/wifi/gnu/usr.bin/cvs/cvs/Makefile#2 integrate
.. //depot/projects/wifi/gnu/usr.bin/dialog/TESTS/Makefile#3 integrate
.. //depot/projects/wifi/gnu/usr.bin/gdb/Makefile.inc#4 integrate
.. //depot/projects/wifi/gnu/usr.bin/gdb/gdbtui/Makefile#4 integrate
.. //depot/projects/wifi/gnu/usr.bin/groff/font/devX100-12/Makefile#2 integrate
.. //depot/projects/wifi/gnu/usr.bin/groff/font/devX100/Makefile#2 integrate
.. //depot/projects/wifi/gnu/usr.bin/groff/font/devX75-12/Makefile#2 integrate
.. //depot/projects/wifi/gnu/usr.bin/groff/font/devX75/Makefile#2 integrate
.. //depot/projects/wifi/gnu/usr.bin/groff/src/devices/grohtml/Makefile#3 integrate
.. //depot/projects/wifi/gnu/usr.bin/groff/src/preproc/html/Makefile#3 integrate
.. //depot/projects/wifi/gnu/usr.bin/texinfo/infokey/Makefile#3 integrate
.. //depot/projects/wifi/include/arpa/Makefile#3 integrate
.. //depot/projects/wifi/include/protocols/Makefile#3 integrate
.. //depot/projects/wifi/kerberos5/Makefile.inc#2 integrate
.. //depot/projects/wifi/kerberos5/libexec/ipropd-master/Makefile#2 integrate
.. //depot/projects/wifi/kerberos5/libexec/ipropd-slave/Makefile#2 integrate
.. //depot/projects/wifi/kerberos5/tools/asn1_compile/Makefile#2 integrate
.. //depot/projects/wifi/kerberos5/tools/make-print-version/Makefile#2 integrate
.. //depot/projects/wifi/kerberos5/tools/make-roken/Makefile#2 integrate
.. //depot/projects/wifi/kerberos5/usr.bin/ksu/Makefile#3 integrate
.. //depot/projects/wifi/lib/Makefile#3 integrate
.. //depot/projects/wifi/lib/bind/config.mk#3 integrate
.. //depot/projects/wifi/lib/libarchive/archive_read_support_format_tar.c#3 integrate
.. //depot/projects/wifi/lib/libarchive/archive_write_set_format_pax.c#5 integrate
.. //depot/projects/wifi/lib/libbsnmp/modules/Makefile#2 integrate
.. //depot/projects/wifi/lib/libc_r/Makefile#3 integrate
.. //depot/projects/wifi/lib/libcompat/Makefile#2 integrate
.. //depot/projects/wifi/lib/libcrypt/Makefile#3 integrate
.. //depot/projects/wifi/lib/libdisk/Makefile#3 integrate
.. //depot/projects/wifi/lib/libfetch/Makefile#2 integrate
.. //depot/projects/wifi/lib/libio/Makefile#3 integrate
.. //depot/projects/wifi/lib/libipsec/Makefile#2 integrate
.. //depot/projects/wifi/lib/libmilter/Makefile#2 integrate
.. //depot/projects/wifi/lib/libncp/Makefile#2 integrate
.. //depot/projects/wifi/lib/libncurses/Makefile#3 integrate
.. //depot/projects/wifi/lib/libpam/libpam/Makefile#3 integrate
.. //depot/projects/wifi/lib/libpam/modules/Makefile.inc#3 integrate
.. //depot/projects/wifi/lib/libpam/modules/modules.inc#2 integrate
.. //depot/projects/wifi/lib/libpcap/Makefile#2 integrate
.. //depot/projects/wifi/lib/libpcap/config.h#2 integrate
.. //depot/projects/wifi/lib/libpthread/thread/thr_sigsuspend.c#3 integrate
.. //depot/projects/wifi/lib/libradius/Makefile#2 integrate
.. //depot/projects/wifi/lib/librpcsvc/Makefile#4 integrate
.. //depot/projects/wifi/lib/libsm/Makefile#3 integrate
.. //depot/projects/wifi/lib/libsmb/Makefile#3 integrate
.. //depot/projects/wifi/lib/libstand/Makefile#3 integrate
.. //depot/projects/wifi/lib/libtelnet/Makefile#3 integrate
.. //depot/projects/wifi/lib/libwrap/Makefile#3 integrate
.. //depot/projects/wifi/lib/liby/Makefile#3 integrate
.. //depot/projects/wifi/libexec/Makefile#3 integrate
.. //depot/projects/wifi/libexec/bootpd/bootpgw/Makefile#3 integrate
.. //depot/projects/wifi/libexec/ftpd/Makefile#2 integrate
.. //depot/projects/wifi/libexec/lukemftpd/Makefile#2 integrate
.. //depot/projects/wifi/libexec/pt_chown/Makefile#3 integrate
.. //depot/projects/wifi/libexec/save-entropy/Makefile#2 integrate
.. //depot/projects/wifi/libexec/tcpd/Makefile#2 integrate
.. //depot/projects/wifi/libexec/telnetd/Makefile#2 integrate
.. //depot/projects/wifi/release/Makefile#3 integrate
.. //depot/projects/wifi/release/picobsd/bridge/crunch.conf#2 integrate
.. //depot/projects/wifi/release/picobsd/build/picobsd#2 integrate
.. //depot/projects/wifi/release/picobsd/tinyware/aps/Makefile#3 integrate
.. //depot/projects/wifi/release/picobsd/tinyware/help/Makefile#3 integrate
.. //depot/projects/wifi/release/picobsd/tinyware/login/Makefile#4 integrate
.. //depot/projects/wifi/release/picobsd/tinyware/msg/Makefile#3 integrate
.. //depot/projects/wifi/release/picobsd/tinyware/ns/Makefile#3 integrate
.. //depot/projects/wifi/release/picobsd/tinyware/oinit/Makefile#3 integrate
.. //depot/projects/wifi/release/picobsd/tinyware/passwd/Makefile#2 integrate
.. //depot/projects/wifi/release/picobsd/tinyware/simple_httpd/Makefile#3 integrate
.. //depot/projects/wifi/release/picobsd/tinyware/sps/Makefile#3 integrate
.. //depot/projects/wifi/release/picobsd/tinyware/view/Makefile#3 integrate
.. //depot/projects/wifi/release/picobsd/tinyware/vm/Makefile#3 integrate
.. //depot/projects/wifi/rescue/rescue/Makefile#6 integrate
.. //depot/projects/wifi/sbin/Makefile#5 integrate
.. //depot/projects/wifi/sbin/Makefile.inc#2 integrate
.. //depot/projects/wifi/sbin/devd/Makefile#2 integrate
.. //depot/projects/wifi/sbin/geom/core/Makefile#2 integrate
.. //depot/projects/wifi/sbin/gvinum/Makefile#3 integrate
.. //depot/projects/wifi/sbin/init/Makefile#3 integrate
.. //depot/projects/wifi/sbin/mca/Makefile#3 integrate
.. //depot/projects/wifi/sbin/mount_cd9660/Makefile#2 integrate
.. //depot/projects/wifi/sbin/mount_msdosfs/Makefile#2 integrate
.. //depot/projects/wifi/sbin/mount_ntfs/Makefile#2 integrate
.. //depot/projects/wifi/sbin/mount_udf/Makefile#2 integrate
.. //depot/projects/wifi/sbin/mount_ufs/Makefile#2 integrate
.. //depot/projects/wifi/sbin/rtsol/Makefile#3 integrate
.. //depot/projects/wifi/secure/Makefile#2 integrate
.. //depot/projects/wifi/secure/lib/libcrypto/Makefile#3 integrate
.. //depot/projects/wifi/secure/lib/libssh/Makefile#4 integrate
.. //depot/projects/wifi/secure/lib/libssl/Makefile#3 integrate
.. //depot/projects/wifi/secure/usr.sbin/sshd/Makefile#3 integrate
.. //depot/projects/wifi/share/dict/Makefile#3 integrate
.. //depot/projects/wifi/share/doc/IPv6/Makefile#3 integrate
.. //depot/projects/wifi/share/doc/bind9/Makefile#3 integrate
.. //depot/projects/wifi/share/examples/FreeBSD_version/Makefile#2 integrate
.. //depot/projects/wifi/share/examples/Makefile#3 integrate
.. //depot/projects/wifi/share/examples/autofs/driver/Makefile#3 integrate
.. //depot/projects/wifi/share/examples/cvsup/ports-supfile#2 integrate
.. //depot/projects/wifi/share/examples/etc/make.conf#7 integrate
.. //depot/projects/wifi/share/examples/find_interface/Makefile#2 integrate
.. //depot/projects/wifi/share/examples/ipfilter/Makefile#3 integrate
.. //depot/projects/wifi/share/examples/isdn/v21/Makefile#3 integrate
.. //depot/projects/wifi/share/examples/kld/cdev/test/Makefile#2 integrate
.. //depot/projects/wifi/share/examples/kld/syscall/test/Makefile#3 integrate
.. //depot/projects/wifi/share/examples/libvgl/Makefile#3 integrate
.. //depot/projects/wifi/share/examples/perfmon/Makefile#2 integrate
.. //depot/projects/wifi/share/examples/pf/Makefile#3 integrate
.. //depot/projects/wifi/share/examples/ppi/Makefile#3 integrate
.. //depot/projects/wifi/share/examples/smbfs/Makefile#3 integrate
.. //depot/projects/wifi/share/examples/smbfs/print/Makefile#3 integrate
.. //depot/projects/wifi/share/info/Makefile#3 integrate
.. //depot/projects/wifi/share/man/Makefile#2 integrate
.. //depot/projects/wifi/share/man/man3/Makefile#2 integrate
.. //depot/projects/wifi/share/man/man4/Makefile#10 integrate
.. //depot/projects/wifi/share/man/man4/ata.4#2 integrate
.. //depot/projects/wifi/share/man/man4/aue.4#2 integrate
.. //depot/projects/wifi/share/man/man4/bpf.4#2 integrate
.. //depot/projects/wifi/share/man/man4/de.4#2 integrate
.. //depot/projects/wifi/share/man/man4/ef.4#2 integrate
.. //depot/projects/wifi/share/man/man4/lp.4#2 integrate
.. //depot/projects/wifi/share/man/man4/man4.i386/cs.4#2 integrate
.. //depot/projects/wifi/share/man/man4/man4.i386/ndis.4#2 integrate
.. //depot/projects/wifi/share/man/man4/man4.i386/ray.4#2 integrate
.. //depot/projects/wifi/share/man/man4/man4.i386/wl.4#2 integrate
.. //depot/projects/wifi/share/man/man4/ng_etf.4#2 integrate
.. //depot/projects/wifi/share/man/man4/ng_source.4#2 integrate
.. //depot/projects/wifi/share/man/man4/vlan.4#4 integrate
.. //depot/projects/wifi/share/man/man4/wi.4#2 integrate
.. //depot/projects/wifi/share/man/man4/xl.4#2 integrate
.. //depot/projects/wifi/share/man/man5/make.conf.5#6 integrate
.. //depot/projects/wifi/share/man/man8/picobsd.8#2 integrate
.. //depot/projects/wifi/share/misc/Makefile#3 integrate
.. //depot/projects/wifi/share/mk/Makefile#3 integrate
.. //depot/projects/wifi/share/mk/bsd.README#2 integrate
.. //depot/projects/wifi/share/mk/bsd.compat.mk#1 branch
.. //depot/projects/wifi/share/mk/bsd.dep.mk#2 integrate
.. //depot/projects/wifi/share/mk/bsd.doc.mk#2 integrate
.. //depot/projects/wifi/share/mk/bsd.info.mk#2 integrate
.. //depot/projects/wifi/share/mk/bsd.init.mk#2 integrate
.. //depot/projects/wifi/share/mk/bsd.lib.mk#2 integrate
.. //depot/projects/wifi/share/mk/bsd.libnames.mk#3 integrate
.. //depot/projects/wifi/share/mk/bsd.man.mk#2 integrate
.. //depot/projects/wifi/share/mk/bsd.obj.mk#2 integrate
.. //depot/projects/wifi/share/mk/bsd.pkg.mk#1 branch
.. //depot/projects/wifi/share/mk/bsd.prog.mk#4 integrate
.. //depot/projects/wifi/share/security/Makefile#3 integrate
.. //depot/projects/wifi/share/sendmail/Makefile#3 integrate
.. //depot/projects/wifi/share/skel/Makefile#3 integrate
.. //depot/projects/wifi/share/snmp/mibs/Makefile#3 integrate
.. //depot/projects/wifi/share/syscons/fonts/Makefile#3 integrate
.. //depot/projects/wifi/share/syscons/keymaps/Makefile#3 integrate
.. //depot/projects/wifi/sys/amd64/amd64/pmap.c#6 integrate
.. //depot/projects/wifi/sys/arm/xscale/i80321/i80321_pci.c#2 integrate
.. //depot/projects/wifi/sys/boot/Makefile#3 integrate
.. //depot/projects/wifi/sys/boot/alpha/boot1/Makefile#2 integrate
.. //depot/projects/wifi/sys/boot/alpha/cdboot/Makefile#2 integrate
.. //depot/projects/wifi/sys/boot/alpha/common/Makefile.common#2 integrate
.. //depot/projects/wifi/sys/boot/alpha/netboot/Makefile#2 integrate
.. //depot/projects/wifi/sys/boot/arc/loader/Makefile#2 integrate
.. //depot/projects/wifi/sys/boot/i386/boot0/Makefile#2 integrate
.. //depot/projects/wifi/sys/boot/i386/btx/btx/Makefile#2 integrate
.. //depot/projects/wifi/sys/boot/i386/btx/btxldr/Makefile#2 integrate
.. //depot/projects/wifi/sys/boot/i386/btx/lib/Makefile#2 integrate
.. //depot/projects/wifi/sys/boot/i386/cdboot/Makefile#2 integrate
.. //depot/projects/wifi/sys/boot/i386/kgzldr/Makefile#2 integrate
.. //depot/projects/wifi/sys/boot/i386/loader/Makefile#3 integrate
.. //depot/projects/wifi/sys/boot/i386/mbr/Makefile#2 integrate
.. //depot/projects/wifi/sys/boot/ia64/efi/Makefile#3 integrate
.. //depot/projects/wifi/sys/boot/ia64/ski/Makefile#2 integrate
.. //depot/projects/wifi/sys/boot/pc98/boot0.5/Makefile#2 integrate
.. //depot/projects/wifi/sys/boot/pc98/boot0/Makefile#2 integrate
.. //depot/projects/wifi/sys/boot/pc98/boot2/Makefile#2 integrate
.. //depot/projects/wifi/sys/boot/pc98/btx/btx/Makefile#2 integrate
.. //depot/projects/wifi/sys/boot/pc98/btx/btxldr/Makefile#2 integrate
.. //depot/projects/wifi/sys/boot/pc98/btx/lib/Makefile#2 integrate
.. //depot/projects/wifi/sys/boot/pc98/kgzldr/Makefile#2 integrate
.. //depot/projects/wifi/sys/boot/pc98/loader/Makefile#3 integrate
.. //depot/projects/wifi/sys/boot/powerpc/loader/Makefile#2 integrate
.. //depot/projects/wifi/sys/boot/sparc64/boot1/Makefile#2 integrate
.. //depot/projects/wifi/sys/boot/sparc64/loader/Makefile#2 integrate
.. //depot/projects/wifi/sys/conf/NOTES#7 integrate
.. //depot/projects/wifi/sys/conf/files.amd64#4 integrate
.. //depot/projects/wifi/sys/contrib/pf/net/pf.c#6 integrate
.. //depot/projects/wifi/sys/crypto/rijndael/Makefile#3 integrate
.. //depot/projects/wifi/sys/dev/acpica/acpi_cmbat.c#3 integrate
.. //depot/projects/wifi/sys/dev/acpica/acpi_pci_link.c#7 integrate
.. //depot/projects/wifi/sys/dev/aic7xxx/aicasm/Makefile#3 integrate
.. //depot/projects/wifi/sys/dev/fxp/if_fxp.c#3 integrate
.. //depot/projects/wifi/sys/dev/hptmv/entry.c#2 integrate
.. //depot/projects/wifi/sys/dev/ofw/ofw_disk.c#2 integrate
.. //depot/projects/wifi/sys/dev/patm/genrtab/Makefile#3 integrate
.. //depot/projects/wifi/sys/dev/usb/usbdevs#6 integrate
.. //depot/projects/wifi/sys/fs/devfs/devfs_vnops.c#11 integrate
.. //depot/projects/wifi/sys/geom/geom.h#5 integrate
.. //depot/projects/wifi/sys/geom/mirror/g_mirror.c#4 integrate
.. //depot/projects/wifi/sys/geom/mirror/g_mirror_ctl.c#2 integrate
.. //depot/projects/wifi/sys/geom/raid3/g_raid3.c#6 integrate
.. //depot/projects/wifi/sys/kern/tty.c#4 integrate
.. //depot/projects/wifi/sys/kern/vfs_mount.c#10 integrate
.. //depot/projects/wifi/sys/kern/vfs_subr.c#8 integrate
.. //depot/projects/wifi/sys/modules/Makefile#9 integrate
.. //depot/projects/wifi/sys/modules/acpi/acpi_video/Makefile#2 integrate
.. //depot/projects/wifi/sys/modules/cp/Makefile#2 integrate
.. //depot/projects/wifi/sys/modules/if_gif/Makefile#4 integrate
.. //depot/projects/wifi/sys/modules/ipfilter/Makefile#2 integrate
.. //depot/projects/wifi/sys/modules/netgraph/Makefile#3 integrate
.. //depot/projects/wifi/sys/modules/netgraph/fec/sample_startup#2 delete
.. //depot/projects/wifi/sys/modules/pf/Makefile#2 integrate
.. //depot/projects/wifi/sys/netgraph/ng_base.c#5 integrate
.. //depot/projects/wifi/sys/pci/if_sk.c#5 integrate
.. //depot/projects/wifi/sys/sys/vnode.h#8 integrate
.. //depot/projects/wifi/tools/KSE/ksetest/Makefile#2 integrate
.. //depot/projects/wifi/tools/KSE/rr/Makefile#2 integrate
.. //depot/projects/wifi/tools/diag/dumpvfscache/Makefile#3 integrate
.. //depot/projects/wifi/tools/diag/localeck/Makefile#3 integrate
.. //depot/projects/wifi/tools/regression/aio/aiotest/Makefile#2 integrate
.. //depot/projects/wifi/tools/regression/fsx/Makefile#3 integrate
.. //depot/projects/wifi/tools/regression/gaithrstress/Makefile#3 integrate
.. //depot/projects/wifi/tools/regression/geom/ConfCmp/Makefile#3 integrate
.. //depot/projects/wifi/tools/regression/geom/MdLoad/Makefile#3 integrate
.. //depot/projects/wifi/tools/regression/geom_mirror/test-1.sh#2 integrate
.. //depot/projects/wifi/tools/regression/geom_mirror/test-2.sh#2 integrate
.. //depot/projects/wifi/tools/regression/geom_mirror/test-3.sh#2 integrate
.. //depot/projects/wifi/tools/regression/geom_mirror/test-4.sh#2 integrate
.. //depot/projects/wifi/tools/regression/geom_mirror/test-5.sh#2 integrate
.. //depot/projects/wifi/tools/regression/geom_mirror/test-6.sh#2 integrate
.. //depot/projects/wifi/tools/regression/geom_mirror/test-7.sh#2 integrate
.. //depot/projects/wifi/tools/regression/geom_raid3/test-12.sh#2 integrate
.. //depot/projects/wifi/tools/regression/ia64_unaligned/Makefile#3 integrate
.. //depot/projects/wifi/tools/regression/include/tgmath/Makefile#3 integrate
.. //depot/projects/wifi/tools/regression/netatalk/simple_send/Makefile#3 integrate
.. //depot/projects/wifi/tools/regression/netinet/ipsockopt/Makefile#3 integrate
.. //depot/projects/wifi/tools/regression/netinet/tcpconnect/Makefile#3 integrate
.. //depot/projects/wifi/tools/regression/netinet/tcpfullwindowrst/Makefile#2 integrate
.. //depot/projects/wifi/tools/regression/netinet/tcpstream/Makefile#3 integrate
.. //depot/projects/wifi/tools/regression/nfsmmap/test1/Makefile#3 integrate
.. //depot/projects/wifi/tools/regression/nfsmmap/test2/Makefile#3 integrate
.. //depot/projects/wifi/tools/regression/p1003_1b/Makefile#3 integrate
.. //depot/projects/wifi/tools/regression/pipe/Makefile#3 integrate
.. //depot/projects/wifi/tools/regression/security/access/Makefile#3 integrate
.. //depot/projects/wifi/tools/regression/security/proc_to_proc/Makefile#3 integrate
.. //depot/projects/wifi/tools/regression/sockets/accept_fd_leak/Makefile#3 integrate
.. //depot/projects/wifi/tools/regression/sockets/accf_data_attach/Makefile#3 integrate
.. //depot/projects/wifi/tools/regression/sockets/kqueue/Makefile#2 integrate
.. //depot/projects/wifi/tools/regression/sockets/listenclose/Makefile#2 integrate
.. //depot/projects/wifi/tools/regression/sockets/socketpair/Makefile#3 integrate
.. //depot/projects/wifi/tools/regression/sysvmsg/Makefile#3 integrate
.. //depot/projects/wifi/tools/regression/sysvsem/Makefile#3 integrate
.. //depot/projects/wifi/tools/regression/sysvshm/Makefile#3 integrate
.. //depot/projects/wifi/tools/regression/tls/libxx/Makefile#3 integrate
.. //depot/projects/wifi/tools/regression/tls/libyy/Makefile#3 integrate
.. //depot/projects/wifi/tools/regression/tls/ttls1/Makefile#3 integrate
.. //depot/projects/wifi/tools/regression/tls/ttls2/Makefile#3 integrate
.. //depot/projects/wifi/tools/test/malloc/Makefile#3 integrate
.. //depot/projects/wifi/tools/test/ppsapi/Makefile#4 integrate
.. //depot/projects/wifi/tools/tools/aac/Makefile#3 integrate
.. //depot/projects/wifi/tools/tools/find-sb/Makefile#2 integrate
.. //depot/projects/wifi/tools/tools/gdb_regofs/Makefile#3 integrate
.. //depot/projects/wifi/tools/tools/ifinfo/Makefile#2 integrate
.. //depot/projects/wifi/tools/tools/ministat/Makefile#3 integrate
.. //depot/projects/wifi/tools/tools/nanobsd/make.conf#6 integrate
.. //depot/projects/wifi/tools/tools/netrate/Makefile.inc#1 branch
.. //depot/projects/wifi/tools/tools/netrate/netblast/Makefile#3 integrate
.. //depot/projects/wifi/tools/tools/netrate/netreceive/Makefile#3 integrate
.. //depot/projects/wifi/tools/tools/netrate/netsend/Makefile#3 integrate
.. //depot/projects/wifi/tools/tools/netrate/netsend/netsend.c#2 integrate
.. //depot/projects/wifi/tools/tools/pirtool/Makefile#3 integrate
.. //depot/projects/wifi/tools/tools/recoverdisk/Makefile#3 integrate
.. //depot/projects/wifi/tools/tools/syscall_timing/Makefile#3 integrate
.. //depot/projects/wifi/usr.bin/Makefile#3 integrate
.. //depot/projects/wifi/usr.bin/alias/Makefile#2 integrate
.. //depot/projects/wifi/usr.bin/bzip2recover/Makefile#2 integrate
.. //depot/projects/wifi/usr.bin/calendar/calendars/calendar.freebsd#6 integrate
.. //depot/projects/wifi/usr.bin/dirname/Makefile#3 integrate
.. //depot/projects/wifi/usr.bin/elf2aout/Makefile#3 integrate
.. //depot/projects/wifi/usr.bin/fetch/Makefile#2 integrate
.. //depot/projects/wifi/usr.bin/lessecho/Makefile#2 integrate
.. //depot/projects/wifi/usr.bin/lex/lib/Makefile#3 integrate
.. //depot/projects/wifi/usr.bin/limits/limits.c#2 integrate
.. //depot/projects/wifi/usr.bin/locate/bigram/Makefile#3 integrate
.. //depot/projects/wifi/usr.bin/locate/code/Makefile#3 integrate
.. //depot/projects/wifi/usr.bin/make/Makefile#6 integrate
.. //depot/projects/wifi/usr.bin/make/job.c#11 integrate
.. //depot/projects/wifi/usr.bin/tar/Makefile#4 integrate
.. //depot/projects/wifi/usr.bin/tar/fts.c#2 integrate
.. //depot/projects/wifi/usr.bin/telnet/Makefile#2 integrate
.. //depot/projects/wifi/usr.bin/unexpand/Makefile#3 integrate
.. //depot/projects/wifi/usr.bin/uudecode/Makefile#3 integrate
.. //depot/projects/wifi/usr.bin/vgrind/RETEST/Makefile#3 integrate
.. //depot/projects/wifi/usr.bin/xlint/lint2/Makefile#2 integrate
.. //depot/projects/wifi/usr.sbin/Makefile#3 integrate
.. //depot/projects/wifi/usr.sbin/bluetooth/bthidd/Makefile#4 integrate
.. //depot/projects/wifi/usr.sbin/bootparamd/callbootd/Makefile#3 integrate
.. //depot/projects/wifi/usr.sbin/burncd/burncd.8#2 integrate
.. //depot/projects/wifi/usr.sbin/burncd/burncd.c#3 integrate
.. //depot/projects/wifi/usr.sbin/crunch/examples/Makefile#3 integrate
.. //depot/projects/wifi/usr.sbin/ctm/ctm_dequeue/Makefile#3 integrate
.. //depot/projects/wifi/usr.sbin/ctm/ctm_smail/Makefile#3 integrate
.. //depot/projects/wifi/usr.sbin/ctm/mkCTM/Makefile#3 integrate
.. //depot/projects/wifi/usr.sbin/lpr/filters.ru/koi2855/Makefile#3 integrate
.. //depot/projects/wifi/usr.sbin/lpr/filters.ru/koi2alt/Makefile#3 integrate
.. //depot/projects/wifi/usr.sbin/lpr/filters/Makefile#3 integrate
.. //depot/projects/wifi/usr.sbin/lpr/lpd/printjob.c#3 integrate
.. //depot/projects/wifi/usr.sbin/mount_smbfs/Makefile#2 integrate
.. //depot/projects/wifi/usr.sbin/mrouted/testrsrr/Makefile#3 integrate
.. //depot/projects/wifi/usr.sbin/nologin/Makefile#2 integrate
.. //depot/projects/wifi/usr.sbin/ntp/Makefile#2 integrate
.. //depot/projects/wifi/usr.sbin/ntp/Makefile.inc#2 integrate
.. //depot/projects/wifi/usr.sbin/ntp/ntp-keygen/Makefile#3 integrate
.. //depot/projects/wifi/usr.sbin/ntp/ntpd/Makefile#3 integrate
.. //depot/projects/wifi/usr.sbin/ntp/ntpdate/Makefile#3 integrate
.. //depot/projects/wifi/usr.sbin/ntp/ntpdc/Makefile#3 integrate
.. //depot/projects/wifi/usr.sbin/ntp/ntpq/Makefile#3 integrate
.. //depot/projects/wifi/usr.sbin/ntp/ntptime/Makefile#3 integrate
.. //depot/projects/wifi/usr.sbin/ntp/ntptrace/Makefile#3 integrate
.. //depot/projects/wifi/usr.sbin/ntp/sntp/Makefile#3 integrate
.. //depot/projects/wifi/usr.sbin/pccard/Makefile.inc#2 integrate
.. //depot/projects/wifi/usr.sbin/pcvt/Misc/Doc/Makefile#3 integrate
.. //depot/projects/wifi/usr.sbin/pcvt/Misc/Etc/Makefile#3 integrate
.. //depot/projects/wifi/usr.sbin/pcvt/Misc/Makefile#3 integrate
.. //depot/projects/wifi/usr.sbin/pcvt/demo/Makefile#3 integrate
.. //depot/projects/wifi/usr.sbin/pcvt/kbdio/Makefile#3 integrate
.. //depot/projects/wifi/usr.sbin/pkg_install/Makefile#2 integrate
.. //depot/projects/wifi/usr.sbin/pkg_install/Makefile.inc#2 integrate
.. //depot/projects/wifi/usr.sbin/ppp/Makefile#3 integrate
.. //depot/projects/wifi/usr.sbin/ppp/main.c#3 integrate
.. //depot/projects/wifi/usr.sbin/pppd/Makefile#2 integrate
.. //depot/projects/wifi/usr.sbin/repquota/repquota.c#2 integrate
.. //depot/projects/wifi/usr.sbin/rpc.ypupdated/Makefile#3 integrate
.. //depot/projects/wifi/usr.sbin/sendmail/Makefile#4 integrate
.. //depot/projects/wifi/usr.sbin/sysinstall/Makefile#3 integrate
.. //depot/projects/wifi/usr.sbin/tcpdchk/Makefile#2 integrate
.. //depot/projects/wifi/usr.sbin/tcpdmatch/Makefile#2 integrate
.. //depot/projects/wifi/usr.sbin/tcpdump/tcpdump/Makefile#2 integrate
.. //depot/projects/wifi/usr.sbin/traceroute/Makefile#2 integrate
.. //depot/projects/wifi/usr.sbin/vnconfig/Makefile#3 integrate

Differences ...

==== //depot/projects/wifi/Makefile#6 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile,v 1.313 2004/12/16 19:55:57 ru Exp $
+# $FreeBSD: src/Makefile,v 1.315 2004/12/21 09:59:39 ru Exp $
 #
 # The user-driven targets are:
 #
@@ -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/wifi/Makefile.inc1#8 (text+ko) ====

@@ -1,19 +1,19 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.460 2004/12/17 10:11:33 ru Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.470 2004/12/21 12:21:25 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
@@ -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
@@ -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
@@ -434,7 +434,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
@@ -664,7 +664,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"
@@ -798,7 +798,7 @@
 #
 # bootstrap-tools: Build tools needed for compatibility
 #
-.if !defined(NOGAMES)
+.if !defined(NO_GAMES)
 _strfile=	games/fortune/strfile
 .endif
 
@@ -876,11 +876,11 @@
 _aicasm= sys/modules/aic7xxx/aicasm
 .endif
 
-.if !defined(NOSHARE)
+.if !defined(NO_SHARE)
 _share=	share/syscons/scrnmaps
 .endif
 
-.if !defined(NO_KERBEROS) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.if !defined(NO_KERBEROS) && !defined(NO_CRYPT) && !defined(NO_OPENSSL)
 _kerberos5_tools= kerberos5/tools
 .endif
 
@@ -994,7 +994,7 @@
 
 _generic_libs=	gnu/lib
 
-.if !defined(NO_KERBEROS) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.if !defined(NO_KERBEROS) && !defined(NO_CRYPT) && !defined(NO_OPENSSL)
 _prebuild_libs+=	kerberos5/lib/libasn1
 _prebuild_libs+=	kerberos5/lib/libgssapi
 _prebuild_libs+=	kerberos5/lib/libkrb5
@@ -1021,7 +1021,7 @@
 
 _generic_libs+=	lib
 
-.if !defined(NOCRYPT)
+.if !defined(NO_CRYPT)
 .if !defined(NO_OPENSSL)
 _prebuild_libs+=	secure/lib/libcrypto secure/lib/libssl
 lib/libradius__L: secure/lib/libssl__L
@@ -1039,7 +1039,7 @@
 _generic_libs+=	secure/lib
 .endif
 
-.if defined(NOCRYPT) || defined(NO_OPENSSL)
+.if defined(NO_CRYPT) || defined(NO_OPENSSL)
 lib/libradius__L: lib/libmd__L
 .endif
 

==== //depot/projects/wifi/UPDATING#8 (text+ko) ====

@@ -23,6 +23,15 @@
 	developers choose to disable these features on build machines
 	to maximize performance.
 
+20041219:
+	Auto-loading of ancillary wlan modules such as wlan_wep has
+	been temporarily disabled; you need to statically configure
+	the modules you need into your kernel or explicitly load them
+	prior to use.  Specifically, if you intend to use WEP encryption
+	with an 802.11 device load/configure wlan_wep; if you want to
+	use WPA with the ath driver load/configure wlan_tkip, wlan_ccmp,
+	and wlan_xauth as required.
+
 20041213:
 	The behaviour of ppp(8) has changed slightly.  If lqr is enabled
 	(``enable lqr''), older versions would revert to LCP ECHO mode on
@@ -1984,4 +1993,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.383 2004/12/13 17:52:10 brian Exp $
+$FreeBSD: src/UPDATING,v 1.384 2004/12/20 04:27:23 sam Exp $

==== //depot/projects/wifi/bin/Makefile.inc#2 (text+ko) ====

@@ -1,9 +1,9 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 5/31/93
-# $FreeBSD: src/bin/Makefile.inc,v 1.21 2004/08/06 00:07:26 gordon Exp $
+# $FreeBSD: src/bin/Makefile.inc,v 1.22 2004/12/21 09:59:40 ru Exp $
 
 BINDIR?=	/bin
 WARNS?=		6
 
 .if defined(NO_DYNAMICROOT)
-NOSHARED?=	YES
+NO_SHARED?=	YES
 .endif

==== //depot/projects/wifi/bin/ed/Makefile#2 (text+ko) ====

@@ -1,11 +1,11 @@
-# $FreeBSD: src/bin/ed/Makefile,v 1.30 2004/08/06 07:27:03 cperciva Exp $
+# $FreeBSD: src/bin/ed/Makefile,v 1.31 2004/12/21 10:15:59 ru Exp $
 
 PROG=	ed
 SRCS=	buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c
 LINKS=	${BINDIR}/ed ${BINDIR}/red
 MLINKS=	ed.1 red.1
 
-.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.if !defined(NO_CRYPT) && !defined(NO_OPENSSL)
 CFLAGS+=-DDES
 WARNS?=	2
 DPADD=	${LIBCRYPTO}

==== //depot/projects/wifi/bin/rmail/Makefile#2 (text+ko) ====

@@ -1,11 +1,11 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD: src/bin/rmail/Makefile,v 1.20 2004/03/22 03:17:36 obrien Exp $
+# $FreeBSD: src/bin/rmail/Makefile,v 1.21 2004/12/21 09:59:40 ru Exp $
 
 SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
 .PATH:	${SENDMAIL_DIR}/rmail
 
 # Not much point this being static. It calls a shared sendmail...
-NOSHARED?= NO
+NO_SHARED?= NO
 
 PROG=	rmail
 SRCS=	rmail.c

==== //depot/projects/wifi/contrib/bind9/FREEBSD-Upgrade#2 (text+ko) ====

@@ -51,7 +51,7 @@
 
    Note that we intentionally disable IPv6 support on the configure
    command line; src/lib/bind/config.mk will re-enable it at compile
-   time if NOINET6 is not defined.
+   time if NO_INET6 is not defined.
 
 8) Copy the resulting config.h to src/lib/bind, add an RCS id tag and
    commit it.  Do not commit any other file that was modified or
@@ -96,4 +96,4 @@
 
 					-- des@FreeBSD.org
 
-$FreeBSD: src/contrib/bind9/FREEBSD-Upgrade,v 1.2 2004/09/27 00:25:56 des Exp $
+$FreeBSD: src/contrib/bind9/FREEBSD-Upgrade,v 1.3 2004/12/21 10:49:25 ru Exp $

==== //depot/projects/wifi/etc/Makefile#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.11 (Berkeley) 5/21/91
-# $FreeBSD: src/etc/Makefile,v 1.335 2004/10/08 00:14:27 dougb Exp $
+# $FreeBSD: src/etc/Makefile,v 1.337 2004/12/21 10:15:59 ru Exp $
 
 .if !defined(NO_SENDMAIL)
 SUBDIR=	sendmail
@@ -23,7 +23,7 @@
 BIN1+=	printcap
 .endif
 
-.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.if !defined(NO_CRYPT) && !defined(NO_OPENSSL)
 .if !defined(NO_OPENSSH)
 SSH=	${.CURDIR}/../crypto/openssh/ssh_config \
 	${.CURDIR}/../crypto/openssh/sshd_config \
@@ -65,7 +65,7 @@
 FREEBSD=COPYRIGHT
 
 afterinstall:
-.if !defined(NOMAN)
+.if !defined(NO_MAN)
 	cd ${.CURDIR}/../share/man; ${MAKE} makedb
 .endif
 

==== //depot/projects/wifi/etc/defaults/Makefile#3 (text+ko) ====

@@ -1,7 +1,7 @@
-# $FreeBSD: src/etc/defaults/Makefile,v 1.4 2004/10/24 15:32:23 ru Exp $
+# $FreeBSD: src/etc/defaults/Makefile,v 1.5 2004/12/21 08:46:49 ru Exp $
 
 FILES=	devfs.rules pccard.conf periodic.conf rc.conf
-NOOBJ=
+NO_OBJ=
 FILESDIR= /etc/defaults
 FILESMODE= 444
 

==== //depot/projects/wifi/etc/devd.conf#4 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/devd.conf,v 1.19 2004/11/28 23:16:00 iedowse Exp $
+# $FreeBSD: src/etc/devd.conf,v 1.20 2004/12/19 00:50:07 brueffer Exp $
 #
 # Refer to devd.conf(5) and devd(8) man pages for the details on how to
 # run and configure devd.
@@ -19,12 +19,13 @@
 	# Setup some shorthand for regex that we use later in the file.
 	set ethernet-nic-regex
 		"(an|ar|ath|aue|awi|axe|bfe|bge|cm|cnw|cs|cue|dc|de|ed|el|em|\
-		ep|ex|fe|fxp|gem|hme|ie|kue|lge|lnc|my|nge|pcn|ray|re|rl|\
-		rue|sf|sis|sk|sn|snc|ste|ti|tl|tx|txp|vge|vr|vx|wb|wi|xe|\
-		xl)[0-9]+";
+		ep|ex|fe|fxp|gem|hme|ie|kue|lge|lnc|my|nge|pcn|ray|re|rl|rue|\
+		sf|sis|sk|sn|snc|ste|ti|tl|tx|txp|udav|vge|vr|vx|wb|wi|xe|xl)\
+		[0-9]+";
 	set scsi-controller-regex
-		"(adv|advw|aic|aha|ahb|ahc|ahd|bt|ct|iir|isp|mly|mpt|ncv|nsp|\
-		stg|sym|wds)[0-9]+";
+		"(aac|adv|adw|aha|ahb|ahc|ahd|aic|amd|amr|asr|bt|ciss|ct|dpt|\
+		ida|iir|ips|isp|mlx|mly|mpt|ncr|ncv|nsp|stg|sym|trm|wds)\
+		[0-9]+";
 };
 
 # Note that the attach/detach with the highest value wins, so that one can

==== //depot/projects/wifi/etc/isdn/Makefile#2 (text+ko) ====

@@ -1,6 +1,6 @@
-# $FreeBSD: src/etc/isdn/Makefile,v 1.12 2004/01/19 13:40:50 ru Exp $
+# $FreeBSD: src/etc/isdn/Makefile,v 1.13 2004/12/21 08:46:50 ru Exp $
 
-NOOBJ=
+NO_OBJ=
 
 SCRIPTS=	answer			\
 		isdntel.sh		\

==== //depot/projects/wifi/etc/mtree/Makefile#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/Makefile,v 1.4 2004/10/24 15:32:23 ru Exp $
+# $FreeBSD: src/etc/mtree/Makefile,v 1.5 2004/12/21 08:46:50 ru Exp $
 
 FILES=	${_BIND.chroot.dist} \
 	${_BIND.include.dist} \
@@ -17,7 +17,7 @@
 .endif
 .endif
 
-NOOBJ=
+NO_OBJ=
 FILESDIR= /etc/mtree
 
 .include <bsd.prog.mk>

==== //depot/projects/wifi/etc/namedb/Makefile#3 (text+ko) ====

@@ -1,8 +1,8 @@
-# $FreeBSD: src/etc/namedb/Makefile,v 1.3 2004/10/24 15:32:23 ru Exp $
+# $FreeBSD: src/etc/namedb/Makefile,v 1.4 2004/12/21 08:46:50 ru Exp $
 
 FILES=	PROTO.localhost.rev PROTO.localhost-v6.rev named.conf named.root \
 	make-localhost
-NOOBJ=
+NO_OBJ=
 FILESDIR= /etc/namedb
 FILESMODE= 644
 

==== //depot/projects/wifi/etc/pam.d/Makefile#3 (text+ko) ====

@@ -1,6 +1,6 @@
-# $FreeBSD: src/etc/pam.d/Makefile,v 1.11 2004/10/24 15:32:24 ru Exp $
+# $FreeBSD: src/etc/pam.d/Makefile,v 1.12 2004/12/21 08:46:50 ru Exp $
 
-NOOBJ=
+NO_OBJ=
 FILES=	README ftpd gdm imap kde login other passwd pop3 \
 	rexecd rsh sshd su system telnetd xdm
 FILESDIR=	/etc/pam.d

==== //depot/projects/wifi/etc/periodic/Makefile.inc#2 (text+ko) ====

@@ -1,5 +1,5 @@
-# $FreeBSD: src/etc/periodic/Makefile.inc,v 1.6 2002/07/18 12:32:57 ru Exp $
+# $FreeBSD: src/etc/periodic/Makefile.inc,v 1.7 2004/12/21 08:46:50 ru Exp $
 
 BINDIR=	/etc/periodic/${.CURDIR:T}
-NOOBJ=
+NO_OBJ=
 FILESMODE= 755

==== //depot/projects/wifi/etc/rc.d/named#3 (text+ko) ====

@@ -1,12 +1,13 @@
 #!/bin/sh
 #
 # $NetBSD: named,v 1.10 2002/03/22 04:33:59 thorpej Exp $
-# $FreeBSD: src/etc/rc.d/named,v 1.17 2004/12/18 15:19:36 phk Exp $
+# $FreeBSD: src/etc/rc.d/named,v 1.19 2004/12/20 18:34:10 peadar Exp $
 #
 
 # PROVIDE: named
 # REQUIRE: SERVERS
 # BEFORE:  DAEMON
+# KEYWORD: shutdown
 
 . /etc/rc.subr
 
@@ -14,6 +15,7 @@
 rcvar=`set_rcvar`
 start_precmd="named_precmd"
 start_postcmd="make_symlinks"
+stop_postcmd="named_poststop"
 required_dirs="$named_chrootdir"	# if it is set, it must exist
 extra_commands="reload"
 
@@ -81,6 +83,13 @@
 	ln -fs "${named_chrootdir}${pidfile}" ${pidfile}
 }
 
+named_poststop()
+{
+	if [ -n "${named_chrootdir}"  -a -c ${named_chrootdir}/dev/null ]; then
+		umount ${named_chrootdir}/dev 2>/dev/null || true
+	fi
+}
+
 named_precmd()
 {
 	local confgen_chroot

==== //depot/projects/wifi/games/factor/Makefile#2 (text+ko) ====

@@ -1,11 +1,11 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD: src/games/factor/Makefile,v 1.8 2004/02/05 22:44:20 ru Exp $
+# $FreeBSD: src/games/factor/Makefile,v 1.9 2004/12/21 10:15:59 ru Exp $
 
 PROG=	factor
 SRCS=	factor.c pr_tbl.c
 CFLAGS+=-I${.CURDIR}/../primes
 
-.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.if !defined(NO_CRYPT) && !defined(NO_OPENSSL)
 CFLAGS+=-DHAVE_OPENSSL
 LDADD=	-lcrypto
 DPADD=	${LIBCRYPTO}

==== //depot/projects/wifi/games/fortune/unstr/Makefile#3 (text+ko) ====

@@ -1,8 +1,8 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD: src/games/fortune/unstr/Makefile,v 1.4 2004/10/24 15:32:24 ru Exp $
+# $FreeBSD: src/games/fortune/unstr/Makefile,v 1.5 2004/12/21 08:46:57 ru Exp $
 
 PROG=	unstr
-NOMAN=
+NO_MAN=
 CFLAGS+=-Wall -I${.CURDIR}/../strfile
 
 .include <bsd.prog.mk>

==== //depot/projects/wifi/games/ppt/Makefile#3 (text+ko) ====

@@ -1,8 +1,8 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD: src/games/ppt/Makefile,v 1.4 2004/10/24 15:32:24 ru Exp $
+# $FreeBSD: src/games/ppt/Makefile,v 1.5 2004/12/21 08:46:57 ru Exp $
 
 PROG=	ppt
-NOMAN=
+NO_MAN=
 
 WARNS?=	6
 

==== //depot/projects/wifi/games/primes/Makefile#3 (text+ko) ====

@@ -1,9 +1,9 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD: src/games/primes/Makefile,v 1.2 2004/10/24 15:32:24 ru Exp $
+# $FreeBSD: src/games/primes/Makefile,v 1.3 2004/12/21 08:46:57 ru Exp $
 
 PROG=	primes
 SRCS=	pattern.c pr_tbl.c primes.c
-NOMAN=
+NO_MAN=
 DPADD=	${LIBM}
 LDADD=	-lm
 

==== //depot/projects/wifi/gnu/Makefile.inc#3 (text+ko) ====

@@ -1,6 +1,6 @@
-# $FreeBSD: src/gnu/Makefile.inc,v 1.5 2004/10/24 15:32:24 ru Exp $
+# $FreeBSD: src/gnu/Makefile.inc,v 1.6 2004/12/21 09:33:44 ru Exp $
 
 # Do not lint the GNU stuff. It is all externally maintained and
 # lint output is wasteful noise here.
 
-NOLINT=
+NO_LINT=

==== //depot/projects/wifi/gnu/lib/libdialog/Makefile#2 (text+ko) ====

@@ -1,5 +1,5 @@
 # Makefile for libdialog
-# $FreeBSD: src/gnu/lib/libdialog/Makefile,v 1.40 2004/10/18 16:39:53 ru Exp $
+# $FreeBSD: src/gnu/lib/libdialog/Makefile,v 1.41 2004/12/21 12:05:10 ru Exp $
 
 LIB=    dialog
 INCS=	dialog.h
@@ -20,7 +20,7 @@
 LDADD=	-lncurses
 DPADD=	${LIBNCURSES}
 
-.if !defined(NOHTML)
+.if !defined(NO_HTML)
 FILES=	${EXAMPLES:C;^;${.CURDIR}/TESTS/;}
 FILESDIR= ${SHAREDIR}/examples/libdialog
 .endif

==== //depot/projects/wifi/gnu/lib/libg2c/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/lib/libg2c/Makefile,v 1.14 2004/07/28 05:27:18 kan Exp $
+# $FreeBSD: src/gnu/lib/libg2c/Makefile,v 1.15 2004/12/21 09:33:45 ru Exp $
 
 SRCDIR=	${.CURDIR}/../../../contrib/libf2c
 
@@ -99,13 +99,13 @@
 ${E77OBJS}: f2cext.c
 	${CC} ${CFLAGS} -c -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
 
-.if !defined(NOPIC)
+.if !defined(NO_PIC)
 ${E77OBJS:.o=.So}: f2cext.c
 	${CC} ${PICFLAG} -DPIC ${CFLAGS} -c -DL${.PREFIX} -o ${.TARGET} \
 	    ${.ALLSRC:M*.c}
 .endif
 
-.if !defined(NOPROFILE)
+.if !defined(NO_PROFILE)
 ${E77OBJS:.o=.po}: f2cext.c
 	${CC} -p ${CFLAGS} -c -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}

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



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