From owner-ports-jp@jp.freebsd.org  Mon Feb  5 04:44:15 2001
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id EAA54430;
	Mon, 5 Feb 2001 04:44:15 +0900 (JST)
	(envelope-from owner-ports-jp@jp.FreeBSD.org)
Received: from m08.alpha-net.ne.jp (m08.alpha-net.ne.jp [210.229.64.38])
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) with ESMTP id EAA54425
	for <ports-jp@jp.FreeBSD.org>; Mon, 5 Feb 2001 04:44:15 +0900 (JST)
	(envelope-from sf@FreeBSD.org)
Received: from kyoto-tc012-p138.alpha-net.ne.jp (kyoto-tc012-p138.alpha-net.ne.jp [210.237.118.172])
	by m08.alpha-net.ne.jp (8.9.3/3.7W) with ESMTP id EAA05543
	for <ports-jp@jp.FreeBSD.org>; Mon, 5 Feb 2001 04:44:01 +0900 (JST)
Received: from souffle.bogus-local.net (localhost [127.0.0.1])
	by kyoto-tc012-p138.alpha-net.ne.jp (Postfix) with ESMTP id 632A716B41
	for <ports-jp@jp.FreeBSD.org>; Mon,  5 Feb 2001 04:44:01 +0900 (JST)
Date: Mon, 05 Feb 2001 04:44:00 +0900
Message-ID: <86itmqxmgv.wl@cheerful.com>
From: FUJISHIMA Satsuki <sf@FreeBSD.org>
To: ports-jp@jp.FreeBSD.org
User-Agent: Wanderlust/2.4.0 (Rio) SEMI/1.13.7 (Awazu) FLIM/1.13.2 (Kasanui) Emacs/20.7 (i386--freebsd) MULE/4.1 (AOI)
MIME-Version: 1.0 (generated by SEMI 1.13.7 - "Awazu")
Content-Type: text/plain; charset=ISO-2022-JP
Reply-To: ports-jp@jp.freebsd.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+000315
X-Sequence: ports-jp 10705
Subject: [ports-jp 10705] ja-msdosfs
Errors-To: owner-ports-jp@jp.freebsd.org
Sender: owner-ports-jp@jp.freebsd.org
X-Originator: sf@FreeBSD.org

