PERFORCE change 56180 for review

David Xu davidxu at FreeBSD.org
Wed Jun 30 19:25:20 PDT 2004


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

Change 56180 by davidxu at davidxu_celeron on 2004/07/01 02:25:13

	IFC

Affected files ...

.. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#3 integrate
.. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/freebsd-questions/article.sgml#2 integrate
.. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#2 integrate
.. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/mac/chapter.sgml#2 integrate
.. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#3 integrate
.. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/multimedia/chapter.sgml#2 integrate
.. //depot/projects/davidxu_ksedbg/doc/share/sgml/man-refs.ent#2 integrate
.. //depot/projects/davidxu_ksedbg/src/UPDATING#2 integrate
.. //depot/projects/davidxu_ksedbg/src/etc/defaults/rc.conf#2 integrate
.. //depot/projects/davidxu_ksedbg/src/etc/ftpusers#2 integrate
.. //depot/projects/davidxu_ksedbg/src/etc/mail/aliases#2 integrate
.. //depot/projects/davidxu_ksedbg/src/include/wordexp.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_read_extract.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libc/gen/vis.3#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libc/gen/wordexp.3#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libc/gen/wordexp.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libc/locale/ctype.3#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libc/locale/mbrlen.3#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libc/locale/mbrtowc.3#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libc/locale/multibyte.3#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libc/net/getipnodebyname.3#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libc/net/inet.3#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libc/net/resolver.3#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libc/posix1e/mac_get.3#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libc/posix1e/mac_text.3#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libc/stdio/printf.3#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libc/string/ffs.3#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libc/sys/kqueue.2#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libc/sys/mount.2#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libc/sys/msync.2#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libc/sys/open.2#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libc/sys/poll.2#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libc/sys/ptrace.2#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libc/sys/read.2#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libc/sys/send.2#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libc/sys/sendfile.2#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libc/sys/statfs.2#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libpthread_dbg/Makefile#2 delete
.. //depot/projects/davidxu_ksedbg/src/lib/libpthread_dbg/arch/i386/Makefile.inc#2 delete
.. //depot/projects/davidxu_ksedbg/src/lib/libpthread_dbg/arch/i386/i386/pthread_dbg_md.c#2 delete
.. //depot/projects/davidxu_ksedbg/src/lib/libpthread_dbg/arch/i386/include/pthread_dbg_md.h#2 delete
.. //depot/projects/davidxu_ksedbg/src/lib/libpthread_dbg/pthread_dbg.c#2 delete
.. //depot/projects/davidxu_ksedbg/src/lib/libpthread_dbg/pthread_dbg.h#2 delete
.. //depot/projects/davidxu_ksedbg/src/lib/libpthread_dbg/pthread_dbg_int.h#2 delete
.. //depot/projects/davidxu_ksedbg/src/lib/libstand/Makefile#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libthr/thread/thr_create.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libz/ChangeLog#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libz/FAQ#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libz/Makefile#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libz/README#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libz/adler32.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libz/algorithm.txt#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libz/compress.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libz/crc32.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libz/crc32.h#1 branch
.. //depot/projects/davidxu_ksedbg/src/lib/libz/deflate.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libz/deflate.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libz/example.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libz/gzio.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libz/infback.c#1 branch
.. //depot/projects/davidxu_ksedbg/src/lib/libz/infblock.c#2 delete
.. //depot/projects/davidxu_ksedbg/src/lib/libz/infblock.h#2 delete
.. //depot/projects/davidxu_ksedbg/src/lib/libz/infcodes.c#2 delete
.. //depot/projects/davidxu_ksedbg/src/lib/libz/infcodes.h#2 delete
.. //depot/projects/davidxu_ksedbg/src/lib/libz/inffast.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libz/inffast.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libz/inffixed.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libz/inflate.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libz/inflate.h#1 branch
.. //depot/projects/davidxu_ksedbg/src/lib/libz/inftrees.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libz/inftrees.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libz/infutil.c#2 delete
.. //depot/projects/davidxu_ksedbg/src/lib/libz/infutil.h#2 delete
.. //depot/projects/davidxu_ksedbg/src/lib/libz/maketree.c#2 delete
.. //depot/projects/davidxu_ksedbg/src/lib/libz/minigzip.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libz/trees.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libz/uncompr.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libz/zconf.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libz/zlib.3#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libz/zlib.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libz/zutil.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/libz/zutil.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/msun/Makefile#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/msun/man/fdim.3#1 branch
.. //depot/projects/davidxu_ksedbg/src/lib/msun/man/fmax.3#1 branch
.. //depot/projects/davidxu_ksedbg/src/lib/msun/src/math.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/lib/msun/src/s_fdim.c#1 branch
.. //depot/projects/davidxu_ksedbg/src/lib/msun/src/s_fmax.c#1 branch
.. //depot/projects/davidxu_ksedbg/src/lib/msun/src/s_fmaxf.c#1 branch
.. //depot/projects/davidxu_ksedbg/src/lib/msun/src/s_fmaxl.c#1 branch
.. //depot/projects/davidxu_ksedbg/src/lib/msun/src/s_fmin.c#1 branch
.. //depot/projects/davidxu_ksedbg/src/lib/msun/src/s_fminf.c#1 branch
.. //depot/projects/davidxu_ksedbg/src/lib/msun/src/s_fminl.c#1 branch
.. //depot/projects/davidxu_ksedbg/src/libexec/tftpd/tftpd.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/early-adopter/article.sgml#2 integrate
.. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/relnotes/alpha/article.sgml#2 integrate
.. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/relnotes/amd64/article.sgml#2 integrate
.. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#2 integrate
.. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/relnotes/i386/article.sgml#2 integrate
.. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/relnotes/ia64/article.sgml#2 integrate
.. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/relnotes/pc98/article.sgml#2 integrate
.. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/relnotes/sparc64/article.sgml#2 integrate
.. //depot/projects/davidxu_ksedbg/src/release/doc/ru_RU.KOI8-R/Makefile#2 integrate
.. //depot/projects/davidxu_ksedbg/src/release/doc/ru_RU.KOI8-R/early-adopter/Makefile#1 branch
.. //depot/projects/davidxu_ksedbg/src/release/doc/ru_RU.KOI8-R/early-adopter/article.sgml#1 branch
.. //depot/projects/davidxu_ksedbg/src/release/doc/ru_RU.KOI8-R/installation/common/install.sgml#2 integrate
.. //depot/projects/davidxu_ksedbg/src/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml#2 integrate
.. //depot/projects/davidxu_ksedbg/src/release/doc/share/sgml/release.ent#2 integrate
.. //depot/projects/davidxu_ksedbg/src/share/examples/pppd/ppp.deny.sample#2 integrate
.. //depot/projects/davidxu_ksedbg/src/share/man/man4/acpi.4#2 integrate
.. //depot/projects/davidxu_ksedbg/src/share/man/man4/ips.4#2 integrate
.. //depot/projects/davidxu_ksedbg/src/share/man/man4/led.4#2 integrate
.. //depot/projects/davidxu_ksedbg/src/share/misc/pci_vendors#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/amd64/acpica/acpi_machdep.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/amd64/amd64/nexus.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/arm/arm/sys_machdep.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/conf/NOTES#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/conf/files#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/conf/files.amd64#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/conf/files.i386#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/conf/files.ia64#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/conf/kmod.mk#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/conf/options#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/contrib/ipfilter/netinet/fil.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi_acad.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi_button.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi_cmbat.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi_ec.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi_if.m#1 branch
.. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi_isab.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi_lid.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi_pci.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi_pcib_acpi.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi_powerres.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi_quirk.c#1 branch
.. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi_quirks#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi_resource.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpivar.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/ata/ata-raid.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/cx/if_cx.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/cy/cy.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/digi/digi.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/ex/if_ex_isa.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/firewire/fwohci_pci.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/fxp/if_fxp.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/lge/if_lge.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/nge/if_nge.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/pci/pci.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/puc/puc.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/rc/rc.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/re/if_re.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/sio/sio.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/txp/if_txp.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/uart/uart_tty.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/uhub.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/usb_subr.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/usbdivar.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/geom/geom_disk.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/i386/acpica/acpi_asus.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/i386/acpica/acpi_machdep.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/i386/acpica/acpi_toshiba.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/i386/i386/nexus.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/i386/i386/pmap.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/i386/include/pmap.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/ia64/acpica/acpi_machdep.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/ia64/ia64/nexus.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_condvar.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_idle.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_synch.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/kern/link_elf_obj.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/kern/subr_bus.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/kern/subr_rman.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/kern/subr_sleepqueue.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/kern/subr_taskqueue.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/kern/subr_turnstile.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/modules/Makefile#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/modules/acpi/acpi/Makefile#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/modules/acpi/acpi_asus/Makefile#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/modules/acpi/acpi_toshiba/Makefile#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/modules/acpi/acpi_video/Makefile#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/modules/ahb/Makefile#1 branch
.. //depot/projects/davidxu_ksedbg/src/sys/modules/netgraph/bluetooth/ubt/Makefile#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/net/if_spppsubr.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/netgraph/netgraph.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/netgraph/ng_base.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/netgraph/ng_device.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/netgraph/ng_device.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/pc98/pc98/sio.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/pci/if_dc.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/pci/if_dcreg.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/pci/if_pcn.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/pci/if_rl.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/pci/if_rlreg.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/pci/if_sf.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/pci/if_sis.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/pci/if_sk.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/pci/if_ste.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/pci/if_vr.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/pci/if_wb.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/pci/if_xl.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/sparc64/ebus/ebus.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/sparc64/fhc/fhc.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/sparc64/pci/psycho.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/sparc64/sbus/sbus.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/sparc64/sparc64/iommu.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/sparc64/sparc64/nexus.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/sys/interrupt.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/sys/rman.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/sys/sleepqueue.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/sys/tty.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/tools/acpi_quirks2h.awk#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/vm/vm_map.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/vm/vm_object.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/tools/tools/pciid/mk_pci_vendors.pl#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.bin/fstat/Makefile#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.bin/fstat/cd9660.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.bin/fstat/fstat.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.bin/fstat/fstat.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.bin/fstat/msdosfs.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.bin/indent/indent.1#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.bin/ldd/Makefile#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.bin/ldd/sods.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.bin/netstat/inet.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.bin/tar/bsdtar.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.bin/top/machine.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.bin/vmstat/vmstat.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.bin/xargs/xargs.1#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/acpi/acpidump/acpi.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/apm/apm.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/config/mkheaders.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/add/Makefile#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/add/add.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/add/extract.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/add/futil.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/add/main.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/add/perform.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/create/Makefile#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/create/create.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/create/main.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/create/perform.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/create/pkg_create.1#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/create/pl.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/delete/Makefile#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/delete/delete.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/delete/main.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/delete/perform.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/delete/pkg_delete.1#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/info/Makefile#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/info/info.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/info/main.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/info/perform.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/info/pkg_info.1#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/lib/Makefile#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/lib/deps.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/lib/file.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/lib/lib.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/lib/match.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/lib/pen.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/lib/url.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/lib/version.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/sign/Makefile#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/sign/pgp_sign.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/sign/sha1.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/sign/sign.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/sign/stand.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/sign/x509.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/version/Makefile#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/version/main.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/version/perform.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/version/pkg_version.1#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/version/test-pkg_version.sh#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/version/version.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/ppp/acf.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/ppp/async.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/ppp/hdlc.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/ppp/hdlc.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/ppp/link.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/ppp/link.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/ppp/lqr.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/ppp/lqr.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/ppp/mbuf.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/ppp/ppp.8.m4#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/ppp/sync.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/usr.sbin/ppp/tcpmss.c#2 integrate

