upgrade to 2.2

fix ntfs

PR:		35019
Submitted by:	Wei-chun Kao <einstein@infor.org>
Discussed with:	rafan@infor.org, submitter

3 files changed, 49 insertions, 14 deletions

diff --git a/chinese/big5fs/Makefile b/chinese/big5fs/Makefile
index baa5a7d95a40..a00db1a844fa 100644
--- a/chinese/big5fs/Makefile
+++ b/chinese/big5fs/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=		big5fs
-PORTVERSION=		2.1
-PORTREVISION=		1
+PORTVERSION=		2.2
 CATEGORIES=		chinese
-MASTER_SITES=		ftp://freebsd.sinica.edu.tw/pub/keith/
+MASTER_SITES=		ftp://freebsd.csie.ntu.edu.tw/pub/users/rafan/
 
 MAINTAINER=		keith@FreeBSD.org
 
@@ -21,16 +20,43 @@ PLIST_SUB=		MSDOSFSKO=${MSDOSFSKO}
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} > 500018
+.if ${OSVERSION} > 500027
+WITHOUT_NTFS=		yes
 MSDOSFSDIR=		${SYSDIR}/fs/msdosfs
 MSDOSFSKO=		msdosfs.ko
-MSDOSFSKODIR=	${SYSDIR}/modules/msdosfs
+MSDOSFSKODIR=		${SYSDIR}/modules/msdosfs
+.elif ${OSVERSION} > 500018 && ${OSVERSION} < 500027
+MSDOSFSDIR=		${SYSDIR}/fs/msdosfs
+MSDOSFSKO=		msdosfs.ko
+MSDOSFSKODIR=		${SYSDIR}/modules/msdosfs
 NTFSDIR=		${SYSDIR}/fs/ntfs
+NTFSPATCH=		ntfs_big5.diff.440000
+.elif ${OSVERSION} <= 500018 && ${OSVERSION} < 440001
+MSDOSFSDIR=		${SYSDIR}/msdosfs
+MSDOSFSKO=		msdos.ko
+MSDOSFSKODIR=		${SYSDIR}/modules/msdos
+NTFSDIR=		${SYSDIR}/ntfs
+NTFSPATCH=		ntfs_big5.diff.440000
 .else
 MSDOSFSDIR=		${SYSDIR}/msdosfs
 MSDOSFSKO=		msdos.ko
-MSDOSFSKODIR=	${SYSDIR}/modules/msdos
+MSDOSFSKODIR=		${SYSDIR}/modules/msdos
 NTFSDIR=		${SYSDIR}/ntfs
+NTFSPATCH=		ntfs_big5.diff.440001
+.endif
+
+.if defined(WITHOUT_NTFS)
+PLIST_SUB+=             NTFSKMOD="@comment "
+.else
+PLIST_SUB+=             NTFSKMOD=""
+.endif
+
+.if defined(WITHOUT_NTFS)
+pre-everything::
+	@${ECHO_MSG}
+	@${ECHO_MSG} "NTFS big5 patch is broken on this version."
+	@${ECHO_MSG} "I will NOT build and install NTFS big5fs."
+	@${ECHO_MSG}
 .endif
 
 pre-extract:
@@ -43,28 +69,35 @@ pre-extract:
 	fi
 
 do-extract:
-	@${MKDIR} ${WRKDIR}/msdos ${WRKDIR}/cd9660 ${WRKDIR}/ntfs
+	@${MKDIR} ${WRKDIR}/msdos ${WRKDIR}/cd9660
 	@${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 ${NTFSDIR}/*.[ch] ${WRKDIR}/ntfs
-	@${CP} ${SYSDIR}/modules/ntfs/Makefile ${WRKDIR}/ntfs/Makefile.orig
+.if !defined(WITHOUT_NTFS)
+		@${MKDIR} ${WRKDIR}/ntfs
+		@${CP} -R ${NTFSDIR}/*.[ch] ${WRKDIR}/ntfs
+		@${CP} ${SYSDIR}/modules/ntfs/Makefile ${WRKDIR}/ntfs/Makefile.orig
+.endif
 	@(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
-	@${SED} -e "/^\.PATH/d" ${WRKDIR}/ntfs/Makefile.orig > ${WRKDIR}/ntfs/Makefile
 	@(cd ${WRKDIR}/msdos; ${PATCH} --quiet < ${WRKDIR}/msdos_big5.diff )
+	@${SED} -e "/^\.PATH/d" ${WRKDIR}/cd9660/Makefile.orig > ${WRKDIR}/cd9660/Makefile
 	@(cd ${WRKDIR}/cd9660; ${PATCH} --quiet < ${WRKDIR}/cd9660_big5.diff )
-	@(cd ${WRKDIR}/ntfs; ${PATCH} --quiet < ${WRKDIR}/ntfs_big5.diff )
+.if !defined(WITHOUT_NTFS)
+	@${SED} -e "/^\.PATH/d" ${WRKDIR}/ntfs/Makefile.orig > ${WRKDIR}/ntfs/Makefile
+	@(cd ${WRKDIR}/ntfs; ${PATCH} --quiet < ${WRKDIR}/${NTFSPATCH} )
+.endif
 
 do-build:
 	@(cd ${WRKDIR}/msdos; make all)
 	@(cd ${WRKDIR}/cd9660; make all)
+.if !defined(WITHOUT_NTFS)
 	@(cd ${WRKDIR}/ntfs; make all)
+.endif
 
 pre-install:
 	@${MKDIR} ${KMODDIR}
@@ -73,6 +106,8 @@ do-install:
 	@${INSTALL_SCRIPT} ${WRKDIR}/big5fs.sh ${PREFIX}/etc/rc.d
 	@${INSTALL_SCRIPT} ${WRKDIR}/msdos/${MSDOSFSKO} ${KMODDIR}/${MSDOSFSKO}
 	@${INSTALL_SCRIPT} ${WRKDIR}/cd9660/cd9660.ko ${KMODDIR}/cd9660.ko
+.if !defined(WITHOUT_NTFS)
 	@${INSTALL_SCRIPT} ${WRKDIR}/ntfs/ntfs.ko ${KMODDIR}/ntfs.ko
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/chinese/big5fs/distinfo b/chinese/big5fs/distinfo
index 31a675a1abfc..45e033902e19 100644
--- a/chinese/big5fs/distinfo
+++ b/chinese/big5fs/distinfo
@@ -1 +1 @@
-MD5 (big5fs-2.1.tar.gz) = b09be96b746f8d6a5e777c93baae86e0
+MD5 (big5fs-2.2.tar.gz) = 2ebe7470cd8893abcfd6c5a79855fd13
diff --git a/chinese/big5fs/pkg-plist b/chinese/big5fs/pkg-plist
index 4839d6303cc5..4190555343bc 100644
--- a/chinese/big5fs/pkg-plist
+++ b/chinese/big5fs/pkg-plist
@@ -1,5 +1,5 @@
 etc/rc.d/big5fs.sh
 modules/cd9660.ko
 modules/%%MSDOSFSKO%%
-modules/ntfs.ko
+%%NTFSKMOD%%modules/ntfs.ko
 @unexec rmdir %D/modules 2>/dev/null || true