Index: src/distrib/macppc/floppies/bootfloppy/Makefile =================================================================== RCS file: /cvsroot/basesrc/distrib/macppc/floppies/bootfloppy/Makefile,v retrieving revision 1.25 diff -u -r1.25 Makefile --- src/distrib/macppc/floppies/bootfloppy/Makefile 2002/05/15 14:03:53 1.25 +++ src/distrib/macppc/floppies/bootfloppy/Makefile 2002/08/16 06:19:15 @@ -15,7 +15,7 @@ KERNOBJ!= cd ${.CURDIR}/../md-kernel && ${PRINTOBJDIR} FLOPPY_NETBSD= ${KERNOBJ}/netbsd.INSTALL.gz FLOPPY_BOOT= ${MDEC}/ofwboot -FLOPPYINSTBOOT= "${INSTALLBOOT} -v -m ${MACHINE} -t raw -B 17 @IMAGE@ ${MDEC}/bootxx ${FLOPPY_BOOT}" +FLOPPYINSTBOOT= "dd if=${MDEC}/ustarboot of=@IMAGE@ conv=notrunc" .include "${DISTRIBDIR}/common/Makefile.tarfloppy" Index: src/distrib/sets/lists/base/md.macppc =================================================================== RCS file: /cvsroot/basesrc/distrib/sets/lists/base/md.macppc,v retrieving revision 1.18 diff -u -r1.18 md.macppc --- src/distrib/sets/lists/base/md.macppc 2002/07/09 05:57:34 1.18 +++ src/distrib/sets/lists/base/md.macppc 2002/08/16 06:19:15 @@ -6,6 +6,5 @@ ./usr/mdec/ofwboot.elf base-sysutil-bin ./usr/mdec/ofwboot.xcf base-sysutil-bin ./usr/mdec/mbr base-sysutil-bin -./usr/sbin/apm base-sysutil-bin -./usr/sbin/apmd base-sysutil-bin -./usr/sbin/zzz base-sysutil-bin +./usr/mdec/installboot base-sysutil-bin +./usr/mdec/ustarboot base-sysutil-bin Index: src/distrib/sets/lists/comp/ad.powerpc =================================================================== RCS file: /cvsroot/basesrc/distrib/sets/lists/comp/ad.powerpc,v retrieving revision 1.27 diff -u -r1.27 ad.powerpc --- src/distrib/sets/lists/comp/ad.powerpc 2002/08/08 13:42:22 1.27 +++ src/distrib/sets/lists/comp/ad.powerpc 2002/08/16 06:19:15 @@ -4,7 +4,6 @@ ./usr/include/powerpc/ansi.h comp-c-include ./usr/include/powerpc/aout_machdep.h comp-c-include ./usr/include/powerpc/asm.h comp-c-include -./usr/include/powerpc/atomic.h comp-c-include ./usr/include/powerpc/bat.h comp-c-include ./usr/include/powerpc/bswap.h comp-c-include ./usr/include/powerpc/byte_swap.h comp-c-include @@ -17,11 +16,6 @@ ./usr/include/powerpc/float.h comp-c-include ./usr/include/powerpc/fpu.h comp-c-include ./usr/include/powerpc/frame.h comp-c-include -./usr/include/powerpc/ibm4xx comp-c-include -./usr/include/powerpc/ibm4xx/cpu.h comp-c-include -./usr/include/powerpc/ibm4xx/pmap.h comp-c-include -./usr/include/powerpc/ibm4xx/pte.h comp-c-include -./usr/include/powerpc/ibm4xx/tlb.h comp-c-include ./usr/include/powerpc/ieee.h comp-c-include ./usr/include/powerpc/ieeefp.h comp-c-include ./usr/include/powerpc/int_const.h comp-c-include @@ -34,19 +28,11 @@ ./usr/include/powerpc/limits.h comp-c-include ./usr/include/powerpc/lock.h comp-c-include ./usr/include/powerpc/math.h comp-c-include -./usr/include/powerpc/mpc6xx comp-c-include -./usr/include/powerpc/mpc6xx/bat.h comp-c-include -./usr/include/powerpc/mpc6xx/hid.h comp-c-include -./usr/include/powerpc/mpc6xx/hid_601.h comp-c-include -./usr/include/powerpc/mpc6xx/pmap.h comp-c-include -./usr/include/powerpc/mpc6xx/pte.h comp-c-include -./usr/include/powerpc/mpc6xx/sr_601.h comp-c-include -./usr/include/powerpc/mpc6xx/vmparam.h comp-c-include ./usr/include/powerpc/param.h comp-c-include ./usr/include/powerpc/pcb.h comp-c-include ./usr/include/powerpc/pio.h comp-c-include ./usr/include/powerpc/pmap.h comp-c-include -./usr/include/powerpc/pmc.h comp-c-include +./usr/include/powerpc/hid.h comp-c-include ./usr/include/powerpc/proc.h comp-c-include ./usr/include/powerpc/profile.h comp-c-include ./usr/include/powerpc/psl.h comp-c-include Index: src/distrib/sets/lists/comp/md.macppc =================================================================== RCS file: /cvsroot/basesrc/distrib/sets/lists/comp/md.macppc,v retrieving revision 1.22 diff -u -r1.22 md.macppc --- src/distrib/sets/lists/comp/md.macppc 2002/08/07 21:20:57 1.22 +++ src/distrib/sets/lists/comp/md.macppc 2002/08/16 06:19:15 @@ -4,7 +4,6 @@ ./usr/include/macppc/adbsys.h comp-c-include ./usr/include/macppc/ansi.h comp-c-include ./usr/include/macppc/aout_machdep.h comp-c-include -./usr/include/macppc/apmvar.h comp-c-include ./usr/include/macppc/asm.h comp-c-include ./usr/include/macppc/autoconf.h comp-c-include ./usr/include/macppc/bat.h comp-c-include @@ -28,7 +27,6 @@ ./usr/include/macppc/int_limits.h comp-c-include ./usr/include/macppc/int_mwgwtypes.h comp-c-include ./usr/include/macppc/int_types.h comp-c-include -./usr/include/macppc/intr.h comp-c-include ./usr/include/macppc/ipkdb.h comp-c-include ./usr/include/macppc/kcore.h comp-c-include ./usr/include/macppc/keyboard.h comp-c-include @@ -39,7 +37,6 @@ ./usr/include/macppc/pcb.h comp-c-include ./usr/include/macppc/pio.h comp-c-include ./usr/include/macppc/pmap.h comp-c-include -./usr/include/macppc/pmc.h comp-c-include ./usr/include/macppc/powerpc.h comp-c-include ./usr/include/macppc/proc.h comp-c-include ./usr/include/macppc/profile.h comp-c-include Index: src/distrib/sets/lists/man/mi =================================================================== RCS file: /cvsroot/basesrc/distrib/sets/lists/man/mi,v retrieving revision 1.510 diff -u -r1.510 mi --- src/distrib/sets/lists/man/mi 2002/08/13 11:22:03 1.510 +++ src/distrib/sets/lists/man/mi 2002/08/16 06:19:17 @@ -1265,7 +1265,6 @@ ./usr/share/man/cat8/amiga/installboot.0 man-sysutil-catman ./usr/share/man/cat8/amiga/makedev.0 man-sysutil-catman ./usr/share/man/cat8/amq.0 man-amd-catman -./usr/share/man/cat8/apmd.0 man-sysutil-catman ./usr/share/man/cat8/arc/MAKEDEV.0 man-sysutil-catman ./usr/share/man/cat8/arc/makedev.0 man-sysutil-catman ./usr/share/man/cat8/arp.0 man-netutil-catman @@ -1397,14 +1396,12 @@ ./usr/share/man/cat8/hprop.0 man-krb5-catman ./usr/share/man/cat8/hpropd.0 man-krb5-catman ./usr/share/man/cat8/i386/MAKEDEV.0 man-sysutil-catman -./usr/share/man/cat8/i386/apm.0 man-sysutil-catman ./usr/share/man/cat8/i386/boot.0 man-sys-catman ./usr/share/man/cat8/i386/boot_console.0 man-sys-catman ./usr/share/man/cat8/i386/dosboot.0 man-sys-catman ./usr/share/man/cat8/i386/installboot.0 man-sysutil-catman ./usr/share/man/cat8/i386/makedev.0 man-sysutil-catman ./usr/share/man/cat8/i386/w95boot.0 man-sys-catman -./usr/share/man/cat8/i386/zzz.0 man-sysutil-catman ./usr/share/man/cat8/identd.0 man-netutil-catman ./usr/share/man/cat8/ifconfig.0 man-netutil-catman ./usr/share/man/cat8/ifmcstat.0 man-netutil-catman @@ -3008,7 +3005,6 @@ ./usr/share/man/man8/amiga/installboot.8 man-sysutil-man ./usr/share/man/man8/amiga/makedev.8 man-sysutil-man ./usr/share/man/man8/amq.8 man-amd-man -./usr/share/man/man8/apmd.8 man-sysutil-man ./usr/share/man/man8/arc/MAKEDEV.8 man-sysutil-man ./usr/share/man/man8/arc/makedev.8 man-sysutil-man ./usr/share/man/man8/arp.8 man-netutil-man @@ -3140,14 +3136,12 @@ ./usr/share/man/man8/hprop.8 man-krb5-man ./usr/share/man/man8/hpropd.8 man-krb5-man ./usr/share/man/man8/i386/MAKEDEV.8 man-sysutil-man -./usr/share/man/man8/i386/apm.8 man-sysutil-man ./usr/share/man/man8/i386/boot.8 man-sys-man ./usr/share/man/man8/i386/boot_console.8 man-sys-man ./usr/share/man/man8/i386/dosboot.8 man-sys-man ./usr/share/man/man8/i386/installboot.8 man-sysutil-man ./usr/share/man/man8/i386/makedev.8 man-sysutil-man ./usr/share/man/man8/i386/w95boot.8 man-sys-man -./usr/share/man/man8/i386/zzz.8 man-sysutil-man ./usr/share/man/man8/identd.8 man-netutil-man ./usr/share/man/man8/ifconfig.8 man-netutil-man ./usr/share/man/man8/ifmcstat.8 man-netutil-man Index: src/usr.sbin/Makefile =================================================================== RCS file: /cvsroot/basesrc/usr.sbin/Makefile,v retrieving revision 1.175 diff -u -r1.175 Makefile --- src/usr.sbin/Makefile 2002/06/26 23:13:04 1.175 +++ src/usr.sbin/Makefile 2002/08/16 06:19:20 @@ -3,7 +3,7 @@ .include -SUBDIR= ac accton altq amd apm apmd arp bad144 bind bootp catman \ +SUBDIR= ac accton altq amd arp bad144 bind bootp catman \ chown chroot chrtbl cnwctl config cron dev_mkdb \ dhcp diskpart dumpfs dumplfs edquota eeprom \ envstat eshconfig etcupdate grfconfig \ Index: src/usr.bin/chpass/chpass.c =================================================================== RCS file: /cvsroot/basesrc/usr.bin/chpass/chpass.c,v retrieving revision 1.25 diff -u -r1.25 chpass.c --- src/usr.bin/chpass/chpass.c 2002/08/08 04:49:26 1.25 +++ src/usr.bin/chpass/chpass.c 2002/08/16 06:19:24 @@ -88,7 +88,10 @@ { enum { NEWSH, LOADENTRY, EDITENTRY } op; struct passwd *pw, lpw, old_pw; - int ch, dfd, pfd, tfd, yflag; + int ch, dfd, pfd, tfd; +#ifdef YP + int yflag; +#endif char *arg, *username = NULL; #ifdef __GNUC__