PERFORCE change 130777 for review
Kip Macy
kmacy at FreeBSD.org
Wed Dec 12 17:44:13 PST 2007
http://perforce.freebsd.org/chv.cgi?CH=130777
Change 130777 by kmacy at kmacy_home:ethng on 2007/12/13 01:43:22
IFC 130774
Affected files ...
.. //depot/projects/ethng/src/Makefile#3 integrate
.. //depot/projects/ethng/src/contrib/amd/FREEBSD-Xlist#2 integrate
.. //depot/projects/ethng/src/contrib/amd/FREEBSD-upgrade#2 integrate
.. //depot/projects/ethng/src/contrib/gcc/config/sparc/freebsd.h#2 integrate
.. //depot/projects/ethng/src/contrib/gcc/fold-const.c#3 integrate
.. //depot/projects/ethng/src/games/fortune/datfiles/fortunes#5 integrate
.. //depot/projects/ethng/src/games/fortune/datfiles/fortunes-o.real#4 integrate
.. //depot/projects/ethng/src/games/fortune/datfiles/fortunes-o.sp.ok#3 integrate
.. //depot/projects/ethng/src/games/fortune/datfiles/fortunes.sp.ok#3 integrate
.. //depot/projects/ethng/src/include/complex.h#2 integrate
.. //depot/projects/ethng/src/include/nsswitch.h#2 integrate
.. //depot/projects/ethng/src/lib/Makefile#5 integrate
.. //depot/projects/ethng/src/lib/libc/gdtoa/_ldtoa.c#3 integrate
.. //depot/projects/ethng/src/lib/libc/gen/getgrent.c#2 integrate
.. //depot/projects/ethng/src/lib/libc/gen/getgrouplist.c#2 integrate
.. //depot/projects/ethng/src/lib/libc/locale/localeconv.c#2 integrate
.. //depot/projects/ethng/src/lib/libc/net/nsdispatch.c#2 integrate
.. //depot/projects/ethng/src/lib/libc/stdio/vfscanf.c#2 integrate
.. //depot/projects/ethng/src/lib/libc/stdio/vfwscanf.c#2 integrate
.. //depot/projects/ethng/src/lib/libc/stdlib/grantpt.c#2 integrate
.. //depot/projects/ethng/src/lib/libc/stdlib/rand.c#2 integrate
.. //depot/projects/ethng/src/lib/libc/string/strtok.3#2 integrate
.. //depot/projects/ethng/src/lib/libc/string/strtok.c#2 integrate
.. //depot/projects/ethng/src/lib/libc/string/wcstok.c#2 integrate
.. //depot/projects/ethng/src/lib/libthr/thread/thr_mutex.c#4 integrate
.. //depot/projects/ethng/src/lib/msun/Makefile#2 integrate
.. //depot/projects/ethng/src/lib/msun/man/atan2.3#2 integrate
.. //depot/projects/ethng/src/lib/msun/man/hypot.3#2 integrate
.. //depot/projects/ethng/src/lib/msun/src/s_carg.c#1 branch
.. //depot/projects/ethng/src/lib/msun/src/s_cargf.c#1 branch
.. //depot/projects/ethng/src/release/Makefile#8 integrate
.. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/Makefile#2 integrate
.. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/errata/Makefile#2 integrate
.. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/hardware/Makefile#2 integrate
.. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/hardware/Makefile.inc#2 delete
.. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/hardware/amd64/Makefile#2 delete
.. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/hardware/amd64/article.sgml#2 delete
.. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/hardware/amd64/proc-amd64.sgml#2 delete
.. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/hardware/article.sgml#1 branch
.. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/hardware/common/artheader.sgml#2 delete
.. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#2 delete
.. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/hardware/common/hw.ent#2 delete
.. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/hardware/common/intro.sgml#2 delete
.. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/hardware/i386/Makefile#2 delete
.. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/hardware/i386/article.sgml#2 delete
.. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/hardware/i386/proc-i386.sgml#2 delete
.. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/installation/Makefile#2 delete
.. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/installation/Makefile.inc#2 delete
.. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/installation/amd64/Makefile#2 delete
.. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/installation/amd64/article.sgml#2 delete
.. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/installation/common/abstract.sgml#2 delete
.. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/installation/common/artheader.sgml#2 delete
.. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/installation/common/install.ent#2 delete
.. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/installation/common/install.sgml#2 delete
.. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/installation/common/layout.sgml#2 delete
.. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/installation/common/trouble.sgml#2 delete
.. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/installation/common/upgrade.sgml#2 delete
.. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/installation/i386/Makefile#2 delete
.. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/installation/i386/article.sgml#2 delete
.. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/installation/ia64/Makefile#2 delete
.. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/installation/ia64/article.sgml#2 delete
.. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/installation/pc98/Makefile#2 delete
.. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/installation/pc98/article.sgml#2 delete
.. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/installation/sparc64/Makefile#2 delete
.. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/installation/sparc64/article.sgml#2 delete
.. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/installation/sparc64/install.sgml#2 delete
.. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/readme/article.sgml#2 integrate
.. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/relnotes/Makefile#2 integrate
.. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/relnotes/Makefile.inc#2 delete
.. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/relnotes/amd64/Makefile#2 delete
.. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/relnotes/amd64/article.sgml#2 delete
.. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/relnotes/article.sgml#1 branch
.. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#2 delete
.. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/relnotes/common/relnotes.ent#2 delete
.. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/relnotes/i386/Makefile#2 delete
.. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/relnotes/i386/article.sgml#2 delete
.. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/relnotes/ia64/Makefile#2 delete
.. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/relnotes/ia64/article.sgml#2 delete
.. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/relnotes/pc98/Makefile#2 delete
.. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/relnotes/pc98/article.sgml#2 delete
.. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/relnotes/powerpc/Makefile#2 delete
.. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/relnotes/powerpc/article.sgml#2 delete
.. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/relnotes/sparc64/Makefile#2 delete
.. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/relnotes/sparc64/article.sgml#2 delete
.. //depot/projects/ethng/src/sbin/bsdlabel/bsdlabel.c#2 integrate
.. //depot/projects/ethng/src/sbin/ifconfig/ifconfig.8#3 integrate
.. //depot/projects/ethng/src/sbin/ifconfig/ifconfig.c#3 integrate
.. //depot/projects/ethng/src/sbin/natd/natd.8#2 integrate
.. //depot/projects/ethng/src/sbin/newfs_msdos/newfs_msdos.8#3 integrate
.. //depot/projects/ethng/src/share/man/man4/nve.4#3 integrate
.. //depot/projects/ethng/src/share/man/man5/src.conf.5#5 integrate
.. //depot/projects/ethng/src/share/man/man7/build.7#2 integrate
.. //depot/projects/ethng/src/share/mk/bsd.own.mk#4 integrate
.. //depot/projects/ethng/src/sys/amd64/amd64/machdep.c#4 integrate
.. //depot/projects/ethng/src/sys/amd64/amd64/pmap.c#8 integrate
.. //depot/projects/ethng/src/sys/arm/arm/pmap.c#8 integrate
.. //depot/projects/ethng/src/sys/cam/scsi/scsi_da.c#2 integrate
.. //depot/projects/ethng/src/sys/compat/freebsd32/freebsd32_misc.c#5 integrate
.. //depot/projects/ethng/src/sys/conf/files#13 integrate
.. //depot/projects/ethng/src/sys/conf/files.amd64#11 integrate
.. //depot/projects/ethng/src/sys/conf/files.i386#9 integrate
.. //depot/projects/ethng/src/sys/dev/amr/amr.c#3 integrate
.. //depot/projects/ethng/src/sys/dev/amr/amr_cam.c#3 integrate
.. //depot/projects/ethng/src/sys/dev/amr/amr_pci.c#3 integrate
.. //depot/projects/ethng/src/sys/dev/amr/amrvar.h#2 integrate
.. //depot/projects/ethng/src/sys/dev/arcmsr/arcmsr.c#3 integrate
.. //depot/projects/ethng/src/sys/dev/if_ndis/if_ndis.c#6 integrate
.. //depot/projects/ethng/src/sys/dev/sound/pci/ich.c#2 integrate
.. //depot/projects/ethng/src/sys/dev/usb/umass.c#2 integrate
.. //depot/projects/ethng/src/sys/dev/usb/usbdevs#10 integrate
.. //depot/projects/ethng/src/sys/fs/udf/udf_vfsops.c#3 integrate
.. //depot/projects/ethng/src/sys/geom/geom_bsd_enc.c#2 integrate
.. //depot/projects/ethng/src/sys/geom/part/g_part.c#5 integrate
.. //depot/projects/ethng/src/sys/i386/i386/machdep.c#5 integrate
.. //depot/projects/ethng/src/sys/i386/i386/pmap.c#8 integrate
.. //depot/projects/ethng/src/sys/kern/kern_proc.c#6 integrate
.. //depot/projects/ethng/src/sys/kern/kern_resource.c#2 integrate
.. //depot/projects/ethng/src/sys/kern/sched_4bsd.c#7 integrate
.. //depot/projects/ethng/src/sys/kern/sched_ule.c#9 integrate
.. //depot/projects/ethng/src/sys/net/bridgestp.c#3 integrate
.. //depot/projects/ethng/src/sys/net/bridgestp.h#2 integrate
.. //depot/projects/ethng/src/sys/net/if.h#3 integrate
.. //depot/projects/ethng/src/sys/net/route.c#10 integrate
.. //depot/projects/ethng/src/sys/net/route.h#5 integrate
.. //depot/projects/ethng/src/sys/net80211/ieee80211_radiotap.h#2 integrate
.. //depot/projects/ethng/src/sys/netgraph/ng_l2tp.c#3 integrate
.. //depot/projects/ethng/src/sys/netinet/if_ether.c#10 integrate
.. //depot/projects/ethng/src/sys/netinet/ip_fw2.c#7 integrate
.. //depot/projects/ethng/src/sys/netinet/tcp_ofld.c#1 branch
.. //depot/projects/ethng/src/sys/netinet/tcp_ofld.h#1 branch
.. //depot/projects/ethng/src/sys/netinet/tcp_syncache.c#8 integrate
.. //depot/projects/ethng/src/sys/netinet/tcp_syncache.h#2 integrate
.. //depot/projects/ethng/src/sys/netinet/tcp_var.h#5 integrate
.. //depot/projects/ethng/src/sys/netinet/toedev.h#1 branch
.. //depot/projects/ethng/src/sys/netinet6/dest6.c#2 integrate
.. //depot/projects/ethng/src/sys/netinet6/frag6.c#2 integrate
.. //depot/projects/ethng/src/sys/netinet6/icmp6.c#2 integrate
.. //depot/projects/ethng/src/sys/netinet6/in6.c#3 integrate
.. //depot/projects/ethng/src/sys/netinet6/in6.h#2 integrate
.. //depot/projects/ethng/src/sys/netinet6/in6_cksum.c#2 integrate
.. //depot/projects/ethng/src/sys/netinet6/in6_gif.c#2 integrate
.. //depot/projects/ethng/src/sys/netinet6/in6_gif.h#2 integrate
.. //depot/projects/ethng/src/sys/netinet6/in6_ifattach.c#2 integrate
.. //depot/projects/ethng/src/sys/netinet6/in6_ifattach.h#2 integrate
.. //depot/projects/ethng/src/sys/netinet6/in6_pcb.c#2 integrate
.. //depot/projects/ethng/src/sys/netinet6/in6_pcb.h#2 integrate
.. //depot/projects/ethng/src/sys/netinet6/in6_proto.c#2 integrate
.. //depot/projects/ethng/src/sys/netinet6/in6_rmx.c#2 integrate
.. //depot/projects/ethng/src/sys/netinet6/in6_src.c#2 integrate
.. //depot/projects/ethng/src/sys/netinet6/in6_var.h#2 integrate
.. //depot/projects/ethng/src/sys/netinet6/ip6_ecn.h#2 integrate
.. //depot/projects/ethng/src/sys/netinet6/ip6_forward.c#2 integrate
.. //depot/projects/ethng/src/sys/netinet6/ip6_id.c#2 integrate
.. //depot/projects/ethng/src/sys/netinet6/ip6_input.c#2 integrate
.. //depot/projects/ethng/src/sys/netinet6/ip6_ipsec.c#2 integrate
.. //depot/projects/ethng/src/sys/netinet6/ip6_ipsec.h#2 integrate
.. //depot/projects/ethng/src/sys/netinet6/ip6_mroute.c#2 integrate
.. //depot/projects/ethng/src/sys/netinet6/ip6_mroute.h#2 integrate
.. //depot/projects/ethng/src/sys/netinet6/ip6_output.c#3 integrate
.. //depot/projects/ethng/src/sys/netinet6/ip6_var.h#2 integrate
.. //depot/projects/ethng/src/sys/netinet6/ip6protosw.h#2 integrate
.. //depot/projects/ethng/src/sys/netinet6/mld6.c#2 integrate
.. //depot/projects/ethng/src/sys/netinet6/mld6_var.h#2 integrate
.. //depot/projects/ethng/src/sys/netinet6/nd6.c#4 integrate
.. //depot/projects/ethng/src/sys/netinet6/nd6.h#2 integrate
.. //depot/projects/ethng/src/sys/netinet6/nd6_nbr.c#2 integrate
.. //depot/projects/ethng/src/sys/netinet6/nd6_rtr.c#2 integrate
.. //depot/projects/ethng/src/sys/netinet6/pim6.h#2 integrate
.. //depot/projects/ethng/src/sys/netinet6/pim6_var.h#2 integrate
.. //depot/projects/ethng/src/sys/netinet6/raw_ip6.c#2 integrate
.. //depot/projects/ethng/src/sys/netinet6/raw_ip6.h#2 integrate
.. //depot/projects/ethng/src/sys/netinet6/route6.c#2 integrate
.. //depot/projects/ethng/src/sys/netinet6/scope6.c#2 integrate
.. //depot/projects/ethng/src/sys/netinet6/scope6_var.h#2 integrate
.. //depot/projects/ethng/src/sys/netinet6/sctp6_usrreq.c#6 integrate
.. //depot/projects/ethng/src/sys/netinet6/sctp6_var.h#3 integrate
.. //depot/projects/ethng/src/sys/netinet6/tcp6_var.h#2 integrate
.. //depot/projects/ethng/src/sys/netinet6/udp6_usrreq.c#4 integrate
.. //depot/projects/ethng/src/sys/netinet6/udp6_var.h#2 integrate
.. //depot/projects/ethng/src/sys/sys/cdefs.h#2 integrate
.. //depot/projects/ethng/src/sys/sys/socket.h#3 integrate
.. //depot/projects/ethng/src/sys/vm/vm_page.c#8 integrate
.. //depot/projects/ethng/src/tools/build/options/WITHOUT_BZIP2#2 integrate
.. //depot/projects/ethng/src/tools/build/options/WITHOUT_GNU#2 integrate
.. //depot/projects/ethng/src/tools/build/options/WITHOUT_GSSAPI#1 branch
.. //depot/projects/ethng/src/tools/build/options/WITHOUT_INSTALLLIB#1 branch
.. //depot/projects/ethng/src/tools/build/options/WITHOUT_KERBEROS#2 integrate
.. //depot/projects/ethng/src/tools/build/options/WITHOUT_KVM#2 integrate
.. //depot/projects/ethng/src/tools/build/options/WITHOUT_PAM#2 integrate
.. //depot/projects/ethng/src/tools/build/options/WITHOUT_TOOLCHAIN#2 integrate
.. //depot/projects/ethng/src/tools/build/options/makeman#3 integrate
.. //depot/projects/ethng/src/tools/regression/lib/libc/stdio/test-scanfloat.c#3 integrate
.. //depot/projects/ethng/src/tools/regression/lib/msun/test-lround.c#2 integrate
.. //depot/projects/ethng/src/tools/regression/lib/msun/test-next.c#2 integrate
.. //depot/projects/ethng/src/usr.bin/make/Makefile.dist#2 integrate
.. //depot/projects/ethng/src/usr.bin/procstat/procstat_args.c#2 integrate
.. //depot/projects/ethng/src/usr.bin/procstat/procstat_bin.c#2 integrate
.. //depot/projects/ethng/src/usr.bin/procstat/procstat_cred.c#2 integrate
.. //depot/projects/ethng/src/usr.bin/procstat/procstat_files.c#2 integrate
.. //depot/projects/ethng/src/usr.sbin/pkg_install/Makefile#3 integrate
.. //depot/projects/ethng/src/usr.sbin/pkg_install/add/pkg_add.1#3 integrate
.. //depot/projects/ethng/src/usr.sbin/pkg_install/create/pkg_create.1#2 integrate
.. //depot/projects/ethng/src/usr.sbin/pkg_install/delete/pkg_delete.1#2 integrate
.. //depot/projects/ethng/src/usr.sbin/pkg_install/info/pkg_info.1#2 integrate
.. //depot/projects/ethng/src/usr.sbin/pkg_install/updating/pkg_updating.1#2 integrate
.. //depot/projects/ethng/src/usr.sbin/pkg_install/version/pkg_version.1#2 integrate
.. //depot/projects/ethng/src/usr.sbin/sysinstall/media.c#2 integrate
.. //depot/projects/ethng/src/usr.sbin/sysinstall/system.c#2 integrate
.. //depot/projects/ethng/src/usr.sbin/syslogd/syslogd.c#3 integrate
Differences ...
==== //depot/projects/ethng/src/Makefile#3 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile,v 1.342 2007/10/18 08:41:52 delphij Exp $
+# $FreeBSD: src/Makefile,v 1.344 2007/12/13 00:08:02 imp Exp $
#
# The user-driven targets are:
#
@@ -234,17 +234,18 @@
PATH=${PATH} ${BINMAKE} obj >/dev/null 2>&1 && \
PATH=${PATH} ${BINMAKE} >/dev/null 2>&1); \
then \
- (cd ${.CURDIR} && make make); \
+ (cd ${.CURDIR} && ${MAKE} make); \
fi
#
# Upgrade make(1) to the current version using the installed
-# headers, libraries and tools.
+# headers, libraries and tools. Also, allow the location of
+# the system bsdmake-like utility to be overridden.
#
MMAKEENV= MAKEOBJDIRPREFIX=${MAKEPATH} \
DESTDIR= \
INSTALL="sh ${.CURDIR}/tools/install.sh"
-MMAKE= ${MMAKEENV} make \
+MMAKE= ${MMAKEENV} ${MAKE} \
-D_UPGRADING \
-DNOMAN -DNO_MAN -DNOSHARED -DNO_SHARED \
-DNO_CPU_CFLAGS -DNO_WERROR
==== //depot/projects/ethng/src/contrib/amd/FREEBSD-Xlist#2 (text+ko) ====
@@ -1,7 +1,8 @@
-$FreeBSD: src/contrib/amd/FREEBSD-Xlist,v 1.5 2004/07/06 12:52:27 mbr Exp $
+$FreeBSD: src/contrib/amd/FREEBSD-Xlist,v 1.6 2007/12/11 19:15:17 obrien Exp $
*LSM.am-utils
*Makefile.*
*README.autofs
+*README.osx
*ac*.m4
*.old
*acconfig.h
@@ -15,6 +16,7 @@
*missing
*mkinstalldirs
*stamp-h.in
+*amd/test1.sh
*amd/Makefile.*
*amq/Makefile.*
*commit
@@ -38,10 +40,13 @@
*conf/fh_dref/fh_dref_sunos3.h
*conf/fh_dref/fh_dref_sunos4.h
*conf/fh_dref/fh_dref_svr4.h
+*conf/hn_dref/hn_dref_default.h,
*conf/hn_dref/hn_dref_isc3.h
*conf/hn_dref/hn_dref_linux.h
*conf/mount/mount_aix.c
+*conf/mount/mount_aix3.c
*conf/mount/mount_bsdi3.c
+*conf/mount/mount_default.c
*conf/mount/mount_freebsd3.c
*conf/mount/mount_hpux.c
*conf/mount/mount_irix5.c
@@ -54,6 +59,7 @@
*conf/mtab/mtab_aix.c
*conf/mtab/mtab_file.c
*conf/mtab/mtab_isc3.c
+*conf/mtab/mtab_linux.c
*conf/mtab/mtab_mach3.c
*conf/mtab/mtab_osf.c
*conf/mtab/mtab_svr4.c
@@ -63,6 +69,7 @@
*conf/nfs_prot/nfs_prot_aix4_2.h
*conf/nfs_prot/nfs_prot_aix4_3.h
*conf/nfs_prot/nfs_prot_aix5_1.h
+*conf/nfs_prot/nfs_prot_aix5_2.h
*conf/nfs_prot/nfs_prot_bsdi2.h
*conf/nfs_prot/nfs_prot_bsdi3.h
*conf/nfs_prot/nfs_prot_darwin.h
@@ -92,6 +99,12 @@
*conf/nfs_prot/nfs_prot_sunos5_8.h
*conf/nfs_prot/nfs_prot_svr4.h
*conf/nfs_prot/nfs_prot_ultrix.h
+*conf/autofs/autofs_linux.h
+*conf/autofs/autofs_linux.c
+*conf/autofs/autofs_solaris_v1.h
+*conf/autofs/autofs_solaris_v1.c
+*conf/autofs/autofs_solaris_v2_v3.h
+*conf/autofs/autofs_solaris_v2_v3.c
*conf/sa_dref/sa_dref_386bsd.h
*conf/sa_dref/sa_dref_aix3.h
*conf/sa_dref/sa_dref_aoi.h
@@ -103,6 +116,7 @@
*conf/trap/trap_aix3.h
*conf/trap/trap_aux.h
*conf/trap/trap_dgux.h
+*conf/trap/trap_freebsd3.h
*conf/trap/trap_hcx.h
*conf/trap/trap_hpux.h
*conf/trap/trap_hpux11.h
@@ -115,7 +129,9 @@
*conf/trap/trap_stellix.h
*conf/trap/trap_svr4.h
*conf/trap/trap_ultrix.h
+*conf/umount/umount_aix.c
*conf/umount/umount_default.c
+*conf/umount/umount_linux.c
*conf/umount/umount_osf.c
*doc/Makefile.am
*doc/Makefile.in
@@ -135,11 +151,118 @@
*fsinfo/Makefile.*
*hlfsd/Makefile.*
*libamu/Makefile.*
+*libamu/alloca.c
*libamu/clnt_sperrno.c
*libamu/memcmp.c
*libamu/strcasecmp.c
*libamu/strdup.c
*libamu/strstr.c
+*libamu/strlcat.c
+*libamu/strlcpy.c
*libamu/ualarm.c
*mk-amd-map/Makefile.*
*wire-test/Makefile.*
+*m4/GNUmakefile
+*m4/amdgrep*
+*m4/amindent*
+*m4/autopat*
+*m4/chop-aclocal.pl*
+*m4/copy-if-newbig*
+*m4/mk-aclocal*
+*m4/mkconf*
+*m4/rmtspc*
+*m4/update_build_version*
+*m4/macros/HEADER
+*m4/macros/TRAILER
+*m4/macros/c_void_p.m4
+*m4/macros/cache_check_dynamic.m4
+*m4/macros/check_amu_fs.m4
+*m4/macros/check_checkmount_style.m4
+*m4/macros/check_extern.m4
+*m4/macros/check_fhandle.m4
+*m4/macros/check_field.m4
+*m4/macros/check_fs_headers.m4
+*m4/macros/check_fs_mntent.m4
+*m4/macros/check_gnu_getopt.m4
+*m4/macros/check_hide_mount_type.m4
+*m4/macros/check_lib2.m4
+*m4/macros/check_map_funcs.m4
+*m4/macros/check_mnt2_cdfs_opt.m4
+*m4/macros/check_mnt2_gen_opt.m4
+*m4/macros/check_mnt2_nfs_opt.m4
+*m4/macros/check_mnttab_file_name.m4
+*m4/macros/check_mnttab_location.m4
+*m4/macros/check_mnttab_opt.m4
+*m4/macros/check_mnttab_style.m4
+*m4/macros/check_mnttab_type.m4
+*m4/macros/check_mount_style.m4
+*m4/macros/check_mount_trap.m4
+*m4/macros/check_mount_type.m4
+*m4/macros/check_mtype_printf_type.m4
+*m4/macros/check_mtype_type.m4
+*m4/macros/check_network_transport_type.m4
+*m4/macros/check_nfs_fh_dref.m4
+*m4/macros/check_nfs_hn_dref.m4
+*m4/macros/check_nfs_prot_headers.m4
+*m4/macros/check_nfs_sa_dref.m4
+*m4/macros/check_nfs_socket_connection.m4
+*m4/macros/check_os_libs.m4
+*m4/macros/check_restartable_signal_handler.m4
+*m4/macros/check_umount_style.m4
+*m4/macros/check_unmount_args.m4
+*m4/macros/check_unmount_call.m4
+*m4/macros/expand_cpp_hex.m4
+*m4/macros/expand_cpp_int.m4
+*m4/macros/expand_cpp_string.m4
+*m4/macros/expand_run_string.m4
+*m4/macros/extern_optarg.m4
+*m4/macros/extern_sys_errlist.m4
+*m4/macros/field_mntent_t_mnt_time_string.m4
+*m4/macros/func_bad_memcmp.m4
+*m4/macros/func_bad_yp_all.m4
+*m4/macros/header_templates.m4
+*m4/macros/host_macros.m4
+*m4/macros/linux_headers.m4
+*m4/macros/localconfig.m4
+*m4/macros/mount_headers.m4
+*m4/macros/name_package.m4
+*m4/macros/name_version.m4
+*m4/macros/opt_amu_cflags.m4
+*m4/macros/opt_cppflags.m4
+*m4/macros/opt_debug.m4
+*m4/macros/opt_ldflags.m4
+*m4/macros/opt_libs.m4
+*m4/macros/os_cflags.m4
+*m4/macros/os_cppflags.m4
+*m4/macros/os_ldflags.m4
+*m4/macros/package_bugreport.m4
+*m4/macros/package_name.m4
+*m4/macros/package_version.m4
+*m4/macros/save_state.m4
+*m4/macros/struct_field_nfs_fh.m4
+*m4/macros/struct_mntent.m4
+*m4/macros/struct_mnttab.m4
+*m4/macros/struct_nfs_args.m4
+*m4/macros/struct_nfs_fh.m4
+*m4/macros/struct_nfs_fh3.m4
+*m4/macros/struct_nfs_gfs_mount.m4
+*m4/macros/try_compile_anyfs.m4
+*m4/macros/try_compile_nfs.m4
+*m4/macros/try_compile_rpc.m4
+*m4/macros/type_auth_create_gidlist.m4
+*m4/macros/type_cachefs_args.m4
+*m4/macros/type_cdfs_args.m4
+*m4/macros/type_efs_args.m4
+*m4/macros/type_lofs_args.m4
+*m4/macros/type_mfs_args.m4
+*m4/macros/type_pcfs_args.m4
+*m4/macros/type_recvfrom_fromlen.m4
+*m4/macros/type_rfs_args.m4
+*m4/macros/type_svc_in_arg.m4
+*m4/macros/type_time_t.m4
+*m4/macros/type_tmpfs_args.m4
+*m4/macros/type_ufs_args.m4
+*m4/macros/type_xdrproc_t.m4
+*m4/macros/type_xfs_args.m4
+*m4/macros/type_yp_order_outorder.m4
+*m4/macros/with_addon.m4
==== //depot/projects/ethng/src/contrib/amd/FREEBSD-upgrade#2 (text+ko) ====
@@ -1,21 +1,19 @@
# ex:ts=8
-$FreeBSD: src/contrib/amd/FREEBSD-upgrade,v 1.15 2004/05/14 13:29:48 mbr Exp $
+$FreeBSD: src/contrib/amd/FREEBSD-upgrade,v 1.16 2007/12/11 19:16:51 obrien Exp $
-AMD (am-utils) 6.0.9
- originals can be found at: ftp://shekel.mcl.cs.columbia.edu/pub/am-utils/
- (http://www.cs.columbia.edu/~ezk/am-utils/index.html)
-
+AMD (am-utils) 6.1.5
+ originals can be found at: ftp://ftp.am-utils.org/pub/am-utils/
For the import of AMD many files were pruned by:
- tar -X FREEBSD-Xlist -xzf am-utils-6.0.9.tar.gz
+ tar -X FREEBSD-Xlist -xf am-utils-6.1.5.tar.gz
and `find . -name '.cvsignore' -delete`
Then imported by:
- cvs import -m 'Virgin import of AMD (am-utils) v6.0.9' \
- src/contrib/amd COLUMBIA amd_6_0_9
+ cvs import -m 'Virgin import of AMD (am-utils) v6.1.5' \
+ src/contrib/amd COLUMBIA amd_6_1_5
After the import, a separate extraction of am-utils was GNU configured in
the "normal" way. The resulting config.h file should be compared with
@@ -25,8 +23,11 @@
To make local changes to amd, simply patch and commit to the main
branch (aka HEAD). Never make local changes on the vendor (COLUMBIA) branch.
-All local changes should be submitted to "amd-dev at majordomo.cs.columbia.edu"
-for inclusion in the next vendor release.
+Note, we don't trim anything in scripts/ as sysadmins may find the bits
+as a useful reference.
+
+All local changes should be submitted to "am-utils at am-utils.org" or
+https://bugzilla.am-utils.org for inclusion in the next vendor release.
Local changes:
==== //depot/projects/ethng/src/contrib/gcc/config/sparc/freebsd.h#2 (text+ko) ====
@@ -19,24 +19,26 @@
the Free Software Foundation, 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA. */
-/* $FreeBSD: src/contrib/gcc/config/sparc/freebsd.h,v 1.10 2007/05/19 02:30:20 kan Exp $ */
+/* $FreeBSD: src/contrib/gcc/config/sparc/freebsd.h,v 1.11 2007/12/09 17:41:47 marius Exp $ */
#undef SUBTARGET_EXTRA_SPECS
#define SUBTARGET_EXTRA_SPECS \
{ "fbsd_dynamic_linker", FBSD_DYNAMIC_LINKER }
/* FreeBSD needs the platform name (sparc64) defined.
- Emacs needs to know if the arch is 64 or 32-bits. */
-
-#undef CPP_CPU64_DEFAULT_SPEC
-#define CPP_CPU64_DEFAULT_SPEC \
- "-D__sparc64__ -D__sparc_v9__ -D__sparcv9 -D__sparc__ -D__arch64__"
+ Emacs needs to know if the arch is 64 or 32-bits.
+ This also selects which targets are available via -mcpu. */
#undef FBSD_TARGET_CPU_CPP_BUILTINS
#define FBSD_TARGET_CPU_CPP_BUILTINS() \
do \
{ \
builtin_define ("__LP64__"); \
+ builtin_define ("__sparc64__"); \
+ builtin_define ("__sparc_v9__"); \
+ builtin_define ("__sparcv9"); \
+ builtin_define ("__sparc__"); \
+ builtin_define ("__arch64__"); \
} \
while (0)
==== //depot/projects/ethng/src/contrib/gcc/fold-const.c#3 (text+ko) ====
@@ -5661,6 +5661,9 @@
}
break;
}
+ /* If the constant is negative, we cannot simplify this. */
+ if (tree_int_cst_sgn (c) == -1)
+ break;
/* FALLTHROUGH */
case NEGATE_EXPR:
if ((t1 = extract_muldiv (op0, c, code, wide_type, strict_overflow_p))
==== //depot/projects/ethng/src/games/fortune/datfiles/fortunes#5 (text+ko) ====
@@ -1,5 +1,5 @@
This fortune brought to you by:
-$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.248 2007/12/07 22:41:39 dougb Exp $
+$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.249 2007/12/09 01:00:11 dougb Exp $
%
=======================================================================
|| ||
@@ -12502,7 +12502,7 @@
%
Bizoos, n.:
The millions of tiny individual bumps that make up a
-basketball.
+ basketball.
-- Rich Hall, "Sniglets"
%
Black people have never rioted. A riot is what white people think blacks
@@ -12575,10 +12575,10 @@
%
BLISS is ignorance
%
-blithwapping:
+Blithwapping, v:
Using anything BUT a hammer to hammer a nail into the
wall, such as shoes, lamp bases, doorstops, etc.
- -- "Sniglets", Rich Hall & Friends
+ -- Rich Hall & Friends, "Sniglets"
%
Blood flows down one leg and up the other.
%
@@ -12948,10 +12948,10 @@
Bunker's Admonition:
You cannot buy beer; you can only rent it.
%
-BURBULATION:
+Burbulation, v:
The obsessive act of opening and closing a refrigerator door in
an attempt to catch it before the automatic light comes on.
- -- "Sniglets", Rich Hall & Friends
+ -- Rich Hall & Friends, "Sniglets"
%
Bureau Termination, Law of:
When a government bureau is scheduled to be phased out,
@@ -13397,8 +13397,8 @@
%
Carperpetuation (kar' pur pet u a shun), n.:
The act, when vacuuming, of running over a string at least a
-dozen times, reaching over and picking it up, examining it, then
-putting it back down to give the vacuum one more chance.
+ dozen times, reaching over and picking it up, examining it,
+ then putting it back down to give the vacuum one more chance.
-- Rich Hall, "Sniglets"
%
Carson's Consolation:
@@ -14277,7 +14277,7 @@
-- Ambrose Bierce, "The Devil's Dictionary"
%
Confidence is simply that quiet, assured feeling you have before you
-fall flag on your face.
+fall flat on your face.
-- Dr. L. Binder
%
Confidence is the feeling you have before you understand the situation.
@@ -16549,10 +16549,10 @@
Either I'm dead or my watch has stopped.
-- Groucho Marx' last words
%
-ELBONICS:
+Elbonics, v:
The actions of two people maneuvering for one
armrest in a movie theatre.
- -- "Sniglets", Rich Hall & Friends
+ -- Rich Hall & Friends, "Sniglets"
%
Eleanor Rigby
Sits at the keyboard and waits for a line on the screen
@@ -17736,10 +17736,10 @@
Female rabbits:
The gift that just "keeps on giving."
%
-FENDERBERG:
+Fenderberg, n.:
The large glacial deposits that form on the insides
of car fenders during snowstorms.
- -- "Sniglets", Rich Hall & Friends
+ -- Rich Hall & Friends, "Sniglets"
%
Ferguson's Precept:
A crisis is when you can't say "let's forget the whole thing."
@@ -18007,9 +18007,9 @@
Flame on!
-- Johnny Storm
%
-FLANNISTER:
+Flannister, n.:
The plastic yoke that holds a six-pack of beer together.
- -- "Sniglets", Rich Hall & Friends
+ -- Rich Hall & Friends, "Sniglets"
%
Flappity, floppity, flip
The mouse on the m"obius strip;
@@ -19606,7 +19606,7 @@
%
Fundamentally, there may be no basis for anything.
%
-Furbling, v.:
+Furbling, v:
Having to wander through a maze of ropes at an airport or bank
even when you are the only person in line.
-- Rich Hall, "Sniglets"
@@ -19684,7 +19684,7 @@
and respect from those around you; everybody loves a sucker. A short
trip is in the stars, possibly to the men's room.
%
-Genderplex, n:
+Genderplex, n.:
The predicament of a person in a restaurant who is unable to
determine his or her designated restroom (e.g., turtles and
tortoises).
@@ -19977,9 +19977,9 @@
LISP programmers to abandon bra and fig-leaf.
-- Epigrams in Programming, ACM SIGPLAN Sept. 1982
%
-GLEEMITES:
+Gleemites, n.:
Petrified deposits of toothpaste found in sinks.
- -- "Sniglets", Rich Hall & Friends
+ -- Rich Hall & Friends, "Sniglets"
%
Glib's Fourth Law of Unreliability:
Investment in reliability will increase until it exceeds the
@@ -20011,7 +20011,7 @@
%
Gnagloot, n.:
A person who leaves all his ski passes on his jacket just to
-impress people.
+ impress people.
-- Rich Hall, "Sniglets"
%
Go ahead, make my day.
@@ -25345,7 +25345,7 @@
%
Idiot Box, n.:
The part of the envelope that tells a person where to place the
-stamp when they can't quite figure it out for themselves.
+ stamp when they can't quite figure it out for themselves.
-- Rich Hall, "Sniglets"
%
Idiot, n.:
@@ -27202,7 +27202,7 @@
If you've seen one redwood, you've seen them all.
-- Ronald Reagan
%
-ignisecond, n:
+Ignisecond, n.:
The overlapping moment of time when the hand is locking the car
door even as the brain is saying, "my keys are in there!"
-- Rich Hall, "Sniglets"
@@ -31189,7 +31189,7 @@
Let me not to the marriage of true minds
Admit impediments. Love is not love
Which alters when it alteration finds,
-Or bends with the remover to remove:
+Or bends with the remover to remove.
O, no! it is an ever-fixed mark,
That looks on tempests and is never shaken;
It is the star to every wandering bark,
@@ -31198,8 +31198,9 @@
Within his bending sickle's compass come;
Love alters not with his brief hours and weeks,
But bears it out even to the edge of doom.
-If this be error and upon me proved,
-I never writ, nor no man ever loved.
+ If this be error and upon me proved,
+ I never writ, nor no man ever loved.
+ -- William Shakespeare, Sonnet CXVI
%
Let me put it this way: today is going to be a learning experience.
%
@@ -32404,7 +32405,7 @@
knowledge.
-- Ambrose Bierce, "The Devil's Dictionary"
%
-Magnocartic, adj:
+Magnocartic, adj.:
Any automobile that, when left unattended, attracts shopping
carts.
-- Rich Hall, "Sniglets"
@@ -33481,10 +33482,10 @@
Any simple problem can be made insoluble
if enough meetings are held to discuss it.
%
-mittsquinter, adj:
- A ballplayer who looks into his glove after missing the ball, as
- if, somehow, the cause of the error lies there.
- -- "Sniglets", Rich Hall & Friends
+Mittsquinter, adj.:
+ A ballplayer who looks into his glove after missing the ball,
+ as if, somehow, the cause of the error lies there.
+ -- Rich Hall & Friends, "Sniglets"
%
Mix a little foolishness with your serious plans;
it's lovely to be silly at the right moment.
@@ -34033,7 +34034,7 @@
Mustgo, n.:
Any item of food that has been sitting in the refrigerator so
long it has become a science project.
- -- Sniglets, "Rich Hall & Friends"
+ -- Rich Hall & Friends, "Sniglets"
%
My advice to you, my violent friend, is to seek out gold and sit on it.
-- The Dragon to Grendel, in John Gardner's "Grendel"
@@ -34401,10 +34402,10 @@
will be right.
-- George Bernard Shaw, "The Man of Destiny"
%
-narcolepulacyi, n:
+Narcolepulacyi, n.:
The contagious action of yawning, causing everyone in sight
to also yawn.
- -- "Sniglets", Rich Hall & Friends
+ -- Rich Hall & Friends, "Sniglets"
%
Nasrudin called at a large house to collect for charity. The servant said
"My master is out." Nasrudin replied, "Tell your master that next time he
@@ -37796,12 +37797,12 @@
%
Pedaeration, n.:
The perfect body heat achieved by having one leg under the
-sheet and one hanging off the edge of the bed.
+ sheet and one hanging off the edge of the bed.
-- Rich Hall, "Sniglets"
%
-pediddel:
+Pediddel, n.:
A car with only one working headlight.
- -- "Sniglets", Rich Hall & Friends
+ -- Rich Hall & Friends, "Sniglets"
%
Pedro Guerrero was playing third base for the Los Angeles Dodgers in 1984
when he made the comment that earns him a place in my Hall of Fame. Second
@@ -38090,7 +38091,7 @@
(3) Things that tick are not always clocks.
(4) Suicide only works when you're bluffing.
%
-petribar:
+Petribar, n.:
Any sun-bleached prehistoric candy that has been sitting in
the window of a vending machine too long.
-- Rich Hall, "Sniglets"
@@ -38113,10 +38114,10 @@
%
Phone call for chucky-pooh.
%
-phosflink:
- To flick a bulb on and off when it burns out (as if, somehow, that
- will bring it back to life).
- -- "Sniglets", Rich Hall & Friends
+Phosflink, v:
+ To flick a bulb on and off when it burns out (as if, somehow,
+ that will bring it back to life).
+ -- Rich Hall & Friends, "Sniglets"
%
Photographing a volcano is just about
the most miserable thing you can do.
@@ -38992,10 +38993,10 @@
Puritanism -- the haunting fear that someone, somewhere, may be happy.
-- H. L. Mencken, "A Book of Burlesques"
%
-PURPITATION:
+Purpitation, v:
To take something off the grocery shelf, decide you
don't want it, and then put it in another section.
- -- "Sniglets", Rich Hall & Friends
+ -- Rich Hall & Friends, "Sniglets"
%
Pushing 30 is exercise enough.
%
@@ -41313,7 +41314,7 @@
%
Schizophrenia beats being alone.
%
-schlattwhapper, n:
+Schlattwhapper, n.:
The window shade that allows itself to be pulled down,
hesitates for a second, then snaps up in your face.
-- Rich Hall, "Sniglets"
@@ -41322,11 +41323,6 @@
All things being equal, a fat person uses more soap
than a thin person.
%
-Schnuffel, n.:
- A dog's practice of continuously nuzzling in your crotch in
- mixed company.
- -- Rich Hall, "Sniglets"
-%
Schwiggle, n.:
The amusing rotation of one's bottom while sharpening a
pencil.
@@ -41464,9 +41460,10 @@
%
Screw up your courage! You've screwed up everything else.
%
-SCRIBLINE:
- The blank area on the back of credit cards where one's signature goes.
- -- "Sniglets", Rich Hall & Friends
+Scribline, n.:
+ The blank area on the back of credit cards where one's
+ signature goes.
+ -- Rich Hall & Friends, "Sniglets"
%
Scrubbing floors and emptying bedpans has as much dignity as the
Presidency.
@@ -42903,9 +42900,10 @@
and new civilizations; to boldly go where no man has gone before.
-- Captain James T. Kirk
%
-SPAGMUMPS:
- Any of the millions of Styrofoam wads that accompany mail-order items.
- -- "Sniglets", Rich Hall & Friends
+Spagmumps, n.:
+ Any of the millions of Styrofoam wads that accompany mail-order
+ items.
+ -- Rich Hall & Friends, "Sniglets"
%
Spare no expense to save money on this one.
-- Samuel Goldwyn
@@ -43037,7 +43035,7 @@
Spirtle, n.:
The fine stream from a grapefruit that always lands right in
your eye.
- -- Sniglets, "Rich Hall & Friends"
+ -- Rich Hall & Friends, "Sniglets"
%
Spock: The odds of surviving another
attack are 13562190123 to 1, Captain.
@@ -43051,9 +43049,9 @@
Spring is here, spring is here,
Life is skittles and life is beer.
%
-SQUATCHO:
+Squatcho, n.:
The button at the top of a baseball cap.
- -- "Sniglets", Rich Hall & Friends
+ -- Rich Hall & Friends, "Sniglets"
%
Squirrels eating squirrels, my God, that's sick.
%
@@ -43848,11 +43846,11 @@
making a disagreeable person keep his distance.
-- Ambrose Bierce, "The Devil's Dictionary"
%
-TELEPRESSION:
- The deep-seated guilt which stems from knowing that you did not try
- hard enough to look up the number on your own and instead put the
- burden on the directory assistant.
- -- "Sniglets", Rich Hall & Friends
+Telepression, n.:
+ The deep-seated guilt which stems from knowing that you did not
+ try hard enough to look up the number on your own and instead
+ put the burden on the directory assistant.
+ -- Rich Hall & Friends, "Sniglets"
%
Television -- a medium. So called because it is neither rare nor well done.
-- Ernie Kovacs
@@ -52117,7 +52115,7 @@
%
Toddlers are the stormtroopers of the Lord of Entropy.
%
-toilet toupee, n:
+Toilet Toupee, n:
Any shag carpet that causes the lid to become top-heavy, thus
creating endless annoyance to male users.
-- Rich Hall, "Sniglets"
@@ -54204,7 +54202,7 @@
Or consider "The Brothers Karamazov", by the famous Russian alcoholic
Fyodor Dostoevsky. It's about these two brothers who kill their father.
Or maybe only one of them kills the father. It's impossible to tell because
-what they mostly do is talk for nearly a thousand pages.If all Russians talk
+what they mostly do is talk for nearly a thousand pages. If all Russians talk
as much as the Karamazovs did, I don't see how they found time to become a
major world power.
I'm told that Dostoevsky wrote "The Brothers Karamazov" to raise
@@ -57638,7 +57636,7 @@
%
XIIdigitation, n.:
The practice of trying to determine the year a movie was made
-by deciphering the Roman numerals at the end of the credits.
+ by deciphering the Roman numerals at the end of the credits.
-- Rich Hall, "Sniglets"
%
XLI:
==== //depot/projects/ethng/src/games/fortune/datfiles/fortunes-o.real#4 (text+ko) ====
@@ -1,4 +1,4 @@
-%% $FreeBSD: src/games/fortune/datfiles/fortunes-o.real,v 1.27 2007/12/07 22:56:10 dougb Exp $
+%% $FreeBSD: src/games/fortune/datfiles/fortunes-o.real,v 1.28 2007/12/09 01:00:11 dougb Exp $
%
PLAYGIRL, Inc.
Philadelphia, Pa. 19369
@@ -11810,9 +11810,9 @@
I'll take head on a flight,
So the guy can have pie in the sky."
%
-schnuffel, n.:
- A dog's practice of continuously nuzzling in your crotch in mixed
- company.
+Schnuffel, n.:
+ A dog's practice of continuously nuzzling in your crotch in
+ mixed company.
-- Rich Hall, "Sniglets"
%
"Scott, baby," the sexually aggressive girl murmured as she guided
@@ -12173,7 +12173,7 @@
%
Snow White:
"Gee guys, I've always dreamed of getting ten inches...
- but not an inch-and-a-half at a time!
+ but not an inch-and-a-half at a time!"
%
"Snyder's got a stiff ticket," said Kay,
"Come on, take it out, and let's play."
@@ -13073,7 +13073,7 @@
%
The new rooster caused a great stir in the barnyard. From resplendent comb
to defiant spurs, he was the picture of young bantamhood. Almost immediately
-upon arrival, he was greeted by and elderly rooster who took him behind the
+upon arrival, he was greeted by an elderly rooster who took him behind the
barn and whispered in his ear: "Young fellow, I'm long past my prime. All I
want now is peace and solitude. So you take over right now as ruler of the
roost with my blessings."
@@ -13082,7 +13082,7 @@
took the young champion behind the barn. "Kid," he said, "the hens are after
me for giving up my position so readily. So why don't we have a race, say,
ten laps around the farmhouse? The winner becomes undisputed keeper of the
-henhouse and the hens will stop nagging me.
+henhouse and the hens will stop nagging me."
The young rooster, with only contempt for his elder, agreed.
Surprisingly, the older one jumped off to an early lead. His counterpart,
weakened by the activities of the previous week, was never quite able to
==== //depot/projects/ethng/src/games/fortune/datfiles/fortunes-o.sp.ok#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/games/fortune/datfiles/fortunes-o.sp.ok,v 1.2 2007/12/07 22:27:04 dougb Exp $
+# $FreeBSD: src/games/fortune/datfiles/fortunes-o.sp.ok,v 1.3 2007/12/09 01:00:11 dougb Exp $
a'plucking
AAAaaeeeeeeeeeiiiiiiiii
Aaah
@@ -1309,7 +1309,7 @@
Schlegel
schlemiel
schloshed
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list