4 files changed, 31 insertions, 46 deletions

diff --git a/chinese/auto-tw-l10n/Makefile b/chinese/auto-tw-l10n/Makefile
index 513aa96ceac1..97755159604f 100644
--- a/chinese/auto-tw-l10n/Makefile
+++ b/chinese/auto-tw-l10n/Makefile
@@ -5,14 +5,12 @@
 # $FreeBSD$
 
 PORTNAME=	auto-tw-l10n
-PORTVERSION=	1.10
-PORTREVISION=	3
+PORTVERSION=	1.11
 CATEGORIES=	chinese
-MASTER_SITES=	LOCAL/chinsan
-DISTNAME=	zh-${PORTNAME}-${PORTVERSION}
+MASTER_SITES=	LOCAL/sunpoet
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	The automatic localization for Traditional Chinese zh_TW.Big5 locale
+COMMENT=	The automatic localization for Traditional Chinese zh_TW.UTF-8 locale
 
 RUN_DEPENDS=	${FASTEST_CVSUP}:${PORTSDIR}/sysutils/fastest_cvsup
 
@@ -23,32 +21,19 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 SUB_FILES=	pkg-install pkg-message
 SUB_LIST=	PREFIX=${PREFIX} ZONE=${ZONE} SOURCE_DIR=${WRKSRC} \
 		WRKDIR=${WRKDIR} FASTEST_CVSUP=${FASTEST_CVSUP}
-OPTIONS=	KDE3 "Enable KDE support" Off
 
 FASTEST_CVSUP?=	${LOCALBASE}/bin/fastest_cvsup
 ZONE?=		tw
 
-.include <bsd.port.pre.mk>
-
-post-patch:
-.if defined(WITH_KDE3)
-	@${REINPLACE_CMD} -e '5 s/en_US.ISO8859-1/zh_TW.Big5/g' \
-		${WRKSRC}/dot.cshrc
-	@${REINPLACE_CMD} -e '1 s/en_US.ISO8859-1/zh_TW.Big5/g' \
-		${WRKSRC}/dot.bashrc
-	@${FIND} ${WRKSRC} -name "*.bak" -delete
-.endif
-	@${FIND} ${WRKSRC} -name "*.orig" -delete
-
 pre-install:
 	@${SH} ${PKGINSTALL}
 	@${FIND} ${WRKSRC} -name "*.in" -delete
 
 do-install:
