PERFORCE change 30772 for review
Marcel Moolenaar
marcel at FreeBSD.org
Thu May 8 00:50:36 PDT 2003
http://perforce.freebsd.org/chv.cgi?CH=30772
Change 30772 by marcel at marcel_pluto1 on 2003/05/08 00:49:29
IFC @30760
Affected files ...
.. //depot/projects/tty/Makefile.inc1#6 integrate
.. //depot/projects/tty/UPDATING#5 integrate
.. //depot/projects/tty/bin/df/df.1#2 integrate
.. //depot/projects/tty/bin/ls/ls.1#3 integrate
.. //depot/projects/tty/bin/mv/mv.c#3 integrate
.. //depot/projects/tty/bin/mv/pathnames.h#2 delete
.. //depot/projects/tty/bin/sh/var.c#2 integrate
.. //depot/projects/tty/contrib/isc-dhcp/client/clparse.c#2 integrate
.. //depot/projects/tty/contrib/tar/src/buffer.c#2 integrate
.. //depot/projects/tty/crypto/telnet/libtelnet/auth.c#2 integrate
.. //depot/projects/tty/crypto/telnet/libtelnet/enc_des.c#3 integrate
.. //depot/projects/tty/crypto/telnet/telnet/authenc.c#2 integrate
.. //depot/projects/tty/crypto/telnet/telnet/commands.c#2 integrate
.. //depot/projects/tty/crypto/telnet/telnet/main.c#2 integrate
.. //depot/projects/tty/crypto/telnet/telnet/network.c#2 integrate
.. //depot/projects/tty/crypto/telnet/telnet/ring.c#2 integrate
.. //depot/projects/tty/crypto/telnet/telnet/sys_bsd.c#2 integrate
.. //depot/projects/tty/crypto/telnet/telnet/telnet.c#2 integrate
.. //depot/projects/tty/crypto/telnet/telnet/terminal.c#2 integrate
.. //depot/projects/tty/crypto/telnet/telnet/utilities.c#2 integrate
.. //depot/projects/tty/crypto/telnet/telnetd/authenc.c#2 integrate
.. //depot/projects/tty/crypto/telnet/telnetd/global.c#2 integrate
.. //depot/projects/tty/crypto/telnet/telnetd/slc.c#2 integrate
.. //depot/projects/tty/crypto/telnet/telnetd/state.c#2 integrate
.. //depot/projects/tty/crypto/telnet/telnetd/sys_term.c#2 integrate
.. //depot/projects/tty/crypto/telnet/telnetd/telnetd.c#2 integrate
.. //depot/projects/tty/crypto/telnet/telnetd/termstat.c#2 integrate
.. //depot/projects/tty/crypto/telnet/telnetd/utility.c#2 integrate
.. //depot/projects/tty/etc/Makefile#5 integrate
.. //depot/projects/tty/etc/devd.conf#4 integrate
.. //depot/projects/tty/etc/devfs.conf#1 branch
.. //depot/projects/tty/etc/newsyslog.conf#4 integrate
.. //depot/projects/tty/etc/pccard_ether#2 integrate
.. //depot/projects/tty/etc/rc.d/abi#2 integrate
.. //depot/projects/tty/etc/rc.d/apm#3 integrate
.. //depot/projects/tty/etc/rc.d/apmd#3 integrate
.. //depot/projects/tty/etc/rc.d/archdep#3 integrate
.. //depot/projects/tty/etc/rc.d/cron#2 integrate
.. //depot/projects/tty/etc/rc.d/devfs#3 integrate
.. //depot/projects/tty/etc/rc.d/jail#2 integrate
.. //depot/projects/tty/etc/rc.d/kpasswdd#2 integrate
.. //depot/projects/tty/etc/rc.d/localdaemons#2 integrate
.. //depot/projects/tty/etc/rc.d/network3#2 integrate
.. //depot/projects/tty/etc/rc.d/securelevel#3 integrate
.. //depot/projects/tty/etc/rc.d/serial#2 integrate
.. //depot/projects/tty/etc/rc.d/virecover#3 integrate
.. //depot/projects/tty/etc/remote#2 integrate
.. //depot/projects/tty/etc/services#3 integrate
.. //depot/projects/tty/games/caesar/caesar.c#2 integrate
.. //depot/projects/tty/games/fortune/fortune/fortune.c#2 integrate
.. //depot/projects/tty/games/fortune/strfile/strfile.c#2 integrate
.. //depot/projects/tty/games/fortune/unstr/unstr.c#2 integrate
.. //depot/projects/tty/games/pom/pom.c#2 integrate
.. //depot/projects/tty/games/random/random.c#4 integrate
.. //depot/projects/tty/gnu/usr.bin/binutils/libbinutils/Makefile#2 integrate
.. //depot/projects/tty/gnu/usr.bin/binutils/libopcodes/Makefile.amd64#1 branch
.. //depot/projects/tty/gnu/usr.bin/cvs/cvs/Makefile#2 integrate
.. //depot/projects/tty/include/Makefile#5 integrate
.. //depot/projects/tty/include/paths.h#3 integrate
.. //depot/projects/tty/include/rpcsvc/bootparam_prot.x#2 integrate
.. //depot/projects/tty/include/rpcsvc/crypt.x#2 integrate
.. //depot/projects/tty/include/rpcsvc/key_prot.x#2 integrate
.. //depot/projects/tty/include/rpcsvc/klm_prot.x#2 integrate
.. //depot/projects/tty/include/rpcsvc/mount.x#2 integrate
.. //depot/projects/tty/include/rpcsvc/nfs_prot.x#2 integrate
.. //depot/projects/tty/include/rpcsvc/nis.x#2 integrate
.. //depot/projects/tty/include/rpcsvc/nis_cache.x#2 integrate
.. //depot/projects/tty/include/rpcsvc/nis_callback.x#2 integrate
.. //depot/projects/tty/include/rpcsvc/nlm_prot.x#2 integrate
.. //depot/projects/tty/include/rpcsvc/pmap_prot.x#2 integrate
.. //depot/projects/tty/include/rpcsvc/rex.x#2 integrate
.. //depot/projects/tty/include/rpcsvc/rnusers.x#2 integrate
.. //depot/projects/tty/include/rpcsvc/rquota.x#2 integrate
.. //depot/projects/tty/include/rpcsvc/rstat.x#2 integrate
.. //depot/projects/tty/include/rpcsvc/sm_inter.x#2 integrate
.. //depot/projects/tty/include/rpcsvc/spray.x#2 integrate
.. //depot/projects/tty/include/rpcsvc/yp.x#2 integrate
.. //depot/projects/tty/include/rpcsvc/yppasswd.x#2 integrate
.. //depot/projects/tty/include/rpcsvc/ypupdate_prot.x#2 integrate
.. //depot/projects/tty/include/rpcsvc/ypxfrd.x#2 integrate
.. //depot/projects/tty/kerberos5/Makefile#2 integrate
.. //depot/projects/tty/lib/Makefile#7 integrate
.. //depot/projects/tty/lib/csu/common/crtbrand.c#2 integrate
.. //depot/projects/tty/lib/csu/i386-elf/Makefile#2 integrate
.. //depot/projects/tty/lib/libc/amd64/_fpmath.h#2 integrate
.. //depot/projects/tty/lib/libc/amd64/arith.h#2 integrate
.. //depot/projects/tty/lib/libc/amd64/gen/Makefile.inc#2 integrate
.. //depot/projects/tty/lib/libc/amd64/gen/alloca.S#2 integrate
.. //depot/projects/tty/lib/libc/amd64/gen/modf.S#2 integrate
.. //depot/projects/tty/lib/libc/amd64/gen/setjmp.S#2 integrate
.. //depot/projects/tty/lib/libc/amd64/gen/sigsetjmp.S#2 integrate
.. //depot/projects/tty/lib/libc/i386/gen/rfork_thread.S#2 integrate
.. //depot/projects/tty/lib/libc/net/getaddrinfo.c#4 integrate
.. //depot/projects/tty/lib/libc/net/name6.c#4 integrate
.. //depot/projects/tty/lib/libpam/libpam/Makefile#4 integrate
.. //depot/projects/tty/lib/libpam/modules/modules.inc#5 integrate
.. //depot/projects/tty/lib/libpthread/sys/lock.c#2 integrate
.. //depot/projects/tty/lib/libpthread/sys/lock.h#2 integrate
.. //depot/projects/tty/lib/libpthread/thread/thr_cancel.c#4 integrate
.. //depot/projects/tty/lib/libpthread/thread/thr_create.c#3 integrate
.. //depot/projects/tty/lib/libpthread/thread/thr_kern.c#4 integrate
.. //depot/projects/tty/lib/libpthread/thread/thr_private.h#4 integrate
.. //depot/projects/tty/lib/libpthread/thread/thr_resume_np.c#3 integrate
.. //depot/projects/tty/lib/libpthread/thread/thr_sig.c#4 integrate
.. //depot/projects/tty/lib/libpthread/thread/thr_suspend_np.c#3 integrate
.. //depot/projects/tty/lib/libthr/arch/i386/i386/_setcurthread.c#2 integrate
.. //depot/projects/tty/lib/libthr/thread/thr_mutex.c#2 integrate
.. //depot/projects/tty/lib/libthr/thread/thr_sig.c#2 integrate
.. //depot/projects/tty/lib/libutil/login.conf.5#3 integrate
.. //depot/projects/tty/libexec/Makefile#3 integrate
.. //depot/projects/tty/libexec/rlogind/rlogind.c#2 integrate
.. //depot/projects/tty/libexec/rtld-elf/malloc.c#3 integrate
.. //depot/projects/tty/libexec/rtld-elf/map_object.c#3 integrate
.. //depot/projects/tty/libexec/rtld-elf/rtld.c#6 integrate
.. //depot/projects/tty/libexec/ypxfr/yp_dbwrite.c#2 integrate
.. //depot/projects/tty/libexec/ypxfr/ypxfr_getmap.c#2 integrate
.. //depot/projects/tty/libexec/ypxfr/ypxfr_main.c#2 integrate
.. //depot/projects/tty/libexec/ypxfr/ypxfr_misc.c#2 integrate
.. //depot/projects/tty/libexec/ypxfr/ypxfrd_getmap.c#2 integrate
.. //depot/projects/tty/release/Makefile#6 integrate
.. //depot/projects/tty/release/alpha/dokern.sh#3 integrate
.. //depot/projects/tty/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#5 integrate
.. //depot/projects/tty/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#4 integrate
.. //depot/projects/tty/release/doc/en_US.ISO8859-1/readme/article.sgml#3 integrate
.. //depot/projects/tty/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#8 integrate
.. //depot/projects/tty/release/doc/share/sgml/release.ent#2 integrate
.. //depot/projects/tty/release/i386/dokern.sh#4 integrate
.. //depot/projects/tty/sbin/Makefile#4 integrate
.. //depot/projects/tty/sbin/atacontrol/atacontrol.c#3 integrate
.. //depot/projects/tty/sbin/bsdlabel/Makefile#2 integrate
.. //depot/projects/tty/sbin/bsdlabel/bsdlabel.c#2 integrate
.. //depot/projects/tty/sbin/dump/main.c#4 integrate
.. //depot/projects/tty/sbin/dump/traverse.c#2 integrate
.. //depot/projects/tty/sbin/dumpon/dumpon.8#2 integrate
.. //depot/projects/tty/sbin/mdmfs/mdmfs.8#3 integrate
.. //depot/projects/tty/sbin/routed/rtquery/rtquery.8#2 integrate
.. //depot/projects/tty/sbin/shutdown/pathnames.h#2 delete
.. //depot/projects/tty/sbin/shutdown/shutdown.c#3 integrate
.. //depot/projects/tty/sbin/startslip/startslip.c#2 integrate
.. //depot/projects/tty/sbin/vinum/commands.c#4 integrate
.. //depot/projects/tty/sbin/vinum/list.c#4 integrate
.. //depot/projects/tty/sbin/vinum/vinum.8#2 integrate
.. //depot/projects/tty/secure/lib/Makefile#3 integrate
.. //depot/projects/tty/secure/lib/libssh/Makefile#3 integrate
.. //depot/projects/tty/secure/libexec/Makefile#3 integrate
.. //depot/projects/tty/secure/usr.bin/Makefile#3 integrate
.. //depot/projects/tty/secure/usr.bin/ssh/Makefile#3 integrate
.. //depot/projects/tty/secure/usr.sbin/sshd/Makefile#3 integrate
.. //depot/projects/tty/share/dict/web2#2 integrate
.. //depot/projects/tty/share/examples/etc/make.conf#5 integrate
.. //depot/projects/tty/share/man/man4/geom.4#3 integrate
.. //depot/projects/tty/share/man/man5/disktab.5#2 integrate
.. //depot/projects/tty/share/man/man5/make.conf.5#5 integrate
.. //depot/projects/tty/share/man/man5/rc.conf.5#6 integrate
.. //depot/projects/tty/share/man/man7/release.7#4 integrate
.. //depot/projects/tty/share/man/man9/malloc.9#5 integrate
.. //depot/projects/tty/share/mk/bsd.libnames.mk#4 integrate
.. //depot/projects/tty/share/mk/bsd.sys.mk#3 integrate
.. //depot/projects/tty/share/sendmail/Makefile#2 integrate
.. //depot/projects/tty/share/syscons/keymaps/INDEX.keymaps#2 integrate
.. //depot/projects/tty/share/syscons/keymaps/Makefile#2 integrate
.. //depot/projects/tty/share/syscons/keymaps/norwegian.dvorak.kbd#1 branch
.. //depot/projects/tty/sys/Makefile#2 integrate
.. //depot/projects/tty/sys/alpha/include/_limits.h#2 integrate
.. //depot/projects/tty/sys/amd64/amd64/exception.S#2 integrate
.. //depot/projects/tty/sys/amd64/amd64/machdep.c#2 integrate
.. //depot/projects/tty/sys/amd64/include/_limits.h#2 integrate
.. //depot/projects/tty/sys/amd64/include/ieeefp.h#1 branch
.. //depot/projects/tty/sys/arm/include/_limits.h#2 integrate
.. //depot/projects/tty/sys/boot/common/help.common#3 integrate
.. //depot/projects/tty/sys/boot/common/loader.8#4 integrate
.. //depot/projects/tty/sys/compat/linux/linux_ipc.c#4 integrate
.. //depot/projects/tty/sys/conf/NOTES#8 integrate
.. //depot/projects/tty/sys/conf/newvers.sh#2 integrate
.. //depot/projects/tty/sys/dev/aic7xxx/ahc_eisa.c#2 integrate
.. //depot/projects/tty/sys/dev/aic7xxx/ahc_pci.c#2 integrate
.. //depot/projects/tty/sys/dev/aic7xxx/ahd_pci.c#2 integrate
.. //depot/projects/tty/sys/dev/aic7xxx/aic7770.c#2 integrate
.. //depot/projects/tty/sys/dev/aic7xxx/aic79xx.c#4 integrate
.. //depot/projects/tty/sys/dev/aic7xxx/aic79xx.h#4 integrate
.. //depot/projects/tty/sys/dev/aic7xxx/aic79xx.reg#4 integrate
.. //depot/projects/tty/sys/dev/aic7xxx/aic79xx.seq#3 integrate
.. //depot/projects/tty/sys/dev/aic7xxx/aic79xx_inline.h#4 integrate
.. //depot/projects/tty/sys/dev/aic7xxx/aic79xx_osm.c#4 integrate
.. //depot/projects/tty/sys/dev/aic7xxx/aic79xx_pci.c#4 integrate
.. //depot/projects/tty/sys/dev/aic7xxx/aic7xxx.c#2 integrate
.. //depot/projects/tty/sys/dev/aic7xxx/aic7xxx.h#2 integrate
.. //depot/projects/tty/sys/dev/aic7xxx/aic7xxx.reg#2 integrate
.. //depot/projects/tty/sys/dev/aic7xxx/aic7xxx_inline.h#2 integrate
.. //depot/projects/tty/sys/dev/aic7xxx/aic7xxx_osm.c#3 integrate
.. //depot/projects/tty/sys/dev/aic7xxx/aic7xxx_pci.c#2 integrate
.. //depot/projects/tty/sys/dev/ata/ata-all.c#7 integrate
.. //depot/projects/tty/sys/dev/ata/ata-all.h#5 integrate
.. //depot/projects/tty/sys/dev/ata/ata-chipset.c#4 integrate
.. //depot/projects/tty/sys/dev/ata/ata-pci.c#4 integrate
.. //depot/projects/tty/sys/dev/ata/ata-pci.h#4 integrate
.. //depot/projects/tty/sys/dev/ata/ata-raid.c#6 integrate
.. //depot/projects/tty/sys/dev/ata/ata-raid.h#4 integrate
.. //depot/projects/tty/sys/dev/ata/atapi-tape.c#5 integrate
.. //depot/projects/tty/sys/dev/bge/if_bge.c#6 integrate
.. //depot/projects/tty/sys/dev/bge/if_bgereg.h#5 integrate
.. //depot/projects/tty/sys/dev/em/if_em.c#4 integrate
.. //depot/projects/tty/sys/dev/en/midway.c#5 integrate
.. //depot/projects/tty/sys/dev/en/midwayvar.h#3 integrate
.. //depot/projects/tty/sys/dev/firewire/firewire.c#7 integrate
.. //depot/projects/tty/sys/dev/firewire/sbp.c#7 integrate
.. //depot/projects/tty/sys/dev/mii/brgphy.c#3 integrate
.. //depot/projects/tty/sys/dev/pccbb/pccbb.c#4 integrate
.. //depot/projects/tty/sys/dev/pccbb/pccbbdevid.h#3 integrate
.. //depot/projects/tty/sys/dev/sio/sio.c#6 integrate
.. //depot/projects/tty/sys/dev/usb/uhci_pci.c#3 integrate
.. //depot/projects/tty/sys/dev/usb/usbdevs#7 integrate
.. //depot/projects/tty/sys/dev/usb/usbdevs.h#7 integrate
.. //depot/projects/tty/sys/dev/usb/usbdevs_data.h#7 integrate
.. //depot/projects/tty/sys/dev/vinum/vinum.c#5 integrate
.. //depot/projects/tty/sys/dev/vinum/vinumconfig.c#3 integrate
.. //depot/projects/tty/sys/dev/vinum/vinumext.h#5 integrate
.. //depot/projects/tty/sys/dev/vinum/vinumio.c#5 integrate
.. //depot/projects/tty/sys/dev/vinum/vinumio.h#2 integrate
.. //depot/projects/tty/sys/dev/vinum/vinumioctl.c#5 integrate
.. //depot/projects/tty/sys/dev/vinum/vinumkw.h#3 integrate
.. //depot/projects/tty/sys/dev/vinum/vinumlock.c#3 integrate
.. //depot/projects/tty/sys/dev/vinum/vinumobj.h#2 integrate
.. //depot/projects/tty/sys/dev/vinum/vinumparser.c#3 integrate
.. //depot/projects/tty/sys/dev/vinum/vinumrequest.c#4 integrate
.. //depot/projects/tty/sys/dev/vinum/vinumrevive.c#3 integrate
.. //depot/projects/tty/sys/fs/procfs/procfs_dbregs.c#2 integrate
.. //depot/projects/tty/sys/fs/procfs/procfs_fpregs.c#2 integrate
.. //depot/projects/tty/sys/fs/procfs/procfs_regs.c#2 integrate
.. //depot/projects/tty/sys/fs/udf/udf.h#2 integrate
.. //depot/projects/tty/sys/fs/udf/udf_vfsops.c#4 integrate
.. //depot/projects/tty/sys/fs/udf/udf_vnops.c#5 integrate
.. //depot/projects/tty/sys/geom/bde/g_bde.c#5 integrate
.. //depot/projects/tty/sys/geom/bde/g_bde_work.c#4 integrate
.. //depot/projects/tty/sys/geom/geom.h#5 integrate
.. //depot/projects/tty/sys/geom/geom_aes.c#4 integrate
.. //depot/projects/tty/sys/geom/geom_bsd.c#5 integrate
.. //depot/projects/tty/sys/geom/geom_bsd_enc.c#2 integrate
.. //depot/projects/tty/sys/geom/geom_ctl.c#4 integrate
.. //depot/projects/tty/sys/geom/geom_io.c#6 integrate
.. //depot/projects/tty/sys/i386/include/_limits.h#2 integrate
.. //depot/projects/tty/sys/i386/isa/intr_machdep.c#3 integrate
.. //depot/projects/tty/sys/ia64/include/_limits.h#2 integrate
.. //depot/projects/tty/sys/kern/kern_mac.c#5 integrate
.. //depot/projects/tty/sys/kern/kern_malloc.c#6 integrate
.. //depot/projects/tty/sys/kern/kern_sig.c#6 integrate
.. //depot/projects/tty/sys/kern/kern_subr.c#5 integrate
.. //depot/projects/tty/sys/kern/kern_synch.c#6 integrate
.. //depot/projects/tty/sys/kern/md5c.c#2 integrate
.. //depot/projects/tty/sys/kern/sysv_shm.c#4 integrate
.. //depot/projects/tty/sys/kern/uipc_syscalls.c#6 integrate
.. //depot/projects/tty/sys/kern/vfs_default.c#6 integrate
.. //depot/projects/tty/sys/net/if_atm.h#4 integrate
.. //depot/projects/tty/sys/net/if_atmsubr.c#5 integrate
.. //depot/projects/tty/sys/net/if_ethersubr.c#5 integrate
.. //depot/projects/tty/sys/netinet/ip_input.c#6 integrate
.. //depot/projects/tty/sys/netinet/tcp_input.c#7 integrate
.. //depot/projects/tty/sys/netinet/tcp_subr.c#5 integrate
.. //depot/projects/tty/sys/netinet/tcp_var.h#5 integrate
.. //depot/projects/tty/sys/pci/if_en_pci.c#3 integrate
.. //depot/projects/tty/sys/pci/if_sis.c#5 integrate
.. //depot/projects/tty/sys/powerpc/include/_limits.h#2 integrate
.. //depot/projects/tty/sys/powerpc/powerpc/ofwmagic.S#2 integrate
.. //depot/projects/tty/sys/sparc64/include/_limits.h#2 integrate
.. //depot/projects/tty/sys/sparc64/sparc64/trap.c#6 integrate
.. //depot/projects/tty/sys/sys/dkstat.h#3 integrate
.. //depot/projects/tty/sys/sys/limits.h#2 integrate
.. //depot/projects/tty/sys/sys/signalvar.h#3 integrate
.. //depot/projects/tty/sys/sys/soundcard.h#3 integrate
.. //depot/projects/tty/sys/sys/syscallsubr.h#4 integrate
.. //depot/projects/tty/sys/vm/swap_pager.c#4 integrate
.. //depot/projects/tty/sys/vm/vm_object.c#6 integrate
.. //depot/projects/tty/sys/vm/vm_pageout.c#5 integrate
.. //depot/projects/tty/sys/vm/vm_pager.c#4 integrate
.. //depot/projects/tty/sys/vm/vnode_pager.c#4 integrate
.. //depot/projects/tty/tools/tools/tinderbox/tbmaster.pl#6 integrate
.. //depot/projects/tty/usr.bin/Makefile#4 integrate
.. //depot/projects/tty/usr.bin/calendar/calendars/calendar.freebsd#5 integrate
.. //depot/projects/tty/usr.bin/vi/pathnames.h#2 integrate
.. //depot/projects/tty/usr.bin/xlint/lint1/param.h#2 integrate
.. //depot/projects/tty/usr.bin/xlint/xlint/xlint.c#3 integrate
.. //depot/projects/tty/usr.sbin/burncd/burncd.8#3 integrate
.. //depot/projects/tty/usr.sbin/burncd/burncd.c#2 integrate
.. //depot/projects/tty/usr.sbin/newsyslog/newsyslog.c#5 integrate
.. //depot/projects/tty/usr.sbin/pw/pw.8#2 integrate
.. //depot/projects/tty/usr.sbin/sysinstall/menus.c#5 integrate
.. //depot/projects/tty/usr.sbin/syslogd/syslogd.c#4 integrate
.. //depot/projects/tty/usr.sbin/usbd/usbd.8#3 integrate
Differences ...
==== //depot/projects/tty/Makefile.inc1#6 (text+ko) ====
@@ -1,8 +1,8 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.353 2003/05/01 20:41:03 ru Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.356 2003/05/05 12:54:26 bde Exp $
#
# Make command line options:
-# -DMAKE_KERBEROS5 to build Kerberos5
+# -DNO_KERBEROS Do not build Heimdal (Kerberos 5)
# -DNOCLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
# -DNOCLEAN do not clean at all
# -DNOCRYPT will prevent building of crypt versions
@@ -61,7 +61,7 @@
SUBDIR+= gnu
.endif
.if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \
- !defined(NOCRYPT) && !defined(NO_OPENSSL) && defined(MAKE_KERBEROS5)
+ !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_KERBEROS)
SUBDIR+= kerberos5
.endif
.if exists(${.CURDIR}/libexec)
@@ -119,7 +119,9 @@
.endif
MAKEOBJDIRPREFIX?= /usr/obj
+.if !defined(OSRELDATE)
OSRELDATE!= sysctl -n kern.osreldate
+.endif
TARGET_ARCH?= ${MACHINE_ARCH}
.if ${TARGET_ARCH} == ${MACHINE_ARCH}
TARGET?= ${MACHINE}
@@ -277,14 +279,10 @@
mkdir -p ${WORLDTMP}/legacy/${_dir}
.endfor
.for _dir in \
- usr/bin usr/lib/compat/aout usr/libdata/ldscripts usr/libexec usr/share/misc
+ usr/bin usr/include usr/lib/compat/aout usr/libdata/ldscripts \
+ usr/libexec usr/share/misc
mkdir -p ${WORLDTMP}/${_dir}
.endfor
-.for _dir in \
- arpa dev fs g++/backward g++/bits g++/ext isc isofs libmilter \
- objc openssl protocols readline rpc rpcsvc security ufs
- mkdir -p ${WORLDTMP}/usr/include/${_dir}
-.endfor
ln -sf ${.CURDIR}/sys ${WORLDTMP}
_legacy:
@echo
@@ -695,7 +693,7 @@
.endif
.if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \
- !defined(NOCRYPT) && defined(MAKE_KERBEROS5)
+ !defined(NOCRYPT) && !defined(NO_KERBEROS)
_libkrb5= kerberos5/lib/libroken kerberos5/lib/libvers \
kerberos5/lib/libasn1 kerberos5/lib/libhdb kerberos5/lib/libsl
.endif
@@ -782,7 +780,7 @@
_generic_libs= gnu/lib
-.if !defined(NOCRYPT) && defined(MAKE_KERBEROS5)
+.if !defined(NOCRYPT) && !defined(NO_KERBEROS)
_prebuild_libs+= kerberos5/lib/libasn1
_prebuild_libs+= kerberos5/lib/libgssapi
_prebuild_libs+= kerberos5/lib/libkrb5
==== //depot/projects/tty/UPDATING#5 (text+ko) ====
@@ -17,6 +17,17 @@
developers choose to disable these features on build machines
to maximize performance.
+20030505:
+ Kerberos 5 (Heimdal) is now built by default. Setting
+ MAKE_KERBEROS5 no longer has any effect. If you do NOT
+ want the "base" Kerberos 5, you need to set NO_KERBEROS.
+
+20030502:
+ groff has been updated. If you try to do a buildworld and
+ get an infinite loop in troff, update to May 4th or newer. If you
+ have a newer kernel than userland, you may need to set the OSRELDATE
+ to 500110 in your environment before starting a buildworld.
+
20030501:
The old rc system has been removed. Please report any problems
to freebsd-rc at yahoogroups.com, and/or freebsd-current at freebsd.org.
@@ -25,7 +36,6 @@
especially when using mergemaster, since the compatibility code that
utilizes these old scripts has also been removed.
-
20030423:
A bug has been fixed in /dev/devctl which would cause devd
to hang on boot, were it not for a workaround in devd. The
@@ -1268,4 +1278,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.249 2003/05/02 05:27:33 dougb Exp $
+$FreeBSD: src/UPDATING,v 1.251 2003/05/05 20:05:37 markm Exp $
==== //depot/projects/tty/bin/df/df.1#2 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)df.1 8.3 (Berkeley) 5/8/95
-.\" $FreeBSD: src/bin/df/df.1,v 1.28 2002/08/26 04:56:23 trhodes Exp $
+.\" $FreeBSD: src/bin/df/df.1,v 1.29 2003/05/06 21:54:46 trhodes Exp $
.\"
.Dd May 8, 1995
.Dt DF 1
@@ -81,11 +81,11 @@
.It Fl H
"Human-readable" output. Use unit suffixes: Byte, Kilobyte, Megabyte,
Gigabyte, Terabyte and Petabyte in order to reduce the number of
-digits to three or less using base 10 for sizes.
+digits to four or fewer using base 10 for sizes.
.It Fl h
"Human-readable" output. Use unit suffixes: Byte, Kilobyte, Megabyte,
Gigabyte, Terabyte and Petabyte in order to reduce the number of
-digits to three or less using base 2 for sizes.
+digits to four or fewer using base 2 for sizes.
.It Fl i
Include statistics on the number of free inodes.
.It Fl k
==== //depot/projects/tty/bin/ls/ls.1#3 (text+ko) ====
@@ -33,7 +33,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)ls.1 8.7 (Berkeley) 7/29/94
-.\" $FreeBSD: src/bin/ls/ls.1,v 1.73 2003/01/20 21:25:00 chris Exp $
+.\" $FreeBSD: src/bin/ls/ls.1,v 1.74 2003/05/06 21:54:46 trhodes Exp $
.\"
.Dd May 19, 2002
.Dt LS 1
@@ -175,7 +175,7 @@
When used with the
.Fl l
option, use unit suffixes: Byte, Kilobyte, Megabyte, Gigabyte, Terabyte
-and Petabyte in order to reduce the number of digits to three or less
+and Petabyte in order to reduce the number of digits to four or fewer
using base 2 for sizes.
.It Fl i
For each file, print the file's file serial number (inode number).
==== //depot/projects/tty/bin/mv/mv.c#3 (text+ko) ====
@@ -46,7 +46,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/mv/mv.c,v 1.40 2003/05/01 16:58:56 obrien Exp $");
+__FBSDID("$FreeBSD: src/bin/mv/mv.c,v 1.41 2003/05/05 22:49:22 obrien Exp $");
#include <sys/param.h>
#include <sys/time.h>
@@ -67,8 +67,6 @@
#include <sysexits.h>
#include <unistd.h>
-#include "pathnames.h"
-
int fflg, iflg, nflg, vflg;
int copy(char *, char *);
==== //depot/projects/tty/bin/sh/var.c#2 (text+ko) ====
@@ -40,10 +40,11 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.23 2002/10/01 00:54:14 tjr Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.24 2003/05/05 22:49:22 obrien Exp $");
#include <unistd.h>
#include <stdlib.h>
+#include <paths.h>
/*
* Shell variables.
@@ -105,7 +106,7 @@
NULL },
{ &vmpath, VSTRFIXED|VTEXTFIXED|VUNSET, "MAILPATH=",
NULL },
- { &vpath, VSTRFIXED|VTEXTFIXED, "PATH=/bin:/usr/bin",
+ { &vpath, VSTRFIXED|VTEXTFIXED, "PATH=" _PATH_DEFPATH,
changepath },
{ &vppid, VSTRFIXED|VTEXTFIXED|VUNSET, "PPID=",
NULL },
==== //depot/projects/tty/contrib/isc-dhcp/client/clparse.c#2 (text+ko) ====
@@ -44,7 +44,7 @@
#ifndef lint
static char copyright[] =
"$Id: clparse.c,v 1.62.2.3 2002/11/17 02:25:43 dhankins Exp $ Copyright (c) 1996-2002 The Internet Software Consortium. All rights reserved.\n"
-"$FreeBSD: src/contrib/isc-dhcp/client/clparse.c,v 1.9 2003/01/16 07:22:32 obrien Exp $\n";
+"$FreeBSD: src/contrib/isc-dhcp/client/clparse.c,v 1.10 2003/05/05 22:49:22 obrien Exp $\n";
#endif /* not lint */
#include "dhcpd.h"
@@ -53,7 +53,7 @@
struct client_config top_level_config;
-char client_script_name [] = "/sbin/dhclient-script";
+char client_script_name [] = _PATH_DHCLIENT_SCRIPT;
u_int32_t default_requested_options [] = {
DHO_SUBNET_MASK,
==== //depot/projects/tty/contrib/tar/src/buffer.c#2 (text+ko) ====
@@ -19,12 +19,18 @@
with this program; if not, write to the Free Software Foundation, Inc.,
59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-/* $FreeBSD: src/contrib/tar/src/buffer.c,v 1.5 2002/10/09 07:33:29 sobomax Exp $ */
+/* $FreeBSD: src/contrib/tar/src/buffer.c,v 1.6 2003/05/05 22:49:22 obrien Exp $ */
#include "system.h"
#include <signal.h>
+#if __FreeBSD__
+# include <paths.h>
+#else
+# define _PATH_BSHELL "/bin/sh"
+#endif
+
#if MSDOS
# include <process.h>
#endif
@@ -1549,7 +1555,7 @@
pid_t child;
const char *shell = getenv ("SHELL");
if (! shell)
- shell = "/bin/sh";
+ shell = _PATH_BSHELL;
child = xfork ();
if (child == 0)
{
==== //depot/projects/tty/crypto/telnet/libtelnet/auth.c#2 (text+ko) ====
@@ -30,16 +30,16 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/crypto/telnet/libtelnet/auth.c,v 1.9 2001/12/03 12:13:18 markm Exp $
*/
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD: src/crypto/telnet/libtelnet/auth.c,v 1.9 2001/12/03 12:13:18 markm Exp $");
-
+#if 0
#ifndef lint
static const char sccsid[] = "@(#)auth.c 8.3 (Berkeley) 5/30/95";
#endif /* not lint */
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/crypto/telnet/libtelnet/auth.c,v 1.10 2003/05/04 02:54:48 obrien Exp $");
+
/*
* Copyright (C) 1990 by the Massachusetts Institute of Technology
==== //depot/projects/tty/crypto/telnet/libtelnet/enc_des.c#3 (text+ko) ====
@@ -29,17 +29,15 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
- *
- * $FreeBSD: src/crypto/telnet/libtelnet/enc_des.c,v 1.9 2003/01/29 18:14:28 nectar Exp $
*/
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD: src/crypto/telnet/libtelnet/enc_des.c,v 1.9 2003/01/29 18:14:28 nectar Exp $");
-
+#if 0
#ifndef lint
static const char sccsid[] = "@(#)enc_des.c 8.3 (Berkeley) 5/30/95";
#endif /* not lint */
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/crypto/telnet/libtelnet/enc_des.c,v 1.10 2003/05/04 02:54:48 obrien Exp $");
#ifdef ENCRYPTION
# ifdef AUTHENTICATION
==== //depot/projects/tty/crypto/telnet/telnet/authenc.c#2 (text+ko) ====
@@ -31,13 +31,13 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD: src/crypto/telnet/telnet/authenc.c,v 1.5 2001/11/30 21:06:35 markm Exp $");
-
+#if 0
#ifndef lint
static const char sccsid[] = "@(#)authenc.c 8.1 (Berkeley) 6/6/93";
#endif
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/crypto/telnet/telnet/authenc.c,v 1.6 2003/05/04 02:54:48 obrien Exp $");
#ifdef AUTHENTICATION
#ifdef ENCRYPTION
==== //depot/projects/tty/crypto/telnet/telnet/commands.c#2 (text+ko) ====
@@ -31,13 +31,13 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD: src/crypto/telnet/telnet/commands.c,v 1.29 2002/11/27 06:34:24 eric Exp $");
-
+#if 0
#ifndef lint
static const char sccsid[] = "@(#)commands.c 8.4 (Berkeley) 5/30/95";
#endif
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/crypto/telnet/telnet/commands.c,v 1.30 2003/05/04 02:54:48 obrien Exp $");
#include <sys/param.h>
#include <sys/un.h>
==== //depot/projects/tty/crypto/telnet/telnet/main.c#2 (text+ko) ====
@@ -31,13 +31,13 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD: src/crypto/telnet/telnet/main.c,v 1.16 2002/09/25 07:26:24 markm Exp $");
-
+#if 0
#ifndef lint
static const char sccsid[] = "@(#)main.c 8.3 (Berkeley) 5/30/95";
#endif
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/crypto/telnet/telnet/main.c,v 1.17 2003/05/04 02:54:48 obrien Exp $");
#include <sys/types.h>
#include <sys/socket.h>
==== //depot/projects/tty/crypto/telnet/telnet/network.c#2 (text+ko) ====
@@ -31,13 +31,13 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD: src/crypto/telnet/telnet/network.c,v 1.6 2002/05/11 03:19:44 alfred Exp $");
-
+#if 0
#ifndef lint
static const char sccsid[] = "@(#)network.c 8.2 (Berkeley) 12/15/93";
#endif
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/crypto/telnet/telnet/network.c,v 1.7 2003/05/04 02:54:48 obrien Exp $");
#include <sys/types.h>
#include <sys/socket.h>
==== //depot/projects/tty/crypto/telnet/telnet/ring.c#2 (text+ko) ====
@@ -31,13 +31,13 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD: src/crypto/telnet/telnet/ring.c,v 1.6 2001/11/30 21:06:36 markm Exp $");
-
+#if 0
#ifndef lint
static const char sccsid[] = "@(#)ring.c 8.2 (Berkeley) 5/30/95";
#endif
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/crypto/telnet/telnet/ring.c,v 1.7 2003/05/04 02:54:48 obrien Exp $");
/*
* This defines a structure for a ring buffer.
==== //depot/projects/tty/crypto/telnet/telnet/sys_bsd.c#2 (text+ko) ====
@@ -31,15 +31,13 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
-#include <stdlib.h>
-#include <err.h>
-
-__FBSDID("$FreeBSD: src/crypto/telnet/telnet/sys_bsd.c,v 1.11 2002/09/25 07:24:01 markm Exp $");
-
+#if 0
#ifndef lint
static const char sccsid[] = "@(#)sys_bsd.c 8.4 (Berkeley) 5/30/95";
#endif
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/crypto/telnet/telnet/sys_bsd.c,v 1.12 2003/05/04 02:54:48 obrien Exp $");
/*
* The following routines try to encapsulate what is system dependent
@@ -49,9 +47,11 @@
#include <sys/param.h>
#include <sys/socket.h>
#include <sys/time.h>
+#include <err.h>
#include <errno.h>
#include <fcntl.h>
#include <signal.h>
+#include <stdlib.h>
#include <unistd.h>
#include <arpa/telnet.h>
==== //depot/projects/tty/crypto/telnet/telnet/telnet.c#2 (text+ko) ====
@@ -31,13 +31,13 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD: src/crypto/telnet/telnet/telnet.c,v 1.12 2002/09/25 07:26:25 markm Exp $");
-
+#if 0
#ifndef lint
static const char sccsid[] = "@(#)telnet.c 8.4 (Berkeley) 5/30/95";
#endif
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/crypto/telnet/telnet/telnet.c,v 1.13 2003/05/04 02:54:48 obrien Exp $");
#include <sys/types.h>
==== //depot/projects/tty/crypto/telnet/telnet/terminal.c#2 (text+ko) ====
@@ -31,13 +31,13 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD: src/crypto/telnet/telnet/terminal.c,v 1.6 2002/05/11 03:19:44 alfred Exp $");
-
+#if 0
#ifndef lint
static const char sccsid[] = "@(#)terminal.c 8.2 (Berkeley) 2/16/95";
#endif
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/crypto/telnet/telnet/terminal.c,v 1.7 2003/05/04 02:54:48 obrien Exp $");
#include <arpa/telnet.h>
#include <sys/types.h>
==== //depot/projects/tty/crypto/telnet/telnet/utilities.c#2 (text+ko) ====
@@ -31,13 +31,13 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD: src/crypto/telnet/telnet/utilities.c,v 1.7 2002/05/11 03:19:44 alfred Exp $");
-
+#if 0
#ifndef lint
static const char sccsid[] = "@(#)utilities.c 8.3 (Berkeley) 5/30/95";
#endif
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/crypto/telnet/telnet/utilities.c,v 1.8 2003/05/04 02:54:48 obrien Exp $");
#define TELOPTS
#define TELCMDS
==== //depot/projects/tty/crypto/telnet/telnetd/authenc.c#2 (text+ko) ====
@@ -31,13 +31,13 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/authenc.c,v 1.7 2001/11/30 21:06:38 markm Exp $");
-
+#if 0
#ifndef lint
static const char sccsid[] = "@(#)authenc.c 8.2 (Berkeley) 5/30/95";
#endif
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/authenc.c,v 1.8 2003/05/04 02:54:49 obrien Exp $");
#ifdef AUTHENTICATION
#ifdef ENCRYPTION
==== //depot/projects/tty/crypto/telnet/telnetd/global.c#2 (text+ko) ====
@@ -31,13 +31,13 @@
* SUCH DAMAGE.
*/
+#if 0
#ifndef lint
-#if 0
static const char sccsid[] = "@(#)global.c 8.1 (Berkeley) 6/4/93";
+#endif /* not lint */
#endif
-static const char rcsid[] =
- "$FreeBSD: src/crypto/telnet/telnetd/global.c,v 1.5 2000/07/16 05:52:45 peter Exp $";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/global.c,v 1.6 2003/05/04 02:54:49 obrien Exp $");
/*
* Allocate global variables. We do this
==== //depot/projects/tty/crypto/telnet/telnetd/slc.c#2 (text+ko) ====
@@ -31,13 +31,13 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/slc.c,v 1.8 2001/11/30 21:06:38 markm Exp $");
-
+#if 0
#ifndef lint
static const char sccsid[] = "@(#)slc.c 8.2 (Berkeley) 5/30/95";
#endif
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/slc.c,v 1.9 2003/05/04 02:54:49 obrien Exp $");
#include "telnetd.h"
==== //depot/projects/tty/crypto/telnet/telnetd/state.c#2 (text+ko) ====
@@ -31,13 +31,13 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/state.c,v 1.13 2002/09/25 07:28:04 markm Exp $");
-
+#if 0
#ifndef lint
static const char sccsid[] = "@(#)state.c 8.5 (Berkeley) 5/30/95";
#endif
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/state.c,v 1.14 2003/05/04 02:54:49 obrien Exp $");
#include <stdarg.h>
#include "telnetd.h"
==== //depot/projects/tty/crypto/telnet/telnetd/sys_term.c#2 (text+ko) ====
@@ -31,13 +31,13 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/sys_term.c,v 1.17 2002/05/27 08:10:21 jmallett Exp $");
-
+#if 0
#ifndef lint
static const char sccsid[] = "@(#)sys_term.c 8.4+1 (Berkeley) 5/30/95";
#endif
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/sys_term.c,v 1.18 2003/05/04 02:54:49 obrien Exp $");
#include <sys/types.h>
#include <sys/tty.h>
==== //depot/projects/tty/crypto/telnet/telnetd/telnetd.c#2 (text+ko) ====
@@ -31,13 +31,13 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/telnetd.c,v 1.21 2001/11/30 22:28:07 markm Exp $");
-
+#if 0
#ifndef lint
static const char sccsid[] = "@(#)telnetd.c 8.4 (Berkeley) 5/30/95";
#endif
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/telnetd.c,v 1.22 2003/05/04 02:54:49 obrien Exp $");
#include "telnetd.h"
#include "pathnames.h"
==== //depot/projects/tty/crypto/telnet/telnetd/termstat.c#2 (text+ko) ====
@@ -31,13 +31,13 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/termstat.c,v 1.11 2001/11/30 21:06:38 markm Exp $");
-
+#if 0
#ifndef lint
static const char sccsid[] = "@(#)termstat.c 8.2 (Berkeley) 5/30/95";
#endif
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/termstat.c,v 1.12 2003/05/04 02:54:49 obrien Exp $");
#include "telnetd.h"
==== //depot/projects/tty/crypto/telnet/telnetd/utility.c#2 (text+ko) ====
@@ -31,13 +31,13 @@
* SUCH DAMAGE.
*/
+#if 0
#ifndef lint
-#if 0
static const char sccsid[] = "@(#)utility.c 8.4 (Berkeley) 5/30/95";
+#endif /* not lint */
#endif
-static const char rcsid[] =
- "$FreeBSD: src/crypto/telnet/telnetd/utility.c,v 1.12 2001/11/30 21:06:38 markm Exp $";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/utility.c,v 1.13 2003/05/04 02:54:49 obrien Exp $");
#ifdef __FreeBSD__
#include <locale.h>
==== //depot/projects/tty/etc/Makefile#5 (text+ko) ====
@@ -1,13 +1,13 @@
# from: @(#)Makefile 5.11 (Berkeley) 5/21/91
-# $FreeBSD: src/etc/Makefile,v 1.312 2003/05/02 22:27:31 dougb Exp $
+# $FreeBSD: src/etc/Makefile,v 1.313 2003/05/06 07:25:17 dougb Exp $
.if !defined(NO_SENDMAIL)
SUBDIR= sendmail
.endif
BIN1= amd.map apmd.conf auth.conf \
- crontab csh.cshrc csh.login csh.logout \
- devd.conf dhclient.conf disktab fbtab ftpusers gettytab group \
+ crontab csh.cshrc csh.login csh.logout devd.conf devfs.conf \
+ dhclient.conf disktab fbtab ftpusers gettytab group \
hosts hosts.allow hosts.equiv hosts.lpd \
inetd.conf login.access login.conf \
mac.conf motd netconfig network.subr networks newsyslog.conf \
==== //depot/projects/tty/etc/devd.conf#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/devd.conf,v 1.3 2003/05/03 10:16:55 akiyama Exp $
+# $FreeBSD: src/etc/devd.conf,v 1.4 2003/05/07 15:48:20 imp Exp $
#
# Refer to devd.conf(5) and devd(8) man pages for the details on how to
# run and configure devd.
@@ -64,9 +64,10 @@
};
# Don't even try to second guess what to do about drivers that don't
-# match here. Instead, pass it off to a smart script to deal.
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list