From owner-man-jp-reviewer@jp.freebsd.org  Tue Nov 23 05:59:36 1999
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id FAA32217;
	Tue, 23 Nov 1999 05:59:36 +0900 (JST)
	(envelope-from owner-man-jp-reviewer@jp.FreeBSD.org)
Received: from tkc.att.ne.jp (tkc.att.ne.jp [165.76.16.7])
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) with ESMTP id FAA32212
	for <man-jp-reviewer@jp.freebsd.org>; Tue, 23 Nov 1999 05:59:36 +0900 (JST)
	(envelope-from mzaki@e-mail.ne.jp)
Received: from work.mzaki.nom (130.pool6.tokyo.att.ne.jp [165.76.23.145]) by tkc.att.ne.jp (8.8.8+Spin/3.6W-CONS(10/24/99)) id FAA18147; Tue, 23 Nov 1999 05:59:33 +0900 (JST)
Received: from work.mzaki.nom (localhost [127.0.0.1])
	by work.mzaki.nom (8.9.3/8.9.3) with ESMTP id FAA01205
	for <man-jp-reviewer@jp.freebsd.org>; Tue, 23 Nov 1999 05:59:32 +0900 (JST)
	(envelope-from mzaki@e-mail.ne.jp)
Date: Tue, 23 Nov 1999 05:59:32 +0900
Message-ID: <14393.44724.22751.90839F@tkc.att.ne.jp>
From: Motomichi Matsuzaki <mzaki@e-mail.ne.jp>
To: man-jp-reviewer@jp.freebsd.org
X-Mailer: Wanderlust/2.2.8 (Free As A Bird)
MIME-Version: 1.0 (generated by WEMI 1.13.7 - "Shimada")
Content-Type: multipart/mixed;
 boundary="Multipart_Tue_Nov_23_05:59:31_1999-1"
Reply-To: man-jp-reviewer@jp.freebsd.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+990727
X-Sequence: man-jp-reviewer 1681
Subject: [man-jp-reviewer 1681] mergemaster.8
Errors-To: owner-man-jp-reviewer@jp.freebsd.org
Sender: owner-man-jp-reviewer@jp.freebsd.org
X-Originator: mzaki@e-mail.ne.jp

--Multipart_Tue_Nov_23_05:59:31_1999-1
Content-Type: text/plain; charset=ISO-2022-JP


$B>>:j$G$9!#(B

mergemaster(8) $B$G$9!#(Bmake world $B$9$k?MMQ!#(B