Differences ...

==== //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#3 (text+ko) ====

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.220 2004/06/27 21:15:48 lofi Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.222 2004/06/29 10:41:15 osa Exp $ -->
 <!--
 	NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
 	order by first name.
@@ -1681,6 +1681,11 @@
     </listitem>
 
     <listitem>
+      <para>Dmitry Semkin
+	<email>lslarry at gmail.ru</email></para>
+    </listitem>
+
+    <listitem>
       <para>Dmytro Rud
 	<email>unixoid at yahoo.com</email></para>
     </listitem>
@@ -4587,6 +4592,11 @@
     </listitem>
 
     <listitem>
+      <para>Mij
+        <email>mij at bitchx.it</email></para>
+    </listitem>
+
+    <listitem>
       <para>Mika Nystrom
 	<email>mika at cs.caltech.edu</email></para>
     </listitem>

==== //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/freebsd-questions/article.sgml#2 (text+ko) ====

@@ -23,7 +23,7 @@
       </affiliation>
     </author>
 
-    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/freebsd-questions/article.sgml,v 1.19 2004/04/06 18:12:43 ceri Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/freebsd-questions/article.sgml,v 1.20 2004/06/30 19:47:38 ceri Exp $</pubdate>
 
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
@@ -87,7 +87,7 @@
     <title id="subscribe">How to subscribe to FreeBSD-questions</title>
 
     <para>FreeBSD-questions is a mailing list, so you need mail access.  Point
