3 files changed, 41 insertions, 19 deletions

diff --git a/chinese/big5fs/Makefile b/chinese/big5fs/Makefile
index eff9ff9ede54..baa5a7d95a40 100644
--- a/chinese/big5fs/Makefile
+++ b/chinese/big5fs/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		big5fs
 PORTVERSION=		2.1
+PORTREVISION=		1
 CATEGORIES=		chinese
 MASTER_SITES=		ftp://freebsd.sinica.edu.tw/pub/keith/
 
@@ -16,6 +17,21 @@ NO_PACKAGE=		"Different versions definitely cause crash"
 
 SYSDIR=			/usr/src/sys
 KMODDIR=		${PREFIX}/modules
+PLIST_SUB=		MSDOSFSKO=${MSDOSFSKO}
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} > 500018
+MSDOSFSDIR=		${SYSDIR}/fs/msdosfs
+MSDOSFSKO=		msdosfs.ko
+MSDOSFSKODIR=	${SYSDIR}/modules/msdosfs
+NTFSDIR=		${SYSDIR}/fs/ntfs
+.else
+MSDOSFSDIR=		${SYSDIR}/msdosfs
+MSDOSFSKO=		msdos.ko
+MSDOSFSKODIR=	${SYSDIR}/modules/msdos
+NTFSDIR=		${SYSDIR}/ntfs
+.endif
 
 pre-extract:
 	@if [ ! -d /sys -o ! -d /usr/src/sys ]; then \
@@ -28,11 +44,11 @@ pre-extract:
 
 do-extract:
 	@${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 ${MSDOSFSDIR}/*.[ch] ${WRKDIR}/msdos
+	@${CP} ${MSDOSFSKODIR}/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} -R ${NTFSDIR}/*.[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
@@ -55,8 +71,8 @@ pre-install:
 
 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
+	@${INSTALL_SCRIPT} ${WRKDIR}/msdos/${MSDOSFSKO} ${KMODDIR}/${MSDOSFSKO}
+	@${INSTALL_SCRIPT} ${WRKDIR}/cd9660/cd9660.ko ${KMODDIR}/cd9660.ko
+	@${INSTALL_SCRIPT} ${WRKDIR}/ntfs/ntfs.ko ${KMODDIR}/ntfs.ko
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/chinese/big5fs/files/big5fs.sh b/chinese/big5fs/files/big5fs.sh
index e05863b7a2ed..c203eac822d4 100644
--- a/chinese/big5fs/files/big5fs.sh
+++ b/chinese/big5fs/files/big5fs.sh
@@ -2,23 +2,29 @@
 
 case "$1" in
 start)
-	if [ -x @@PREFIX@@/modules/big5cd9660.ko ]; then
+	if [ -x @@PREFIX@@/modules/cd9660.ko ]; then
 		echo -n ' Big5-cd9660'
-		kldload /usr/local/modules/big5cd9660.ko
+		kldload /usr/local/modules/cd9660.ko
 	fi
-	if [ -x @@PREFIX@@/modules/big5msdos.ko ]; then
+	if [ -x @@PREFIX@@/modules/msdos.ko ]; then
 		echo -n ' Big5-msdos'
-		kldload /usr/local/modules/big5msdos.ko
+		kldload /usr/local/modules/msdos.ko
 	fi
-	if [ -x @@PREFIX@@/modules/big5ntfs.ko ]; then
+	# msdosfs.ko instead of msdos.ko after FreeBSD 5.0-CURRENT
+	if [ -x @@PREFIX@@/modules/msdosfs.ko ]; then
+		echo -n ' Big5-msdosfs'
+		kldload /usr/local/modules/msdosfs.ko
+	fi
+	if [ -x @@PREFIX@@/modules/ntfs.ko ]; then
 		echo -n ' Big5-ntfs'
-		kldload /usr/local/modules/big5ntfs.ko
+		kldload /usr/local/modules/ntfs.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'
+	kldunload -v -n cd9660 && echo -n ' Big5-cd9660'
+	kldunload -v -n msdos && echo -n ' Big5-msdos'
+	kldunload -v -n msdosfs && echo -n ' Big5-msdosfs'
+	kldunload -v -n ntfs && echo -n ' Big5-ntfs'
 	;;
 *)
 	echo "Usage: big5fs.sh {start|stop}" >&2
diff --git a/chinese/big5fs/pkg-plist b/chinese/big5fs/pkg-plist
index 749382f90fe2..4839d6303cc5 100644
--- a/chinese/big5fs/pkg-plist
+++ b/chinese/big5fs/pkg-plist
@@ -1,5 +1,5 @@
 etc/rc.d/big5fs.sh
-modules/big5cd9660.ko
-modules/big5msdos.ko
-modules/big5ntfs.ko
+modules/cd9660.ko
+modules/%%MSDOSFSKO%%
+modules/ntfs.ko
 @unexec rmdir %D/modules 2>/dev/null || true