svn commit: r201998 - in user/ed/utmpx: . contrib/gcc/config/mips contrib/one-true-awk contrib/tcp_wrappers etc games/fortune/datfiles games/pom gnu/lib/libgcc gnu/usr.bin/binutils gnu/usr.bin/binu...

Ed Schouten ed at FreeBSD.org
Sun Jan 10 13:30:48 UTC 2010 

Author: ed
Date: Sun Jan 10 13:30:45 2010
New Revision: 201998
URL: http://svn.freebsd.org/changeset/base/201998

Log:
  Merge with HEAD.

Added:
  user/ed/utmpx/include/semaphore.h
     - copied unchanged from r201997, head/include/semaphore.h
  user/ed/utmpx/lib/libc/gen/sem_new.c
     - copied unchanged from r201997, head/lib/libc/gen/sem_new.c
  user/ed/utmpx/lib/libc/mips/gen/hardfloat/
     - copied from r201997, head/lib/libc/mips/gen/hardfloat/
  user/ed/utmpx/share/man/man3/pthread_affinity_np.3
     - copied unchanged from r201997, head/share/man/man3/pthread_affinity_np.3
  user/ed/utmpx/share/man/man3/pthread_attr_affinity_np.3
     - copied unchanged from r201997, head/share/man/man3/pthread_attr_affinity_np.3
  user/ed/utmpx/sys/boot/efi/libefi/efipart.c
     - copied unchanged from r201997, head/sys/boot/efi/libefi/efipart.c
  user/ed/utmpx/sys/conf/ldscript.mips.mips64
     - copied unchanged from r201997, head/sys/conf/ldscript.mips.mips64
  user/ed/utmpx/sys/conf/ldscript.mips.octeon1.32
     - copied unchanged from r201997, head/sys/conf/ldscript.mips.octeon1.32
  user/ed/utmpx/sys/conf/ldscript.mips.octeon1.64
     - copied unchanged from r201997, head/sys/conf/ldscript.mips.octeon1.64
  user/ed/utmpx/sys/conf/ldscript.mips.octeon1.n32
     - copied unchanged from r201997, head/sys/conf/ldscript.mips.octeon1.n32
  user/ed/utmpx/sys/dev/flash/mx25l.c
     - copied unchanged from r201997, head/sys/dev/flash/mx25l.c
  user/ed/utmpx/sys/dev/flash/mx25lreg.h
     - copied unchanged from r201997, head/sys/dev/flash/mx25lreg.h
     - copied from r201997, head/sys/dev/siba/siba/
     - copied from r201997, head/sys/mips/atheros/
     - copied from r201997, head/sys/mips/cavium/
  user/ed/utmpx/sys/mips/conf/AR71XX
     - copied unchanged from r201997, head/sys/mips/conf/AR71XX
  user/ed/utmpx/sys/mips/conf/AR71XX.hints
     - copied unchanged from r201997, head/sys/mips/conf/AR71XX.hints
  user/ed/utmpx/sys/mips/conf/MALTA64
     - copied unchanged from r201997, head/sys/mips/conf/MALTA64
  user/ed/utmpx/sys/mips/conf/OCTEON1
     - copied unchanged from r201997, head/sys/mips/conf/OCTEON1
  user/ed/utmpx/sys/mips/conf/OCTEON1-32
     - copied unchanged from r201997, head/sys/mips/conf/OCTEON1-32
  user/ed/utmpx/sys/mips/conf/OCTEON1.hints
     - copied unchanged from r201997, head/sys/mips/conf/OCTEON1.hints
  user/ed/utmpx/sys/mips/conf/SWARM
     - copied unchanged from r201997, head/sys/mips/conf/SWARM
  user/ed/utmpx/sys/mips/conf/SWARM.hints
     - copied unchanged from r201997, head/sys/mips/conf/SWARM.hints
  user/ed/utmpx/sys/mips/conf/XLR
     - copied unchanged from r201997, head/sys/mips/conf/XLR
  user/ed/utmpx/sys/mips/mips/ptrace_machdep.c
     - copied unchanged from r201997, head/sys/mips/mips/ptrace_machdep.c
     - copied from r201997, head/sys/mips/rmi/
     - copied from r201997, head/sys/mips/sibyte/
  user/ed/utmpx/tools/regression/posixsem2/
     - copied from r201997, head/tools/regression/posixsem2/
  user/ed/utmpx/tools/regression/usr.bin/make/sysmk/
     - copied from r201997, head/tools/regression/usr.bin/make/sysmk/
  user/ed/utmpx/usr.sbin/traceroute/findsaddr-udp.c
     - copied unchanged from r201997, head/usr.sbin/traceroute/findsaddr-udp.c
Directory Properties:
  user/ed/utmpx/sys/dev/siba/siba/   (props changed)
  user/ed/utmpx/sys/mips/atheros/   (props changed)
  user/ed/utmpx/sys/mips/cavium/   (props changed)
  user/ed/utmpx/sys/mips/rmi/   (props changed)
  user/ed/utmpx/sys/mips/sibyte/   (props changed)
Deleted:
  user/ed/utmpx/contrib/one-true-awk/mac.code
  user/ed/utmpx/lib/libc/mips/gen/fpgetmask.c
  user/ed/utmpx/lib/libc/mips/gen/fpgetround.c
  user/ed/utmpx/lib/libc/mips/gen/fpgetsticky.c
  user/ed/utmpx/lib/libc/mips/gen/fpsetmask.c
  user/ed/utmpx/lib/libc/mips/gen/fpsetround.c
  user/ed/utmpx/lib/libc/mips/gen/fpsetsticky.c
  user/ed/utmpx/sys/boot/efi/libefi/efifs.c
  user/ed/utmpx/sys/mips/sentry5/siba_cc.c
  user/ed/utmpx/sys/mips/sentry5/siba_mips.c
  user/ed/utmpx/sys/mips/sentry5/siba_sdram.c
  user/ed/utmpx/sys/sys/semaphore.h
  user/ed/utmpx/usr.bin/awk/b.c.diff
  user/ed/utmpx/usr.bin/awk/main.c.diff
  user/ed/utmpx/usr.bin/awk/run.c.diff