mergemaster(8) $B$O!"(Bmake world $B$7$?$"$H!"(B /etc $B$r99?7$9$k$H$-$K!"(B
$B$$$-$J$j(B /etc $B$K=q$-9~$s$G$$$/$H@_Dj$r>e=q$-$7$A$c$&$N$G!"(B
$BJL$N>l=j$K?7$7$$(B /etc $B$r=q$-9~$s$G$,$s$,$s(B diff $B$r$H$k$H$$$&(B
$B%9%/%j%W%H$J$s$G$9$,!"(B

$B$=$N!VJL$N>l=j!W$r<($9(B
temporary root environment $B$H$$$&%U%l!<%:$d$=$N0!<o$,(B
$B;H$o$l$F$$$k$N$G$9$,!"$I$&F|K\8l$K$7$FNI$$$b$N$d$iG:$s$G$$$^$9!#(B
# $B:#$O!V0l;~E*$J(B root $B4D6-!W(B


$B$=$NB>$K$b$I$&$bI=8=$,$"$d$7$$$H$3$m$,B?$$46$8$G$9!#(B
$BF|K\8l$K$J$C$F$J$$2U=j$b;D$C$F$$$^$9!#(B

-- 
+-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-+
|  $B>>:j(B $BAGF;(B (Motomichi Matsuzaki/maki)     $BEl5~Bg3XM}3XIt@8J*3X2J#4G/(B  |
|  mailto:mzaki@e-mail.ne.jp                    $B:YK&@8M}2=3X8&5f<<=jB0(B  |
+-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-+


--Multipart_Tue_Nov_23_05:59:31_1999-1
Content-Type: text/plain; charset=ISO-2022-JP

.\" Copyright (c) 1998, 1999 Douglas Barton
.\" All rights reserved.
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
.\" are met:
.\" 1. Redistributions of source code must retain the above copyright
.\"    notice, this list of conditions and the following disclaimer.
.\" 2. Redistributions in binary form must reproduce the above copyright
.\"    notice, this list of conditions and the following disclaimer in the
.\"    documentation and/or other materials provided with the distribution.
.\"
.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
.\" 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/usr.sbin/mergemaster/mergemaster.8,v 1.4.2.1 1999/11/03 20:58:47 billf Exp $
.\"
.Dd September 10, 1999
.\" jpman %Id: mergemaster.8,v 0.0 1999/11/19 15:47:56 horikawa Stab %
.Dt MERGEMASTER 8
.Os FreeBSD
.Sh $BL>>N(B
.Nm mergemaster
.Nd $B%"%C%W%0%l!<%ICf$N@_Dj%U%!%$%k$=$NB>$N%^!<%8(B
.Sh $B=q<0(B
.Nm
.Op Fl scrvah
.Op Fl m Ar /path/to/sources
.Op Fl t Ar /path/to/temp/root
.Op Fl d
.Op Fl u Ar N
.Op Fl w Ar N
.Sh $B2r@b(B
.Nm
$B$O!"MM!9$J@_Dj$d(B FreeBSD $B$K4XO"$7$?%U%!%$%k$r%"%C%W%G!<%H$9$k:n6H$r(B
$BJd=u$9$k$?$a$K:n$i$l$?(B Bourne $B%7%'%k%9%/%j%W%H$G$9!#(B
$B$3$N:n6H$r;O$a$kA0$K(B
.Pa /etc
$B%G%#%l%/%H%j$r%P%C%/%"%C%W$7$F$*$/$3$H$r(B
.Sy $B6/$/(B
$B4+$a$^$9!#(B
.Pp
$B$3$N%9%/%j%W%H$O(B
.Pa /usr/src/etc/Makefile
$B$r;H$C$F0l;~E*$J(B root $B4D6-$r(B 
.Pa /
$B$h$j2<$K:n@.$7!"$=$3$KMM!9$J%U%!%$%k$r3JG<$7$^$9!#(B
.Op Fl m
$B%3%^%s%I%i%$%s%*%W%7%g%s$G0c$&%=!<%9%G%#%l%/%H%j$r;XDj$9$k$3$H$b$G$-$^$9!#(B
$B$=$7$F$=$N4D6-Cf$N$=$l$>$l$N%U%!%$%k$r!"(B
$B%$%s%9%H!<%k$5$l$F$$$k$b$N$HHf3S$7$^$9!#(B
$B%9%/%j%W%H$,?7$7$$%U%!%$%k$KJQ99E@$r8+$D$1$?>l9g$d!"(B
$B?7$7$$%U%!%$%k$KBP1~$9$k%$%s%9%H!<%k$5$l$F$$$k%U%!%$%k$,$J$$>l9g$K$O!"(B
$B$=$l$r=hM}$9$k$?$a$N(B 4 $B$D$NA*Br;h$r<($7$^$9!#(B
$B?7$7$$%U%!%$%k$r$=$N$^$^%$%s%9%H!<%k$9$k!"(B
$B?7$7$$%U%!%$%k$O>C$9!"(B
$B?75l$N%U%!%$%k$r(B
.Xr sdiff 1
$B$r;H$C$FE,@Z$K%^!<%8$9$k!"(B
$B8e$G<j$G%^!<%8$9$k$?$a$K%U%!%$%k$r0l;~E*$J(B root $B4D6-$K;D$7$F$*$/!"(B
$B$N$$$:$l$+$rA*$Y$^$9!#(B
.Pp
$B%G%U%)%k%H$G$O!"(B
.Pa /var/tmp/temproot
$B$K0l;~E*$J(B root $B$r:n$j!"(B
.Xr cvs 1
$B%P!<%8%g%s$N(B $Id/$FreeBSD $BJ8;zNs$,$"$k%U%!%$%k$K$D$$$F$O$=$l$rHf3S$7$F!"(B
$B$b$7F1$8$G$"$l$P0l;~%U%!%$%k$r:o=|$7$^$9!#(B
$Id $BJ8;zNs$,$J$$;~$d!"$"$C$F$b0lCW$7$J$$>l9g$K$O!"(B
$B%U%!%$%k$=$N$b$N$rHf3S$7$^$9!#(B
$Id $BJ8;zNs$rL5;k$7$FA4$F$N%U%!%$%k$rHf3S$9$k$h$&$K;XDj$9$k$3$H$b$G$-$^$9!#(B
.Pp
.Nm
$B$O(B umask $B$rD4$Y$F!"(B 022 $B0J30$G$"$l$P7Y9p$r=P$7$^$9!#(B
$BB?$/$N@_Dj%U%!%$%k$O(B world read $B%Q!<%_%C%7%g%s$rM?$($kI,MW$O$"$j$^$;$s$,!"(B
$B$=$&$7$J$$$HLdBj$K$J$k$+$b$7$l$^$;$s!#(B
$B$b$7(B 022 $B0J30(B $B$N(B umask $B$rA*$s$@>l9g!"8e$N%H%i%V%k$N860x$K$J$k$+$b$7$l$^$;$s!#(B
.Pa /etc/master.passwd
$B$OFCNc$H$7$F07$$$^$9!#(B
$B$3$N%U%!%$%k$J$$$7%^!<%8$7$?%U%!%$%k$r%$%s%9%H!<%k$9$k$3$H$rA*Br$9$k$H!"(B
$B$3$N%U%!%$%k$N%Q!<%_%C%7%g%s$O%;%-%e%j%F%#>e$NM}M3$+$i(B
$B>o$K(B 600 (rw-------) $B$K$J$j$^$9!#(B
$B$3$N%U%!%$%k$N%"%C%W%G!<%HHG$r%$%s%9%H!<%k$7$?8e$O!"(B
.Xr pwd_mkdb 8
$B$r(B -p $B%*%W%7%g%sIU$-$G<B9T$7$F!"(B
$B%Q%9%o!<%I%G!<%?%Y!<%9$N:F9=C[$H(B
.Pa /etc/passwd
$B$N:n$jD>$7$r$5$;$J$1$l$P$J$i$J$$$G$7$g$&!#(B
.Pp
$B%9%/%j%W%H$O!"(B
.Pa /usr/src/etc/Makefile
$B$,%U%!%$%k$r:n@.$7$?;~$N=jM-<T$*$h$S%0%k!<%W(B ID $B$H!"(B
umask $B$K$h$C$F;XDj$5$l$?%U%!%$%k%Q!<%_%C%7%g%s$rMQ$$$^$9!#(B
context diff $B$rA*$P$J$$8B$j!"(B
$B%G%U%)%k%H$G(B unified diff $B$r;H$C$F:9J,$rI=<($7$^$9!#(B
.Pp
$B%*%W%7%g%s$O0J2<$NDL$j$G$9(B:
.Bl -tag -width Fl
.It Fl s
$BA4$F$N%U%!%$%k$NBP$K$D$$$F(B diff $B$r$H$j!"87L)$JHf3S$r$7$^$9!#(B
.It Fl c
unified diff $B$NBe$o$j$K(B context diff $B$rMQ$$$^$9!#(B
.It Fl r
.Nm
$B$r0JA0A]=|$7$?%G%#%l%/%H%j$G:F<B9T$9$k$3$H$G!"(B
$B0l;~E*$J(B root $B4D6-$r:n$k$3$H$r>J$-$^$9!#(B
$B$3$N%*%W%7%g%s$OB>$NA4$F$N%*%W%7%g%s$H0l=o$K;H$($^$9!#(B
.It Fl v
$B=hM}$K$D$$$F$h$j>iD9$K=PNO$7$^$9!#(B
$B$"$J$?$,=i$a$F(B
.Nm mergemaster
$B$r<B9T$9$k;~$K$O!"$*$=$i$/$3$N%*%W%7%g%s$rIU$1$k$Y$-$G$7$g$&!#(B
$B$5$i$K$3$N%*%W%7%g%s$O!"(B
$B%$%s%9%H!<%k$5$l$F$$$kJ}$N(B
.Pa /etc
$B$K$7$+$J$$%U%!%$%k$N0lMw$rDs6!$7$^$9!#(B
.It Fl a
$B<+F0<B9T!#(B
$B$3$N%*%W%7%g%s$O%$%s%9%H!<%k$5$l$F$$$k$b$N$H?)$$0c$&A4$F$N%U%!%$%k$r!"(B
$B<j$G=hM}$9$k$?$a$K0l;~%G%#%l%/%H%j$K;D$7$F$*$-$^$9!#(B
$B$b$7$9$G$K(B
.Pa temproot
$B%G%#%l%/%H%j$,$"$k>l9g$K$O!"(B
$B0JA0$O$J$+$C$?%G%#%l%/%H%j$K?7$7$/:n$j$^$9!#(B
$B$3$N%*%W%7%g%s$O>iD9%U%i%0$r2r=|$7$^$9$,!"(B
$BB>$NA4$F$N%*%W%7%g%s$H0l=o$K;H$($^$9!#(B
-a $B%*%W%7%g%s$r;H$&$H!"(B -w $B%*%W%7%g%s$OL50UL#$K$J$j$^$9!#(B
.It Fl h
$B;HMQK!$H%X%k%W>pJs$rI=<($7$^$9!#(B
.It Fl m Ar /path/to/sources
.Xr make 1
$B$r<B9T$9$k%G%#%l%/%H%j$N%Q%9$r;XDj$7$^$9!#(B
$B!J8@$$BX$($k$H%=!<%9$N>l=j$G$9!#(B -s $B$,$b$&;H$o$l$F$$$k$N$G!K(B
.It Fl t Ar /path/to/temp/root
$B0l;~E*$J(B root $B4D6-$r%G%U%)%k%H$N(B
.Pa /var/tmp/temproot
$B$NBe$o$j$K(B
.Pa /path/to/temp/root
$B$K:n$j$^$9!#(B
.It Fl d
$B0l;~E*$J(B root $B%G%#%l%/%H%j$NL>A0$K!"F|IU$H;~4V$rB-$7$^$9!#(B
-t $B%*%W%7%g%s$r;XDj$7$F$$$k$H$-$O!"(B
$BF|IU$rB-$7$?$$$J$i$3$N%*%W%7%g%s$O$=$N8e$m$K$D$1$J$1$l$P$J$j$^$;$s!#(B
.It Fl u Ar N
umask $B$r?t;z$G;XDj$7$^$9!#%G%U%)%k%H$O(B 022 $B$G$9!#(B
.It Fl w Ar N
.Xr sdiff 1
$B%3%^%s%I$K2hLLI}$r7e?t$G;XDj$7$^$9!#(B
$B%G%U%)%k%H$O(B 80 $B$G$9!#(B
.El
.Sh $B4D6-JQ?t(B
.Nm
$B%9%/%j%W%H$O!"(B
.Ev PAGER
$B4D6-JQ?t$,%;%C%H$5$l$F$$$l$P$=$l$r;H$$!"$5$b$J$/$P(B
.Xr more 1
$B$r;H$$$^$9!#(B
$B$b$7(B
.Ev PAGER
$B$K!"%U%k%Q%9$G$O$J$/!"(B
.Ev PATH
$B$NHO0O$K$J$$%W%m%0%i%`$r;XDj$7$F$$$k>l9g$K$O!"(B
.Nm
$B$OA*Br;h$H$H$b$K$I$&B39T$9$k$N$+$r:EB%$7$^$9!#(B
.Sh $B;HMQNc(B
$BBgDq$N>l9g!"$"$J$?$,$9$kI,MW$,$"$k$N$O!"(B
$B%W%m%s%W%H$G(B
.Nm
$B$HBG$D$3$H$@$1$G!"$"$H$O%9%/%j%W%H$,$"$J$?$KBe$o$C$FA4$F$N:n6H$r$7$^$9!#(B
.Pp
context diff $B$r;H$$!"$+$D(B
.Nm
$B$,?JD=$K=>$C$F$?$/$5$s$N@bL@$r$9$k$h$&$K$9$k$K$O(B:
.Pp
.Dl # mergemaster -cv
.Pp
.Nm
$B$,0l;~E*$J(B root $B4D6-$r(B
.Pa /usr/tmp/root
$B$K:n$k$h$&$K;XDj$9$k$K$O(B:
.Pp
.Dl # mergemaster -t /usr/tmp/root
.Pp
110 $B7e$N2hLL$H!"87L)$JHf3S$r;XDj$9$k$K$O(B:
.Pp
.Dl # mergemaster -sw 110
.Sh $B4XO"%U%!%$%k(B
.Bl -tag -width $HOME/.mergemasterrc -compact
.Pa $HOME/.mergemasterrc
.Pp
.Nm
$B$O$3$N%U%!%$%k$,$"$l$PFI$_9~$_$^$9!#(B
$B%3%^%s%I%i%$%s%*%W%7%g%s$O(B rc $B%U%!%$%k%*%W%7%g%s$r>e=q$-$7$^$9!#(B
$BA4$F$NCM$r%3%a%s%H%"%&%H$7$?Nc$r<($7$^$9(B:
.Pp
.Bd -literal
# mergemaster $B$N%*%W%7%g%s$,!"%G%U%)%k%HCM$H$H$b$K0lMw$7$F$"$j$^$9(B
# $B0J2<$N%*%W%7%g%s$O%3%^%s%I%i%$%s$,>e=q$-$7$^$9(B
#
# $B0l;~E*$J(B root $B4D6-$r%$%s%9%H!<%k$9$k%G%#%l%/%H%j(B
#TEMPROOT='/var/tmp/temproot'
#
# CVS $Id $B$N8!::$r>JN,$7$FA4$F$N%U%!%$%k$rHf3S$9$k87L)$JHf3S(B
#STRICT=no
#
# $B%U%!%$%k$,?)$$0c$C$?;~$K:9J,$rI=<($9$k$?$a$N(B diff $B$K;H$&%U%i%0(B
#DIFF_FLAG='-u'
#
# $B$h$j>\:Y$J=PNO$H%A%'%C%/$NDI2C$r4^$a$k>iD9%b!<%I(B
#VERBOSE=
#
# 'make' $B$r<B9T$9$k%G%#%l%/%H%j(B ($B?7$7$$%U%!%$%k$,$"$k>l=j(B)
#SOURCEDIR=/usr/src/etc
#
# mergemaster $B$,%G%U%)%k%H$N%U%!%$%k%b!<%I$H$NHf3S$K;H$&(B umask
#NEW_UMASK=022
#
# $B0J2<$N%*%W%7%g%s$O%3%^%s%I%i%$%s$+$i>e=q$-$G$-$^$;$s(B
# PAGER $B$K%U%k%Q%9$r4^$a$?$/$J$$?MMQ(B
#DONT_CHECK_PAGER=
# $B>e$r(B 'yes' $B$K$7$?$i!"%Z!<%8%c$X$N(B PATH $B$,4^$^$l$F$$$k$+3NG'$7$F$/$@$5$$(B
#PATH=/bin:/usr/bin:/usr/sbin
# $B?75l$N(B motd $B%U%!%$%k$rHf3S$7$J$$(B
#IGNORE_MOTD=yes
.Ed
.Sh $B4XO"9`L\(B
.Xr cvs 1 ,
.Xr diff 1 ,
.Xr make 1 ,
.Xr more 1 ,
.Xr sdiff 1 ,
.Xr pwd_mkdb 8
.Pp
.Pa /usr/src/etc/Makefile
.Pp
http://www.FreeBSD.org/tutorials/,
.Pa Upgrading FreeBSD from source (using make world) ,
by Nik Clayton
.Pp
($BLuCm(B: $BF|K\8lHG$O(B
http://kerberos.math.sci.kobe-u.ac.jp/~maekawa/FreeBSD/mw.html,
.Pa $B$d$C$F$_$h$&$h(B ``make world'' ,
by MAEKAWA Masahide)
.Sh $B?GCG(B
$B@.8y=*N;!"$J$$$7%f!<%6!<$,<B9TCf$K<jF0$GC&=P$7$?>l9g$K$O!"(B
$B=*N;%9%F!<%?%9$O(B 0 $B$G$9!#(B
.Pp
$B0J2<$K5s$2$k$$$:$l$+$NM}M3$G<:GT$7$?>l9g$K$O=*N;%9%F!<%?%9$O(B 1 $B$G$9(B:
.Pp
$B%3%^%s%I%i%$%s%*%W%7%g%s$,IT@5(B
.Pp
$B0l;~E*$J(B root $B4D6-$r:n@.$9$k$N$K<:GT$7$?(B
.Pp
$B0l;~E*$J(B root $B$K%U%!%$%k$r3JG<$9$k$N$K<:GT$7$?!#(B
.Pp
.Sh $BNr;K(B
.Nm
$B%9%/%j%W%H$O!"(B
1998 $BG/(B 3 $B7n(B 13 $BF|$K(B
$B;d$N%&%'%V%Z!<%8$NCf$G(B
$B$b$C$HC1=c$J7A$G(B
.Pa comproot
$B$H$$$&L>A0$G:G=i$K8x3+$5$l$^$7$?!#(B
$B0l;~E*$J(B root $B4D6-$r:n$k$H$$$&%"%$%G%"$O!"(B
$B>e$G;2>H$7$?(B Nik Clayton $B$N(B make world tutorial $B$+$iMh$F$$$^$9!#(B
.Pp
.Sh $B:n<T(B
$B$3$N%^%K%e%"%k%Z!<%8$H%9%/%j%W%H$O(B
.An Douglas Barton Aq Doug@gorean.org
$B$,=q$-$^$7$?!#(B
.Sh $B%P%0(B
$B:#$N=j$o$+$C$F$$$k%P%0$O$"$j$^$;$s!#(B
$B$J$K$+LdBj$d!"%3%a%s%H$d!"Ds0F$,$"$l$P!"$I$&$+:n<T$^$GJs9p$7$F$/$@$5$$!#(B
$B$3$N%W%m%0%i%`$K$J$5$l$?2~NI$N$$$/$D$+$O(B
$B%f!<%6$+$i$NDs0F$K$h$k$b$N$G$9!#$"$j$,$H$&!#(B

--Multipart_Tue_Nov_23_05:59:31_1999-1--