-      your WWW browser to <ulink url="">FreeBSD-question Info Page</ulink>.
+      your WWW browser to <ulink url="&a.questions.url;">FreeBSD-question Info Page</ulink>.
       In the section titled <quote>Subscribing to freebsd-questions</quote> fill
       in the <quote>Your email address</quote> field; the other fields are optional.
     </para>

==== //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#2 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.309 2004/06/23 19:56:23 blackend Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.310 2004/06/28 20:04:33 blackend Exp $
 -->
 
 <chapter id="advanced-networking">
@@ -5235,9 +5235,9 @@
         Internet Name Domain), which is the most common implementation of the
         DNS protocol.  DNS is the protocol through which names are mapped to
         IP addresses, and vice versa.  For example, a query for
-	<hostid>www.FreeBSD.org</hostid>
+	<hostid role="fqdn">www.FreeBSD.org</hostid>
         will receive a reply with the IP address of The FreeBSD Project's
-        web server, whereas, a query for <hostid>ftp.FreeBSD.org</hostid>
+        web server, whereas, a query for <hostid role="fqdn">ftp.FreeBSD.org</hostid>
 	will return the IP
 	address of the corresponding FTP machine.  Likewise, the opposite can
         happen.  A query for an IP address can resolve its hostname.  It is
@@ -5415,7 +5415,7 @@
 	</listitem>
       </itemizedlist>
 
-      <para>When one queries for <hostid>www.FreeBSD.org</hostid>, the
+      <para>When one queries for <hostid role="fqdn">www.FreeBSD.org</hostid>, the
 	resolver usually queries the uplink ISP's name server, and retrieves
 	the reply.  With a local, caching DNS server, the query only has to
 	be made once to the outside world by the caching DNS server.  Every
@@ -5847,10 +5847,10 @@
 
         <para>
           The A record indicates machine names.  As seen above,
-          <hostid>ns1.example.org</hostid> would resolve to
+          <hostid role="fqdn">ns1.example.org</hostid> would resolve to
           <hostid role="ipaddr">3.2.1.2</hostid>.  Again,
           the origin symbol, <literal>@</literal>, is
-          used here, thus meaning <hostid>example.org</hostid>
+          used here, thus meaning <hostid role="domainname">example.org</hostid>
           would resolve to <hostid role="ipaddr">3.2.1.30</hostid>.
         </para>
 
@@ -5861,7 +5861,7 @@
           The canonical name record is usually used for giving aliases
           to a machine.  In the example, <hostid>www</hostid> is
           aliased to the machine addressed to the origin, or
-          <hostid>example.org</hostid>
+          <hostid role="domainname">example.org</hostid>
           (<hostid role="ipaddr">3.2.1.30</hostid>).
           <varname>CNAME</varname>s can be used to provide alias
           hostnames, or round robin one hostname among multiple

==== //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/mac/chapter.sgml#2 (text+ko) ====

@@ -1,6 +1,6 @@
 <!--
      The FreeBSD Documentation Project
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/mac/chapter.sgml,v 1.1 2004/06/21 19:34:56 trhodes Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/mac/chapter.sgml,v 1.3 2004/06/30 13:14:19 dannyboy Exp $
 -->
 
 <chapter id="mac">
@@ -331,7 +331,7 @@
       the system.</para>
 
     <para>When setting a label, the user must be able to comprehend
-      what it is, exactly, that they are doing.  Setting the label
+      what it is, exactly, that is being done.  Setting the label
       too high or too low may jeopardize the entire security
       structure of their directory or file system.</para>
 
@@ -393,16 +393,16 @@
       <title>Label Configuration</title>
 
       <para>Virtually all aspects of label policy configuration
-	will be performed using a set of four commands.  Theses
+	will be performed using a set of four commands.  These
 	commands provide a simple interface for object or subject
 	configuration or the manipulation and verification of
 	the configuration.</para>
 
       <para>All configuration may be done by use of the
 	&man.setfmac.8; and &man.setpmac.8; utilities respectively.
