PERFORCE change 129234 for review
Xin LI
delphij at FreeBSD.org
Sun Nov 18 23:53:45 PST 2007
http://perforce.freebsd.org/chv.cgi?CH=129234
Change 129234 by delphij at charlie on 2007/11/19 07:53:29
IFC
Affected files ...
.. //depot/projects/delphij_fork/ObsoleteFiles.inc#13 integrate
.. //depot/projects/delphij_fork/UPDATING#6 integrate
.. //depot/projects/delphij_fork/bin/ln/ln.1#2 integrate
.. //depot/projects/delphij_fork/bin/ln/ln.c#2 integrate
.. //depot/projects/delphij_fork/bin/sh/Makefile#2 integrate
.. //depot/projects/delphij_fork/contrib/csup/mux.c#2 integrate
.. //depot/projects/delphij_fork/contrib/gdb/gdb/i386fbsd-nat.c#2 integrate
.. //depot/projects/delphij_fork/contrib/less/FREEBSD-upgrade#1 branch
.. //depot/projects/delphij_fork/contrib/less/LICENSE#2 integrate
.. //depot/projects/delphij_fork/contrib/less/Makefile.dsm#2 delete
.. //depot/projects/delphij_fork/contrib/less/NEWS#4 integrate
.. //depot/projects/delphij_fork/contrib/less/README#4 integrate
.. //depot/projects/delphij_fork/contrib/less/ch.c#3 integrate
.. //depot/projects/delphij_fork/contrib/less/command.c#2 integrate
.. //depot/projects/delphij_fork/contrib/less/configure#3 integrate
.. //depot/projects/delphij_fork/contrib/less/configure.ac#3 integrate
.. //depot/projects/delphij_fork/contrib/less/decode.c#2 integrate
.. //depot/projects/delphij_fork/contrib/less/defines.ds#2 integrate
.. //depot/projects/delphij_fork/contrib/less/defines.h.in#2 integrate
.. //depot/projects/delphij_fork/contrib/less/defines.o2#2 integrate
.. //depot/projects/delphij_fork/contrib/less/defines.o9#2 integrate
.. //depot/projects/delphij_fork/contrib/less/defines.wn#2 integrate
.. //depot/projects/delphij_fork/contrib/less/edit.c#2 integrate
.. //depot/projects/delphij_fork/contrib/less/filename.c#3 integrate
.. //depot/projects/delphij_fork/contrib/less/funcs.h#3 integrate
.. //depot/projects/delphij_fork/contrib/less/less.h#3 integrate
.. //depot/projects/delphij_fork/contrib/less/less.man#4 integrate
.. //depot/projects/delphij_fork/contrib/less/less.nro#4 integrate
.. //depot/projects/delphij_fork/contrib/less/lessecho.man#4 integrate
.. //depot/projects/delphij_fork/contrib/less/lessecho.nro#4 integrate
.. //depot/projects/delphij_fork/contrib/less/lesskey.man#4 integrate
.. //depot/projects/delphij_fork/contrib/less/lesskey.nro#4 integrate
.. //depot/projects/delphij_fork/contrib/less/line.c#3 integrate
.. //depot/projects/delphij_fork/contrib/less/optfunc.c#2 integrate
.. //depot/projects/delphij_fork/contrib/less/opttbl.c#2 integrate
.. //depot/projects/delphij_fork/contrib/less/screen.c#2 integrate
.. //depot/projects/delphij_fork/contrib/less/search.c#3 integrate
.. //depot/projects/delphij_fork/contrib/less/tags.c#2 integrate
.. //depot/projects/delphij_fork/contrib/less/version.c#4 integrate
.. //depot/projects/delphij_fork/etc/etc.amd64/ttys#2 integrate
.. //depot/projects/delphij_fork/etc/etc.arm/ttys#3 integrate
.. //depot/projects/delphij_fork/etc/etc.i386/ttys#2 integrate
.. //depot/projects/delphij_fork/etc/etc.ia64/ttys#2 integrate
.. //depot/projects/delphij_fork/etc/etc.powerpc/ttys#2 integrate
.. //depot/projects/delphij_fork/etc/etc.sparc64/ttys#2 integrate
.. //depot/projects/delphij_fork/etc/rc.d/hostapd#2 integrate
.. //depot/projects/delphij_fork/gnu/usr.bin/cc/cc_tools/Makefile#2 integrate
.. //depot/projects/delphij_fork/gnu/usr.bin/gdb/arch/arm/Makefile#2 integrate
.. //depot/projects/delphij_fork/gnu/usr.bin/gdb/arch/arm/armfbsd-nat.c#2 integrate
.. //depot/projects/delphij_fork/gnu/usr.bin/gdb/arch/arm/armfbsd-tdep.c#2 integrate
.. //depot/projects/delphij_fork/gnu/usr.bin/gdb/arch/arm/init.c#2 integrate
.. //depot/projects/delphij_fork/gnu/usr.bin/gdb/arch/arm/nm-fbsd.h#2 integrate
.. //depot/projects/delphij_fork/gnu/usr.bin/gdb/kgdb/kgdb.h#2 integrate
.. //depot/projects/delphij_fork/gnu/usr.bin/gdb/kgdb/kthr.c#2 integrate
.. //depot/projects/delphij_fork/gnu/usr.bin/gdb/kgdb/trgt_i386.c#2 integrate
.. //depot/projects/delphij_fork/lib/Makefile#4 integrate
.. //depot/projects/delphij_fork/lib/libc/net/Makefile.inc#2 integrate
.. //depot/projects/delphij_fork/lib/libdisk/libdisk.3#2 integrate
.. //depot/projects/delphij_fork/lib/libkse/thread/thr_spec.c#3 integrate
.. //depot/projects/delphij_fork/lib/libsdp/search.c#2 integrate
.. //depot/projects/delphij_fork/lib/libthread_db/arch/arm/libpthread_md.c#1 branch
.. //depot/projects/delphij_fork/lib/libutil/expand_number.3#4 integrate
.. //depot/projects/delphij_fork/lib/libutil/expand_number.c#3 integrate
.. //depot/projects/delphij_fork/lib/libutil/libutil.h#3 integrate
.. //depot/projects/delphij_fork/release/Makefile#6 integrate
.. //depot/projects/delphij_fork/release/doc/en_US.ISO8859-1/hardware/article.sgml#6 integrate
.. //depot/projects/delphij_fork/release/doc/en_US.ISO8859-1/relnotes/article.sgml#15 integrate
.. //depot/projects/delphij_fork/release/picobsd/bridge/PICOBSD#2 integrate
.. //depot/projects/delphij_fork/release/picobsd/bridge/crunch.conf#2 integrate
.. //depot/projects/delphij_fork/release/picobsd/build/Makefile.conf#2 integrate
.. //depot/projects/delphij_fork/release/picobsd/build/picobsd#2 integrate
.. //depot/projects/delphij_fork/release/picobsd/tinyware/login/Makefile#2 integrate
.. //depot/projects/delphij_fork/sbin/devd/Makefile#2 integrate
.. //depot/projects/delphij_fork/sbin/geom/class/journal/gjournal.8#2 integrate
.. //depot/projects/delphij_fork/sbin/geom/class/virstor/geom_virstor.c#2 integrate
.. //depot/projects/delphij_fork/sbin/ipf/ipftest/Makefile#2 integrate
.. //depot/projects/delphij_fork/sbin/ipfw/ipfw.8#4 integrate
.. //depot/projects/delphij_fork/sbin/mdconfig/mdconfig.c#2 integrate
.. //depot/projects/delphij_fork/sbin/mount_ntfs/mount_ntfs.8#2 integrate
.. //depot/projects/delphij_fork/sbin/spppcontrol/spppcontrol.c#2 integrate
.. //depot/projects/delphij_fork/share/man/man4/Makefile#8 integrate
.. //depot/projects/delphij_fork/share/man/man4/asmc.4#2 integrate
.. //depot/projects/delphij_fork/share/man/man4/ipw.4#2 integrate
.. //depot/projects/delphij_fork/share/man/man4/iwi.4#2 integrate
.. //depot/projects/delphij_fork/share/man/man4/wlan.4#3 integrate
.. //depot/projects/delphij_fork/share/man/man4/wpi.4#2 integrate
.. //depot/projects/delphij_fork/share/man/man9/Makefile#5 integrate
.. //depot/projects/delphij_fork/sys/amd64/amd64/db_trace.c#2 integrate
.. //depot/projects/delphij_fork/sys/amd64/amd64/exception.S#2 integrate
.. //depot/projects/delphij_fork/sys/amd64/amd64/machdep.c#4 integrate
.. //depot/projects/delphij_fork/sys/amd64/amd64/pmap.c#4 integrate
.. //depot/projects/delphij_fork/sys/amd64/amd64/trap.c#3 integrate
.. //depot/projects/delphij_fork/sys/amd64/amd64/vm_machdep.c#2 integrate
.. //depot/projects/delphij_fork/sys/arm/arm/pmap.c#6 integrate
.. //depot/projects/delphij_fork/sys/arm/arm/trap.c#3 integrate
.. //depot/projects/delphij_fork/sys/arm/arm/vm_machdep.c#4 integrate
.. //depot/projects/delphij_fork/sys/arm/conf/HL200#1 branch
.. //depot/projects/delphij_fork/sys/boot/i386/cdboot/cdboot.s#2 integrate
.. //depot/projects/delphij_fork/sys/boot/i386/libi386/biosdisk.c#3 integrate
.. //depot/projects/delphij_fork/sys/boot/pc98/cdboot/cdboot.s#2 integrate
.. //depot/projects/delphij_fork/sys/cam/scsi/scsi_all.h#3 integrate
.. //depot/projects/delphij_fork/sys/conf/files#11 integrate
.. //depot/projects/delphij_fork/sys/conf/files.amd64#6 integrate
.. //depot/projects/delphij_fork/sys/conf/files.i386#6 integrate
.. //depot/projects/delphij_fork/sys/conf/files.pc98#3 integrate
.. //depot/projects/delphij_fork/sys/conf/kmod.mk#3 integrate
.. //depot/projects/delphij_fork/sys/dev/agp/agp.c#1 branch
.. //depot/projects/delphij_fork/sys/dev/agp/agp_ali.c#1 branch
.. //depot/projects/delphij_fork/sys/dev/agp/agp_amd.c#1 branch
.. //depot/projects/delphij_fork/sys/dev/agp/agp_amd64.c#1 branch
.. //depot/projects/delphij_fork/sys/dev/agp/agp_ati.c#1 branch
.. //depot/projects/delphij_fork/sys/dev/agp/agp_i810.c#1 branch
.. //depot/projects/delphij_fork/sys/dev/agp/agp_if.m#1 branch
.. //depot/projects/delphij_fork/sys/dev/agp/agp_intel.c#1 branch
.. //depot/projects/delphij_fork/sys/dev/agp/agp_nvidia.c#1 branch
.. //depot/projects/delphij_fork/sys/dev/agp/agp_sis.c#1 branch
.. //depot/projects/delphij_fork/sys/dev/agp/agp_via.c#1 branch
.. //depot/projects/delphij_fork/sys/dev/agp/agppriv.h#1 branch
.. //depot/projects/delphij_fork/sys/dev/agp/agpreg.h#1 branch
.. //depot/projects/delphij_fork/sys/dev/agp/agpvar.h#1 branch
.. //depot/projects/delphij_fork/sys/dev/an/if_an.c#5 integrate
.. //depot/projects/delphij_fork/sys/dev/an/if_anreg.h#2 integrate
.. //depot/projects/delphij_fork/sys/dev/ata/ata-all.h#2 integrate
.. //depot/projects/delphij_fork/sys/dev/ata/ata-chipset.c#5 integrate
.. //depot/projects/delphij_fork/sys/dev/ata/ata-pci.c#3 integrate
.. //depot/projects/delphij_fork/sys/dev/ata/ata-pci.h#5 integrate
.. //depot/projects/delphij_fork/sys/dev/bge/if_bge.c#3 integrate
.. //depot/projects/delphij_fork/sys/dev/dc/dcphy.c#2 integrate
.. //depot/projects/delphij_fork/sys/dev/drm/drmP.h#2 integrate
.. //depot/projects/delphij_fork/sys/dev/drm/drm_agpsupport.c#2 integrate
.. //depot/projects/delphij_fork/sys/dev/ichwd/ichwd.c#3 integrate
.. //depot/projects/delphij_fork/sys/dev/ichwd/ichwd.h#3 integrate
.. //depot/projects/delphij_fork/sys/dev/mii/amphy.c#2 integrate
.. //depot/projects/delphij_fork/sys/dev/mii/e1000phy.c#3 integrate
.. //depot/projects/delphij_fork/sys/dev/mii/nsphy.c#2 integrate
.. //depot/projects/delphij_fork/sys/dev/mii/rlphy.c#2 integrate
.. //depot/projects/delphij_fork/sys/dev/mii/tdkphy.c#2 integrate
.. //depot/projects/delphij_fork/sys/dev/mii/ukphy_subr.c#2 integrate
.. //depot/projects/delphij_fork/sys/dev/nfe/if_nfe.c#5 integrate
.. //depot/projects/delphij_fork/sys/dev/pci/pci.c#4 integrate
.. //depot/projects/delphij_fork/sys/dev/txp/if_txp.c#2 integrate
.. //depot/projects/delphij_fork/sys/dev/usb/ehci_pci.c#3 integrate
.. //depot/projects/delphij_fork/sys/dev/usb/uhci_pci.c#2 integrate
.. //depot/projects/delphij_fork/sys/dev/wpi/if_wpi.c#2 integrate
.. //depot/projects/delphij_fork/sys/fs/msdosfs/msdosfs_vfsops.c#13 integrate
.. //depot/projects/delphij_fork/sys/fs/ntfs/ntfs_ihash.c#2 integrate
.. //depot/projects/delphij_fork/sys/fs/ntfs/ntfs_vfsops.c#4 integrate
.. //depot/projects/delphij_fork/sys/fs/tmpfs/tmpfs.h#6 integrate
.. //depot/projects/delphij_fork/sys/fs/tmpfs/tmpfs_subr.c#6 integrate
.. //depot/projects/delphij_fork/sys/fs/tmpfs/tmpfs_vfsops.c#9 integrate
.. //depot/projects/delphij_fork/sys/fs/tmpfs/tmpfs_vnops.c#6 integrate
.. //depot/projects/delphij_fork/sys/geom/label/g_label_reiserfs.c#2 integrate
.. //depot/projects/delphij_fork/sys/i386/bios/apm.c#3 integrate
.. //depot/projects/delphij_fork/sys/i386/i386/locore.s#2 integrate
.. //depot/projects/delphij_fork/sys/i386/i386/machdep.c#5 integrate
.. //depot/projects/delphij_fork/sys/i386/i386/mp_machdep.c#3 integrate
.. //depot/projects/delphij_fork/sys/i386/i386/pmap.c#4 integrate
.. //depot/projects/delphij_fork/sys/i386/i386/trap.c#3 integrate
.. //depot/projects/delphij_fork/sys/i386/i386/vm_machdep.c#3 integrate
.. //depot/projects/delphij_fork/sys/i386/include/pmap.h#2 integrate
.. //depot/projects/delphij_fork/sys/ia64/ia64/machdep.c#5 integrate
.. //depot/projects/delphij_fork/sys/ia64/ia64/pmap.c#5 integrate
.. //depot/projects/delphij_fork/sys/ia64/ia64/trap.c#2 integrate
.. //depot/projects/delphij_fork/sys/ia64/ia64/vm_machdep.c#2 integrate
.. //depot/projects/delphij_fork/sys/kern/imgact_elf.c#3 integrate
.. //depot/projects/delphij_fork/sys/kern/init_main.c#4 integrate
.. //depot/projects/delphij_fork/sys/kern/kern_clock.c#3 integrate
.. //depot/projects/delphij_fork/sys/kern/kern_exec.c#6 integrate
.. //depot/projects/delphij_fork/sys/kern/kern_fork.c#5 integrate
.. //depot/projects/delphij_fork/sys/kern/kern_kse.c#6 integrate
.. //depot/projects/delphij_fork/sys/kern/kern_kthread.c#3 integrate
.. //depot/projects/delphij_fork/sys/kern/kern_ktrace.c#4 integrate
.. //depot/projects/delphij_fork/sys/kern/kern_linker.c#3 integrate
.. //depot/projects/delphij_fork/sys/kern/kern_lock.c#2 integrate
.. //depot/projects/delphij_fork/sys/kern/kern_mutex.c#3 integrate
.. //depot/projects/delphij_fork/sys/kern/kern_proc.c#4 integrate
.. //depot/projects/delphij_fork/sys/kern/kern_rmlock.c#2 integrate
.. //depot/projects/delphij_fork/sys/kern/kern_rwlock.c#3 integrate
.. //depot/projects/delphij_fork/sys/kern/kern_switch.c#7 integrate
.. //depot/projects/delphij_fork/sys/kern/kern_sx.c#4 integrate
.. //depot/projects/delphij_fork/sys/kern/kern_synch.c#4 integrate
.. //depot/projects/delphij_fork/sys/kern/kern_thr.c#4 integrate
.. //depot/projects/delphij_fork/sys/kern/kern_thread.c#7 integrate
.. //depot/projects/delphij_fork/sys/kern/linker_if.m#2 integrate
.. //depot/projects/delphij_fork/sys/kern/p1003_1b.c#3 integrate
.. //depot/projects/delphij_fork/sys/kern/sched_4bsd.c#6 integrate
.. //depot/projects/delphij_fork/sys/kern/sched_ule.c#9 integrate
.. //depot/projects/delphij_fork/sys/kern/subr_pcpu.c#3 integrate
.. //depot/projects/delphij_fork/sys/kern/subr_sleepqueue.c#3 integrate
.. //depot/projects/delphij_fork/sys/kern/subr_trap.c#3 integrate
.. //depot/projects/delphij_fork/sys/kern/subr_turnstile.c#2 integrate
.. //depot/projects/delphij_fork/sys/kern/subr_witness.c#3 integrate
.. //depot/projects/delphij_fork/sys/kern/sys_generic.c#3 integrate
.. //depot/projects/delphij_fork/sys/modules/agp/Makefile#2 integrate
.. //depot/projects/delphij_fork/sys/net80211/ieee80211.h#4 integrate
.. //depot/projects/delphij_fork/sys/netgraph/netgraph.h#4 integrate
.. //depot/projects/delphij_fork/sys/netgraph/ng_base.c#4 integrate
.. //depot/projects/delphij_fork/sys/netinet/ip_dummynet.c#6 integrate
.. //depot/projects/delphij_fork/sys/netipsec/keysock.c#2 integrate
.. //depot/projects/delphij_fork/sys/pc98/pc98/machdep.c#3 integrate
.. //depot/projects/delphij_fork/sys/pci/agp.c#4 delete
.. //depot/projects/delphij_fork/sys/pci/agp_ali.c#3 delete
.. //depot/projects/delphij_fork/sys/pci/agp_amd.c#3 delete
.. //depot/projects/delphij_fork/sys/pci/agp_amd64.c#3 delete
.. //depot/projects/delphij_fork/sys/pci/agp_ati.c#3 delete
.. //depot/projects/delphij_fork/sys/pci/agp_i810.c#5 delete
.. //depot/projects/delphij_fork/sys/pci/agp_if.m#2 delete
.. //depot/projects/delphij_fork/sys/pci/agp_intel.c#3 delete
.. //depot/projects/delphij_fork/sys/pci/agp_nvidia.c#3 delete
.. //depot/projects/delphij_fork/sys/pci/agp_sis.c#3 delete
.. //depot/projects/delphij_fork/sys/pci/agp_via.c#4 delete
.. //depot/projects/delphij_fork/sys/pci/agppriv.h#4 delete
.. //depot/projects/delphij_fork/sys/pci/agpreg.h#3 delete
.. //depot/projects/delphij_fork/sys/pci/agpvar.h#2 delete
.. //depot/projects/delphij_fork/sys/powerpc/include/atomic.h#3 integrate
.. //depot/projects/delphij_fork/sys/powerpc/include/md_var.h#3 integrate
.. //depot/projects/delphij_fork/sys/powerpc/powerpc/clock.c#2 integrate
.. //depot/projects/delphij_fork/sys/powerpc/powerpc/machdep.c#3 integrate
.. //depot/projects/delphij_fork/sys/powerpc/powerpc/mmu_if.m#2 integrate
.. //depot/projects/delphij_fork/sys/powerpc/powerpc/mmu_oea.c#2 integrate
.. //depot/projects/delphij_fork/sys/powerpc/powerpc/pmap_dispatch.c#3 integrate
.. //depot/projects/delphij_fork/sys/powerpc/powerpc/trap.c#4 integrate
.. //depot/projects/delphij_fork/sys/powerpc/powerpc/vm_machdep.c#3 integrate
.. //depot/projects/delphij_fork/sys/sparc64/conf/DEFAULTS#2 integrate
.. //depot/projects/delphij_fork/sys/sparc64/sparc64/pmap.c#5 integrate
.. //depot/projects/delphij_fork/sys/sparc64/sparc64/vm_machdep.c#3 integrate
.. //depot/projects/delphij_fork/sys/sun4v/sun4v/pmap.c#3 integrate
.. //depot/projects/delphij_fork/sys/sun4v/sun4v/trap.c#2 integrate
.. //depot/projects/delphij_fork/sys/sun4v/sun4v/vm_machdep.c#3 integrate
.. //depot/projects/delphij_fork/sys/sys/eventhandler.h#2 integrate
.. //depot/projects/delphij_fork/sys/sys/linker.h#3 integrate
.. //depot/projects/delphij_fork/sys/sys/lock.h#3 integrate
.. //depot/projects/delphij_fork/sys/sys/param.h#5 integrate
.. //depot/projects/delphij_fork/sys/sys/proc.h#8 integrate
.. //depot/projects/delphij_fork/sys/vm/pmap.h#3 integrate
.. //depot/projects/delphij_fork/sys/vm/vm_object.c#4 integrate
.. //depot/projects/delphij_fork/tools/regression/priv/Makefile#3 integrate
.. //depot/projects/delphij_fork/tools/regression/priv/main.c#3 integrate
.. //depot/projects/delphij_fork/tools/regression/priv/main.h#3 integrate
.. //depot/projects/delphij_fork/tools/regression/priv/priv_netinet_ipsec.c#1 branch
.. //depot/projects/delphij_fork/tools/sched/schedgraph.py#3 integrate
.. //depot/projects/delphij_fork/usr.bin/fstat/zfs/zfs.c#2 integrate
.. //depot/projects/delphij_fork/usr.bin/less/defines.h#2 integrate
.. //depot/projects/delphij_fork/usr.bin/lsvfs/lsvfs.c#2 integrate
.. //depot/projects/delphij_fork/usr.bin/tee/tee.1#2 integrate
.. //depot/projects/delphij_fork/usr.bin/tip/tip/Makefile#2 integrate
.. //depot/projects/delphij_fork/usr.bin/write/write.c#2 integrate
.. //depot/projects/delphij_fork/usr.sbin/IPXrouted/trace.c#2 integrate
.. //depot/projects/delphij_fork/usr.sbin/acpi/acpidump/acpi.c#2 integrate
.. //depot/projects/delphij_fork/usr.sbin/arp/Makefile#2 integrate
.. //depot/projects/delphij_fork/usr.sbin/freebsd-update/freebsd-update.sh#5 integrate
.. //depot/projects/delphij_fork/usr.sbin/pciconf/cap.c#4 integrate
.. //depot/projects/delphij_fork/usr.sbin/ppp/chap.h#2 integrate
.. //depot/projects/delphij_fork/usr.sbin/ppp/physical.h#2 integrate
.. //depot/projects/delphij_fork/usr.sbin/sa/db.c#2 integrate
Differences ...
==== //depot/projects/delphij_fork/ObsoleteFiles.inc#13 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.117 2007/11/08 17:43:13 imp Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.118 2007/11/16 04:03:08 marcel Exp $
#
# This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
# directories (OLD_DIRS) which should get removed at an update. Recently
@@ -16,6 +16,12 @@
# 20071108: Removed very crunch OLDCARD support file
OLD_FILES+=etc/defaults/pccard.conf
+# 20071104: Removed bsdlabel, fdisk and gpt from rescue on ia64.
+.if ${TARGET_ARCH} == "ia64"
+OLD_FILES+=rescue/bsdlabel
+OLD_FILES+=rescue/fdisk
+OLD_FILES+=rescue/gpt
+.endif
# 20071025: rc.d/nfslocking superceeded by rc.d/lockd and rc.d/statd
OLD_FILES+=etc/rc.d/nfslocking
# 20070930: rename of cached to nscd
==== //depot/projects/delphij_fork/UPDATING#6 (text+ko) ====
@@ -21,6 +21,17 @@
developers choose to disable these features on build machines
to maximize performance.
+20071118:
+ The AT keyboard emulation of sunkbd(4) has been turned on
+ by default. In order to make the special symbols of the Sun
+ keyboards driven by sunkbd(4) work under X these now have
+ to be configured the same way as Sun USB keyboards driven
+ by ukbd(4) (which also does AT keyboard emulation), f.e.:
+
+ Option "XkbLayout" "us"
+ Option "XkbRules" "xorg"
+ Option "XkbSymbols" "pc(pc105)+sun_vndr/usb(sun_usb)+us"
+
20071024:
It has been decided that it is desirable to provide ABI
backwards compatibility to the FreeBSD 4/5/6 versions of the
@@ -934,4 +945,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.511 2007/10/24 20:51:43 marius Exp $
+$FreeBSD: src/UPDATING,v 1.512 2007/11/18 18:11:16 marius Exp $
==== //depot/projects/delphij_fork/bin/ln/ln.1#2 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)ln.1 8.2 (Berkeley) 12/30/93
-.\" $FreeBSD: src/bin/ln/ln.1,v 1.31 2006/02/14 11:08:05 glebius Exp $
+.\" $FreeBSD: src/bin/ln/ln.1,v 1.32 2007/11/17 21:01:22 ru Exp $
.\"
.Dd February 14, 2006
.Dt LN 1
@@ -41,11 +41,15 @@
.Nd make links
.Sh SYNOPSIS
.Nm
-.Op Fl Ffhinsv
+.Op Fl s Op Fl F
+.Op Fl f | i
+.Op Fl hnv
.Ar source_file
.Op Ar target_file
.Nm
-.Op Fl Ffhinsv
+.Op Fl s Op Fl F
+.Op Fl f | i
+.Op Fl hnv
.Ar source_file ...
.Ar target_dir
.Nm link
==== //depot/projects/delphij_fork/bin/ln/ln.c#2 (text+ko) ====
@@ -39,7 +39,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ln/ln.c,v 1.34 2006/02/14 11:08:05 glebius Exp $");
+__FBSDID("$FreeBSD: src/bin/ln/ln.c,v 1.36 2007/11/17 21:01:22 ru Exp $");
#include <sys/param.h>
#include <sys/stat.h>
@@ -69,7 +69,7 @@
main(int argc, char *argv[])
{
struct stat sb;
- char *p, *sourcedir;
+ char *p, *targetdir;
int ch, exitval;
/*
@@ -134,34 +134,34 @@
case 0:
usage();
/* NOTREACHED */
- case 1: /* ln target */
+ case 1: /* ln source */
exit(linkit(argv[0], ".", 1));
- case 2: /* ln target source */
+ case 2: /* ln source target */
exit(linkit(argv[0], argv[1], 0));
default:
;
}
- /* ln target1 target2 directory */
- sourcedir = argv[argc - 1];
- if (hflag && lstat(sourcedir, &sb) == 0 && S_ISLNK(sb.st_mode)) {
+ /* ln source1 source2 directory */
+ targetdir = argv[argc - 1];
+ if (hflag && lstat(targetdir, &sb) == 0 && S_ISLNK(sb.st_mode)) {
/*
* We were asked not to follow symlinks, but found one at
* the target--simulate "not a directory" error
*/
errno = ENOTDIR;
- err(1, "%s", sourcedir);
+ err(1, "%s", targetdir);
}
- if (stat(sourcedir, &sb))
- err(1, "%s", sourcedir);
+ if (stat(targetdir, &sb))
+ err(1, "%s", targetdir);
if (!S_ISDIR(sb.st_mode))
usage();
- for (exitval = 0; *argv != sourcedir; ++argv)
- exitval |= linkit(*argv, sourcedir, 1);
+ for (exitval = 0; *argv != targetdir; ++argv)
+ exitval |= linkit(*argv, targetdir, 1);
exit(exitval);
}
int
-linkit(const char *target, const char *source, int isdir)
+linkit(const char *source, const char *target, int isdir)
{
struct stat sb;
const char *p;
@@ -169,57 +169,57 @@
char path[PATH_MAX];
if (!sflag) {
- /* If target doesn't exist, quit now. */
- if (stat(target, &sb)) {
- warn("%s", target);
+ /* If source doesn't exist, quit now. */
+ if (stat(source, &sb)) {
+ warn("%s", source);
return (1);
}
/* Only symbolic links to directories. */
if (S_ISDIR(sb.st_mode)) {
errno = EISDIR;
- warn("%s", target);
+ warn("%s", source);
return (1);
}
}
/*
- * If the source is a directory (and not a symlink if hflag),
- * append the target's name.
+ * If the target is a directory (and not a symlink if hflag),
+ * append the source's name.
*/
if (isdir ||
- (lstat(source, &sb) == 0 && S_ISDIR(sb.st_mode)) ||
- (!hflag && stat(source, &sb) == 0 && S_ISDIR(sb.st_mode))) {
- if ((p = strrchr(target, '/')) == NULL)
- p = target;
+ (lstat(target, &sb) == 0 && S_ISDIR(sb.st_mode)) ||
+ (!hflag && stat(target, &sb) == 0 && S_ISDIR(sb.st_mode))) {
+ if ((p = strrchr(source, '/')) == NULL)
+ p = source;
else
++p;
- if (snprintf(path, sizeof(path), "%s/%s", source, p) >=
+ if (snprintf(path, sizeof(path), "%s/%s", target, p) >=
(ssize_t)sizeof(path)) {
errno = ENAMETOOLONG;
- warn("%s", target);
+ warn("%s", source);
return (1);
}
- source = path;
+ target = path;
}
- exists = !lstat(source, &sb);
+ exists = !lstat(target, &sb);
/*
* If the file exists, then unlink it forcibly if -f was specified
* and interactively if -i was specified.
*/
if (fflag && exists) {
if (Fflag && S_ISDIR(sb.st_mode)) {
- if (rmdir(source)) {
- warn("%s", source);
+ if (rmdir(target)) {
+ warn("%s", target);
return (1);
}
- } else if (unlink(source)) {
- warn("%s", source);
+ } else if (unlink(target)) {
+ warn("%s", target);
return (1);
}
} else if (iflag && exists) {
fflush(stdout);
- fprintf(stderr, "replace %s? ", source);
+ fprintf(stderr, "replace %s? ", target);
first = ch = getchar();
while(ch != '\n' && ch != EOF)
@@ -230,23 +230,23 @@
}
if (Fflag && S_ISDIR(sb.st_mode)) {
- if (rmdir(source)) {
- warn("%s", source);
+ if (rmdir(target)) {
+ warn("%s", target);
return (1);
}
- } else if (unlink(source)) {
- warn("%s", source);
+ } else if (unlink(target)) {
+ warn("%s", target);
return (1);
}
}
/* Attempt the link. */
- if ((*linkf)(target, source)) {
- warn("%s", source);
+ if ((*linkf)(source, target)) {
+ warn("%s", target);
return (1);
}
if (vflag)
- (void)printf("%s %c> %s\n", source, linkch, target);
+ (void)printf("%s %c> %s\n", target, linkch, source);
return (0);
}
@@ -254,8 +254,8 @@
usage(void)
{
(void)fprintf(stderr, "%s\n%s\n%s\n",
- "usage: ln [-Ffhinsv] source_file [target_file]",
- " ln [-Ffhinsv] source_file ... target_dir",
+ "usage: ln [-s [-F]] [-f | -i] [-hnv] source_file [target_file]",
+ " ln [-s [-F]] [-f | -i] [-hnv] source_file ... target_dir",
" link source_file target_file");
exit(1);
}
==== //depot/projects/delphij_fork/bin/sh/Makefile#2 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.4 (Berkeley) 5/5/95
-# $FreeBSD: src/bin/sh/Makefile,v 1.46 2006/04/17 17:55:11 schweikh Exp $
+# $FreeBSD: src/bin/sh/Makefile,v 1.47 2007/11/18 01:53:07 jb Exp $
PROG= sh
INSTALLFLAGS= -S
@@ -22,7 +22,7 @@
CFLAGS+=-DSHELL -I. -I${.CURDIR}
# for debug:
# CFLAGS+= -g -DDEBUG=2
-WARNS?= 3
+WARNS?= 2
WFORMAT=0
.PATH: ${.CURDIR}/bltin \
==== //depot/projects/delphij_fork/contrib/csup/mux.c#2 (text) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/contrib/csup/mux.c,v 1.1.1.1 2006/03/03 04:11:28 mux Exp $
+ * $FreeBSD: src/contrib/csup/mux.c,v 1.2 2007/11/18 00:25:18 jb Exp $
*/
#include <sys/param.h>
@@ -782,7 +782,7 @@
struct buf *buf;
uint32_t winsize;
uint16_t hdrsize, size, len;
- int error, id, iovcnt, what;
+ int error, id, iovcnt, what = 0;
m = (struct mux *)arg;
again:
==== //depot/projects/delphij_fork/contrib/gdb/gdb/i386fbsd-nat.c#2 (text+ko) ====
@@ -91,7 +91,7 @@
#ifdef KERN_PS_STRINGS
{
int mib[2];
- int ps_strings;
+ u_long ps_strings;
size_t len;
mib[0] = CTL_KERN;
==== //depot/projects/delphij_fork/contrib/less/LICENSE#2 (text+ko) ====
@@ -2,7 +2,7 @@
------------
Less
-Copyright (C) 1984-2005 Mark Nudelman
+Copyright (C) 1984-2007 Mark Nudelman
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
==== //depot/projects/delphij_fork/contrib/less/NEWS#4 (text+ko) ====
@@ -13,6 +13,17 @@
======================================================================
+ Major changes between "less" versions 409 and 415
+
+* New --follow-name option makes F command follow the name of a file
+ rather than the file descriptor if an open file is renamed.
+
+* Make searching with -i/-I work correctly with non-ASCII text.
+
+* Fix DJGPP build.
+
+======================================================================
+
Major changes between "less" versions 406 and 409
* Support CSI escape sequences, like SGR escape sequences.
@@ -698,3 +709,4 @@
+
==== //depot/projects/delphij_fork/contrib/less/README#4 (text+ko) ====
@@ -1,7 +1,7 @@
- Less, version 409
+ Less, version 415
- This is the distribution of less, version 409, released 12 Oct 2007.
+ This is the distribution of less, version 415, released 15 Nov 2007.
This program is part of the GNU project (http://www.gnu.org).
This program is free software. You may redistribute it and/or
==== //depot/projects/delphij_fork/contrib/less/ch.c#3 (text+ko) ====
@@ -21,6 +21,12 @@
#include <windows.h>
#endif
+#if HAVE_STAT_INO
+#include <sys/stat.h>
+extern dev_t curr_dev;
+extern ino_t curr_ino;
+#endif
+
typedef POSITION BLOCKNUM;
public int ignore_eoi;
@@ -98,6 +104,8 @@
extern int autobuf;
extern int sigs;
extern int secure;
+extern int screen_trashed;
+extern int follow_mode;
extern constant char helpdata[];
extern constant int size_helpdata;
extern IFILE curr_ifile;
@@ -195,7 +203,7 @@
*/
if (!(ch_flags & CH_CANSEEK))
return ('?');
- if (lseek(ch_file, (off_t)pos, 0) == BAD_LSEEK)
+ if (lseek(ch_file, (off_t)pos, SEEK_SET) == BAD_LSEEK)
{
error("seek error", NULL_PARG);
clear_eol();
@@ -276,6 +284,25 @@
#endif
#endif
slept = TRUE;
+
+#if HAVE_STAT_INO
+ if (follow_mode == FOLLOW_NAME)
+ {
+ /* See whether the file's i-number has changed.
+ * If so, force the file to be closed and
+ * reopened. */
+ struct stat st;
+ int r = stat(get_filename(curr_ifile), &st);
+ if (r == 0 && (st.st_ino != curr_ino ||
+ st.st_dev != curr_dev))
+ {
+ /* screen_trashed=2 causes
+ * make_display to reopen the file. */
+ screen_trashed = 2;
+ return (EOI);
+ }
+ }
+#endif
}
if (sigs)
return (EOI);
@@ -648,7 +675,7 @@
}
#endif
- if (lseek(ch_file, (off_t)0, 0) == BAD_LSEEK)
+ if (lseek(ch_file, (off_t)0, SEEK_SET) == BAD_LSEEK)
{
/*
* Warning only; even if the seek fails for some reason,
@@ -711,7 +738,7 @@
while (ch_bufhead != END_OF_CHAIN)
{
bp = ch_bufhead;
- bp->next->prev = bp->prev;;
+ bp->next->prev = bp->prev;
bp->prev->next = bp->next;
free(bp);
}
@@ -737,7 +764,7 @@
return (0);
}
#endif
- return (lseek(f, (off_t)1, 0) != BAD_LSEEK);
+ return (lseek(f, (off_t)1, SEEK_SET) != BAD_LSEEK);
}
/*
==== //depot/projects/delphij_fork/contrib/less/command.c#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/contrib/less/command.c,v 1.8 2007/06/21 10:44:50 delphij Exp $ */
+/* $FreeBSD: src/contrib/less/command.c,v 1.9 2007/11/16 22:24:31 delphij Exp $ */
/*
* Copyright (C) 1984-2007 Mark Nudelman
*
@@ -558,6 +558,21 @@
}
/*
+ * Discard any buffered file data.
+ */
+ static void
+clear_buffers()
+{
+ if (!(ch_getflags() & CH_CANSEEK))
+ return;
+ ch_flush();
+ clr_linenum();
+#if HILITE_SEARCH
+ clr_hilite();
+#endif
+}
+
+/*
* Make sure the screen is displayed.
*/
static void
@@ -580,11 +595,20 @@
jump_loc(initial_scrpos.pos, initial_scrpos.ln);
} else if (screen_trashed)
{
- int save_top_scroll;
- save_top_scroll = top_scroll;
+ int save_top_scroll = top_scroll;
+ int save_ignore_eoi = ignore_eoi;
top_scroll = 1;
+ ignore_eoi = 0;
+ if (screen_trashed == 2)
+ {
+ /* Special case used by ignore_eoi: re-open the input file
+ * and jump to the end of the file. */
+ reopen_curr_ifile();
+ jump_forw();
+ }
repaint();
top_scroll = save_top_scroll;
+ ignore_eoi = save_ignore_eoi;
}
}
@@ -1115,7 +1139,10 @@
ignore_eoi = 1;
hit_eof = 0;
while (!sigs)
+ {
+ make_display();
forward(1, 0, 0);
+ }
ignore_eoi = 0;
/*
* This gets us back in "F mode" after processing
@@ -1154,14 +1181,7 @@
* Flush buffers, then repaint screen.
* Don't flush the buffers on a pipe!
*/
- if (ch_getflags() & CH_CANSEEK)
- {
- ch_flush();
- clr_linenum();
-#if HILITE_SEARCH
- clr_hilite();
-#endif
- }
+ clear_buffers();
/* FALLTHRU */
case A_REPAINT:
/*
@@ -1263,7 +1283,8 @@
/*
* Define abbreviation for a commonly used sequence below.
*/
-#define DO_SEARCH() if (number <= 0) number = 1; \
+#define DO_SEARCH() \
+ if (number <= 0) number = 1; \
mca_search(); \
cmd_exec(); \
multi_search((char *)NULL, (int) number);
==== //depot/projects/delphij_fork/contrib/less/configure#3 (text+ko) ====
@@ -3611,6 +3611,73 @@
# Checks for general libraries.
+{ echo "$as_me:$LINENO: checking for tgoto in -ltinfo" >&5
+echo $ECHO_N "checking for tgoto in -ltinfo... $ECHO_C" >&6; }
+if test "${ac_cv_lib_tinfo_tgoto+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ltinfo $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char tgoto ();
+int
+main ()
+{
+return tgoto ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_tinfo_tgoto=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_tinfo_tgoto=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_tinfo_tgoto" >&5
+echo "${ECHO_T}$ac_cv_lib_tinfo_tgoto" >&6; }
+if test $ac_cv_lib_tinfo_tgoto = yes; then
+ have_tinfo=yes
+else
+ have_tinfo=no
+fi
+
{ echo "$as_me:$LINENO: checking for initscr in -lxcurses" >&5
echo $ECHO_N "checking for initscr in -lxcurses... $ECHO_C" >&6; }
if test "${ac_cv_lib_xcurses_initscr+set}" = set; then
@@ -4246,6 +4313,61 @@
fi
if test $curses_broken = 0; then
+
+# -- Try tinfo.
+if test "x$TERMLIBS" = x; then
+ if test $have_tinfo = yes; then
+ TERMLIBS="-ltinfo"
+ SAVE_LIBS=$LIBS
+ LIBS="$LIBS $TERMLIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ termok=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ termok=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$SAVE_LIBS
+ if test $termok = no; then TERMLIBS=""; fi
+ fi
+fi
+
# -- Try xcurses.
if test "x$TERMLIBS" = x; then
if test $have_xcurses = yes; then
@@ -4895,7 +5017,8 @@
-for ac_header in ctype.h errno.h fcntl.h limits.h stdio.h stdlib.h string.h termcap.h termio.h termios.h time.h unistd.h values.h sys/ioctl.h sys/stream.h
+
+for ac_header in ctype.h errno.h fcntl.h limits.h stdio.h stdlib.h string.h termcap.h termio.h termios.h time.h unistd.h values.h sys/ioctl.h sys/stream.h wctype.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -5448,6 +5571,10 @@
+
+
+
+
# Checks for identifiers.
{ echo "$as_me:$LINENO: checking for off_t" >&5
echo $ECHO_N "checking for off_t... $ECHO_C" >&6; }
@@ -5656,7 +5783,56 @@
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: checking for st_ino in struct stat" >&5
+echo $ECHO_N "checking for st_ino in struct stat... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <sys/types.h>
+#include <sys/stat.h>
+int
+main ()
+{
+struct stat s; dev_t dev = s.st_dev; ino_t ino = s.st_ino;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list