6 files changed, 23 insertions, 9 deletions

diff --git a/chinese/big5fs/Makefile b/chinese/big5fs/Makefile
index a5a870d8309f..2102816b6f10 100644
--- a/chinese/big5fs/Makefile
+++ b/chinese/big5fs/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		big5fs
-PORTVERSION=		1.0
+PORTVERSION=		2.0
 CATEGORIES=		chinese
 MASTER_SITES=		ftp://freebsd.sinica.edu.tw/pub/keith/
 
@@ -27,23 +27,28 @@ pre-extract:
 	fi
 
 do-extract:
-	@${MKDIR} ${WRKDIR}/msdos ${WRKDIR}/cd9660
+	@${MKDIR} ${WRKDIR}/msdos ${WRKDIR}/cd9660 ${WRKDIR}/ntfs
 	@${CP} -R ${SYSDIR}/msdosfs/*.[ch] ${WRKDIR}/msdos
 	@${CP} ${SYSDIR}/modules/msdos/Makefile ${WRKDIR}/msdos/Makefile.orig
 	@${CP} -R ${SYSDIR}/isofs/cd9660/*.[ch] ${WRKDIR}/cd9660
 	@${CP} ${SYSDIR}/modules/cd9660/Makefile ${WRKDIR}/cd9660/Makefile.orig
+	@${CP} -R ${SYSDIR}/ntfs/*.[ch] ${WRKDIR}/ntfs
+	@${CP} ${SYSDIR}/modules/ntfs/Makefile ${WRKDIR}/ntfs/Makefile.orig
 	@(cd ${WRKDIR}; ${TAR} xzf ${DISTDIR}/${DISTFILES} )
 	@${SED} -e 's,@@PREFIX@@,${PREFIX},' ${FILESDIR}/big5fs.sh > ${WRKDIR}/big5fs.sh
 
 do-patch:
 	@${SED} -e "/^\.PATH/d" ${WRKDIR}/msdos/Makefile.orig > ${WRKDIR}/msdos/Makefile
 	@${SED} -e "/^\.PATH/d" ${WRKDIR}/cd9660/Makefile.orig > ${WRKDIR}/cd9660/Makefile
-	@(cd ${WRKDIR}/msdos; ${PATCH} < ${WRKDIR}/VFATBig5.diff )
-	@(cd ${WRKDIR}/cd9660; ${PATCH} < ${WRKDIR}/JolietBig5.diff )
+	@${SED} -e "/^\.PATH/d" ${WRKDIR}/ntfs/Makefile.orig > ${WRKDIR}/ntfs/Makefile
+	@(cd ${WRKDIR}/msdos; ${PATCH} --quiet < ${WRKDIR}/msdos_big5.diff )
+	@(cd ${WRKDIR}/cd9660; ${PATCH} --quiet < ${WRKDIR}/cd9660_big5.diff )
+	@(cd ${WRKDIR}/ntfs; ${PATCH} --quiet < ${WRKDIR}/ntfs_big5.diff )
 
 do-build:
 	@(cd ${WRKDIR}/msdos; make all)
 	@(cd ${WRKDIR}/cd9660; make all)
+	@(cd ${WRKDIR}/ntfs; make all)
 
 pre-install:
 	@${MKDIR} ${KMODDIR}
@@ -52,5 +57,6 @@ do-install:
 	@${INSTALL_SCRIPT} ${WRKDIR}/big5fs.sh ${PREFIX}/etc/rc.d
 	@${INSTALL_SCRIPT} ${WRKDIR}/msdos/msdos.ko ${KMODDIR}/big5msdos.ko
 	@${INSTALL_SCRIPT} ${WRKDIR}/cd9660/cd9660.ko ${KMODDIR}/big5cd9660.ko
+	@${INSTALL_SCRIPT} ${WRKDIR}/ntfs/ntfs.ko ${KMODDIR}/big5ntfs.ko
 
 .include <bsd.port.mk>
diff --git a/chinese/big5fs/distinfo b/chinese/big5fs/distinfo
index fc377212708c..873fb74240d2 100644
--- a/chinese/big5fs/distinfo
+++ b/chinese/big5fs/distinfo
@@ -1 +1 @@
-MD5 (big5fs-1.0.tar.gz) = c522016cba22ee77124dd7c3d6e06745
+MD5 (big5fs-2.0.tar.gz) = eee4d333979eaa3aa279123ec709867d
diff --git a/chinese/big5fs/files/big5fs.sh b/chinese/big5fs/files/big5fs.sh
index f1125d0fd3cb..813302f98371 100644
--- a/chinese/big5fs/files/big5fs.sh
+++ b/chinese/big5fs/files/big5fs.sh
@@ -10,10 +10,15 @@ start)
 		echo -n ' Big5-msdos'
 		kldload /usr/local/modules/big5msdos.ko
 	fi
+	if [ -x @@PREFIX@@/modules/big5ntfs.ko ]; then
+		echo -n ' Big5 ntfs'
+		kldload /usr/local/modules/big5ntfs.ko
+	fi
 	;;
 stop)
 	kldunload -v -n big5cd9660 && echo -n ' Big5-cd9660'
 	kldunload -v -n big5msdos && echo -n ' Big5-msdos'
+	kldunload -v -n big5ntfs && echo -n ' Big5-ntfs'
 	;;
 *)
 	echo "Usage: big5fs.sh {start|stop}" >&2
diff --git a/chinese/big5fs/pkg-comment b/chinese/big5fs/pkg-comment
index a6209486c1db..77d8fbb378ba 100644
--- a/chinese/big5fs/pkg-comment
+++ b/chinese/big5fs/pkg-comment
@@ -1 +1 @@
-Reads Big5 filenames on Joliet and VFAT filesystems
+Reads Big5 filenames on Joliet, VFAT and NTFS filesystems
diff --git a/chinese/big5fs/pkg-descr b/chinese/big5fs/pkg-descr
index 8444eaf8dba9..5e35ea8541bf 100644
--- a/chinese/big5fs/pkg-descr
+++ b/chinese/big5fs/pkg-descr
@@ -1,3 +1,5 @@
-This port installs two kernel modules, cd9660.ko and
-msdos.ko, which will let users read Big5 filenames on
-Joliet and VFAT filesystems.
+This port installs three kernel modules, big5cd9660.ko, big5msdos.ko and
+big5ntfs.ko, which will let users read Big5 filenames on Joliet, VFAT,
+and NTFS filesystems, respectively.
+
+The NTFS version is contributed by:  huangant.bbs@bbs.cs.ntou.edu.tw
diff --git a/chinese/big5fs/pkg-plist b/chinese/big5fs/pkg-plist
index 1df7fc434be6..749382f90fe2 100644
--- a/chinese/big5fs/pkg-plist
+++ b/chinese/big5fs/pkg-plist
@@ -1,4 +1,5 @@
 etc/rc.d/big5fs.sh
 modules/big5cd9660.ko
 modules/big5msdos.ko
+modules/big5ntfs.ko
 @unexec rmdir %D/modules 2>/dev/null || true