Modified:
  user/ed/utmpx/Makefile
  user/ed/utmpx/ObsoleteFiles.inc
  user/ed/utmpx/UPDATING
  user/ed/utmpx/contrib/gcc/config/mips/freebsd.h
  user/ed/utmpx/contrib/one-true-awk/FIXES
  user/ed/utmpx/contrib/one-true-awk/b.c
  user/ed/utmpx/contrib/one-true-awk/lib.c
  user/ed/utmpx/contrib/one-true-awk/main.c
  user/ed/utmpx/contrib/one-true-awk/makefile
  user/ed/utmpx/contrib/one-true-awk/maketab.c
  user/ed/utmpx/contrib/one-true-awk/proctab.c
  user/ed/utmpx/contrib/one-true-awk/proto.h
  user/ed/utmpx/contrib/one-true-awk/run.c
  user/ed/utmpx/contrib/tcp_wrappers/hosts_access.c
  user/ed/utmpx/etc/rc.firewall
  user/ed/utmpx/games/fortune/datfiles/fortunes
  user/ed/utmpx/games/fortune/datfiles/fortunes-o.real
  user/ed/utmpx/games/pom/pom.6
  user/ed/utmpx/games/pom/pom.c
  user/ed/utmpx/gnu/lib/libgcc/Makefile
  user/ed/utmpx/gnu/usr.bin/binutils/Makefile.inc0
  user/ed/utmpx/gnu/usr.bin/binutils/ld/Makefile.mips
  user/ed/utmpx/gnu/usr.bin/cc/Makefile.tgt
  user/ed/utmpx/include/Makefile
  user/ed/utmpx/include/dirent.h
  user/ed/utmpx/include/strings.h
  user/ed/utmpx/kerberos5/usr.bin/kdestroy/Makefile
  user/ed/utmpx/kerberos5/usr.bin/kpasswd/Makefile
  user/ed/utmpx/lib/libc/Makefile
  user/ed/utmpx/lib/libc/gen/Makefile.inc
  user/ed/utmpx/lib/libc/gen/Symbol.map
  user/ed/utmpx/lib/libc/gen/_pthread_stubs.c
  user/ed/utmpx/lib/libc/gen/opendir.c
  user/ed/utmpx/lib/libc/gen/scandir.c
  user/ed/utmpx/lib/libc/gen/sem.c
  user/ed/utmpx/lib/libc/gen/sem_init.3
  user/ed/utmpx/lib/libc/gen/sem_open.3
  user/ed/utmpx/lib/libc/include/libc_private.h
  user/ed/utmpx/lib/libc/mips/Symbol.map
  user/ed/utmpx/lib/libc/mips/sys/brk.S
  user/ed/utmpx/lib/libc/rpc/getnetpath.c
  user/ed/utmpx/lib/libc/rpc/svc_auth_des.c
  user/ed/utmpx/lib/libc/stdio/getc.3
  user/ed/utmpx/lib/libc/stdtime/localtime.c
  user/ed/utmpx/lib/libc/sys/cpuset.2
  user/ed/utmpx/lib/libc/sys/cpuset_getaffinity.2
  user/ed/utmpx/lib/libc/sys/sendfile.2
  user/ed/utmpx/lib/libstand/dosfs.c
  user/ed/utmpx/lib/libthr/arch/mips/include/pthread_md.h
  user/ed/utmpx/lib/libthr/pthread.map
  user/ed/utmpx/lib/libthr/thread/thr_init.c
  user/ed/utmpx/lib/libthr/thread/thr_private.h
  user/ed/utmpx/lib/libthr/thread/thr_sem.c
  user/ed/utmpx/release/doc/share/misc/dev.archlist.txt
  user/ed/utmpx/sbin/dumpfs/dumpfs.c
  user/ed/utmpx/sbin/fsck_ffs/fsutil.c
  user/ed/utmpx/sbin/fsck_ffs/main.c
  user/ed/utmpx/sbin/fsck_ffs/pass1.c
  user/ed/utmpx/sbin/geom/class/raid3/geom_raid3.c
  user/ed/utmpx/sbin/geom/class/raid3/graid3.8
  user/ed/utmpx/sbin/geom/class/stripe/geom_stripe.c
  user/ed/utmpx/share/man/man3/Makefile
  user/ed/utmpx/share/man/man3/pthread.3
  user/ed/utmpx/share/man/man3/pthread_attr.3
  user/ed/utmpx/share/man/man4/bridge.4
  user/ed/utmpx/share/man/man4/carp.4
  user/ed/utmpx/share/man/man4/faith.4
  user/ed/utmpx/share/man/man4/uart.4
  user/ed/utmpx/share/man/man7/security.7
  user/ed/utmpx/share/man/man9/VFS.9
  user/ed/utmpx/share/man/man9/VFS_CHECKEXP.9
  user/ed/utmpx/share/man/man9/VFS_FHTOVP.9
  user/ed/utmpx/share/man/man9/sleepqueue.9
  user/ed/utmpx/share/mk/bsd.libnames.mk
  user/ed/utmpx/sys/amd64/amd64/sys_machdep.c
  user/ed/utmpx/sys/amd64/conf/DEFAULTS
  user/ed/utmpx/sys/amd64/conf/Makefile
  user/ed/utmpx/sys/arm/conf/DEFAULTS
  user/ed/utmpx/sys/boot/common/bootstrap.h
  user/ed/utmpx/sys/boot/common/dev_net.c
  user/ed/utmpx/sys/boot/efi/include/efilib.h
  user/ed/utmpx/sys/boot/efi/libefi/Makefile
  user/ed/utmpx/sys/boot/ia64/efi/conf.c
  user/ed/utmpx/sys/boot/ia64/efi/main.c
  user/ed/utmpx/sys/boot/ia64/efi/version
  user/ed/utmpx/sys/boot/sparc64/loader/Makefile
  user/ed/utmpx/sys/boot/zfs/zfsimpl.c
  user/ed/utmpx/sys/cam/ata/ata_xpt.c
  user/ed/utmpx/sys/cam/scsi/scsi_ses.c
  user/ed/utmpx/sys/cam/scsi/scsi_targ_bh.c
  user/ed/utmpx/sys/cddl/boot/zfs/zfsimpl.h
  user/ed/utmpx/sys/cddl/boot/zfs/zfssubr.c
  user/ed/utmpx/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c
  user/ed/utmpx/sys/compat/linux/linux_futex.c
  user/ed/utmpx/sys/conf/Makefile.mips
  user/ed/utmpx/sys/conf/NOTES
  user/ed/utmpx/sys/conf/files
  user/ed/utmpx/sys/conf/files.mips
  user/ed/utmpx/sys/conf/kern.mk
  user/ed/utmpx/sys/conf/ldscript.mips
  user/ed/utmpx/sys/conf/makeLINT.mk
  user/ed/utmpx/sys/conf/options
  user/ed/utmpx/sys/conf/options.mips
  user/ed/utmpx/sys/contrib/ngatm/netnatm/api/cc_conn.c
  user/ed/utmpx/sys/ddb/db_ps.c
  user/ed/utmpx/sys/dev/aac/aac.c
  user/ed/utmpx/sys/dev/acpi_support/acpi_ibm.c
  user/ed/utmpx/sys/dev/agp/agp.c
  user/ed/utmpx/sys/dev/amd/amd.c
  user/ed/utmpx/sys/dev/amr/amr.c
  user/ed/utmpx/sys/dev/arcmsr/arcmsr.c
  user/ed/utmpx/sys/dev/ata/ata-all.c
  user/ed/utmpx/sys/dev/ata/ata-raid.c
  user/ed/utmpx/sys/dev/ata/chipsets/ata-ahci.c
  user/ed/utmpx/sys/dev/ata/chipsets/ata-ati.c
  user/ed/utmpx/sys/dev/ata/chipsets/ata-siliconimage.c
  user/ed/utmpx/sys/dev/ath/ath_hal/ar5211/ar5211_reset.c
  user/ed/utmpx/sys/dev/ath/ath_hal/ar5212/ar5212_interrupts.c
  user/ed/utmpx/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c
  user/ed/utmpx/sys/dev/bktr/bktr_i2c.c
  user/ed/utmpx/sys/dev/cardbus/cardbus.c
  user/ed/utmpx/sys/dev/cs/if_cs.c
  user/ed/utmpx/sys/dev/cxgb/common/cxgb_t3_hw.c
  user/ed/utmpx/sys/dev/cxgb/cxgb_sge.c
  user/ed/utmpx/sys/dev/de/if_de.c
  user/ed/utmpx/sys/dev/dpt/dpt.h
  user/ed/utmpx/sys/dev/dpt/dpt_scsi.c
  user/ed/utmpx/sys/dev/e1000/if_em.c
  user/ed/utmpx/sys/dev/ep/if_ep.c
  user/ed/utmpx/sys/dev/ex/if_ex.c
  user/ed/utmpx/sys/dev/fatm/if_fatm.c
  user/ed/utmpx/sys/dev/firewire/sbp.c
  user/ed/utmpx/sys/dev/hatm/if_hatm.c
  user/ed/utmpx/sys/dev/hptmv/entry.c
  user/ed/utmpx/sys/dev/if_ndis/if_ndis.c
  user/ed/utmpx/sys/dev/if_ndis/if_ndis_usb.c
  user/ed/utmpx/sys/dev/iir/iir.c
  user/ed/utmpx/sys/dev/iir/iir_pci.c
  user/ed/utmpx/sys/dev/iscsi/initiator/isc_sm.c
  user/ed/utmpx/sys/dev/isp/isp.c
  user/ed/utmpx/sys/dev/isp/isp_library.c
  user/ed/utmpx/sys/dev/iwn/if_iwn.c
  user/ed/utmpx/sys/dev/iwn/if_iwnvar.h
  user/ed/utmpx/sys/dev/ixgbe/ixgbe.c
  user/ed/utmpx/sys/dev/jme/if_jme.c
  user/ed/utmpx/sys/dev/lmc/if_lmc.c
  user/ed/utmpx/sys/dev/malo/if_malo.c
  user/ed/utmpx/sys/dev/mge/if_mge.c
  user/ed/utmpx/sys/dev/mly/mly.c
  user/ed/utmpx/sys/dev/mxge/if_mxge.c
  user/ed/utmpx/sys/dev/patm/if_patm_intr.c
  user/ed/utmpx/sys/dev/pci/pci.c
  user/ed/utmpx/sys/dev/pci/pci_private.h
  user/ed/utmpx/sys/dev/pdq/if_fea.c
  user/ed/utmpx/sys/dev/safe/safe.c
  user/ed/utmpx/sys/dev/sound/pci/maestro3.c
  user/ed/utmpx/sys/dev/ste/if_ste.c
  user/ed/utmpx/sys/dev/trm/trm.c
  user/ed/utmpx/sys/dev/usb/controller/musb_otg.c
  user/ed/utmpx/sys/dev/usb/controller/uhci.c
  user/ed/utmpx/sys/dev/usb/quirk/usb_quirk.c
  user/ed/utmpx/sys/dev/usb/serial/u3g.c
  user/ed/utmpx/sys/dev/usb/storage/umass.c
  user/ed/utmpx/sys/dev/usb/usb_device.c
  user/ed/utmpx/sys/dev/usb/usb_msctest.c
  user/ed/utmpx/sys/dev/usb/usb_msctest.h
  user/ed/utmpx/sys/dev/usb/usbdevs
  user/ed/utmpx/sys/fs/procfs/procfs_status.c
  user/ed/utmpx/sys/fs/smbfs/smbfs_smb.c
  user/ed/utmpx/sys/fs/tmpfs/tmpfs_vfsops.c
  user/ed/utmpx/sys/geom/geom_slice.c
  user/ed/utmpx/sys/geom/mirror/g_mirror.c
  user/ed/utmpx/sys/geom/part/g_part.c
  user/ed/utmpx/sys/geom/raid3/g_raid3.c
  user/ed/utmpx/sys/geom/uzip/g_uzip.c
  user/ed/utmpx/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c
  user/ed/utmpx/sys/i386/conf/DEFAULTS
  user/ed/utmpx/sys/i386/conf/Makefile
  user/ed/utmpx/sys/i386/conf/PAE
  user/ed/utmpx/sys/i386/i386/locore.s
  user/ed/utmpx/sys/i386/i386/pmap.c
  user/ed/utmpx/sys/i386/include/pmap.h
  user/ed/utmpx/sys/i386/xen/locore.s
  user/ed/utmpx/sys/i386/xen/pmap.c
  user/ed/utmpx/sys/ia64/conf/DEFAULTS
  user/ed/utmpx/sys/ia64/conf/Makefile
  user/ed/utmpx/sys/isa/pnp.c
  user/ed/utmpx/sys/kern/kern_clock.c
  user/ed/utmpx/sys/kern/kern_cpu.c
  user/ed/utmpx/sys/kern/kern_fail.c
  user/ed/utmpx/sys/kern/kern_lock.c
  user/ed/utmpx/sys/kern/kern_mib.c
  user/ed/utmpx/sys/kern/kern_umtx.c
  user/ed/utmpx/sys/kern/sched_4bsd.c
  user/ed/utmpx/sys/kern/subr_firmware.c
  user/ed/utmpx/sys/kern/subr_sleepqueue.c
  user/ed/utmpx/sys/kern/subr_turnstile.c
  user/ed/utmpx/sys/kern/tty.c
  user/ed/utmpx/sys/kern/tty_compat.c
  user/ed/utmpx/sys/kern/tty_pts.c
  user/ed/utmpx/sys/kern/uipc_sem.c
  user/ed/utmpx/sys/mips/adm5120/if_admsw.c
  user/ed/utmpx/sys/mips/conf/DEFAULTS
  user/ed/utmpx/sys/mips/include/sysarch.h
  user/ed/utmpx/sys/mips/mips/elf_machdep.c
  user/ed/utmpx/sys/modules/crypto/Makefile
  user/ed/utmpx/sys/net/flowtable.c
  user/ed/utmpx/sys/net/if_bridge.c
  user/ed/utmpx/sys/net/if_epair.c
  user/ed/utmpx/sys/net/if_ethersubr.c
  user/ed/utmpx/sys/net/if_lagg.c
  user/ed/utmpx/sys/net80211/ieee80211_node.c
  user/ed/utmpx/sys/net80211/ieee80211_var.h
  user/ed/utmpx/sys/netgraph/ng_ether.c
  user/ed/utmpx/sys/netgraph/ng_ipfw.c
  user/ed/utmpx/sys/netinet/if_ether.c
  user/ed/utmpx/sys/netinet/in.c
  user/ed/utmpx/sys/netinet/ip_carp.c
  user/ed/utmpx/sys/netinet/ip_divert.c
  user/ed/utmpx/sys/netinet/ip_divert.h
  user/ed/utmpx/sys/netinet/ip_dummynet.h
  user/ed/utmpx/sys/netinet/ip_var.h
  user/ed/utmpx/sys/netinet/ipfw/ip_dummynet.c
  user/ed/utmpx/sys/netinet/ipfw/ip_fw2.c
  user/ed/utmpx/sys/netinet/ipfw/ip_fw_dynamic.c
  user/ed/utmpx/sys/netinet/ipfw/ip_fw_log.c
  user/ed/utmpx/sys/netinet/ipfw/ip_fw_nat.c
  user/ed/utmpx/sys/netinet/ipfw/ip_fw_pfil.c
  user/ed/utmpx/sys/netinet/ipfw/ip_fw_private.h
  user/ed/utmpx/sys/netinet/ipfw/ip_fw_sockopt.c
  user/ed/utmpx/sys/netinet/ipfw/ip_fw_table.c
  user/ed/utmpx/sys/netinet/libalias/alias_db.c
  user/ed/utmpx/sys/netinet/libalias/alias_mod.c
  user/ed/utmpx/sys/netinet/raw_ip.c
  user/ed/utmpx/sys/netinet/sctp_asconf.c
  user/ed/utmpx/sys/netinet/sctputil.c
  user/ed/utmpx/sys/netinet6/icmp6.c
  user/ed/utmpx/sys/netinet6/ip6_input.c
  user/ed/utmpx/sys/netinet6/nd6_rtr.c
  user/ed/utmpx/sys/nfsclient/bootp_subr.c
  user/ed/utmpx/sys/nfsclient/nfs_vfsops.c
  user/ed/utmpx/sys/nfsclient/nfs_vnops.c
  user/ed/utmpx/sys/nfsserver/nfs.h
  user/ed/utmpx/sys/nfsserver/nfs_fha.c
  user/ed/utmpx/sys/nfsserver/nfs_srvkrpc.c
  user/ed/utmpx/sys/opencrypto/cryptosoft.c
  user/ed/utmpx/sys/pc98/conf/DEFAULTS
  user/ed/utmpx/sys/pc98/conf/Makefile
  user/ed/utmpx/sys/pci/ncr.c
  user/ed/utmpx/sys/powerpc/aim/mmu_oea.c
  user/ed/utmpx/sys/powerpc/aim/mmu_oea64.c
  user/ed/utmpx/sys/powerpc/booke/pmap.c
  user/ed/utmpx/sys/powerpc/conf/DEFAULTS
  user/ed/utmpx/sys/powerpc/conf/Makefile
  user/ed/utmpx/sys/rpc/clnt_dg.c
  user/ed/utmpx/sys/rpc/rpcsec_gss/rpcsec_gss_prot.c
  user/ed/utmpx/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c
  user/ed/utmpx/sys/sparc64/conf/DEFAULTS
  user/ed/utmpx/sys/sparc64/conf/GENERIC
  user/ed/utmpx/sys/sparc64/conf/Makefile
  user/ed/utmpx/sys/sun4v/conf/DEFAULTS
  user/ed/utmpx/sys/sun4v/conf/Makefile
  user/ed/utmpx/sys/sys/_semaphore.h
  user/ed/utmpx/sys/sys/proc.h
  user/ed/utmpx/sys/sys/sleepqueue.h
  user/ed/utmpx/sys/sys/socket.h
  user/ed/utmpx/sys/sys/tty.h
  user/ed/utmpx/sys/ufs/ffs/ffs_snapshot.c
  user/ed/utmpx/sys/ufs/ufs/ufs_dirhash.c
  user/ed/utmpx/sys/xen/xenbus/xenbus_probe.c
  user/ed/utmpx/tools/build/mk/OptionalObsoleteFiles.inc
  user/ed/utmpx/tools/regression/usr.bin/make/common.sh
  user/ed/utmpx/usr.bin/awk/Makefile
  user/ed/utmpx/usr.bin/ctags/Makefile
  user/ed/utmpx/usr.bin/ctags/ctags.c
  user/ed/utmpx/usr.bin/ctags/fortran.c
  user/ed/utmpx/usr.bin/last/last.c
  user/ed/utmpx/usr.bin/make/dir.c
  user/ed/utmpx/usr.bin/make/dir.h
  user/ed/utmpx/usr.bin/make/main.c
  user/ed/utmpx/usr.bin/make/make.1
  user/ed/utmpx/usr.bin/tcopy/tcopy.c
  user/ed/utmpx/usr.bin/unzip/unzip.c
  user/ed/utmpx/usr.bin/w/Makefile
  user/ed/utmpx/usr.bin/w/w.c
  user/ed/utmpx/usr.bin/xlint/xlint/Makefile
  user/ed/utmpx/usr.bin/xlint/xlint/xlint.c
  user/ed/utmpx/usr.sbin/cdcontrol/Makefile
  user/ed/utmpx/usr.sbin/cdcontrol/cdcontrol.c
  user/ed/utmpx/usr.sbin/faithd/faithd.8
  user/ed/utmpx/usr.sbin/mergemaster/mergemaster.8
  user/ed/utmpx/usr.sbin/mergemaster/mergemaster.sh
  user/ed/utmpx/usr.sbin/traceroute/Makefile
  user/ed/utmpx/usr.sbin/usbconfig/Makefile
  user/ed/utmpx/usr.sbin/usbconfig/dump.c
  user/ed/utmpx/usr.sbin/usbconfig/dump.h
  user/ed/utmpx/usr.sbin/usbconfig/usbconfig.8
  user/ed/utmpx/usr.sbin/usbconfig/usbconfig.c
