From owner-ports-jp@jp.FreeBSD.org Tue Aug 10 19:20:12 2004
Received: (from daemon@localhost)
	by castle.jp.FreeBSD.org (8.11.6p2+3.4W/8.11.3) id i7AAKCb84447;
	Tue, 10 Aug 2004 19:20:12 +0900 (JST)
	(envelope-from owner-ports-jp@jp.FreeBSD.org)
Received: from blade100.tutrp.tut.ac.jp (blade100.tutrp.tut.ac.jp [133.15.67.5])
	by castle.jp.FreeBSD.org (8.11.6p2+3.4W/8.11.3) with ESMTP/inet id i7AAKC884442
	for <ports-jp@jp.freebsd.org>; Tue, 10 Aug 2004 19:20:12 +0900 (JST)
	(envelope-from nakaji@tutrp.tut.ac.jp)
Received: from roddy.acest.tutrp.tut.ac.jp (roddy.acest.tutrp.tut.ac.jp [133.15.67.28])
	by blade100.tutrp.tut.ac.jp (8.12.11/8.12.11) with ESMTP id i7AAJxdL001976
	for <ports-jp@jp.freebsd.org>; Tue, 10 Aug 2004 19:19:59 +0900 (JST)
To: FreeBSD Ports JP <ports-jp@jp.FreeBSD.org>
From: NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp>
MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka")
Content-Type: text/plain; charset=ISO-2022-JP
Message-ID: <87hdrb1ei8.fsf@roddy.acest.tutrp.tut.ac.jp>
User-Agent: T-gnus/6.17.3 (based on No Gnus v0.3) SEMI/1.14.6 (Maruoka) FLIM/1.14.6 (Marutamachi) APEL/10.6 Emacs/21.3 (i386--freebsd) MULE/5.0 (SAKAKI)
Reply-To: ports-jp@jp.FreeBSD.org
Precedence: list
Date: Tue, 10 Aug 2004 19:19:59 +0900
X-Sequence: ports-jp 14932
Subject: [ports-jp 14932] [Q] patch =?ISO-2022-JP?B?GyRCJEskRBsoQg==?=
 =?ISO-2022-JP?B?GyRCJCQkRhsoQg==?= 
Sender: owner-ports-jp@jp.FreeBSD.org
X-Originator: nakaji@tutrp.tut.ac.jp
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+040806

$BCf<#!wK-66$G$9!#(B

$BGyA3$H$7$?%5%V%8%'%/%H$G$9$_$^$;$s!#(B

$B!{$d$j$?$$$3$H!'(B

japanese/samba $B$K!"(Bnet/samba $B$G;H$C$F$$$k(B

.if defined(WITH_JAIL)
# This patch was originally created by Gerhard Sittig <Gerhard.Sittig@gmx.net>
# See PR ports/22316
# Reworked/updated and portsified by anders@FreeBSD.org, 2003-11-08
PATCH_SITES+=	ftp://totem.fix.no/pub/mirrors/misc/:smbjail \
		ftp://ftp.nuug.no/pub/anders/distfiles/:smbjail
PATCHFILES+=	samba-2.2.10-freebsd-jail-patch-20040806.gz:smbjail
.endif

$B$rDI2C$7$?$$!#(B

$B!{;n$7$?$3$H!'(B

Index: Makefile
===================================================================
RCS file: /net/boggy/home/ncvs/ports/japanese/samba/Makefile,v
retrieving revision 1.43
diff -u -u -r1.43 Makefile
--- Makefile	5 Aug 2004 16:45:51 -0000	1.43
+++ Makefile	10 Aug 2004 10:01:50 -0000
@@ -16,6 +16,16 @@
 MASTER_SITE_SUBDIR=	${PORTNAME}-${SAMBA_VERSION}-ja
 DISTNAME=	${PORTNAME}-${SAMBA_VERSION}-ja-${SAMBA_JA_VERSION}
 
+.if defined(WITH_JAIL)
+# This patch was originally created by Gerhard Sittig <Gerhard.Sittig@gmx.net>
+# See PR ports/22316
+# Reworked/updated and portsified by anders@FreeBSD.org, 2003-11-08
+PATCH_SITES+=	ftp://totem.fix.no/pub/mirrors/misc/:smbjail \
+		ftp://ftp.nuug.no/pub/anders/distfiles/:smbjail
+PATCHFILES+=	samba-2.2.10-freebsd-jail-patch-20040806.gz:smbjail
+PATCH_DIST_STRIP=	-p1
+.endif
+
 MAINTAINER=	nakaji@jp.FreeBSD.org
 COMMENT=	A free SMB and CIFS client and server for UNIX
 

$B$H$7$F$_$?$i!"(B

$ make patch WITH_JAIL=yes
===>  Extracting for ja-samba-2.2.10.j1.0
>> Checksum OK for samba-2.2.10-ja-1.0.tar.bz2.
>> Checksum OK for samba-2.2.10-freebsd-jail-patch-20040806.gz.
===>  Patching for ja-samba-2.2.10.j1.0
===>  Applying distribution patches for ja-samba-2.2.10.j1.0
1 out of 1 hunks failed--saving rejects to utils/smbpasswd.c.rej
*** Error code 1

Stop in /home/nakaji/work/ports/japanese/ja-samba.
*** Error code 1

Stop in /home/nakaji/work/ports/japanese/ja-samba.

$B$H$$$&%(%i!<$K$J$C$?!#(B

$B!{9M$($i$l$kM}M3!'(B

files/patch-* $B$O(B work/samba-2.2.10-ja-1.0/source $B$G(Bpatch -p0 $B$GEv$?$k$h$&(B
$B$K:n$C$F$"$k$,!">e5-$N(B jail-patch $B$O!"(Bwork/samba-2.2.10-ja-1.0 $B$G(B patch
-p0 $B$GEv$?$k$h$&$K$J$C$F$$$k$+$i!"$3$l$OEvA3$N5sF0$G$"$k!#(B

$B!{LdBj!'(B

$B$3$s$J$H$-!"$I$&$9$k$N$,$h$$$G$7$g$&$+(B? $B<!$N(B4$B$D$N2DG=@-$r9M$($F$_$^$7$?$,!"(B
$B%*%9%9%a$O$I$l$G$7$g$&(B?

1. WRKSRC $B$,(B work/samba-2.2.10-ja-1.0 $B$K$J$k$h$&$K(B files/patch-* $B$r=$@5$9(B
   $B$k(B ($BLLE]$@$1$I<j7x$$(B)
2. $B$A$C$A$C$A!#$3$NJQ?t(B($B$"$k$$$O(Bmake$B$N5;(B)$B$r;H$($P%P%C%A%j$5!#$J$s$F$b$N$,(B
   $BB8:_$9$k(B ($B$3$l$O%9%^!<%H$@(B)
3. samba-2.2.x $B$J$s$+$b$&$($($d$s!"$H8@$C$F<N$F$k(B ($B$=$l$O$=$l$GLdBj$,!D(B)
4. $B$=$NB>(B ($B2?$+$"$j$^$9$+(B?)
-- 
NAKAJI Hiroyuki ($BCf<#(B $B909T(B)
