From owner-freebsd-stable Wed Jun 13 9:30:25 2001 Delivered-To: freebsd-stable@freebsd.org Received: from skyshroud.enchantress.ca (skyshroud.enchantress.ca [24.108.91.126]) by hub.freebsd.org (Postfix) with SMTP id 6F5FD37B403 for ; Wed, 13 Jun 2001 09:29:28 -0700 (PDT) (envelope-from darren@enchantress.ca) Received: (qmail 46165 invoked from network); 13 Jun 2001 16:30:41 -0000 Received: from argothian.enchantress.ab.ca (HELO Darren) (10.200.200.4) by Skyshroud with SMTP; 13 Jun 2001 16:30:41 -0000 Message-ID: <045401c0f426$4a45d900$04c8c80a@enchantress.ab.ca> From: "Darren Gamble" Cc: References: <20010608134705.19635.qmail@web14701.mail.yahoo.com> <004001c0f030$36a0d3e0$0600020a@frontend> <20010612120958.G10614@tao.org.uk> <20010613102058.F5486@wantadilla.lemis.com> Subject: Problems with mergemaster Date: Wed, 13 Jun 2001 10:31:25 -0600 MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit X-Priority: 3 X-MSMail-Priority: Normal X-Mailer: Microsoft Outlook Express 5.00.2615.200 x-mimeole: Produced By Microsoft MimeOLE V5.00.2615.200 Sender: owner-freebsd-stable@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Good day, I have recently (finally) been able to do a make build/installworld on one of my test systems with the Stable tree. However, mergemaster does not appear to be working properly. Possibly related is the fact that I am using the -m flag since my source is not in the standard location (there was not enough room under /usr to keep all of the source and compile it, even after deleting ports and such). Attached is the entire output for completeness sake. For each file, I get *** Problem installing ./foo , it will remain to merge by hand Furthermore, on subsequent runs mergemaster ignores these files completely, thinking that they have already been updated What might be the problem? Running mergemaster with the -v flag does not supply any more output. And, assuming the problem is located, what will I need to do to have mergemaster examine these files again? Thanks in advance. I would prefer to not to have to go through the chore of doing all of this by hand and possibly making a mistake. # mergemaster -m /home/darren/cvsup/src/etc/ *** The directory specified for the temporary root environment, /var/tmp/temproot, exists. This can be a security risk if untrusted users have access to the system. Use 'd' to delete the old /var/tmp/temproot and continue Use 't' to select a new temporary root directory Use 'e' to exit mergemaster Default is to use /var/tmp/temproot as is How should I deal with this? [Use the existing /var/tmp/temproot] d *** Deleting the old /var/tmp/temproot *** Creating the temporary root environment in /var/tmp/temproot *** /var/tmp/temproot ready for use *** Creating and populating directory structure in /var/tmp/temproot mtree -deU -f /home/darren/cvsup/src/etc/mtree/BSD.root.dist -p /var/tmp/temproot/ ./bin missing (created) ./boot missing (created) ./boot/defaults missing (created) ./dev missing (created) ./dev/fd missing (created) ./etc missing (created) ./etc/defaults missing (created) ./etc/gnats missing (created) ./etc/isdn missing (created) ./etc/kerberosIV missing (created) ./etc/mail missing (created) ./etc/mtree missing (created) ./etc/namedb missing (created) ./etc/periodic missing (created) ./etc/periodic/daily missing (created) ./etc/periodic/monthly missing (created) ./etc/periodic/weekly missing (created) ./etc/ppp missing (created) ./etc/skel missing (created) ./etc/ssh missing (created) ./etc/ssl missing (created) ./etc/uucp missing (created) ./mnt missing (created) ./modules missing (created) ./proc missing (created) ./root missing (created) ./sbin missing (created) ./tmp missing (created) ./usr missing (created) ./var missing (created) mtree -deU -f /home/darren/cvsup/src/etc/mtree/BSD.var.dist -p /var/tmp/temproot/var ./account missing (created) ./at missing (created) ./at/jobs missing (created) ./at/spool missing (created) ./backups missing (created) ./crash missing (created) ./cron missing (created) ./cron/tabs missing (created) ./db missing (created) ./db/pkg missing (created) ./games missing (created) ./games/hackdir missing (created) ./games/hackdir/save missing (created) ./games/larn missing (created) ./games/phantasia missing (created) ./log missing (created) ./mail missing (created) ./msgs missing (created) ./preserve missing (created) ./run missing (created) ./rwho missing (created) ./spool missing (created) ./spool/lock missing (created) ./spool/lpd missing (created) ./spool/mqueue missing (created) ./spool/opielocks missing (created) ./spool/output missing (created) ./spool/output/lpd missing (created) ./spool/uucp missing (created) ./spool/uucp/.Preserve missing (created) ./spool/uucp/.Sequence missing (created) ./spool/uucp/.Status missing (created) ./spool/uucp/.Temp missing (created) ./spool/uucp/.Xqtdir missing (created) ./spool/uucppublic missing (created) ./tmp missing (created) ./tmp/vi.recover missing (created) ./yp missing (created) mtree -deU -f /home/darren/cvsup/src/etc/mtree/BSD.usr.dist -p /var/tmp/temproot/usr ./bin missing (created) ./games missing (created) ./games/hide missing (created) ./include missing (created) ./lib missing (created) ./lib/aout missing (created) ./lib/compat missing (created) ./lib/compat/aout missing (created) ./libdata missing (created) ./libdata/doscmd missing (created) ./libdata/doscmd/fonts missing (created) ./libdata/gcc missing (created) ./libdata/ldscripts missing (created) ./libdata/lint missing (created) ./libdata/msdosfs missing (created) ./libdata/perl missing (created) ./libdata/perl/5.00503 missing (created) ./libdata/perl/5.00503/B missing (created) ./libdata/perl/5.00503/CGI missing (created) ./libdata/perl/5.00503/CPAN missing (created) ./libdata/perl/5.00503/Class missing (created) ./libdata/perl/5.00503/Data missing (created) ./libdata/perl/5.00503/Devel missing (created) ./libdata/perl/5.00503/ExtUtils missing (created) ./libdata/perl/5.00503/File missing (created) ./libdata/perl/5.00503/File/Spec missing (created) ./libdata/perl/5.00503/Getopt missing (created) ./libdata/perl/5.00503/I18N missing (created) ./libdata/perl/5.00503/IPC missing (created) ./libdata/perl/5.00503/Math missing (created) ./libdata/perl/5.00503/Net missing (created) ./libdata/perl/5.00503/Pod missing (created) ./libdata/perl/5.00503/Search missing (created) ./libdata/perl/5.00503/Sys missing (created) ./libdata/perl/5.00503/Term missing (created) ./libdata/perl/5.00503/Test missing (created) ./libdata/perl/5.00503/Text missing (created) ./libdata/perl/5.00503/Tie missing (created) ./libdata/perl/5.00503/Time missing (created) ./libdata/perl/5.00503/User missing (created) ./libdata/perl/5.00503/auto missing (created) ./libdata/perl/5.00503/auto/Getopt missing (created) ./libdata/perl/5.00503/auto/Getopt/Long missing (created) ./libdata/perl/5.00503/mach missing (created) ./libdata/perl/5.00503/mach/B missing (created) ./libdata/perl/5.00503/mach/CORE missing (created) ./libdata/perl/5.00503/mach/Data missing (created) ./libdata/perl/5.00503/mach/IO missing (created) ./libdata/perl/5.00503/mach/IPC missing (created) ./libdata/perl/5.00503/mach/auto missing (created) ./libdata/perl/5.00503/mach/auto/B missing (created) ./libdata/perl/5.00503/mach/auto/DB_File missing (created) ./libdata/perl/5.00503/mach/auto/Data missing (created) ./libdata/perl/5.00503/mach/auto/Data/Dumper missing (created) ./libdata/perl/5.00503/mach/auto/DynaLoader missing (created) ./libdata/perl/5.00503/mach/auto/Fcntl missing (created) ./libdata/perl/5.00503/mach/auto/IO missing (created) ./libdata/perl/5.00503/mach/auto/IPC missing (created) ./libdata/perl/5.00503/mach/auto/IPC/SysV missing (created) ./libdata/perl/5.00503/mach/auto/NDBM_File missing (created) ./libdata/perl/5.00503/mach/auto/Opcode missing (created) ./libdata/perl/5.00503/mach/auto/POSIX missing (created) ./libdata/perl/5.00503/mach/auto/SDBM_File missing (created) ./libdata/perl/5.00503/mach/auto/Socket missing (created) ./libdata/perl/5.00503/mach/auto/attrs missing (created) ./libdata/perl/5.00503/mach/auto/re missing (created) ./libdata/perl/5.00503/mach/auto/sdbm missing (created) ./libdata/perl/5.00503/pod missing (created) ./libdata/stallion missing (created) ./libexec missing (created) ./libexec/aout missing (created) ./libexec/elf missing (created) ./libexec/lpr missing (created) ./libexec/lpr/ru missing (created) ./libexec/sendmail missing (created) ./libexec/sm.bin missing (created) ./libexec/uucp missing (created) ./local missing (created) ./obj missing (created) ./sbin missing (created) ./share missing (created) ./share/calendar missing (created) ./share/calendar/de_DE.ISO_8859-1 missing (created) ./share/calendar/hr_HR.ISO_8859-2 missing (created) ./share/calendar/ru_SU.KOI8-R missing (created) ./share/dict missing (created) ./share/doc missing (created) ./share/doc/IPv6 missing (created) ./share/doc/bind missing (created) ./share/doc/bind/html missing (created) ./share/doc/bind/misc missing (created) ./share/doc/ncurses missing (created) ./share/doc/ntp missing (created) ./share/doc/papers missing (created) ./share/doc/psd missing (created) ./share/doc/psd/05.sysman missing (created) ./share/doc/psd/12.make missing (created) ./share/doc/psd/13.rcs missing (created) ./share/doc/psd/18.gprof missing (created) ./share/doc/psd/20.ipctut missing (created) ./share/doc/psd/21.ipc missing (created) ./share/doc/psd/22.rpcgen missing (created) ./share/doc/psd/23.rpc missing (created) ./share/doc/psd/24.xdr missing (created) ./share/doc/psd/25.xdrrfc missing (created) ./share/doc/psd/26.rpcrfc missing (created) ./share/doc/psd/27.nfsrfc missing (created) ./share/doc/psd/28.cvs missing (created) ./share/doc/smm missing (created) ./share/doc/smm/01.setup missing (created) ./share/doc/smm/02.config missing (created) ./share/doc/smm/03.fsck missing (created) ./share/doc/smm/04.quotas missing (created) ./share/doc/smm/05.fastfs missing (created) ./share/doc/smm/06.nfs missing (created) ./share/doc/smm/07.lpd missing (created) ./share/doc/smm/08.sendmailop missing (created) ./share/doc/smm/10.named missing (created) ./share/doc/smm/11.timedop missing (created) ./share/doc/smm/12.timed missing (created) ./share/doc/smm/18.net missing (created) ./share/doc/usd missing (created) ./share/doc/usd/04.csh missing (created) ./share/doc/usd/07.mail missing (created) ./share/doc/usd/10.exref missing (created) ./share/doc/usd/11.edit missing (created) ./share/doc/usd/12.vi missing (created) ./share/doc/usd/13.viref missing (created) ./share/doc/usd/18.msdiffs missing (created) ./share/doc/usd/19.memacros missing (created) ./share/doc/usd/20.meref missing (created) ./share/doc/usd/30.rogue missing (created) ./share/doc/usd/31.trek missing (created) ./share/examples missing (created) ./share/examples/BSD_daemon missing (created) ./share/examples/FreeBSD_version missing (created) ./share/examples/IPv6 missing (created) ./share/examples/atm missing (created) ./share/examples/bc missing (created) ./share/examples/bootforth missing (created) ./share/examples/cvs missing (created) ./share/examples/cvs/contrib missing (created) ./share/examples/cvs/examples missing (created) ./share/examples/cvs/pcl-cvs missing (created) ./share/examples/cvsup missing (created) ./share/examples/dialog missing (created) ./share/examples/diskless missing (created) ./share/examples/diskless/209.157.86.12 missing (created) ./share/examples/diskless/HT.DISKLESS missing (created) ./share/examples/diskless/HT.STD missing (created) ./share/examples/diskless/archive.backplane.com missing (created) ./share/examples/drivers missing (created) ./share/examples/etc missing (created) ./share/examples/etc/defaults missing (created) ./share/examples/find_interface missing (created) ./share/examples/ibcs2 missing (created) ./share/examples/isdn missing (created) ./share/examples/kld missing (created) ./share/examples/kld/cdev missing (created) ./share/examples/kld/cdev/module missing (created) ./share/examples/kld/cdev/test missing (created) ./share/examples/kld/dyn_sysctl missing (created) ./share/examples/kld/dyn_sysctl/module missing (created) ./share/examples/kld/syscall missing (created) ./share/examples/kld/syscall/module missing (created) ./share/examples/kld/syscall/test missing (created) ./share/examples/libdialog missing (created) ./share/examples/libvgl missing (created) ./share/examples/mdoc missing (created) ./share/examples/meteor missing (created) ./share/examples/netgraph missing (created) ./share/examples/nwclient missing (created) ./share/examples/perfmon missing (created) ./share/examples/portal missing (created) ./share/examples/ppi missing (created) ./share/examples/ppp missing (created) ./share/examples/printing missing (created) ./share/examples/scsi_target missing (created) ./share/examples/ses missing (created) ./share/examples/ses/getencstat missing (created) ./share/examples/ses/sesd missing (created) ./share/examples/ses/setencstat missing (created) ./share/examples/ses/setobjstat missing (created) ./share/examples/ses/srcs missing (created) ./share/examples/slattach missing (created) ./share/examples/sliplogin missing (created) ./share/examples/startslip missing (created) ./share/examples/sunrpc missing (created) ./share/examples/sunrpc/dir missing (created) ./share/examples/sunrpc/msg missing (created) ./share/examples/sunrpc/sort missing (created) ./share/examples/worm missing (created) ./share/games missing (created) ./share/games/atc missing (created) ./share/games/fortune missing (created) ./share/games/larn missing (created) ./share/games/quiz.db missing (created) ./share/groff_font missing (created) ./share/groff_font/devX100 missing (created) ./share/groff_font/devX100-12 missing (created) ./share/groff_font/devX75 missing (created) ./share/groff_font/devX75-12 missing (created) ./share/groff_font/devascii missing (created) ./share/groff_font/devcp1047 missing (created) ./share/groff_font/devdvi missing (created) ./share/groff_font/devhtml missing (created) ./share/groff_font/devkoi8-r missing (created) ./share/groff_font/devlatin1 missing (created) ./share/groff_font/devlbp missing (created) ./share/groff_font/devlj4 missing (created) ./share/groff_font/devps missing (created) ./share/groff_font/devutf8 missing (created) ./share/info missing (created) ./share/isdn missing (created) ./share/libg++ missing (created) ./share/locale missing (created) ./share/locale/cs_CZ.ISO_8859-2 missing (created) ./share/locale/da_DK.DIS_8859-15 missing (created) ./share/locale/da_DK.ISO_8859-1 missing (created) ./share/locale/de_AT.DIS_8859-15 missing (created) ./share/locale/de_AT.ISO_8859-1 missing (created) ./share/locale/de_CH.DIS_8859-15 missing (created) ./share/locale/de_CH.ISO_8859-1 missing (created) ./share/locale/de_DE.DIS_8859-15 missing (created) ./share/locale/de_DE.ISO_8859-1 missing (created) ./share/locale/el_GR.ISO_8859-7 missing (created) ./share/locale/en_AU.DIS_8859-15 missing (created) ./share/locale/en_AU.ISO_8859-1 missing (created) ./share/locale/en_CA.DIS_8859-15 missing (created) ./share/locale/en_CA.ISO_8859-1 missing (created) ./share/locale/en_GB.DIS_8859-15 missing (created) ./share/locale/en_GB.ISO_8859-1 missing (created) ./share/locale/en_US.DIS_8859-15 missing (created) ./share/locale/en_US.ISO_8859-1 missing (created) ./share/locale/es_ES.DIS_8859-15 missing (created) ./share/locale/es_ES.ISO_8859-1 missing (created) ./share/locale/fi_FI.DIS_8859-15 missing (created) ./share/locale/fi_FI.ISO_8859-1 missing (created) ./share/locale/fr_BE.DIS_8859-15 missing (created) ./share/locale/fr_BE.ISO_8859-1 missing (created) ./share/locale/fr_CA.DIS_8859-15 missing (created) ./share/locale/fr_CA.ISO_8859-1 missing (created) ./share/locale/fr_CH.DIS_8859-15 missing (created) ./share/locale/fr_CH.ISO_8859-1 missing (created) ./share/locale/fr_FR.DIS_8859-15 missing (created) ./share/locale/fr_FR.ISO_8859-1 missing (created) ./share/locale/hr_HR.ISO_8859-2 missing (created) ./share/locale/hu_HU.ISO_8859-2 missing (created) ./share/locale/is_IS.DIS_8859-15 missing (created) ./share/locale/is_IS.ISO_8859-1 missing (created) ./share/locale/it_CH.DIS_8859-15 missing (created) ./share/locale/it_CH.ISO_8859-1 missing (created) ./share/locale/it_IT.DIS_8859-15 missing (created) ./share/locale/it_IT.ISO_8859-1 missing (created) ./share/locale/ja_JP.EUC missing (created) ./share/locale/ja_JP.SJIS missing (created) ./share/locale/ja_JP.Shift_JIS missing (created) ./share/locale/ko_KR.EUC missing (created) ./share/locale/la_LN.ASCII missing (created) ./share/locale/la_LN.DIS_8859-15 missing (created) ./share/locale/la_LN.ISO_8859-1 missing (created) ./share/locale/la_LN.ISO_8859-2 missing (created) ./share/locale/la_LN.ISO_8859-4 missing (created) ./share/locale/lt_LT.ISO_8859-4 missing (created) ./share/locale/nl_BE.DIS_8859-15 missing (created) ./share/locale/nl_BE.ISO_8859-1 missing (created) ./share/locale/nl_NL.DIS_8859-15 missing (created) ./share/locale/nl_NL.ISO_8859-1 missing (created) ./share/locale/no_NO.DIS_8859-15 missing (created) ./share/locale/no_NO.ISO_8859-1 missing (created) ./share/locale/pl_PL.ISO_8859-2 missing (created) ./share/locale/pt_PT.DIS_8859-15 missing (created) ./share/locale/pt_PT.ISO_8859-1 missing (created) ./share/locale/ru_SU.CP866 missing (created) ./share/locale/ru_SU.ISO_8859-5 missing (created) ./share/locale/ru_SU.KOI8-R missing (created) ./share/locale/sl_SI.ISO_8859-2 missing (created) ./share/locale/sv_SE.DIS_8859-15 missing (created) ./share/locale/sv_SE.ISO_8859-1 missing (created) ./share/locale/tr_TR.ISO_8859-9 missing (created) ./share/locale/uk_UA.KOI8-U missing (created) ./share/locale/zh_CN.EUC missing (created) ./share/locale/zh_TW.Big5 missing (created) ./share/man missing (created) ./share/man/cat1 missing (created) ./share/man/cat1aout missing (created) ./share/man/cat2 missing (created) ./share/man/cat3 missing (created) ./share/man/cat4 missing (created) ./share/man/cat4/alpha missing (created) ./share/man/cat4/i386 missing (created) ./share/man/cat5 missing (created) ./share/man/cat6 missing (created) ./share/man/cat7 missing (created) ./share/man/cat8 missing (created) ./share/man/cat8/alpha missing (created) ./share/man/cat8/i386 missing (created) ./share/man/cat9 missing (created) ./share/man/cat9/i386 missing (created) ./share/man/catn missing (created) ./share/man/en.ISO_8859-1 missing (created) ./share/man/en.ISO_8859-1/cat1 missing (created) ./share/man/en.ISO_8859-1/cat1aout missing (created) ./share/man/en.ISO_8859-1/cat2 missing (created) ./share/man/en.ISO_8859-1/cat3 missing (created) ./share/man/en.ISO_8859-1/cat4 missing (created) ./share/man/en.ISO_8859-1/cat4/alpha missing (created) ./share/man/en.ISO_8859-1/cat4/i386 missing (created) ./share/man/en.ISO_8859-1/cat5 missing (created) ./share/man/en.ISO_8859-1/cat6 missing (created) ./share/man/en.ISO_8859-1/cat7 missing (created) ./share/man/en.ISO_8859-1/cat8 missing (created) ./share/man/en.ISO_8859-1/cat8/alpha missing (created) ./share/man/en.ISO_8859-1/cat8/i386 missing (created) ./share/man/en.ISO_8859-1/cat9 missing (created) ./share/man/en.ISO_8859-1/cat9/i386 missing (created) ./share/man/en.ISO_8859-1/catn missing (created) ./share/man/ja missing (created) ./share/man/ja/cat1 missing (created) ./share/man/ja/cat2 missing (created) ./share/man/ja/cat3 missing (created) ./share/man/ja/cat4 missing (created) ./share/man/ja/cat5 missing (created) ./share/man/ja/cat6 missing (created) ./share/man/ja/cat7 missing (created) ./share/man/ja/cat8 missing (created) ./share/man/ja/cat9 missing (created) ./share/man/ja/catn missing (created) ./share/man/ja/man1 missing (created) ./share/man/ja/man2 missing (created) ./share/man/ja/man3 missing (created) ./share/man/ja/man4 missing (created) ./share/man/ja/man5 missing (created) ./share/man/ja/man6 missing (created) ./share/man/ja/man7 missing (created) ./share/man/ja/man8 missing (created) ./share/man/ja/man9 missing (created) ./share/man/ja/mann missing (created) ./share/man/man1 missing (created) ./share/man/man1aout missing (created) ./share/man/man2 missing (created) ./share/man/man3 missing (created) ./share/man/man4 missing (created) ./share/man/man4/i386 missing (created) ./share/man/man5 missing (created) ./share/man/man6 missing (created) ./share/man/man7 missing (created) ./share/man/man8 missing (created) ./share/man/man8/alpha missing (created) ./share/man/man8/i386 missing (created) ./share/man/man9 missing (created) ./share/man/man9/i386 missing (created) ./share/man/mann missing (created) ./share/me missing (created) ./share/misc missing (created) ./share/misc/fonts missing (created) ./share/misc/pcvtfonts missing (created) ./share/mk missing (created) ./share/nls missing (created) ./share/nls/C missing (created) ./share/nls/cs_CZ.ISO_8859-2 missing (created) ./share/nls/da_DK.DIS_8859-15 missing (created) ./share/nls/da_DK.ISO_8859-1 missing (created) ./share/nls/de_AT.DIS_8859-15 missing (created) ./share/nls/de_AT.ISO_8859-1 missing (created) ./share/nls/de_CH.DIS_8859-15 missing (created) ./share/nls/de_CH.ISO_8859-1 missing (created) ./share/nls/de_DE.DIS_8859-15 missing (created) ./share/nls/de_DE.ISO_8859-1 missing (created) ./share/nls/el_GR.ISO_8859-7 missing (created) ./share/nls/en_AU.DIS_8859-15 missing (created) ./share/nls/en_AU.ISO_8859-1 missing (created) ./share/nls/en_CA.DIS_8859-15 missing (created) ./share/nls/en_CA.ISO_8859-1 missing (created) ./share/nls/en_GB.DIS_8859-15 missing (created) ./share/nls/en_GB.ISO_8859-1 missing (created) ./share/nls/en_US.DIS_8859-15 missing (created) ./share/nls/en_US.ISO_8859-1 missing (created) ./share/nls/es_ES.DIS_8859-15 missing (created) ./share/nls/es_ES.ISO_8859-1 missing (created) ./share/nls/fi_FI.DIS_8859-15 missing (created) ./share/nls/fi_FI.ISO_8859-1 missing (created) ./share/nls/fr_BE.DIS_8859-15 missing (created) ./share/nls/fr_BE.ISO_8859-1 missing (created) ./share/nls/fr_CA.DIS_8859-15 missing (created) ./share/nls/fr_CA.ISO_8859-1 missing (created) ./share/nls/fr_CH.DIS_8859-15 missing (created) ./share/nls/fr_CH.ISO_8859-1 missing (created) ./share/nls/fr_FR.DIS_8859-15 missing (created) ./share/nls/fr_FR.ISO_8859-1 missing (created) ./share/nls/hr_HR.ISO_8859-2 missing (created) ./share/nls/hu_HU.ISO_8859-2 missing (created) ./share/nls/is_IS.DIS_8859-15 missing (created) ./share/nls/is_IS.ISO_8859-1 missing (created) ./share/nls/it_CH.DIS_8859-15 missing (created) ./share/nls/it_CH.ISO_8859-1 missing (created) ./share/nls/it_IT.DIS_8859-15 missing (created) ./share/nls/it_IT.ISO_8859-1 missing (created) ./share/nls/ja_JP.EUC missing (created) ./share/nls/ja_JP.SJIS missing (created) ./share/nls/ja_JP.Shift_JIS missing (created) ./share/nls/ko_KR.EUC missing (created) ./share/nls/la_LN.ASCII missing (created) ./share/nls/la_LN.DIS_8859-15 missing (created) ./share/nls/la_LN.ISO_8859-1 missing (created) ./share/nls/la_LN.ISO_8859-2 missing (created) ./share/nls/la_LN.ISO_8859-4 missing (created) ./share/nls/lt_LT.ISO_8859-4 missing (created) ./share/nls/nl_BE.ISO_8859-1 missing (created) ./share/nls/nl_NL.ISO_8859-1 missing (created) ./share/nls/no_NO.ISO_8859-1 missing (created) ./share/nls/pl_PL.ISO_8859-2 missing (created) ./share/nls/pt_PT.ISO_8859-1 missing (created) ./share/nls/ru_SU.CP866 missing (created) ./share/nls/ru_SU.ISO_8859-5 missing (created) ./share/nls/ru_SU.KOI8-R missing (created) ./share/nls/sl_SI.ISO_8859-2 missing (created) ./share/nls/sv_SE.DIS_8859-15 missing (created) ./share/nls/sv_SE.ISO_8859-1 missing (created) ./share/nls/tr_TR.ISO_8859-9 missing (created) ./share/nls/uk_UA.KOI8-U missing (created) ./share/nls/zh_CN.EUC missing (created) ./share/pcvt missing (created) ./share/pcvt/Doc missing (created) ./share/pcvt/Etc missing (created) ./share/perl missing (created) ./share/perl/man missing (created) ./share/perl/man/cat3 missing (created) ./share/perl/man/man3 missing (created) ./share/sendmail missing (created) ./share/skel missing (created) ./share/syscons missing (created) ./share/syscons/fonts missing (created) ./share/syscons/keymaps missing (created) ./share/syscons/scrnmaps missing (created) ./share/tabset missing (created) ./share/tmac missing (created) ./share/tmac/mdoc missing (created) ./share/tmac/mm missing (created) ./share/vi missing (created) ./share/vi/catalog missing (created) ./share/vi/perl missing (created) ./share/vi/tcl missing (created) ./share/zoneinfo missing (created) ./share/zoneinfo/Africa missing (created) ./share/zoneinfo/America missing (created) ./share/zoneinfo/America/Indiana missing (created) ./share/zoneinfo/Antarctica missing (created) ./share/zoneinfo/Arctic missing (created) ./share/zoneinfo/Asia missing (created) ./share/zoneinfo/Atlantic missing (created) ./share/zoneinfo/Australia missing (created) ./share/zoneinfo/Etc missing (created) ./share/zoneinfo/Europe missing (created) ./share/zoneinfo/Indian missing (created) ./share/zoneinfo/Pacific missing (created) ./share/zoneinfo/SystemV missing (created) ./src missing (created) mtree -deU -f /home/darren/cvsup/src/etc/mtree/BSD.include.dist -p /var/tmp/temproot/usr/include ./arpa missing (created) ./cam missing (created) ./cam/scsi missing (created) ./dev missing (created) ./dev/ppbus missing (created) ./dev/usb missing (created) ./fs missing (created) ./fs/smbfs missing (created) ./g++ missing (created) ./g++/std missing (created) ./isc missing (created) ./isofs missing (created) ./isofs/cd9660 missing (created) ./machine missing (created) ./msdosfs missing (created) ./net missing (created) ./netatalk missing (created) ./netatm missing (created) ./netgraph missing (created) ./netinet missing (created) ./netinet6 missing (created) ./netipx missing (created) ./netkey missing (created) ./netnatm missing (created) ./netncp missing (created) ./netns missing (created) ./netsmb missing (created) ./nfs missing (created) ./ntfs missing (created) ./nwfs missing (created) ./objc missing (created) ./openssl missing (created) ./pccard missing (created) ./posix4 missing (created) ./protocols missing (created) ./readline missing (created) ./rpc missing (created) ./rpcsvc missing (created) ./security missing (created) ./ss missing (created) ./sys missing (created) ./ufs missing (created) ./ufs/ffs missing (created) ./ufs/mfs missing (created) ./ufs/ufs missing (created) ./vm missing (created) mtree -deU -f /home/darren/cvsup/src/etc/mtree/BSD.include.dist -p /var/tmp/temproot/usr/libdata/perl/5.00503/mach ./arpa missing (created) ./cam missing (created) ./cam/scsi missing (created) ./dev missing (created) ./dev/ppbus missing (created) ./dev/usb missing (created) ./fs missing (created) ./fs/smbfs missing (created) ./g++ missing (created) ./g++/std missing (created) ./isc missing (created) ./isofs missing (created) ./isofs/cd9660 missing (created) ./machine missing (created) ./msdosfs missing (created) ./net missing (created) ./netatalk missing (created) ./netatm missing (created) ./netgraph missing (created) ./netinet missing (created) ./netinet6 missing (created) ./netipx missing (created) ./netkey missing (created) ./netnatm missing (created) ./netncp missing (created) ./netns missing (created) ./netsmb missing (created) ./nfs missing (created) ./ntfs missing (created) ./nwfs missing (created) ./objc missing (created) ./openssl missing (created) ./pccard missing (created) ./posix4 missing (created) ./protocols missing (created) ./readline missing (created) ./rpc missing (created) ./rpcsvc missing (created) ./security missing (created) ./ss missing (created) ./sys missing (created) ./ufs missing (created) ./ufs/ffs missing (created) ./ufs/mfs missing (created) ./ufs/ufs missing (created) ./vm missing (created) cd /var/tmp/temproot/; rm -f /var/tmp/temproot/sys; ln -s usr/src/sys sys cd /var/tmp/temproot/usr/share/man/en.ISO_8859-1; ln -sf ../man* . cd /var/tmp/temproot/usr/share/locale; set - `cat /home/darren/cvsup/src/etc/locale.alias`; while [ $# -gt 0 ] ; do rm -rf "$1"; ln -s "$2" "$1"; shift; shift; done cd /var/tmp/temproot/usr/share/nls; set - `cat /home/darren/cvsup/src/etc/locale.alias`; while [ $# -gt 0 ] ; do rm -rf "$1"; ln -s "$2" "$1"; shift; shift; done; rm -rf POSIX; ln -s C POSIX (cd /home/darren/cvsup/src/etc; install -c -o root -g wheel -m 644 amd.map apmd.conf auth.conf crontab csh.cshrc csh.login csh.logout dhclient.conf dm.conf fbtab ftpusers gettytab group hosts hosts.allow host.conf hosts.equiv hosts.lpd inetd.conf login.access login.conf motd modems networks newsyslog.conf pam.conf phones printcap profile protocols rc rc.atm rc.devfs rc.diskless1 rc.diskless2 rc.firewall rc.firewall6 rc.isdn rc.network rc.network6 rc.pccard rc.serial rc.shutdown rc.syscons rc.sysctl remote rpc security services shells syslog.conf usbd.conf etc.i386/disktab etc.i386/rc.i386 etc.i386/ttys /home/darren/cvsup/src/etc/../gnu/usr.bin/man/manpath/manpath.config /home/darren/cvsup/src/etc/../usr.bin/mail/misc/mail.rc /home/darren/cvsup/src/etc/../usr.bin/locate/locate/locate.rc /var/tmp/temproot/etc; install -c -o root -g wheel -m 755 netstart pccard_ether rc.suspend rc.resume /var/tmp/temproot/etc; install -c -o root -g wheel -m 644 defaults/rc.conf /var/tmp/temproot/etc/defaults/; install -c -o root -g wheel -m 644 defaults/make.conf /var/tmp/temproot/etc/defaults/; install -c -o root -g wheel -m 644 defaults/pccard.conf /var/tmp/temproot/etc/defaults/; install -c -o root -g wheel -m 644 defaults/periodic.conf /var/tmp/temproot/etc/defaults/; install -c -o root -g wheel -m 600 /dev/null /var/tmp/temproot/var/log/cron; install -c -o root -g wheel -m 600 master.passwd /var/tmp/temproot/etc; ( cd /home/darren/cvsup/src/etc/periodic; make install ); ( cd /home/darren/cvsup/src/etc/../gnu/usr.bin/send-pr; make etc-gnats-freefall ); ( cd /home/darren/cvsup/src/etc/../share/termcap; make etc-termcap ); ( cd /home/darren/cvsup/src/etc/../usr.sbin/rmt; make etc-rmt ); ( cd /home/darren/cvsup/src/etc/isdn; make install ); pwd_mkdb -p -d /var/tmp/temproot/etc /var/tmp/temproot/etc/master.passwd; install -c -o root -g wheel -m 555 MAKEDEV.local MAKEDEV /var/tmp/temproot/dev ) ===> daily install -c -o root -g wheel -m 755 100.clean-disks 110.clean-tmps 120.clean-preserve 130.clean-msgs 140.clean-rwho 150.clean-hoststat 200.backup-passwd 210.backup-aliases 220.backup-distfile 300.calendar 310.accounting 320.rdist 330.news 400.status-disks 420.status-network 430.status-rwho 440.status-mailq 450.status-security 460.status-mail-rejects 470.status-named 500.queuerun 999.local 340.uucp 410.status-uucp /var/tmp/temproot/etc/periodic/daily ===> weekly install -c -o root -g wheel -m 755 120.clean-kvmdb 310.locate 320.whatis 330.catman 340.noid 400.status-pkg 999.local 300.uucp /var/tmp/temproot/etc/periodic/weekly ===> monthly install -c -o root -g wheel -m 755 200.accounting 999.local /var/tmp/temproot/etc/periodic/monthly install -c -o root -g wheel -m 0644 /home/darren/cvsup/src/gnu/usr.bin/send-pr/categories /var/tmp/temproot/etc/gnats/freefall rm -f /var/tmp/temproot/etc/termcap ln -s /usr/share/misc/termcap /var/tmp/temproot/etc/termcap rm -f /var/tmp/temproot/etc/rmt ln -s /usr/sbin/rmt /var/tmp/temproot/etc/rmt for i in answer isdntel.sh record tell tell-record ; do install -c -o root -g wheel -m 700 $i /var/tmp/temproot/etc/isdn ; done ; for i in isdnd.rates.D isdnd.rates.F isdnd.rates.UK.BT isdnd.rc.sample isdntel.alias.sample ; do install -c -o root -g wheel -m 600 $i /var/tmp/temproot/etc/isdn ; done ( cd /home/darren/cvsup/src/etc/sendmail; make distribution ); install -c -o root -g wheel -m 644 /home/darren/cvsup/src/etc/sendmail/freebsd.mc /var/tmp/temproot/etc/mail/freebsd.mc install -c -o root -g wheel -m 644 freebsd.cf /var/tmp/temproot/etc/mail/freebsd.cf install -c -o root -g wheel -m 644 freebsd.cf /var/tmp/temproot/etc/mail/sendmail.cf install -c -o root -g wheel -m 444 /home/darren/cvsup/src/etc/sendmail/../../contrib/sendmail/src/helpfile /var/tmp/temproot/etc/mail/helpfile install -c -o root -g wheel -m 644 /dev/null /var/tmp/temproot/var/log/sendmail.st ( cd /home/darren/cvsup/src/etc/../gnu/libexec/uucp/sample; make install ) install -c -o uucp -g uucp -m 440 call.sample config.sample dial.sample dialcode.sample passwd.sample port.sample sys1.sample sys2.sample /var/tmp/temproot/etc/uucp (cd /home/darren/cvsup/src/etc; install -c -o root -g wheel -m 644 /home/darren/cvsup/src/etc/../crypto/openssh/ssh_config /home/darren/cvsup/src/etc/../crypto/openssh/sshd_config primes /var/tmp/temproot/etc/ssh ) (cd /home/darren/cvsup/src/etc; install -c -o root -g wheel -m 644 /home/darren/cvsup/src/etc/../crypto/openssl/apps/openssl.cnf /var/tmp/temproot/etc/ssl ) (cd /home/darren/cvsup/src/etc/root; install -c -o root -g wheel -m 644 dot.cshrc /var/tmp/temproot/root/.cshrc; install -c -o root -g wheel -m 644 dot.klogin /var/tmp/temproot/root/.klogin; install -c -o root -g wheel -m 644 dot.login /var/tmp/temproot/root/.login; install -c -o root -g wheel -m 644 dot.profile /var/tmp/temproot/root/.profile; rm -f /var/tmp/temproot/.cshrc /var/tmp/temproot/.profile; ln /var/tmp/temproot/root/.cshrc /var/tmp/temproot/.cshrc; ln /var/tmp/temproot/root/.profile /var/tmp/temproot/.profile) cd /home/darren/cvsup/src/etc/mtree; install -c -o root -g wheel -m 444 BSD.include.dist BSD.local.dist BSD.root.dist BSD.usr.dist BSD.var.dist BSD.x11.dist BSD.x11-4.dist /var/tmp/temproot/etc/mtree cd /home/darren/cvsup/src/etc/namedb; install -c -o root -g wheel -m 644 PROTO.localhost.rev named.conf named.root make-localhost /var/tmp/temproot/etc/namedb cd /home/darren/cvsup/src/etc/ppp; install -c -o root -g wheel -m 644 ppp.deny ppp.shells.sample /var/tmp/temproot/etc/ppp cd /home/darren/cvsup/src/etc/ppp; install -c -o root -g wheel -m 600 ppp.conf /var/tmp/temproot/etc/ppp cd /home/darren/cvsup/src/etc/mail; install -c -o root -g wheel -m 644 Makefile README mailer.conf access.sample virtusertable.sample mailertable.sample aliases /var/tmp/temproot/etc/mail + ln -s mail/aliases /var/tmp/temproot/etc/aliases install -c -o root -g operator -m 664 /dev/null /var/tmp/temproot/etc/dumpdates install -c -o nobody -g wheel -m 644 /dev/null /var/tmp/temproot/var/db/locate.database install -c -o root -g wheel -m 644 /dev/null /var/tmp/temproot/var/log/lpd-errs install -c -o root -g wheel -m 644 /dev/null /var/tmp/temproot/var/log/maillog install -c -o root -g wheel -m 644 /dev/null /var/tmp/temproot/var/log/lastlog install -c -o root -g wheel -m 644 /dev/null /var/tmp/temproot/var/log/messages install -c -o root -g wheel -m 600 /dev/null /var/tmp/temproot/var/log/security install -c -o root -g wheel -m 600 /dev/null /var/tmp/temproot/var/log/slip.log install -c -o root -g wheel -m 600 /dev/null /var/tmp/temproot/var/log/ppp.log install -c -o root -g wheel -m 644 /dev/null /var/tmp/temproot/var/log/wtmp install -c -o root -g wheel -m 644 /dev/null /var/tmp/temproot/var/run/utmp install -c -o root -g wheel -m 644 /home/darren/cvsup/src/etc/minfree /var/tmp/temproot/var/crash (cd /home/darren/cvsup/src/etc/..; install -c -o root -g wheel -m 444 COPYRIGHT /var/tmp/temproot/) (cd /home/darren/cvsup/src/etc/../share/man; make makedb; ) makewhatis /var/tmp/temproot/usr/share/man makewhatis /var/tmp/temproot/usr/share/perl/man *** Beginning comparison *** Temp ./dev/MAKEDEV.local and installed have the same CVS Id, deleting *** Temp ./dev/MAKEDEV and installed have the same CVS Id, deleting *** Temp ./etc/defaults/rc.conf and installed have the same CVS Id, deleting *** Temp ./etc/defaults/make.conf and installed have the same CVS Id, deleting *** Temp ./etc/defaults/pccard.conf and installed have the same CVS Id, deleting *** Temp ./etc/defaults/periodic.conf and installed have the same CVS Id, deleting *** Temp ./etc/gnats/freefall and installed have the same CVS Id, deleting *** Temp ./etc/isdn/answer and installed have the same CVS Id, deleting *** Temp ./etc/isdn/isdntel.sh and installed have the same CVS Id, deleting *** Temp ./etc/isdn/record and installed have the same CVS Id, deleting *** Temp ./etc/isdn/tell and installed have the same CVS Id, deleting *** Displaying differences between ./etc/isdn/tell-record and installed version: --- /etc/isdn/tell-record Mon Nov 20 05:03:05 2000 +++ ./etc/isdn/tell-record Wed Jun 13 08:30:25 2001 @@ -4,9 +4,9 @@ # tell called and calling numbers answer script for i4b isdnd # ----------------------------------------------------------- # -# $FreeBSD: src/etc/isdn/tell-record,v 1.4 1999/09/13 15:44:20 sheldonh Exp $ +# $FreeBSD: src/etc/isdn/tell-record,v 1.4.2.1 2001/03/06 02:42:05 obrien Exp $ # -# last edit-date: [Thu May 20 11:45:21 1999] +# last edit-date: [Tue Oct 31 10:59:49 2000] # #--------------------------------------------------------------------------- VARDIR=/var/isdn @@ -86,4 +86,4 @@ dd of=${DEVICE} if=${LIBDIR}/beep.al bs=2k >/dev/null 2>&1 fi -dd if=${DEVICE} of=${VARDIR}/recorded.msg bs=2k +dd if=${DEVICE} of=${VARDIR}/recorded.msg bs=2k >/dev/null 2>&1 Use 'd' to delete the temporary ./etc/isdn/tell-record Use 'i' to install the temporary ./etc/isdn/tell-record Use 'm' to merge the temporary and installed versions Use 'v' to view the diff results again Default is to leave the temporary file to deal with by hand How should I deal with this? [Leave it for later] i *** Problem installing ./etc/isdn/tell-record, it will remain to merge by hand *** Temp ./etc/isdn/isdnd.rates.D and installed have the same CVS Id, deleting *** Temp ./etc/isdn/isdnd.rates.F and installed have the same CVS Id, deleting *** Temp ./etc/isdn/isdnd.rates.UK.BT and installed have the same CVS Id, deleting *** Temp ./etc/isdn/isdnd.rc.sample and installed have the same CVS Id, deleting *** Temp ./etc/isdn/isdntel.alias.sample and installed have the same CVS Id, deleting *** There is no installed version of ./etc/mail/freebsd.mc Use 'd' to delete the temporary ./etc/mail/freebsd.mc Use 'i' to install the temporary ./etc/mail/freebsd.mc Default is to leave the temporary file to deal with by hand How should I deal with this? [Leave it for later] i *** Problem installing ./etc/mail/freebsd.mc, it will remain to merge by hand To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message