-	${MKDIR} ${PREFIX}/share/skel/zh_TW.Big5
-	${CP} ${WRKSRC}/* ${PREFIX}/share/skel/zh_TW.Big5
+	${MKDIR} ${PREFIX}/share/skel/zh_TW.UTF-8/
+	${CP} ${WRKSRC}/* ${PREFIX}/share/skel/zh_TW.UTF-8/
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/chinese/auto-tw-l10n/distinfo b/chinese/auto-tw-l10n/distinfo
index d1ee49ce24d4..475c7d9d71ea 100644
--- a/chinese/auto-tw-l10n/distinfo
+++ b/chinese/auto-tw-l10n/distinfo
@@ -1,2 +1,2 @@
-SHA256 (zh-auto-tw-l10n-1.10.tar.gz) = fe76d8325be82b53182790a565a8447c66646a06cdb43c6f3a8cbcbd5da135d9
-SIZE (zh-auto-tw-l10n-1.10.tar.gz) = 8520
+SHA256 (auto-tw-l10n-1.11.tar.gz) = 60f9d68913eefaaf41feb4ffd6b9fc0494ff2211bf9efabbe1912a12806331ab
+SIZE (auto-tw-l10n-1.11.tar.gz) = 8647
diff --git a/chinese/auto-tw-l10n/files/pkg-message.in b/chinese/auto-tw-l10n/files/pkg-message.in
index 18cd0c5a3f53..004a70a7267c 100644
--- a/chinese/auto-tw-l10n/files/pkg-message.in
+++ b/chinese/auto-tw-l10n/files/pkg-message.in
@@ -2,24 +2,24 @@
 
 English Instructions:
  Please tell your users to merge their old dotfiles with the new ones, in
- 	%%PREFIX%%/share/skel/zh_TW.Big5/dot.*
+ 	%%PREFIX%%/share/skel/zh_TW.UTF-8/dot.*
 
  For future adduser
-	# adduser -k /usr/local/share/skel/zh_TW.Big5
+	# adduser -k /usr/local/share/skel/zh_TW.UTF-8
 
  Finally, tuning your /etc/make.conf.  Please SEE ALSO following file.
- ==> %%PREFIX%%/share/skel/zh_TW.Big5/make.conf
+ ==> %%PREFIX%%/share/skel/zh_TW.UTF-8/make.conf
 
 **************************************************************************
 
-中文繁體(BIG5)說明:
- 請告知您的使用者比對他們的舊設定跟新設定，放在
- %%PREFIX%%/share/skel/zh_TW.Big5/dot.*
+銝剜��蝜�擃�(UTF-8)隤芣��:
+ 隢������交�函��雿輻�刻��瘥�撠�隞����������閮剖��頝���啗身摰�嚗���曉��
+ %%PREFIX%%/share/skel/zh_TW.UTF-8/dot.*
 
- 若之後新增使用者的話，請用下面類似方式：
-	# adduser -k /usr/local/share/skel/zh_TW.Big5
+ ��乩��敺���啣��雿輻�刻�����閰梧��隢���其����ａ��隡潭�孵��嚗�
+	# adduser -k /usr/local/share/skel/zh_TW.UTF-8
  
- 最後，請參考下面這檔案來修改O /etc/make.conf 以做更好的設定： 
- ==> %%PREFIX%%/share/skel/zh_TW.Big5/make.conf
+ ���敺�嚗�隢�������銝���ａ��瑼�獢�靘�靽格�� /etc/make.conf 隞亙����游末���閮剖��嚗� 
+ ==> %%PREFIX%%/share/skel/zh_TW.UTF-8/make.conf
 
 ************************************************************************** 
diff --git a/chinese/auto-tw-l10n/pkg-plist b/chinese/auto-tw-l10n/pkg-plist
index 1d56c7f0c695..56dedbb7a1ab 100644
--- a/chinese/auto-tw-l10n/pkg-plist
+++ b/chinese/auto-tw-l10n/pkg-plist
@@ -1,13 +1,13 @@
-share/skel/zh_TW.Big5/MANIFEST
-share/skel/zh_TW.Big5/dot.Xdefaults
-share/skel/zh_TW.Big5/dot.bashrc
-share/skel/zh_TW.Big5/dot.cshrc
-share/skel/zh_TW.Big5/dot.emacs
-share/skel/zh_TW.Big5/dot.fonts.conf
-share/skel/zh_TW.Big5/dot.gtkrc
-share/skel/zh_TW.Big5/dot.inputrc
-share/skel/zh_TW.Big5/dot.muttrc
-share/skel/zh_TW.Big5/dot.vimrc
-share/skel/zh_TW.Big5/dot.xinitrc
-share/skel/zh_TW.Big5/make.conf
-@dirrmtry share/skel/zh_TW.Big5
+share/skel/zh_TW.UTF-8/MANIFEST
+share/skel/zh_TW.UTF-8/dot.Xdefaults
+share/skel/zh_TW.UTF-8/dot.bashrc
+share/skel/zh_TW.UTF-8/dot.cshrc
+share/skel/zh_TW.UTF-8/dot.emacs
+share/skel/zh_TW.UTF-8/dot.fonts.conf
+share/skel/zh_TW.UTF-8/dot.gtkrc
+share/skel/zh_TW.UTF-8/dot.inputrc
+share/skel/zh_TW.UTF-8/dot.muttrc
+share/skel/zh_TW.UTF-8/dot.vimrc
+share/skel/zh_TW.UTF-8/dot.xinitrc
+share/skel/zh_TW.UTF-8/make.conf
+@dirrmtry share/skel/zh_TW.UTF-8