Directory Properties:
  user/ed/utmpx/   (props changed)
  user/ed/utmpx/contrib/one-true-awk/   (props changed)
  user/ed/utmpx/sys/mips/rmi/dev/   (props changed)

Modified: user/ed/utmpx/Makefile
==============================================================================
--- user/ed/utmpx/Makefile	Sun Jan 10 13:15:58 2010	(r201997)
+++ user/ed/utmpx/Makefile	Sun Jan 10 13:30:45 2010	(r201998)
@@ -278,7 +278,7 @@ tinderbox:
 # with a reasonable chance of success, regardless of how old your
 # existing system is.
 #
-.if make(universe) || make(tinderbox)
+.if make(universe) || make(universe_kernels) || make(tinderbox)
 TARGETS?=amd64 arm i386 ia64 mips pc98 powerpc sparc64 sun4v
 
 .if defined(DOING_TINDERBOX)
@@ -297,10 +297,6 @@ universe_prologue:
 	rm -f ${FAILFILE}
 .endif
 .for target in ${TARGETS}
-KERNCONFS!=	cd ${.CURDIR}/sys/${target}/conf && \
-		find [A-Z0-9]*[A-Z0-9] -type f -maxdepth 0 \
-		! -name DEFAULTS ! -name LINT
-KERNCONFS:=	${KERNCONFS:S/^NOTES$/LINT/}
 universe: universe_${target}
 .ORDER: universe_prologue universe_${target} universe_epilogue
 universe_${target}:
@@ -320,16 +316,25 @@ universe_${target}:
 	    (echo "${target} 'make LINT' failed," \
 	    "check _.${target}.makeLINT for details"| ${MAKEFAIL}))
 .endif
+	@cd ${.CURDIR} && ${MAKE} ${.MAKEFLAGS} TARGET=${target} \
+	    universe_kernels
+	@echo ">> ${target} completed on `LC_ALL=C date`"
+.endfor
+universe_kernels: universe_kernconfs
+XMACHINE!=	uname -m
+TARGET?=	${XMACHINE}
+KERNCONFS!=	cd ${.CURDIR}/sys/${TARGET}/conf && \
+		find [A-Z0-9]*[A-Z0-9] -type f -maxdepth 0 \
+		! -name DEFAULTS ! -name NOTES
+universe_kernconfs:
 .for kernel in ${KERNCONFS}
 	@(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \
 	    ${MAKE} ${JFLAG} buildkernel \
-	    TARGET=${target} \
+	    TARGET=${TARGET} \
 	    KERNCONF=${kernel} \
-	    > _.${target}.${kernel} 2>&1 || \
-	    (echo "${target} ${kernel} kernel failed," \
-	    "check _.${target}.${kernel} for details"| ${MAKEFAIL}))
-.endfor
-	@echo ">> ${target} completed on `LC_ALL=C date`"
+	    > _.${TARGET}.${kernel} 2>&1 || \
+	    (echo "${TARGET} ${kernel} kernel failed," \
+	    "check _.${TARGET}.${kernel} for details"| ${MAKEFAIL}))
 .endfor
 universe: universe_epilogue
 universe_epilogue:

Modified: user/ed/utmpx/ObsoleteFiles.inc
==============================================================================
--- user/ed/utmpx/ObsoleteFiles.inc	Sun Jan 10 13:15:58 2010	(r201997)
+++ user/ed/utmpx/ObsoleteFiles.inc	Sun Jan 10 13:30:45 2010	(r201998)
@@ -14,7 +14,7 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
-# 20100104: utmp and utility functions replaced by utmpx
+# 20100110: utmp and utility functions replaced by utmpx
 OLD_FILES+=usr/share/man/man3/login.3.gz
 OLD_FILES+=usr/share/man/man3/logout.3.gz
 OLD_FILES+=usr/share/man/man3/logwtmp.3.gz
@@ -29,6 +29,8 @@ OLD_FILES+=usr/share/man/man5/lastlog.5.
 OLD_FILES+=usr/share/man/man5/utmp.5.gz
 OLD_FILES+=usr/share/man/man5/wtmp.5.gz
 OLD_LIBS+=lib/libutil.so.8
+# 20100105: new userland semaphore implementation
+OLD_FILES+=usr/include/sys/semaphore.h
 # 20100103: ntptrace(8) removed
 OLD_FILES+=usr/sbin/ntptrace
 OLD_FILES+=usr/share/man/man8/ntptrace.8.gz

Modified: user/ed/utmpx/UPDATING
==============================================================================
--- user/ed/utmpx/UPDATING	Sun Jan 10 13:15:58 2010	(r201997)
+++ user/ed/utmpx/UPDATING	Sun Jan 10 13:30:45 2010	(r201998)
@@ -22,6 +22,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 9.
 	machines to maximize performance.  (To disable malloc debugging, run
 	ln -s aj /etc/malloc.conf.)
 
+20100108:
+	Introduce the kernel thread "deadlock resolver" (which can be enabled
+	via the DEADLKRES option, see NOTES for more details) and the
+	sleepq_type() function for sleepqueues.
+
 20091202:
 	The rc.firewall and rc.firewall6 were unified, and
 	rc.firewall6 and rc.d/ip6fw were removed.

Modified: user/ed/utmpx/contrib/gcc/config/mips/freebsd.h
==============================================================================
--- user/ed/utmpx/contrib/gcc/config/mips/freebsd.h	Sun Jan 10 13:15:58 2010	(r201997)
+++ user/ed/utmpx/contrib/gcc/config/mips/freebsd.h	Sun Jan 10 13:30:45 2010	(r201998)
@@ -97,6 +97,9 @@ Boston, MA 02110-1301, USA.  */
    Needs to agree with <machine/ansi.h>.  GCC defaults come from c-decl.c,
    c-common.c, and config/<arch>/<arch>.h.  */
 
+#undef TARGET_DEFAULT
+#define TARGET_DEFAULT (MASK_ABICALLS | MASK_SOFT_FLOAT)
+
 #if TARGET_ENDIAN_DEFAULT != 0
 #define TARGET_VERSION	fprintf (stderr, " (FreeBSD/mips)");
 #else

Modified: user/ed/utmpx/contrib/one-true-awk/FIXES
==============================================================================
--- user/ed/utmpx/contrib/one-true-awk/FIXES	Sun Jan 10 13:15:58 2010	(r201997)
+++ user/ed/utmpx/contrib/one-true-awk/FIXES	Sun Jan 10 13:30:45 2010	(r201998)
@@ -25,6 +25,23 @@ THIS SOFTWARE.
 This file lists all bug fixes, changes, etc., made since the AWK book
 was sent to the printers in August, 1987.
 
+Nov 26, 2009:
+	fixed a long-standing issue with when FS takes effect.  a
+	change to FS is now noticed immediately for subsequent splits.
+
+	changed the name getline() to awkgetline() to avoid yet another
+	name conflict somewhere.
+
+Feb 11, 2009:
+	temporarily for now defined HAS_ISBLANK, since that seems to
+	be the best way through the thicket.  isblank arrived in C99,
+	but seems to be arriving at different systems at different
+	times.
+
+Oct 8, 2008:
+	fixed typo in b.c that set tmpvec wrongly.  no one had ever
+	run into the problem, apparently.  thanks to alistair crooks.
+
 Oct 23, 2007:
 	minor fix in lib.c: increase inputFS to 100, change malloc
 	for fields to n+1.  

Modified: user/ed/utmpx/contrib/one-true-awk/b.c
==============================================================================
--- user/ed/utmpx/contrib/one-true-awk/b.c	Sun Jan 10 13:15:58 2010	(r201997)
+++ user/ed/utmpx/contrib/one-true-awk/b.c	Sun Jan 10 13:30:45 2010	(r201998)
@@ -24,6 +24,9 @@ THIS SOFTWARE.
 
 /* lasciate ogne speranza, voi ch'intrate. */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #define	DEBUG
 
 #include <ctype.h>