-	The <command>setfmac</command> is used to set
+	The <command>setfmac</command> command is used to set
 	<acronym>MAC</acronym> labels on system objects while the
-	<command>setpmac</command> is used to set the labels on system
+	<command>setpmac</command> command is used to set the labels on system
 	subjects.  Observe:</para>
 
       <screen>&prompt.root; <userinput>setfmac biba/high test</userinput></screen>
@@ -412,8 +412,8 @@
 	quiescent is when an error occurred.  In some cases this
 	error may be a <errorname>Permission denied</errorname> and
 	is usually obtained when the label is being set or modified
-	on an object which is restricted.  The system administrator,
-	may use the commands in conjunction to overcome this:</para>
+	on an object which is restricted.  The system administrator
+	may use the following commands to overcome this:</para>
 
       <screen>&prompt.root; <userinput>setfmac biba/high test</userinput>
 <errorname>Permission denied</errorname>
@@ -421,16 +421,16 @@
 &prompt.root; <userinput>getfmac test</userinput>
 test: biba/high</screen>
 
-      <para>As can be observed, the <command>setpmac</command>
-	can be used to override the policies settings by assigning
+      <para>As can be observed, <command>setpmac</command>
+	can be used to override the policy's settings by assigning
 	a different label to the invoked process.  The
-	<command>getpmac</command> is usually used with current
-	running processes, such as <application>sendmail</application>
+	<command>getpmac</command> utility is usually used with currently
+	running processes, such as <application>sendmail</application>:
 	although it takes a process ID in place of
 	a command the logic is extremely similar.  It should be pointed
 	out that users will only be able to override policy labels if
-	they themselves own the object or subject.  If a user would
-	attempt to manipulate a file not in their access level, the
+	they themselves own the object or subject.  If users would
+	attempt to manipulate a file not in their access levels, the
 	<errorname>Operation not permitted</errorname> error
 	will be displayed by the <function>mac_set_link</function>
 	function.</para>
@@ -441,7 +441,7 @@
 	<para>Users themselves are required to have labels so that
 	  their files and processes may properly.  This is
 	  configured through the <filename>login.conf</filename> file
-	  by use of login classes.  Every policy which uses labels
+	  by use of login classes.  Every policy that uses labels
 	  will enforce the user class setting.</para>
 
 	<para>An example entry containing every policy is listed
@@ -475,7 +475,7 @@
 	  user class default label which will be enforced by
 	  <acronym>MAC</acronym>.  Users will never be permitted to
 	  modify this value, thus it can be considered not optional
-	  in the user case.  In a real configuration; however, the
+	  in the user case.  In a real configuration, however, the
 	  administrator will never wish to enable every policy.
 	  It is recommended that the rest of this chapter be reviewed
 	  before any of this configuration is implemented.</para>
@@ -487,7 +487,7 @@
 	  example or discussion.</para>
 
 	<para>It is useful to note that many sites may have a
-	  particularly large amount of users requiring several
+	  particularly large number of users requiring several
 	  different user classes.  In depth planning is required
 	  as this may get extremely difficult to manage.</para>
       </sect3>
@@ -517,7 +517,7 @@
 
 	<para>Each policy which supports labeling has some tunable
 	  which may be used to disable the <acronym>MAC</acronym>
-	  label on network interfaces.  Setting them to
+	  label on network interfaces.  Setting the label to
 	  <option>equal</option> will have a similar effect.  Review
 	  the output from <command>sysctl</command>, the policy manual
 	  pages, or even the information found later in this chapter
@@ -563,8 +563,8 @@
 	</listitem>
 
 	<listitem>
-	  <para>This machine only requires one label
-	    <literal>biba/high</literal> for everything in the system.
+	  <para>This machine only requires one label,
+	    <literal>biba/high</literal>, for everything in the system.
 	    Here the file system would not require the
 	    <option>multilabel</option> option as a single label
 	    will always be in effect.</para>
@@ -680,7 +680,7 @@
 
       <note>
 	<para>Every policy or <acronym>MAC</acronym> option supports
-	  a tunables.  These usually hang off of the
+	  tunables.  These usually hang off of the
 	  <literal>security.mac.&lt;policyname&gt;</literal> tree.
 	  To view all of the tunables from <acronym>MAC</acronym>
 	  use the following command:</para>
@@ -1347,8 +1347,8 @@
 
       <listitem>
 	<para><literal>security.mac.mls.max_compartments</literal> is
-	  used to set the maximum amount of compartment levels with
-	  objects; basically the maximum compartment amount allowed
+	  used to set the maximum number of compartment levels with
+	  objects; basically the maximum compartment number allowed
 	  on a system.</para>
       </listitem>
     </itemizedlist>

==== //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#3 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.449 2004/06/27 14:52:27 pav Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.450 2004/06/30 03:04:24 linimon Exp $
 -->
 
 <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -3062,7 +3062,26 @@
 	<title><makevar>USE_<replaceable>*</replaceable></makevar></title>
 
 	<para>A number of variables exist in order to encapsulate common
-	  dependencies that many ports have.</para>
+	  dependencies that many ports have.  Although their use is
+	  optional, they can help to reduce the verbosity of the port
+	  <filename>Makefile</filename>s.  Each of them is styled
+	  as <makevar>USE_<replaceable>*</replaceable></makevar>.  The
+	  usage of these variables is restricted to the port
+	  <filename>Makefile</filename>s and
+	  <filename>ports/Mk/bsd.*.mk</filename> and is not designed
+	  to encapsulate user-settable options &mdash; use
+	  <makevar>WITH_<replaceable>*</replaceable></makevar> and
+	  <makevar>WITHOUT_<replaceable>*</replaceable></makevar>
+	  for that purpose.</para>
+
+	<note>
+	  <para>It is <emphasis>always</emphasis> incorrect to set
+	    any <makevar>USE_<replaceable>*</replaceable></makevar>
+	    in <filename>/etc/make.conf</filename>.  For instance,
+	    setting <programlisting>USE_GCC=3.2</programlisting>
+	    would adds a dependency on gcc32 for every port,
+	    including gcc32 itself!</para>
+	</note>
 
 	<table frame="none">
 	  <title>The <makevar>USE_<replaceable>*</replaceable></makevar>