japanese/msdosfs$B$,(B-CURRENT$B$G:n$l$J$/$J$C$?$N$G8+$F$_$^$7$?!%(B

$B$3$l$O(BJan 24 2001$B$N(Bsimplelock$BGQ;_$K$h$k$b$N$G!$(Bmake patch$B8e$K(B
msdos_denode.c$B$H(Bmsdos_vfsops.c$B$K$=$ND>A0$N(Brevision$B$H$N:9J,$rDI2C$7$FEv(B
$B$F$F$d$k$3$H$GF0$/$b$N$,$G$-$^$7$?!%(B

$B9,$$$K$7$F(Bmsdosfs$B$X$NJQ99$N(B5$B;~4V8e$K(Blibc_r$B$NJQ99$KH<$&(BOSVERSION bump$B$,(B
$B5/$3$C$F$$$^$9$N$G!$$[$\LdBj$J$7$H$_$F$3$l$KJX>h$7$F;H$C$F$$$^$9!%(B

port$B$G$O:G?7$G$J$$(B-CURRENT$B$O%5%]!<%H$7$J$/$F$h$7$H$$$&$3$H$K$J$C$F$$$^(B
$B$9$,!$$3$&$d$C$FHs8_49$JJQ99$,@8$8$k$?$S$K(Bpatch$B$rDI2C$7$F$$$/$H$$$&$N(B
$B$b$^$??M$NF;$+$H;W$$$^$9!%(B

$B$b$C$HH~$7$/D>$7$A$c$&?MJg=8(B($BK\2;(B)

-- 
FUJISHIMA Satsuki

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/japanese/msdosfs/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- Makefile	2000/10/28 08:37:17	1.6
+++ Makefile	2001/02/04 04:14:04
@@ -28,6 +28,10 @@
 LAST_UPDATED=	20001022
 PATCHDIR=	${MASTERDIR}/patches.5
 NO_PACKAGE=	"to avoid crashing a machine when try to install incorrect version"
+.if ${OSVERSION} >= 500016
+LAST_UPDATED=	20010124
+PATCHES_ADD=	${PATCHDIR}/500016.diff
+.endif
 .else
 LAST_UPDATED=	20001007
 BROKEN=		"It may not work with your FreeBSD version (but I'm not sure)"
@@ -38,6 +42,11 @@
 	cd ${WRKDIR}/mount_msdos ; co RCS/*,v
 	${LN} -s ${WRKSRC} ${WRKSRC}/msdosfs
 	${LN} -s ${WRKSRC}/msdosfsmount.h ${WRKDIR}/mount_msdos
+
+post-patch:
+.for i in ${PATCHES_ADD}
+	${PATCH} ${PATCH_ARGS} < $i
+.endfor
 
 pre-build:
 	@if [ ! -d /sys -o ! -d /usr/src/sys ]; then \
Index: patches.5/500016.diff
===================================================================
RCS file: 500016.diff
diff -N 500016.diff
--- /dev/null	Sun Feb  4 13:15:00 2001
+++ 500016.diff	Sun Feb  4 13:28:42 2001
@@ -0,0 +1,62 @@
+--- msdosfs_denode.c.orig	Sun Feb  4 13:14:07 2001
++++ msdosfs_denode.c	Sun Feb  4 13:14:07 2001
+@@ -61,0 +62 @@
++#include <sys/mutex.h>
+@@ -66,2 +66,0 @@
+-#include <machine/mutex.h>
+-
+@@ -80,3 +79 @@
+-#ifndef NULL_SIMPLELOCKS
+-static struct simplelock dehash_slock;
+-#endif
++static struct mtx dehash_mtx;
+@@ -113 +110 @@
+-	simple_lock_init(&dehash_slock);
++	mtx_init(&dehash_mtx, "msdosfs dehash", MTX_DEF);
+@@ -123,0 +121 @@
++	mtx_destroy(&dehash_mtx);
+@@ -138 +136 @@
+-	simple_lock(&dehash_slock);
++	mtx_enter(&dehash_mtx, MTX_DEF);
+@@ -146 +144 @@
+-			simple_unlock(&dehash_slock);
++			mtx_exit(&dehash_mtx, MTX_DEF);
+@@ -152 +150 @@
+-	simple_unlock(&dehash_slock);
++	mtx_exit(&dehash_mtx, MTX_DEF);
+@@ -162 +160 @@
+-	simple_lock(&dehash_slock);
++	mtx_enter(&dehash_mtx, MTX_DEF);
+@@ -170 +168 @@
+-	simple_unlock(&dehash_slock);
++	mtx_exit(&dehash_mtx, MTX_DEF);
+@@ -179 +177 @@
+-	simple_lock(&dehash_slock);
++	mtx_enter(&dehash_mtx, MTX_DEF);
+@@ -188 +186 @@
+-	simple_unlock(&dehash_slock);
++	mtx_exit(&dehash_mtx, MTX_DEF);
+@@ -727 +725 @@
+-		vrecycle(vp, (struct simplelock *)0, p);
++		vrecycle(vp, NULL, p);
+--- msdosfs_vfsops.c.orig	Sun Feb  4 13:14:07 2001
++++ msdosfs_vfsops.c	Sun Feb  4 13:14:07 2001
+@@ -65,2 +65 @@
+-
+-#include <machine/mutex.h>
++#include <sys/mutex.h>
+@@ -869 +868 @@
+-	simple_lock(&mntvnode_slock);
++	mtx_enter(&mntvnode_mtx, MTX_DEF);
+@@ -889 +888 @@
+-		simple_unlock(&mntvnode_slock);
++		mtx_exit(&mntvnode_mtx, MTX_DEF);
+@@ -892 +891 @@
+-			simple_lock(&mntvnode_slock);
++			mtx_enter(&mntvnode_mtx, MTX_DEF);
+@@ -902 +901 @@
+-		simple_lock(&mntvnode_slock);
++		mtx_enter(&mntvnode_mtx, MTX_DEF);
+@@ -904 +903 @@
+-	simple_unlock(&mntvnode_slock);
++	mtx_exit(&mntvnode_mtx, MTX_DEF);
