DELTA 249735 0 1131 SVN jfW^}25: The mergemaster command now uses the default MAKEOBJDIRPREFIX rather than creating it's own in the temporary directory in order allow access to bootstrapped versions of tools such as install and mtree. When upgrading from version of FreeBSD where the install command does not support -l, you will need to install a new mergemaster command if mergemaster -p is required. This can be accomplished with the command (cd src/usr.sbin/mergemaster && make install).130425 or from -stable before 20130430ENDREP DELTA 243892 0 1197 SVNSw75?5${MM_MAKE} DESTDIR=${TEMPROOT} distrib-dirs >/dev/null && ${MM_MAKE} _obj SUBDIR_OVERRIDE=etc >/dev/null && ${MM_MAKE} everything SUBDIR_OVERRIDE=etc >/dev/null && ENDREP id: 1-41806.0.r249906/813 type: file pred: 1-41806.0.r249735/1158 count: 761 text: 249906 0 546 76138 694fe808ae8e4fbf9dca861c61f2e1ac cbc0e59711cceaee576e194eb1cc05a20274ac9d 249905-5ctv/_2 props: 179315 96310 38 0 b6b34f029ed66be42751a530d6e4b830 cpath: /head/UPDATING copyroot: 0 / id: d-52400.2-52401.r249906/1099 type: file pred: d-52400.2-52401.r243892/1226 count: 93 text: 249906 573 213 39927 f35c57ac547273900e5ca76e5f9d20a1 4cb48755b8a9c35f1a20a0809eb7a48c3397fd11 249905-5ctv/_5 props: 179315 70170 64 0 a0283a89aab39edd4cfb26f6b28671ff cpath: /head/usr.sbin/mergemaster/mergemaster.sh copyroot: 52401 /head/usr.sbin/mergemaster/mergemaster.sh PLAIN K 8 Makefile V 26 file 4-52403.0.r115821/171 K 13 mergemaster.8 V 33 file b-52400.1-52401.r227013/1724 K 14 mergemaster.sh V 33 file d-52400.2-52401.r249906/1099 END ENDREP id: 2-52401.0.r249906/1649 type: dir pred: 2-52401.0.r243892/1774 count: 138 text: 249906 1470 166 166 548b7c903dc5dd47d2305e4e9c10bbd6 cpath: /head/usr.sbin/mergemaster copyroot: 0 / PLAIN K 9 IPXrouted V 26 dir 2-11820.0.r231817/1360 K 8 Makefile V 31 file 24-1553.6-1554.r249090/641 K 14 Makefile.amd64 V 29 file 4-212525.0.r245652/87687 K 12 Makefile.arm V 27 file 6-212525.0.r232908/439 K 13 Makefile.i386 V 27 file 8-212525.0.r244859/574 K 13 Makefile.ia64 V 30 file a-212525.0.r241680/112297 K 12 Makefile.inc V 33 file 27-1553.7-1554.r201390/43477 K 13 Makefile.mips V 29 file c-212525.0.r233644/35649 K 16 Makefile.powerpc V 30 file g-212525.0.r241680/112598 K 16 Makefile.sparc64 V 27 file i-212525.0.r244859/874 K 2 ac V 24 dir b-1554.0.r248413/655 K 6 accton V 26 dir d-1554.0.r201390/92943 K 4 acpi V 27 dir 1l-65047.0.r249821/2109 K 7 adduser V 24 dir 2-5263.0.r240530/762 K 3 amd V 26 dir f-1554.0.r231118/16987 K 9 ancontrol V 26 dir 1k-55992.0.r238221/640 K 3 apm V 24 dir 2-3259.0.r227249/940 K 4 apmd V 27 dir 2-48731.0.r237015/15388 K 3 arp V 27 dir 15-1554.0.r246143/39695 K 8 arpaname V 28 dir w-224093.0.r224093/30864 K 3 asf V 29 dir 2-116009.0.r206622/239756 K 5 audit V 28 dir 4-155213.0.r201390/92261 K 6 auditd V 28 dir 8-155213.0.r204352/20883 K 10 auditdistd V 28 dir l-243752.0.r249657/45177 K 11 auditreduce V 28 dir c-155213.0.r201390/32353 K 6 authpf V 30 dir 18-126385.0.r240494/122068 K 5 bhyve V 35 dir 3i-221828.a-245652.r249813/3276 K 8 bhyvectl V 35 dir 52-221828.b-245652.r248935/9299 K 9 bhyveload V 33 dir 5-223828.c-245652.r248492/951 K 9 bluetooth V 29 dir 58-107120.0.r249657/47342 K 8 boot0cfg V 27 dir 2-44197.0.r233455/17324 K 9 boot98cfg V 25 dir 4-64126.0.r174764/566 K 10 bootparamd V 26 dir 2-6752.0.r233510/85903 K 9 bsdconfig V 27 dir c-238438.0.r249827/1961 K 10 bsdinstall V 28 dir 7-218799.0.r248612/15586 K 6 bsnmpd V 29 dir 1h-122405.0.r249657/48972 K 5 btxld V 27 dir 2-39093.0.r201390/29595 K 9 cdcontrol V 28 dir 4-10099.0.r233648/264165 K 6 chkgrp V 26 dir 2-36332.0.r243085/1530 K 5 chown V 25 dir 19-1554.0.r227251/930 K 6 chroot V 26 dir 1b-1554.0.r241330/2465 K 6 ckdist V 28 dir 2-21919.0.r213573/161935 K 11 clear_locks V 29 dir 4m-177633.0.r208291/91682 K 6 config V 27 dir 1d-1554.0.r249657/50145 K 10 cpucontrol V 28 dir 19-181430.0.r245491/1445 K 9 crashinfo V 26 dir 4-181335.0.r232666/792 K 4 cron V 25 dir 2-2312.0.r242101/5872 K 6 crunch V 25 dir 2-1723.0.r246346/1438 K 6 ctladm V 29 dir 2y-229997.0.r249373/85178 K 3 ctm V 25 dir 2-2887.0.r228659/1082 K 6 daemon V 26 dir 4-82547.0.r244986/2313 K 9 dconschat V 28 dir 1b-121468.0.r233195/3017 K 12 ddns-confgen V 29 dir 10-224093.0.r224093/32655 K 7 devinfo V 26 dir 2-75752.0.r227252/1043 K 7 digictl V 27 dir 3i-76195.0.r236500/9590 K 8 diskinfo V 29 dir 4-113287.0.r241844/107592 K 16 dnssec-dsfromkey V 29 dir pk-193149.0.r201390/41428 K 19 dnssec-keyfromlabel V 29 dir po-193149.0.r201390/47803 K 13 dnssec-keygen V 28 dir u-135569.0.r201390/21654 K 13 dnssec-revoke V 29 dir 14-224093.0.r224093/28509 K 14 dnssec-settime V 29 dir 18-224093.0.r224093/34830 K 15 dnssec-signzone V 28 dir y-135569.0.r224093/29048 K 7 dumpcis V 28 dir 4-185032.0.r201390/73525 K 7 editmap V 27 dir 4-90797.0.r201390/77638 K 7 edquota V 25 dir 1n-1554.0.r243321/635 K 6 eeprom V 27 dir 2-129590.0.r203972/5080 K 9 etcupdate V 26 dir j-238423.0.r238428/690 K 7 extattr V 29 dir 2-102607.0.r248995/113927 K 10 extattrctl V 26 dir 4-59247.0.r216292/1234 K 6 faithd V 27 dir 1y-56668.0.r233522/8466 K 9 fdcontrol V 25 dir 2-4008.0.r208593/2092 K 8 fdformat V 25 dir 2-1023.0.r218910/2945 K 6 fdread V 25 dir 2-76590.0.r227253/929 K 7 fdwrite V 26 dir 2-2850.0.r233510/90408 K 7 fifolog V 28 dir 2-176998.0.r249657/51797 K 7 flowctl V 27 dir 4-135380.0.r236808/1444 K 14 freebsd-update V 28 dir h-161748.0.r235873/41287 K 9 ftp-proxy V 30 dir 18-171173.0.r240494/123060 K 9 fwcontrol V 27 dir 4-108441.0.r236500/8935 K 9 genrandom V 29 dir 1e-224093.0.r224093/32035 K 7 getfmac V 29 dir 4-105756.0.r201390/123934 K 7 getpmac V 28 dir c-105756.0.r201390/94242 K 7 gpioctl V 28 dir 4-213238.0.r241737/80205 K 4 gssd V 27 dir 63-184588.0.r245051/964 K 5 gstat V 29 dir 4-112444.0.r201390/130013 K 3 i2c V 28 dir 4-187712.0.r235873/42586 K 8 ifmcstat V 27 dir 1i-55163.0.r245015/1003 K 5 inetd V 25 dir 1r-1554.0.r245696/921 K 6 iostat V 26 dir 1t-1554.0.r244271/1616 K 10 ip6addrctl V 28 dir 4-121748.0.r241737/80936 K 8 ipfwpcap V 26 dir 2-151427.0.r238612/975 K 14 isc-hmac-fixup V 29 dir 1i-224093.0.r224093/29707 K 6 isfctl V 28 dir r-239685.0.r239685/69724 K 4 jail V 28 dir 2o-46155.0.r249657/52824 K 5 jexec V 28 dir b-113277.0.r201390/85285 K 3 jls V 27 dir j-113277.0.r232613/1085 K 10 kbdcontrol V 26 dir 2-2088.0.r228976/13622 K 6 kbdmap V 24 dir 2-7303.0.r237257/649 K 7 keyserv V 27 dir 2-26235.0.r239991/54070 K 5 kgmon V 25 dir 1v-1554.0.r246792/988 K 5 kgzip V 28 dir 2-48906.0.r140442/132774 K 7 kldxref V 26 dir 4-83322.0.r242277/1004 K 9 lastlogin V 26 dir 4-68723.0.r222767/2270 K 9 lmcconfig V 26 dir f-150850.0.r239988/751 K 3 lpr V 25 dir z-1553.0.r242091/5869 K 10 lptcontrol V 27 dir 2-2471.0.r201390/121864 K 9 mailstats V 28 dir 2-38095.0.r201390/103671 K 11 mailwrapper V 25 dir 7-54817.0.r213749/710 K 6 makefs V 35 dir 1-185222.0-186335.r249373/86469 K 7 makemap V 28 dir 2-38097.0.r201390/144851 K 6 manctl V 26 dir 2-1367.0.r99968/128409 K 10 memcontrol V 25 dir 2-45411.0.r241829/885 K 11 mergemaster V 26 dir 2-52401.0.r249906/1649 K 7 mfiutil V 27 dir e-196200.0.r249258/1029 K 5 mixer V 25 dir 2-6449.0.r230611/1920 K 9 mld6query V 26 dir 2-62915.0.r216586/2061 K 10 mlxcontrol V 28 dir 2-59139.0.r229997/281545 K 11 mount_smbfs V 27 dir q-87874.0.r201390/21092 K 6 mountd V 25 dir 5g-1558.0.r247034/673 K 6 moused V 27 dir 2-16566.0.r248478/61914 K 7 mptable V 25 dir 2-25265.0.r244530/665 K 7 mptutil V 28 dir 4-196212.0.r249373/87563 K 5 mtest V 27 dir 2-20530.0.r244538/21136 K 5 mtree V 27 dir 2j-1554.0.r245241/21844 K 5 named V 24 dir 2-2981.0.r246627/446 K 15 named-checkconf V 29 dir 2r-135549.0.r224093/34168 K 15 named-checkzone V 29 dir 2v-135549.0.r201390/69633 K 18 named-journalprint V 29 dir 1q-224093.0.r224093/33285 K 7 nandsim V 27 dir 57-235537.0.r249744/826 K 8 nandtool V 28 dir 5p-235537.0.r235544/6858 K 7 ndiscvt V 28 dir 2-123475.0.r243906/23713 K 3 ndp V 28 dir 24-55505.0.r246143/40332 K 9 newsyslog V 26 dir 2-13245.0.r248776/3068 K 6 nfscbd V 28 dir 4-192811.0.r243238/13483 K 4 nfsd V 25 dir 5s-1558.0.r246781/928 K 12 nfsdumpstate V 26 dir c-192811.0.r210272/549 K 9 nfsrevoke V 27 dir k-192811.0.r193070/4553 K 8 nfsuserd V 27 dir s-192811.0.r223382/1326 K 5 ngctl V 27 dir 8t-52419.0.r216588/2827 K 6 nghook V 28 dir 9n-52419.0.r201390/67815 K 6 nmtree V 27 dir 5-244562.0.r249293/7719 K 7 nologin V 26 dir 60-1558.0.r169439/1113 K 4 nscd V 28 dir 3q-158115.0.r238095/2295 K 9 nsec3hash V 29 dir 1u-224093.0.r224093/35453 K 3 ntp V 27 dir 2-54552.0.r235337/23252 K 5 nvram V 27 dir 11-160892.0.r239733/724 K 7 ofwdump V 29 dir 2-105401.0.r201390/129367 K 13 pc-sysinstall V 27 dir 7-209513.0.r249094/5002 K 7 pciconf V 25 dir 2-19103.0.r246632/785 K 8 periodic V 26 dir 2-28113.0.r231568/1678 K 3 pkg V 26 dir 4-234313.0.r248133/899 K 11 pkg_install V 24 dir 2-328.0.r245837/2781 K 11 pmcannotate V 28 dir 4-185347.0.r249375/21287 K 10 pmccontrol V 29 dir 31-145256.0.r241737/87223 K 7 pmcstat V 29 dir 39-145256.0.r241737/89499 K 7 pnpinfo V 27 dir 2-29619.0.r201390/63741 K 8 portsnap V 27 dir h-148871.0.r244165/1752 K 6 powerd V 26 dir 2-142577.0.r234070/570 K 3 ppp V 27 dir 37-6059.0.r249582/78865 K 6 pppctl V 28 dir 4-27008.0.r206622/238921 K 9 praliases V 27 dir 2-38096.0.r201390/18412 K 7 praudit V 29 dir g-155213.0.r201390/107729 K 7 procctl V 27 dir b-31565.0.r201390/25635 K 5 pstat V 27 dir 2n-1554.0.r225847/22501 K 2 pw V 26 dir 2-20254.0.r246192/1912 K 8 pwd_mkdb V 25 dir 2p-1554.0.r227257/651 K 4 quot V 27 dir 2r-1554.0.r241015/17168 K 7 quotaon V 27 dir 2t-1554.0.r241737/90217 K 5 rarpd V 24 dir 2-6824.0.r249234/934 K 8 repquota V 27 dir 2v-1554.0.r241737/90939 K 9 rip6query V 26 dir 1y-55163.0.r227258/674 K 3 rmt V 25 dir 2x-1554.0.r227259/869 K 4 rndc V 29 dir 33-135549.0.r224093/31390 K 12 rndc-confgen V 29 dir 37-135549.0.r224093/27853 K 7 route6d V 27 dir 26-55163.0.r243242/1045 K 9 rpc.lockd V 26 dir 5-14124.0.r240350/2178 K 9 rpc.statd V 27 dir 5-14126.0.r231118/19910 K 11 rpc.umntall V 27 dir 4-53494.0.r201390/54196 K 13 rpc.yppasswdd V 27 dir 2-14063.0.r231994/28467 K 13 rpc.ypupdated V 27 dir 2-26237.0.r231118/21586 K 10 rpc.ypxfrd V 27 dir 2-16126.0.r231118/25289 K 7 rpcbind V 28 dir 7c-74462.0.r244538/22295 K 7 rrenumd V 28 dir 2e-55505.0.r201390/65243 K 8 rtadvctl V 35 dir 6-224006.0-224144.r235873/39709 K 6 rtadvd V 27 dir 2u-55505.0.r247863/1935 K 6 rtprio V 24 dir 4-2447.0.r241061/919 K 6 rtsold V 26 dir 2m-55163.0.r230357/778 K 5 rwhod V 27 dir 2z-1554.0.r240506/40266 K 2 sa V 24 dir 2-3126.0.r228681/764 K 8 sendmail V 27 dir 31-1554.0.r246880/24346 K 7 service V 27 dir 4-200743.0.r244132/1193 K 13 services_mkdb V 28 dir 4-206156.0.r249373/88331 K 6 setfib V 28 dir 2l-178888.0.r236509/8730 K 7 setfmac V 29 dir i-105756.0.r206622/242441 K 7 setpmac V 29 dir q-105756.0.r206622/237616 K 9 sicontrol V 26 dir 2-10045.0.r179668/2667 K 6 smbmsg V 28 dir 2-129331.0.r235873/40604 K 8 snapinfo V 28 dir 2-148197.0.r241015/17819 K 8 spkrtest V 24 dir 2-3763.0.r217364/516 K 5 spray V 25 dir 2-13243.0.r227261/714 K 7 syslogd V 26 dir 4f-1554.0.r244523/1268 K 5 sysrc V 27 dir 7-241149.0.r246546/2015 K 7 tcpdchk V 27 dir 4-44747.0.r201390/17211 K 9 tcpdmatch V 27 dir 8-44747.0.r201390/26861 K 7 tcpdrop V 27 dir 8-141381.0.r246129/1406 K 7 tcpdump V 23 dir u-3.0.r241235/40230 K 5 timed V 26 dir 4h-1554.0.r249771/1730 K 10 traceroute V 26 dir 4t-1554.0.r216184/6263 K 11 traceroute6 V 26 dir 34-55163.0.r235138/681 K 4 trpt V 26 dir 4v-1554.0.r189090/9126 K 7 tzsetup V 24 dir 2-2751.0.r247780/719 K 8 uathload V 26 dir t-190688.0.r218749/778 K 6 ugidfw V 28 dir 4-101209.0.r210641/39595 K 7 uhsoctl V 26 dir r-202181.0.r229467/523 K 9 usbconfig V 29 dir j4-184610.0.r248236/17548 K 7 usbdump V 26 dir 2-215651.0.r238279/462 K 3 utx V 33 dir 8-218847.0-231530.r235967/557 K 10 vidcontrol V 26 dir 2-2089.0.r241737/91732 K 4 vipw V 25 dir 51-1554.0.r231648/950 K 4 wake V 26 dir 4-195200.0.r232102/729 K 5 watch V 24 dir 9-6521.0.r232781/671 K 9 watchdogd V 26 dir n-116874.0.r249245/582 K 9 wlandebug V 30 dir 12-153317.0.r233648/260158 K 8 wlconfig V 27 dir 2-26006.0.r233522/10121 K 3 wpa V 27 dir 2-147020.0.r242696/2060 K 7 yp_mkdb V 25 dir 2-15424.0.r228722/655 K 6 ypbind V 24 dir 2-1927.0.r226690/686 K 6 yppoll V 25 dir 4-1929.0.r203972/4033 K 6 yppush V 27 dir 2-13395.0.r231118/26067 K 6 ypserv V 27 dir 2-12892.0.r244538/23548 K 5 ypset V 26 dir a-1929.0.r201390/24997 K 3 zic V 26 dir 2-2703.0.r223758/54396 K 3 zzz V 28 dir 2-117557.0.r130420/15225 END ENDREP id: q-3.0.r249906/12558 type: dir pred: q-3.0.r249827/12869 count: 13496 text: 249906 1834 10711 10711 6dec8e2337fed3932a947892f70f14f8 cpath: /head/usr.sbin copyroot: 0 / minfo-cnt: 9 PLAIN K 9 COPYRIGHT V 25 file 1-2656.0.r244900/131 K 5 LOCKS V 26 file 1-146890.0.r244822/91 K 11 MAINTAINERS V 25 file 1-94742.0.r248805/98 K 8 Makefile V 30 file 3-1594.0-1595.r249395/279 K 13 Makefile.inc1 V 25 file 5-38666.0.r249893/70 K 17 ObsoleteFiles.inc V 27 file 4-148330.0.r249473/859 K 6 README V 26 file 1-21173.0.r215293/415 K 8 UPDATING V 26 file 1-41806.0.r249906/813 K 3 bin V 22 dir 1-5.0.r249811/3738 K 4 cddl V 27 dir 1-168404.0.r249884/6709 K 7 contrib V 26 dir 1-16755.0.r249896/6797 K 6 crypto V 27 dir 1-25405.0.r249839/17722 K 3 etc V 23 dir 1-38.0.r249732/5138 K 5 games V 25 dir 1-2491.0.r248580/2553 K 3 gnu V 22 dir 1-3.0.r249880/2379 K 7 include V 24 dir 1-697.0.r249802/5477 K 9 kerberos5 V 27 dir 4q-29815.0.r246657/2052 K 3 lib V 22 dir 6-5.0.r249905/5991 K 7 libexec V 22 dir c-5.0.r249525/4215 K 7 release V 25 dir 1-3027.0.r249733/2865 K 6 rescue V 28 dir 7-117035.0.r249083/15761 K 4 sbin V 23 dir fa-4.0.r249904/5406 K 6 secure V 27 dir r-1553.0.r248619/107352 K 5 share V 22 dir e-3.0.r249863/2934 K 3 sys V 22 dir g-5.0.r249903/9965 K 5 tools V 26 dir 43-1590.0.r249594/5781 K 7 usr.bin V 23 dir m-3.0.r249806/12186 K 8 usr.sbin V 23 dir q-3.0.r249906/12558 END ENDREP id: 5-1.0.r249906/13953 type: dir pred: 5-1.0.r249905/7379 count: 174536 text: 249906 12744 1196 1196 d5e846aa949d7de83f56ae8c1ed25f4f props: 233713 14925 417 0 fe95f2ac252be6f08902a979c27a022c cpath: /head copyroot: 0 / minfo-cnt: 127 minfo-here: y PLAIN K 11 ROADMAP.txt V 27 file 0-179453.0.r221478/293 K 7 cvs2svn V 23 dir 0-1.0.r177821/70859 K 4 head V 23 dir 5-1.0.r249906/13953 K 8 projects V 23 dir 6-1.0.r249855/15848 K 7 release V 22 dir 7-1.0.r243808/2800 K 6 releng V 22 dir 8-1.0.r249842/6876 K 6 stable V 23 dir 9-1.0.r249900/45375 K 8 svnadmin V 27 dir 0-179447.0.r249861/1812 K 4 user V 23 dir a-1.0.r249890/28874 K 6 vendor V 22 dir b-1.0.r249728/7719 K 13 vendor-crypto V 26 dir 0-1575.0.r249838/22266 K 10 vendor-sys V 27 dir 0-12116.0.r249857/18790 END ENDREP id: 0.0.r249906/14734 type: dir pred: 0.0.r249905/8157 count: 249906 text: 249906 14204 517 517 8f1a18d09a79aea4eed38382c08f88e7 cpath: / copyroot: 0 / minfo-cnt: 33393 1-41806.0.t249905-5ctv modify-file true false /head/UPDATING d-52400.2-52401.t249905-5ctv modify-file true false /head/usr.sbin/mergemaster/mergemaster.sh 14734 14904