@@ -3231,42 +3250,6 @@
 	    intention will be clear.</para>
 	</sect2>
 
-     <sect2>
-      <title>Optional dependencies</title>
-
-      <para>Some large applications can be built in a number of
-	configurations, adding functionality if one of a number of
-	libraries or applications is available. Since not all users
-	want those libraries or applications, the ports system
-	provides hooks that the port author can use to decide which
-	configuration should be built. Supporting these properly will
-	make users happy, and effectively provide 2 or more ports for the
-	price of one.</para>
-
-      <para>The easiest of these to use is
-	<makevar>WITHOUT_X11</makevar>. If the port can be built both
-	with and without X support, then it should normally be built
-	with X support. If <makevar>WITHOUT_X11</makevar> is defined,
-	then the version that does not have X support should be
-	built.</para>
-
-      <para>Various parts of GNOME have such knobs, though they are
-	slightly more difficult to use. The variables to use in the
-	<filename>Makefile</filename> are <makevar>WANT_*</makevar>
-	and <makevar>HAVE_*</makevar>. If the application can be
-	built both with or without one of the dependencies listed
-	below, then the <filename>Makefile</filename> should set
-	<makevar>WANT_PKG</makevar>, and should build the version that
-	uses <makevar>PKG</makevar> if <makevar>HAVE_PKG</makevar>
-	is defined.</para>
-
-      <para>The <makevar>WANT_*</makevar> variables currently
-	supported this way are <makevar>WANT_GLIB</makevar>,
-	<makevar>WANT_GTK</makevar>, <makevar>WANT_ESOUND</makevar>,
-	<makevar>WANT_IMLIB</makevar>, and
-	<makevar>WANT_GNOME</makevar>.</para>
-      </sect2>
-
       <sect2>
 	<title>Circular dependencies are fatal</title>
 
@@ -3286,6 +3269,142 @@
 	  save a large number of people&mdash;including yourself&mdash;
 	  a lot of grief in the process.</para>
       </sect2>
+
+      </sect1>
+
+      <sect1 id="makefile-options">
+      <title>Makefile Options</title>
+
+      <para>Some large applications can be built in a number of
+	configurations, adding functionality if one of a number of
+	libraries or applications is available.  Examples include
+	choice of natural (human) language, GUI versus command-line,
+	or type of database to support.  Since not all users
+	want those libraries or applications, the ports system
+	provides hooks that the port author can use to control which
+	configuration should be built. Supporting these properly will
+	make users happy, and effectively provide 2 or more ports for the
+	price of one.</para>
+
+        <sect2>
+	  <title><makevar>WITH_<replaceable>*</replaceable></makevar> and
+	    <makevar>WITHOUT_<replaceable>*</replaceable></makevar></title>
+
+	  <para>These variables are designed to be set by the system
+	    administrator.  There are many that are standardized in
+	    <filename>ports/Mk/bsd.*.mk</filename>; others are not,
+	    which can be confusing.  If you need to add such a
+	    configuration variable, please consider using one of the
+	    ones from the following list.</para>
+
+	  <note>
+	    <para>You should not assume that a
+	      <makevar>WITH_<replaceable>*</replaceable></makevar>
+	      necessarily has a corresponding
+	      <makevar>WITHOUT_<replaceable>*</replaceable></makevar>
+	      variable and vice versa.  In general, the default is
+	      simply assumed.</para>
+	  </note>
+
+	  <note>
+	    <para>Unless otherwise specified, these variables are only
+	      tested for being set or not set, rather than being set to
+	      some kind of variable such as <literal>YES</literal> or
+	      <literal>NO</literal>.</para>
+	  </note>
+
+	  <table frame="none">
+	    <title>The <makevar>WITH_<replaceable>*</replaceable></makevar>
+	      and <makevar>WITHOUT_<replaceable>*</replaceable></makevar>
+	      variables</title>
+
+	    <tgroup cols="2">
+	      <thead>
+	        <row>
+		  <entry>Variable</entry>
+
+		  <entry>Means</entry>
+	        </row>
+	      </thead>
+
+	      <tbody>
+	        <row>
+		  <entry><makevar>WITH_APACHE2</makevar></entry>
+
+		  <entry>If set, use
+		    <filename role="package">www/apache2</filename>
+		    instead of the default of
+		    <filename role="package">www/apache</filename>.</entry>
+	        </row>
+
+	        <row>
+		  <entry><makevar>WITH_BERKELEY_DB</makevar></entry>
+
+		  <entry>Define this variable to specify the ability to
+		    use a variant of the Berkeley database package such as
+		    <filename role="package">databases/db41</filename>.
+		    An associated variable, 
+		    <entry><makevar>WITH_BDB_VER</makevar>, may be
+		    set to values such as 2, 3, 4, 41 or 42.</entry>
+	        </row>
+
+	        <row>
+		  <entry><makevar>WITHOUT_GETTEXT</makevar></entry>
+
+		  <entry>If set, says that internationalization is not
+		    needed, which can save compile time.  By default,
+		    internalization is used.</entry>
+	        </row>
+
+	        <row>
+		  <entry><makevar>WITH_MYSQL</makevar></entry>
+
+		  <entry>Define this variable to specify the ability to
+		    use a variant of the MySQL database package such as
+		    <filename role="package">databases/mysql40-server</filename>.
+		    An associated variable, 
+		    <entry><makevar>WANT_MYSQL_VER</makevar>, may be
+		    set to values such as 323, 40, 41, or 50.</entry>
+	        </row>
+
+	        <row>
+		  <entry><makevar>WITH_OPENSSL_BASE</makevar></entry>
+
+		  <entry>Use the version of OpenSSL in the base system.</entry>
+	        </row>
+
+	        <row>
+		  <entry><makevar>WITH_OPENSSL_PORT</makevar></entry>
+
+		  <entry>Use the version of OpenSSL from
+		    <filename role="package">security/openssh</filename>,
+		    overwriting the version that was originally installed
+		    in the base system.</entry>
+	        </row>
+
+	        <row>
+		  <entry><makevar>WITH_POSTGRESQL</makevar></entry>
+
+		  <entry>Define this variable to specify the ability to
+		    use a variant of the PostGreSQL database package such as
+		    <filename role="package">databases/postgresql72</filename>.
+		    </entry>
+	        </row>
+
+	        <row>
+		  <entry><makevar>WITHOUT_X11</makevar></entry>
+
+		  <entry>If the port can be built both with and without
+		    X support, then it should normally be built with
+		    with X support. If this variable is defined, then
+		    then the version that does not have X support should
+		    be built instead.</entry>
+	        </row>
+	      </tbody>
+	    </tgroup>
+	  </table>
+
+      </sect2>
     </sect1>
 
     <sect1 id="makefile-wrkdir">