@@ -285,9 +288,21 @@ int quoted(char **pp)	/* pick up next th
 	return c;
 }
 
+static int collate_range_cmp(int a, int b)
+{
+	static char s[2][2];
+
+	if ((uschar)a == (uschar)b)
+		return 0;
+	s[0][0] = a;
+	s[1][0] = b;
+	return (strcoll(s[0], s[1]));
+}
+
 char *cclenter(const char *argp)	/* add a character class */
 {
 	int i, c, c2;
+	int j;
 	uschar *p = (uschar *) argp;
 	uschar *op, *bp;
 	static uschar *buf = 0;
@@ -306,15 +321,18 @@ char *cclenter(const char *argp)	/* add 
 				c2 = *p++;
 				if (c2 == '\\')
 					c2 = quoted((char **) &p);
-				if (c > c2) {	/* empty; ignore */
+				if (collate_range_cmp(c, c2) > 0) {
 					bp--;
 					i--;
 					continue;
 				}
-				while (c < c2) {
+				for (j = 0; j < NCHARS; j++) {
+					if ((collate_range_cmp(c, j) > 0) ||
+					    collate_range_cmp(j, c2) > 0)
+						continue;
 					if (!adjbuf((char **) &buf, &bufsz, bp-buf+2, 100, (char **) &bp, "cclenter1"))
 						FATAL("out of space for character class [%.10s...] 2", p);
-					*bp++ = ++c;
+					*bp++ = j;
 					i++;
 				}
 				continue;
@@ -731,6 +749,7 @@ Node *unary(Node *np)
  * to nelson beebe for the suggestion; let's see if it works everywhere.
  */
 
+/* #define HAS_ISBLANK */
 #ifndef HAS_ISBLANK
 
 int (isblank)(int c)
@@ -876,7 +895,7 @@ int cgoto(fa *f, int s, int c)
 					if (q[j] >= maxsetvec) {
 						maxsetvec *= 4;
 						setvec = (int *) realloc(setvec, maxsetvec * sizeof(int));
-						tmpset = (int *) realloc(setvec, maxsetvec * sizeof(int));
+						tmpset = (int *) realloc(tmpset, maxsetvec * sizeof(int));
 						if (setvec == 0 || tmpset == 0)
 							overflo("cgoto overflow");
 					}

Modified: user/ed/utmpx/contrib/one-true-awk/lib.c
==============================================================================
--- user/ed/utmpx/contrib/one-true-awk/lib.c	Sun Jan 10 13:15:58 2010	(r201997)
+++ user/ed/utmpx/contrib/one-true-awk/lib.c	Sun Jan 10 13:30:45 2010	(r201998)
@@ -274,6 +274,7 @@ void fldbld(void)	/* create fields from 
 	}
 	fr = fields;
 	i = 0;	/* number of fields accumulated here */
+	strcpy(inputFS, *FS);
 	if (strlen(inputFS) > 1) {	/* it's a regular expression */
 		i = refldbld(r, inputFS);
 	} else if ((sep = *inputFS) == ' ') {	/* default whitespace */

Modified: user/ed/utmpx/contrib/one-true-awk/main.c
==============================================================================
--- user/ed/utmpx/contrib/one-true-awk/main.c	Sun Jan 10 13:15:58 2010	(r201997)
+++ user/ed/utmpx/contrib/one-true-awk/main.c	Sun Jan 10 13:30:45 2010	(r201998)
@@ -22,7 +22,10 @@ ARISING OUT OF OR IN CONNECTION WITH THE
 THIS SOFTWARE.
 ****************************************************************/
 
-const char	*version = "version 20070501";
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+const char	*version = "version 20091126 (FreeBSD)";
 
 #define DEBUG
 #include <stdio.h>
@@ -58,6 +61,7 @@ int main(int argc, char *argv[])
 	const char *fs = NULL;
 
 	setlocale(LC_CTYPE, "");
+	setlocale(LC_COLLATE, "");
 	setlocale(LC_NUMERIC, "C"); /* for parsing cmdline & prog */
 	cmdname = argv[0];
 	if (argc == 1) {
@@ -86,13 +90,18 @@ int main(int argc, char *argv[])
 				safe = 1;
 			break;
 		case 'f':	/* next argument is program filename */
-			argc--;
-			argv++;
-			if (argc <= 1)
-				FATAL("no program filename");
-			if (npfile >= MAX_PFILE - 1)
-				FATAL("too many -f options"); 
-			pfile[npfile++] = argv[1];
+			if (argv[1][2] != 0) {	/* arg is -fsomething */
+				if (npfile >= MAX_PFILE - 1)
+					FATAL("too many -f options"); 
+				pfile[npfile++] = &argv[1][2];
+			} else {		/* arg is -f something */
+				argc--; argv++;
+				if (argc <= 1)
+					FATAL("no program filename");
+				if (npfile >= MAX_PFILE - 1)
+					FATAL("too many -f options"); 
+				pfile[npfile++] = argv[1];
+			}
 			break;
 		case 'F':	/* set field separator */
 			if (argv[1][2] != 0) {	/* arg is -Fsomething */
@@ -111,8 +120,14 @@ int main(int argc, char *argv[])
 				WARNING("field separator FS is empty");
 			break;
 		case 'v':	/* -v a=1 to be done NOW.  one -v for each */
-			if (argv[1][2] == '\0' && --argc > 1 && isclvar((++argv)[1]))
-				setclvar(argv[1]);
+			if (argv[1][2] != 0) {	/* arg is -vsomething */
+				if (argv[1][2] != 0)
+					setclvar(&argv[1][2]);
+			} else {		/* arg is -v something */
+				argc--; argv++;
+				if (argc > 1 && isclvar(argv[1]))
+					setclvar(argv[1]);
+			}
 			break;
 		case 'd':
 			dbg = atoi(&argv[1][2]);

Modified: user/ed/utmpx/contrib/one-true-awk/makefile
==============================================================================
--- user/ed/utmpx/contrib/one-true-awk/makefile	Sun Jan 10 13:15:58 2010	(r201997)
+++ user/ed/utmpx/contrib/one-true-awk/makefile	Sun Jan 10 13:30:45 2010	(r201998)
@@ -31,7 +31,6 @@ CC = gcc -fprofile-arcs -ftest-coverage 
 CC = gcc -Wall -g
 CC = cc
 CC = gcc -O4
-CC = gcc -Wall -g
 
 
 YACC = bison -y

Modified: user/ed/utmpx/contrib/one-true-awk/maketab.c
==============================================================================
--- user/ed/utmpx/contrib/one-true-awk/maketab.c	Sun Jan 10 13:15:58 2010	(r201997)
+++ user/ed/utmpx/contrib/one-true-awk/maketab.c	Sun Jan 10 13:30:45 2010	(r201998)
@@ -102,7 +102,7 @@ struct xx
 	{ CALL, "call", "call" },
 	{ ARG, "arg", "arg" },
 	{ VARNF, "getnf", "NF" },
-	{ GETLINE, "getline", "getline" },
+	{ GETLINE, "awkgetline", "getline" },
 	{ 0, "", "" },
 };
 

Modified: user/ed/utmpx/contrib/one-true-awk/proctab.c
==============================================================================
--- user/ed/utmpx/contrib/one-true-awk/proctab.c	Sun Jan 10 13:15:58 2010	(r201997)
+++ user/ed/utmpx/contrib/one-true-awk/proctab.c	Sun Jan 10 13:30:45 2010	(r201998)
@@ -180,7 +180,7 @@ Cell *(*proctab[93])(Node **, int) = {
 	nullproc,	/* NUMBER */
 	nullproc,	/* STRING */
 	nullproc,	/* REGEXPR */
-	getline,	/* GETLINE */
+	awkgetline,	/* GETLINE */
 	substr,	/* SUBSTR */
 	split,	/* SPLIT */
 	jump,	/* RETURN */

Modified: user/ed/utmpx/contrib/one-true-awk/proto.h
==============================================================================
--- user/ed/utmpx/contrib/one-true-awk/proto.h	Sun Jan 10 13:15:58 2010	(r201997)
+++ user/ed/utmpx/contrib/one-true-awk/proto.h	Sun Jan 10 13:30:45 2010	(r201998)
@@ -149,7 +149,7 @@ extern	Cell	*call(Node **, int);
 extern	Cell	*copycell(Cell *);
 extern	Cell	*arg(Node **, int);
 extern	Cell	*jump(Node **, int);
-extern	Cell	*getline(Node **, int);
+extern	Cell	*awkgetline(Node **, int);
 extern	Cell	*getnf(Node **, int);
 extern	Cell	*array(Node **, int);
 extern	Cell	*awkdelete(Node **, int);

Modified: user/ed/utmpx/contrib/one-true-awk/run.c
==============================================================================
--- user/ed/utmpx/contrib/one-true-awk/run.c	Sun Jan 10 13:15:58 2010	(r201997)
+++ user/ed/utmpx/contrib/one-true-awk/run.c	Sun Jan 10 13:30:45 2010	(r201998)
@@ -22,6 +22,9 @@ ARISING OUT OF OR IN CONNECTION WITH THE
 THIS SOFTWARE.
 ****************************************************************/
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #define DEBUG
 #include <stdio.h>
 #include <ctype.h>
@@ -388,7 +391,7 @@ Cell *jump(Node **a, int n)	/* break, co
 	return 0;	/* not reached */
 }
 
-Cell *getline(Node **a, int n)	/* get next line from specific input */
+Cell *awkgetline(Node **a, int n)	/* get next line from specific input */
 {		/* a[0] is variable, a[1] is operator, a[2] is filename */
 	Cell *r, *x;
 	extern Cell **fldtab;
@@ -653,7 +656,7 @@ Cell *relop(Node **a, int n)	/* a[0 < a[
 		j = x->fval - y->fval;
 		i = j<0? -1: (j>0? 1: 0);
 	} else {
-		i = strcmp(getsval(x), getsval(y));
+		i = strcoll(getsval(x), getsval(y));
 	}
 	tempfree(x);
 	tempfree(y);
@@ -1159,11 +1162,11 @@ Cell *cat(Node **a, int q)	/* a[0] cat a
 			x->sval, y->sval);
 	strcpy(s, x->sval);
 	strcpy(s+n1, y->sval);
+	tempfree(x);
 	tempfree(y);
 	z = gettemp();
 	z->sval = s;
 	z->tval = STR;
-	tempfree(x);
 	return(z);
 }
 

Modified: user/ed/utmpx/contrib/tcp_wrappers/hosts_access.c
==============================================================================
--- user/ed/utmpx/contrib/tcp_wrappers/hosts_access.c	Sun Jan 10 13:15:58 2010	(r201997)
+++ user/ed/utmpx/contrib/tcp_wrappers/hosts_access.c	Sun Jan 10 13:30:45 2010	(r201998)
@@ -148,6 +148,7 @@ struct request_info *request;
     char   *sh_cmd;			/* becomes optional shell command */
     int     match = NO;
     struct tcpd_context saved_context;
+    char   *cp;
 
     saved_context = tcpd_context;		/* stupid compilers */
 
@@ -164,7 +165,16 @@ struct request_info *request;
 		tcpd_warn("missing newline or line too long");
 		continue;
 	    }
-	    if (sv_list[0] == '#' || sv_list[strspn(sv_list, " \t\r\n")] == 0)
+	    /* Ignore anything after unescaped # character */
+	    for (cp = strchr(sv_list, '#'); cp != NULL;) {
+		if (cp > sv_list && cp[-1] == '\\') {
+		    cp = strchr(cp + 1, '#');
+		    continue;
+		}
+		*cp = '\0';
+		break;
+	    }
+	    if (sv_list[strspn(sv_list, " \t\r\n")] == 0)
 		continue;
 	    if ((cl_list = split_at(sv_list, ':')) == 0) {
 		tcpd_warn("missing \":\" separator");

Modified: user/ed/utmpx/etc/rc.firewall
==============================================================================
--- user/ed/utmpx/etc/rc.firewall	Sun Jan 10 13:15:58 2010	(r201997)
+++ user/ed/utmpx/etc/rc.firewall	Sun Jan 10 13:30:45 2010	(r201998)
@@ -220,6 +220,8 @@ case ${firewall_type} in
 		# Allow any link-local multicast traffic
 		${fwcmd} add pass all from fe80::/10 to ff02::/16
 		${fwcmd} add pass all from ${net6} to ff02::/16
+		# Allow DHCPv6
+		${fwcmd} add pass udp from fe80::/10 to me6 546
 	fi
 
 	# Allow TCP through if setup succeeded
@@ -505,7 +507,10 @@ case ${firewall_type} in
 
 	# Allow "mandatory" ICMP in.
 	${fwcmd} add pass icmp from any to any icmptype 3,4,11
-	
+	if [ $ipv6_available -eq 0 ]; then
+		${fwcmd} add pass ipv6-icmp from any to any icmp6type 3
+	fi
+
 	# Add permits for this workstations published services below
 	# Only IPs and nets in firewall_allowservices is allowed in.
 	# If you really wish to let anyone use services on your 

Modified: user/ed/utmpx/games/fortune/datfiles/fortunes
==============================================================================
--- user/ed/utmpx/games/fortune/datfiles/fortunes	Sun Jan 10 13:15:58 2010	(r201997)
+++ user/ed/utmpx/games/fortune/datfiles/fortunes	Sun Jan 10 13:30:45 2010	(r201998)
@@ -1604,13 +1604,6 @@ friends and family, and then justify thi
 for doing it."
 		-- Bruce Feirstein, "Nice Guys Sleep Alone"
 %
-	As we know, there are known knowns.  There are things we know we
-know.  We also know there are known unknowns.  That is to say, we know
-there're some things we do not know.  But there're also unknown unknowns;
-the ones we don't know we don't know."
-		-- Defense Secretary Donald Rumsfeld,
-		   about the invasion to Iraq.
-%
 	At a recent meeting in Snowmass, Colorado, a participant from
 Los Angeles fainted from hyperoxygenation, and we had to hold his head
 under the exhaust of a bus until he revived.
@@ -1703,14 +1696,6 @@ the Cat.
 	"Then it doesn't matter which way you go," said the Cat.
 		-- Lewis Carroll
 %
-	COMMENT
-
-Oh, life is a glorious cycle of song,
-A medley of extemporanea;
-And love is thing that can never go wrong;
-And I am Marie of Roumania.
-		-- Dorothy Parker
-%
 	Concerning the war in Vietnam, Senator George Aiken of Vermont noted
 in January, 1966, "I'm not very keen for doves or hawks.  I think we need more
 owls."
@@ -1930,22 +1915,6 @@ Christmas tree.  The piano is missing.
 you rent your home and own Firearms, in which case you can go to level
 4.  The best way to get to level 3 is egg-nog.
 %
-	FIGHTING WORDS
-
-Say my love is easy had,
-	Say I'm bitten raw with pride,
-Say I am too often sad --
-	Still behold me at your side.
-
-Say I'm neither brave nor young,
-	Say I woo and coddle care,
-Say the devil touched my tongue --
-	Still you have my heart to wear.
-
-But say my verses do not scan,
-	And I get me another man!
-		-- Dorothy Parker
-%
 	"For I perceive that behind this seemingly unrelated sequence
 of events, there lurks a singular, sinister attitude of mind."
 
@@ -2217,20 +2186,6 @@ full of money before."
 	"Didn't you see it?"
 	"Damn kid had it under his coat."
 %
-	Hug O' War
-
-I will not play at tug o' war.
-I'd rather play at hug o' war,
-Where everyone hugs
-Instead of tugs,
-Where everyone giggles
-And rolls on the rug,
-Where everyone kisses,
-And everyone grins,
-And everyone cuddles,
-And everyone wins.
-		-- Shel Silverstein
-%
 	Human thinking can skip over a great deal, leap over small
 misunderstandings, can contain ifs and buts in untroubled corners of
 the mind. But the machine has no corners. Despite all the attempts to
@@ -2684,33 +2639,6 @@ right any day."
 life-style otherwise."
 		-- Douglas Adams, "The Hitchhiker's Guide to the Galaxy"
 %
-	Insofar as I may be heard by anything, which may or may not care
-what I say, I ask, if it matters, that you be forgiven for anything you
-may have done or failed to do which requires forgiveness.  Conversely, if
-not forgiveness but something else may be required to insure any possible
-benefit for which you may be eligible after the destruction of your body,
-I ask this, whatever it may be, be granted or withheld, as the case may be,
-in such a manner as to insure your receiving said benefit.  I ask this in my
-capacity as your elected intermediary between yourself and that which may
-not be yourself, but which may have an interest in the matter of your
-receiving as much as it is possible for you to receive of this thing, and
-which may in some way be influenced by this ceremony.
-	Amen.
-		-- Roger Zelazny, "Creatures of Light and Darkness", 1969
-%
-	INVENTORY
-Four be the things I am wiser to know:
-Idleness, sorrow, a friend, and a foe.
-
-Four be the things I'd been better without:
-Love, curiosity, freckles, and doubt.
-
-Three be the things I shall never attain:
-Envy, content, and sufficient champagne.
-
-Three be the things I shall have till I die:
-Laughter and hope and a sock in the eye.
-%
 	"Is there any point to which you would wish to draw my attention?"
 	"To the curious incident of the dog in the night-time."
 	"The dog did nothing in the night-time."
@@ -3990,28 +3918,6 @@ almost succeeded in getting a VAX to thi
 organization say that each time the machine fails to think it ceases to
 exist.
 %
-	THE LESSER-KNOWN PROGRAMMING LANGUAGES #5: VALGOL
-From its modest beginnings in Southern California's San Fernando Valley,
-VALGOL is enjoying a dramatic surge of popularity across the industry.
-
-Here is a sample program:
-	LIKE, Y*KNOW(I MEAN)START
-	IF PIZZA = LIKE BITCHEN AND GUY = LIKE TUBULAR AND
-	   VALLEY GIRL = LIKE GRODY**MAX(FERSURE)**2 THEN
-		FOR I = LIKE 1 TO OH*MAYBE 100
-			DO*WAH - (DITTY**2)
-			BARF(I)=TOTALLY GROSS(OUT)
-		SURE
-	LIKE BAG THIS PROGRAM
-	REALLY
-	LIKE TOTALLY (Y*KNOW)
-	IM*SURE
-	GOTO THE MALL
-
-When the user makes a syntax error, the interpreter displays the message:
-
-	GAG ME WITH A SPOON!!
-%
 	THE LESSER-KNOWN PROGRAMMING LANGUAGES #8: LAIDBACK
 
 This language was developed at the Marin County Center for T'ai Chi,
@@ -5342,9 +5248,6 @@ that he didn't force you down on the ask
 -- A plethora of individuals wither expertise in culinary techniques vitiated
 	the potable concoction produced by steeping certain coupestibles.
 -- Eleemosynary deeds have their initial incidence intramurally.
--- Male cadavers are incapable of yielding testimony.
--- Individuals who make their abode in vitreous edifices would be well
-	advised to refrain from catapulting projectiles.
 %
 =============== ALL FRESHMEN PLEASE NOTE ===============
 
@@ -11083,9 +10986,6 @@ Armstrong's Collection Law:
 	If the check is truly in the mail,
 	it is surely made out to someone else.
 %
-Arnold's Addendum:
-	Anything not fitting into these categories causes cancer in rats.
-%
 Arnold's Laws of Documentation:
 	1.) If it should exist, it doesn't.
 	2.) If it does exist, it's out of date.
@@ -12661,7 +12561,7 @@ Boren's Laws:
 	(2) When in trouble, delegate.
 	(3) When in doubt, mumble.
 %
-boss, n:
+Boss, n:
 	According to the Oxford English Dictionary, in the Middle Ages the
 	words "boss" and "botch" were largely synonymous, except that boss,
 	in addition to meaning "a supervisor of workers" also meant "an
@@ -12942,7 +12842,7 @@ wrote the program.
 Fortunately, the second-to-last bug has just been fixed.
 		-- Ray Simard
 %
-bug, n:
+Bug, n:
 	An elusive creature living in a program that makes it incorrect.
 	The activity of "debugging", or removing bugs from a program, ends
 	when people get tired of doing it, not when the bugs are removed.
@@ -13531,14 +13431,14 @@ only robust persons doing this thing is 
 others who have tried it.
 		-- Ambrose Bierce, "The Devil's Dictionary"
 %
-
-Certain passages in several laws have always defied interpretation and the
-most inexplicable must be a matter of opinion.  A judge of the Court of
-Session of Scotland has sent the editors of this book his candidate which
-reads, "In the Nuts (unground), (other than ground nuts) Order, the expression
-nuts shall have reference to such nuts, other than ground nuts, as would
-but for this amending Order not qualify as nuts (unground) (other than ground
-nuts) by reason of their being nuts (unground)."
+Certain passages in several laws have always defied interpretation and
+the most inexplicable must be a matter of opinion.  A judge of the Court
+of Session of Scotland has sent the editors of this book his candidate
+which reads, "In the Nuts (unground), (other than ground nuts) Order,
+the expression nuts shall have reference to such nuts, other than ground
+nuts, as would but for this amending Order not qualify as nuts
+(unground) (other than ground nuts) by reason of their being nuts
+(unground)."
 		-- Guinness Book of World Records, 1973
 %
 Certainly the game is rigged.
@@ -15064,17 +14964,6 @@ letter, or even 25 cents on a stamp!
 so post it as many places as you can.
 		-- Emily Postnews Answers Your Questions on Netiquette
 %
-Dear Sir,
-	I am firmly opposed to the spread of microchips either to the home or
-to the office.  We have more than enough of them foisted upon us in public
-places.  They are a disgusting Americanism, and can only result in the farmers
-being forced to grow smaller potatoes, which in turn will cause massive un-
-employment in the already severely depressed agricultural industry.
-	Yours faithfully,
-	Capt. Quinton D'Arcy, J.P.
-	Sevenoaks
-		-- Letters To The Editor, The Times of London
-%
 Death before dishonor.
 But neither before breakfast.
 %
@@ -17845,9 +17734,6 @@ Finagle's Eleventh Law:
 	it happened according to his pet theory.
 %
 Finagle's First Law:
-	If an experiment works, something has gone wrong.
-%
-Finagle's First Law:
 	To study a subject best, understand it thoroughly before you start.
 
 Finagle's Second Law:
@@ -18180,9 +18066,6 @@ For children with short attention spans:
 For courage mounteth with occasion.
 		-- William Shakespeare, "King John"
 %
-For every action, there is an equal and opposite criticism.
-		-- Harrison
-%
 For every bloke who makes his mark,
 there's half a dozen waiting to rub it out.
 		-- Andy Capp
@@ -19527,17 +19410,6 @@ Your butt is on the menu
 And the check is in the mail.
 		-- The Piranha Club Anthem, to the tune of "De Camptown Races"
 %
-From the "Guinness Book of World Records", 1973:
-
-Certain passages in several laws have always defied interpretation and
-the most inexplicable must be a matter of opinion.  A judge of the
-Court of Session of Scotland has sent the editors of this book his
-candidate which reads, "In the Nuts (unground), (other than ground
-nuts) Order, the expression nuts shall have reference to such nuts,
-other than ground nuts, as would but for this amending Order not
-qualify as nuts (unground)(other than ground nuts) by reason of their
-being nuts (unground)."
-%
 From the moment I picked your book up until I put it down I was
 convulsed with laughter.  Some day I intend reading it.
 		-- Groucho Marx, from "The Book of Insults"
@@ -24042,21 +23914,6 @@ I may not be totally perfect, but parts 
 I met a wonderful new man.  He's fictional, but you can't have everything.
 		-- Cecelia, "The Purple Rose of Cairo"
 %
-I met him in a swamp down in Dagobah
-Where it bubbles all the time like a giant cabinet soda
-	S-O-D-A soda
-I saw the little runt sitting there on a log
-I asked him his name and in a raspy voice he said Yoda
-	Y-O-D-A Yoda, Yo-Yo-Yo-Yo Yoda
-
-Well I've been around but I ain't never seen
-A guy who looks like a Muppet but he's wrinkled and green
-	Oh my Yoda, Yo-Yo-Yo-Yo Yoda
-Well I'm not dumb but I can't understand
-How he can raise me in the air just by raising his hand
-	Oh my Yoda, Yo-Yo-Yo-Yo Yoda, Yo-Yo-Yo-Yo Yoda
-		-- The STAR WARS Song, to "Lola", by the Kinks
-%
 I met my latest girl friend in a department store.  She was looking at
 clothes, and I was putting Slinkys on the escalators.
 		-- Steven Wright
@@ -24531,10 +24388,6 @@ are worth considering, to wit:
 	"When paying tolls, remember that it is necessary to release the
 	quarter a full 3 seconds before passing the basket if you are
 	traveling more than 60 MPH."
-
-[110.13]:
-	"When traveling on a one-way street, stay to the right, so as not
-	to interfere with oncoming traffic."
 %
 I suppose some of the variation between Boston drivers and the rest of the
 country is due to the progressive Massachusetts Driver Education Manual which
@@ -24628,12 +24481,6 @@ I think that I shall never see
 A billboard lovely as a tree.
 Indeed, unless the billboards fall
 I'll never see a tree at all.
-		-- Nash
-%
-I think that I shall never see
-A billboard lovely as a tree.
-Perhaps, unless the billboards fall
-I'll never see a tree at all.
 		-- Ogden Nash
 %
 I think that I shall never see
@@ -25899,21 +25746,6 @@ this is the case, then programmers stand
 software engineers dig each other's graves.
 		-- Unknown
 %
-If I have seen farther than others, it is because I was standing on the
-shoulders of giants.
-		-- Isaac Newton
-
-In the sciences, we are now uniquely privileged to sit side by side
-with the giants on whose shoulders we stand.
-		-- Gerald Holton
-
-If I have not seen as far as others, it is because giants were standing
-on my shoulders.
-		-- Hal Abelson
-
-In computer science, we stand on each other's feet.
-		-- Brian K. Reid
-%
 If I have to lay an egg for my country, I'll do it.
 		-- Bob Hope
 %
@@ -37641,7 +37473,7 @@ Pardo's First Postulate:
 fattening.
 
 Arnold's Addendum:
-	Everything else causes cancer in rats.
+	Anything not fitting into these categories causes cancer in rats.
 %
 Parents often talk about the younger generation as if they
 didn't have much of anything to do with it.
@@ -39438,10 +39270,6 @@ A:	A dope ring.
 
 Q:	Why do blondes put their hair in ponytails?
 A:	To cover up the valve stem.
-
-Q:	Why did the blonde get so excited after she finished her jigsaw
-	puzzle in only 6 months?
-A:	Because on the box it said "From 2-4 years".
 %
 Q:	What do you call a blind pre-historic animal?
 A:	Diyathinkhesaurus.
@@ -41474,25 +41302,6 @@ Spock:	Affirmative.
 Kirk:	Mr. Sulu, go to pass two.
 Sulu:	Aye aye, sir, going to pass two.
 %
-Scratch the disks, dump the core,	Shut it down, pull the plug
-Roll the tapes across the floor,	Give the core an extra tug
-And the system is going to crash.	And the system is going to crash.
-Teletypes smashed to bits.		Mem'ry cards, one and all,
-Give the scopes some nasty hits		Toss out halfway down the hall
-And the system is going to crash.	And the system is going to crash.
-And we've also found			Just flip one switch
-When you turn the power down,		And the lights will cease to twitch
-You turn the disk readers into trash.	And the tape drives will crumble
-Oh, it's so much fun,				in a flash.
-Now the CPU won't run			 When the CPU
-And the system is going to crash.	Can print nothing out but "foo,"
-					The system is going to crash.
-		-- To The Caissons Go Rolling Along
-%
-Scratch the disks!
-Drop the core!
-Roll the tapes across the floor!
-%
 Screw up your courage!  You've screwed up everything else.
 %
 Scribline, n.:
@@ -46379,13 +46188,6 @@ constitutions, displaying the utmost imp
 overturning everything.
 		-- Plato, "Republic", 370 B.C.
 %
-The investment community feels very putupon.  They feel there is no
-reason why they shouldn't earn $1 million to $200 million a year,
-and they don't want to be held responsible for the global financial
-meltdown.
-		-- Daniel Fass, chairman of Obama's
-		financial-industry fundraising party
-%
 The IQ of the group is the lowest IQ of a member of
 the group divided by the number of people in the group.
 %
@@ -46676,7 +46478,8 @@ often turn to a related (but infinitely 
 %
 THE LESSER-KNOWN PROGRAMMING LANGUAGES #14 -- VALGOL
 
-	VALGOL is enjoying a dramatic surge of popularity across the
+	From its modest beginnings in Southern California's San Fernando
+Valley VALGOL is enjoying a dramatic surge of popularity across the
 industry.  VALGOL commands include REALLY, LIKE, WELL, and Y*KNOW.
 Variables are assigned with the =LIKE and =TOTALLY operators.  Other
 operators include the "California booleans", AX and NOWAY.  Loops are
@@ -48383,9 +48186,6 @@ and peculiar sort of voluntary thinking.
 The solution of this problem is trivial
 and is left as an exercise for the reader.
 %
-The solution to a problem changes the nature of the problem.
-		-- Peer
-%
 The somewhat old and crusty vicar was taking a well-earned retirement from
 his rather old and crusty parish.  As is usual in these cases, a locum was
 sent to cover the transition period.  This particular man was young and
@@ -52054,7 +51854,7 @@ yourself and that which may have an inte
 as much as it is possible for you to receive of this thing, and which may
 in some way be influenced by this ceremony.
 	Amen.
-		-- Roger Zelazny, "Creatures of Light and Darkness"
+		-- Roger Zelazny, "Creatures of Light and Darkness", 1969
 %
 To understand a program you must become both the machine and the program.
 %
@@ -56803,22 +56603,6 @@ I'd LOVE to, but...
 	-- I'm teaching my ferret to yodel.
 	-- My crayons all melted together.
 %
-Why I Can't Go Out With You:
-
-I'd LOVE to, but ...
-	-- I have to floss my cat.
-	-- I've dedicated my life to linguini.
-	-- I need to spend more time with my blender.
-	-- it wouldn't be fair to the other Beautiful People.
-	-- it's my night to pet the dog/ferret/goldfish.
-	-- I'm going downtown to try on some gloves.
-	-- I have to check the freshness dates on my dairy products.
-	-- I'm going down to the bakery to watch the buns rise.
-	-- I have an appointment with a cuticle specialist.
-	-- I have some really hard words to look up.
-	-- I've got a Friends of the Lowly Rutabaga meeting.
-	-- I promised to help a friend fold road maps.
-%
 Why is it called a funny bone when it hurts so much?
 %
 Why is it taking so long for her to bring out all the good in you?
@@ -57873,9 +57657,6 @@ a private eye.
 Yeah, there are more important things in life than money,
 but they won't go out with you if you don't have any.
 %
-YEAR:
-	A period of three hundred and sixty-five disappointments.
-%
 Year  Name				James Bond	Book
 ----  --------------------------------	--------------	----
 50's  James Bond TV Series		Barry Nelson

Modified: user/ed/utmpx/games/fortune/datfiles/fortunes-o.real
==============================================================================
--- user/ed/utmpx/games/fortune/datfiles/fortunes-o.real	Sun Jan 10 13:15:58 2010	(r201997)
+++ user/ed/utmpx/games/fortune/datfiles/fortunes-o.real	Sun Jan 10 13:30:45 2010	(r201998)
@@ -663,6 +663,13 @@ posh hotel.
 	"Why, yes, young man," said the gentleman.  "Would you bring me
 a postcard?"
 %
+	As we know, there are known knowns.  There are things we know we
+know.  We also know there are known unknowns.  That is to say, we know
+there are some things we do not know.  But there are also unknown
+unknowns; the ones we don't know we don't know.
+		-- United States Secretary of Defense Donald Rumsfeld
+		   12 February 2002, Regarding the US invasion of Iraq
+%
 	"Are pirates an ethnic group?  Or are they just people who burn
 illegal cds?"
 	"Arrrr!  We prefer to be called Buccaneer-Americans."
@@ -12873,6 +12880,14 @@ Contraception", has been withdrawn after
 pull it out at the last minute.
 		-- Not the Nine O'Clock News
 %
+The investment community feels very putupon.  They feel there is no
+reason why they shouldn't earn $1 million to $200 million a year,
+and they don't want to be held responsible for the global financial
+meltdown.
+		-- Daniel Fass, Chairman of United States President
+		   Barack Obama's financial-industry fundraising party
+		   20 October 2009
+%
 The king arranged a regal marriage for his daughter -- a bond that would unite
 two great kingdoms.  Yet, because the young couple seemed so formal to each
 other, he posted a spy outside the royal wedding chamber and demanded a full

Modified: user/ed/utmpx/games/pom/pom.6
==============================================================================
--- user/ed/utmpx/games/pom/pom.6	Sun Jan 10 13:15:58 2010	(r201997)
+++ user/ed/utmpx/games/pom/pom.6	Sun Jan 10 13:30:45 2010	(r201998)
@@ -32,15 +32,34 @@
 .\"	@(#)pom.6	8.1 (Berkeley) 5/31/93
 .\" $FreeBSD$
 .\"
-.TH POM 6 "May 31, 1993"
+.Dd May 31, 1993
+.Dt POM 6
 .UC 7
-.SH NAME
-pom \- display the phase of the moon
-.SH SYNOPSIS
-.B pom
-.SH DESCRIPTION
+.Sh NAME
+.Nm pom
+.Nd display the phase of the moon
+.Sh SYNOPSIS
+.Nm 
+.Op Fl d Ar yyyy.mm.dd
+.Op Fl t Ar hh:mm:ss
+.Sh DESCRIPTION
 The
-.I pom
+.Nm
 utility displays the current phase of the moon.
 Useful for selecting software completion target dates and predicting
 managerial behavior.
+.Pp
+Use the arguments
+.Fl d
+and
+.Fl o
+to specify a specific date and time for which the phase of the moon
+has to be calculated.
+If
+.Fl d
+but not
+.Fl t
+has been specified, it will calculate the phase of the moon on that
+day at midnight.
+.Sh SEE ALSO
+`Practical Astronomy with Your Calculator' by Duffett-Smith.

Modified: user/ed/utmpx/games/pom/pom.c
==============================================================================
--- user/ed/utmpx/games/pom/pom.c	Sun Jan 10 13:15:58 2010	(r201997)
+++ user/ed/utmpx/games/pom/pom.c	Sun Jan 10 13:30:45 2010	(r201998)
@@ -57,9 +57,13 @@ __FBSDID("$FreeBSD$");
  *
  */
 
-#include <time.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <math.h>
+#include <string.h>
+#include <sysexits.h>
+#include <time.h>
+#include <unistd.h> 
 
 #ifndef	PI
 #define	PI	  3.14159265358979323846
@@ -76,20 +80,62 @@ __FBSDID("$FreeBSD$");
 static void	adj360(double *);
 static double	dtor(double);
 static double	potm(double);
+static void	usage(char *progname);
 
 int
-main(void)
+main(int argc, char **argv)
 {
 	time_t tt;
-	struct tm *GMT;
+	struct tm GMT, tmd;
 	double days, today, tomorrow;
-	int cnt;
+	int ch, cnt;
+	char *odate = NULL, *otime = NULL;
+
+	while ((ch = getopt(argc, argv, "d:t:")) != -1)
+		switch (ch) {
+		case 'd':
+			odate = optarg;
+			break;
+		case 't':
+			otime = optarg;
+			break;
+		default:
+			usage(argv[0]);
+		}
+
+        argc -= optind;
+	argv += optind;
+
+	if (argc)
+		usage(argv[0]);
 
-	(void) time(&tt);
-	GMT = gmtime(&tt);
-	days = (GMT->tm_yday + 1) + ((GMT->tm_hour +
-	    (GMT->tm_min / 60.0) + (GMT->tm_sec / 3600.0)) / 24.0);
-	for (cnt = EPOCH; cnt < GMT->tm_year; ++cnt)
+	/* Adjust based on users preferences */
+	time(&tt);
+	if (otime != NULL || odate != NULL) {
+		/* Save today in case -d isn't specified */
+		localtime_r(&tt, &tmd);
+
+		if (odate != NULL) {
+			tmd.tm_year = strtol(odate, NULL, 10) - 1900;
+			tmd.tm_mon = strtol(odate + 5, NULL, 10) - 1;
+			tmd.tm_mday = strtol(odate + 8, NULL, 10);
+			/* Use midnight as the middle of the night */

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-src-user mailing list