==== //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/multimedia/chapter.sgml#2 (text+ko) ====

@@ -2,8 +2,8 @@
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
 
-     $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/multimedia/chapter.sgml,v 1.12 2004/02/20 17:33:53 blackend Exp $
-     Original revision: 1.80
+     $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/multimedia/chapter.sgml,v 1.13 2004/06/28 19:03:23 blackend Exp $
+     Original revision: 1.83
 -->
 
 <chapter id="multimedia">
@@ -229,7 +229,13 @@
 
     <para>Ces exemples concernent la carte Creative &soundblaster;
       Live!.  Les autres modules son chargeables sont list&eacute;s dans
-      <filename>/boot/defaults/loader.conf</filename>.</para>
+      <filename>/boot/defaults/loader.conf</filename>.  Si vous
+      n'&ecirc;tes pas s&ucirc;r du pilote &agrave; utiliser, vous
+      pouvez tenter de charger le pilote
+      <filename>snd_driver</filename>, qui est un m&eacute;ta-pilote
+      chargeant les pilotes les plus courants, cela
+      acc&eacute;l&egrave;re la recherche du pilote
+      adapt&eacute;.</para>
 
     <para>Sinon, vous pouvez compiler le
       support pour votre carte son en statique dans votre noyau.  Les
@@ -575,6 +581,42 @@
       pr&eacute;c&egrave;de sera automatiquement effectu&eacute;
       de fa&ccedil;on transparente pour l'utilisateur.</para>
    </sect2>
+
+    <sect2>
+      <sect2info>
+	<authorgroup>
+	  <author>
+	    <firstname>Josef</firstname>
+	    <surname>El-Rayes</surname>
+	    <contrib>Contribution de </contrib>
+	  </author>
+	</authorgroup>
+      </sect2info>
+
+      <title>D&eacute;finir les valeurs par d&eacute;faut du mixeur
+	des diff&eacute;rents canaux</title>
+
+      <para>Les valeurs par d&eacute;faut du mixeur des
+	diff&eacute;rents canaux sont fix&eacute;es en dur dans le
+	code source du pilote &man.pcm.4;.  Il existe de nombreuses
+	applications et &ldquo;daemons&rdquo; qui vous permettent de
+	fixer les valeurs du mixeur, les m&eacute;morisent et les
+	refixent &agrave; chaque fois qu'ils sont lanc&eacute;s, mais
+	ce n'est pas une solution id&eacute;ale, nous d&eacute;sirons
+	r&eacute;gler les valeurs par d&eacute;faut au niveau du
+	pilote.  Ceci se fait en d&eacute;finissant les valeurs
+	ad&eacute;quates dans le fichier
+	<filename>/boot/device.hints</filename>.  Par exemple:</para>
+
+      <programlisting>hint.pcm.0.vol="100"</programlisting>
+
+      <para>Cela fixera le volume du canal &agrave; une valeur par
+	d&eacute;faut de 100; d&egrave;s que le module &man.pcm.4; est
+	charg&eacute;.</para>
+
+      <note><para>Seuls &os;&nbsp;5.3 et les versions suivantes
+	supportent cette particularit&eacute;.</para></note>
+    </sect2>
   </sect1>
 
   <sect1 id="sound-mp3">
@@ -1126,7 +1168,7 @@
       efficace que l'interface X11.</para>
 
     <para>La biblioth&egrave;que SDL peut &ecirc;tre trouv&eacute;e
-      dans <filename role="package">devel/sdl12</filename></para>
+      dans <filename role="package">devel/sdl12</filename>.</para>
 
     </sect3>
 
@@ -1376,15 +1418,15 @@
 	  mat&eacute;riel.</para>
 
 	<para>Pour lire &agrave; partir d'un DVD, remplacez
-	 <filename>testfile.avi</filename> par <option>-dvd &lt;N&gt;
-	 <replaceable>DEVICE</replaceable></option> o&ugrave; &lt;N&gt; est
+	 <filename>testfile.avi</filename> par <option>-dvd <replaceable>N</replaceable>
+	 <replaceable>DEVICE</replaceable></option> o&ugrave; <replaceable>N</replaceable> est
 	 le num&eacute;ro du titre &agrave; jouer et
 	 <filename><replaceable>DEVICE</replaceable></filename> est
 	 le fichier sp&eacute;cial de p&eacute;riph&eacute;rique correspondant
 	 au lecteur de DVD.  Par exemple, pour jouer le titre 3 depuis
 	 <filename>/dev/dvd</filename>:</para>
 
-	  <screen>&prompt.root; <userinput>mplayer -vo dga -dvd 2 /dev/dvd</userinput></screen>
+	  <screen>&prompt.root; <userinput>mplayer -vo dga -dvd 3 /dev/dvd</userinput></screen>
 
 	<para>Pour arr&ecirc;ter, avancer, etc..., consultez
 	  les combinaisons de touches, qui sont donn&eacute;es en

==== //depot/projects/davidxu_ksedbg/doc/share/sgml/man-refs.ent#2 (text+ko) ====

@@ -20,7 +20,7 @@
      lexicographical order by the entity (i.e., the dots used in place of
      special characters should not be expanded when comparing).
 
-     $FreeBSD: doc/share/sgml/man-refs.ent,v 1.281 2004/06/22 03:00:09 trhodes Exp $
+     $FreeBSD: doc/share/sgml/man-refs.ent,v 1.284 2004/06/30 13:53:32 hrs Exp $
 -->
 
 <!ENTITY man...1 "<citerefentry/<refentrytitle/[/<manvolnum/1//">
@@ -516,6 +516,7 @@
 <!ENTITY man.rlog.1 "<citerefentry/<refentrytitle/rlog/<manvolnum/1//">
 <!ENTITY man.rlogin.1 "<citerefentry/<refentrytitle/rlogin/<manvolnum/1//">
 <!ENTITY man.rm.1 "<citerefentry/<refentrytitle/rm/<manvolnum/1//">
+<!ENTITY man.rmd160.1 "<citerefentry/<refentrytitle/rmd160/<manvolnum/1//">
 <!ENTITY man.rmdir.1 "<citerefentry/<refentrytitle/rmdir/<manvolnum/1//">
 <!ENTITY man.rpcgen.1 "<citerefentry/<refentrytitle/rpcgen/<manvolnum/1//">
 <!ENTITY man.rs.1 "<citerefentry/<refentrytitle/rs/<manvolnum/1//">
@@ -548,6 +549,7 @@
 <!ENTITY man.sgmlnorm.1 "<citerefentry vendor='ports'/<refentrytitle/sgmlnorm/<manvolnum/1//">
 <!ENTITY man.sgsc.1 "<citerefentry/<refentrytitle/sgsc/<manvolnum/1//">
 <!ENTITY man.sh.1 "<citerefentry/<refentrytitle/sh/<manvolnum/1//">
+<!ENTITY man.sha1.1 "<citerefentry/<refentrytitle/sha1/<manvolnum/1//">
 <!ENTITY man.shar.1 "<citerefentry/<refentrytitle/shar/<manvolnum/1//">
 <!ENTITY man.shift.1 "<citerefentry/<refentrytitle/shift/<manvolnum/1//">
 <!ENTITY man.size.1 "<citerefentry/<refentrytitle/size/<manvolnum/1//">
@@ -3228,9 +3230,11 @@
 <!ENTITY man.fla.4 "<citerefentry/<refentrytitle/fla/<manvolnum/4//">
 <!ENTITY man.fpa.4 "<citerefentry/<refentrytitle/fpa/<manvolnum/4//">
 <!ENTITY man.fwe.4 "<citerefentry/<refentrytitle/fwe/<manvolnum/4//">
+<!ENTITY man.fwip.4 "<citerefentry/<refentrytitle/fwip/<manvolnum/4//">
 <!ENTITY man.fwohci.4 "<citerefentry/<refentrytitle/fwohci/<manvolnum/4//">
 <!ENTITY man.fxp.4 "<citerefentry/<refentrytitle/fxp/<manvolnum/4//">
 <!ENTITY man.gbde.4 "<citerefentry/<refentrytitle/gbde/<manvolnum/4//">
+<!ENTITY man.gconcat.8 "<citerefentry/<refentrytitle/gconcat/<manvolnum/8//">
 <!ENTITY man.gem.4 "<citerefentry/<refentrytitle/gem/<manvolnum/4//">
 <!ENTITY man.geom.4 "<citerefentry/<refentrytitle/geom/<manvolnum/4//">
 <!ENTITY man.gif.4 "<citerefentry/<refentrytitle/gif/<manvolnum/4//">
@@ -3293,6 +3297,7 @@
 <!ENTITY man.ispfw.4 "<citerefentry/<refentrytitle/ispfw/<manvolnum/4//">
 <!ENTITY man.itjc.4 "<citerefentry/<refentrytitle/itjc/<manvolnum/4//">
 <!ENTITY man.iwic.4 "<citerefentry/<refentrytitle/iwic/<manvolnum/4//">
+<!ENTITY man.ixgb.4 "<citerefentry/<refentrytitle/ixgb/<manvolnum/4//">
 <!ENTITY man.joy.4 "<citerefentry/<refentrytitle/joy/<manvolnum/4//">
 <!ENTITY man.kame.4 "<citerefentry/<refentrytitle/kame/<manvolnum/4//">
 <!ENTITY man.keyboard.4 "<citerefentry/<refentrytitle/keyboard/<manvolnum/4//">
@@ -3911,14 +3916,18 @@
 <!ENTITY man.ft.8 "<citerefentry/<refentrytitle/ft/<manvolnum/8//">
 <!ENTITY man.ftpd.8 "<citerefentry/<refentrytitle/ftpd/<manvolnum/8//">
 <!ENTITY man.fwcontrol.8 "<citerefentry/<refentrytitle/fwcontrol/<manvolnum/8//">
+<!ENTITY man.eeprom.8 "<citerefentry/<refentrytitle/eeprom/<manvolnum/8//">
 <!ENTITY man.gbde.8 "<citerefentry/<refentrytitle/gbde/<manvolnum/8//">
-<!ENTITY man.gconcat.8 "<citerefentry/<refentrytitle/gconcat/<manvolnum/8//">
 <!ENTITY man.genassym.8 "<citerefentry/<refentrytitle/genassym/<manvolnum/8//">
 <!ENTITY man.gensetdefs.8 "<citerefentry/<refentrytitle/gensetdefs/<manvolnum/8//">
 <!ENTITY man.getextattr.8 "<citerefentry/<refentrytitle/getextattr/<manvolnum/8//">
 <!ENTITY man.getfmac.8 "<citerefentry/<refentrytitle/getfmac/<manvolnum/8//">
 <!ENTITY man.getpmac.8 "<citerefentry/<refentrytitle/getpmac/<manvolnum/8//">
 <!ENTITY man.getty.8 "<citerefentry/<refentrytitle/getty/<manvolnum/8//">
+<!ENTITY man.geom.8 "<citerefentry/<refentrytitle/geom/<manvolnum/8//">
+<!ENTITY man.ggatec.8 "<citerefentry/<refentrytitle/ggatec/<manvolnum/8//">
+<!ENTITY man.ggated.8 "<citerefentry/<refentrytitle/ggated/<manvolnum/8//">
+<!ENTITY man.ggatel.8 "<citerefentry/<refentrytitle/ggatel/<manvolnum/8//">
 <!ENTITY man.gifconfig.8 "<citerefentry/<refentrytitle/gifconfig/<manvolnum/8//">
 <!ENTITY man.growfs.8 "<citerefentry/<refentrytitle/growfs/<manvolnum/8//">
 <!ENTITY man.gstat.8 "<citerefentry/<refentrytitle/gstat/<manvolnum/8//">
@@ -4204,6 +4213,7 @@
 <!ENTITY man.slip.8 "<citerefentry/<refentrytitle/slip/<manvolnum/8//">
 <!ENTITY man.sliplogin.8 "<citerefentry/<refentrytitle/sliplogin/<manvolnum/8//">
 <!ENTITY man.slstat.8 "<citerefentry/<refentrytitle/slstat/<manvolnum/8//">
+<!ENTITY man.smbmsg.8 "<citerefentry/<refentrytitle/smbmsg/<manvolnum/8//">
 <!ENTITY man.smrsh.8 "<citerefentry/<refentrytitle/smrsh/<manvolnum/8//">
 <!ENTITY man.spkrtest.8 "<citerefentry/<refentrytitle/spkrtest/<manvolnum/8//">
 <!ENTITY man.spppcontrol.8 "<citerefentry/<refentrytitle/spppcontrol/<manvolnum/8//">
@@ -4215,6 +4225,7 @@
 <!ENTITY man.stlload.8 "<citerefentry/<refentrytitle/stlload/<manvolnum/8//">
 <!ENTITY man.stlstats.8 "<citerefentry/<refentrytitle/stlstats/<manvolnum/8//">
 <!ENTITY man.strfile.8 "<citerefentry/<refentrytitle/strfile/<manvolnum/8//">
+<!ENTITY man.sunlabel.8 "<citerefentry/<refentrytitle/sunlabel/<manvolnum/8//">
 <!ENTITY man.svr4.8 "<citerefentry/<refentrytitle/svr4/<manvolnum/8//">
 <!ENTITY man.swapctl.8 "<citerefentry/<refentrytitle/swapctl/<manvolnum/8//">
 <!ENTITY man.swapfile.8 "<citerefentry/<refentrytitle/swapfile/<manvolnum/8//">

==== //depot/projects/davidxu_ksedbg/src/UPDATING#2 (text+ko) ====

@@ -17,7 +17,24 @@
 	developers choose to disable these features on build machines
 	to maximize performance.
 
-20040623:
+20040630:
+	The netgraph ABI version number has been incremented to indicate
+	an incompatible change in the ABI. Old netgraph nodes will refuse
+	to attach until recompiled. Netgraph now uses mbuf tags to move
+	metadata and this commit removes its home-grown metadata facility.
+	Nodes should just recompile, unless they use metadata, in which
+	case the changes are simple; the file ng_ksocket.c serves as an
+	example of such changes.
+
+20040630:
+	ACPI has been updated to disable known-bad BIOS revisions.  A message
+	will be printed on console indicating that ACPI has been disabled
+	automatically and that the user should use a newer BIOS, if possible.
+	If you think ACPI does work on your system and want to override
+	this (i.e., for testing), set hint.acpi.0.disabled="0" at the
+	loader prompt.
+
+20040623:
 	pf was updated to OpenBSD-stable 3.5 and pflogd(8) is priviledge
 	separated now. It uses the newly created "_pflogd" user/group
 	combination. If you plan to use pflogd(8) make sure to run
@@ -1653,4 +1670,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.318 2004/06/26 21:58:56 green Exp $
+$FreeBSD: src/UPDATING,v 1.321 2004/06/30 23:13:16 bms Exp $

==== //depot/projects/davidxu_ksedbg/src/etc/defaults/rc.conf#2 (text+ko) ====

@@ -13,7 +13,7 @@
 #
 # All arguments must be in double or single quotes.
 #
-# $FreeBSD: src/etc/defaults/rc.conf,v 1.209 2004/06/18 20:09:29 green Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.210 2004/06/30 15:58:46 imp Exp $
 
 ##############################################################

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


More information about the p4-projects mailing list