7 files changed, 94 insertions, 39 deletions

diff --git a/chinese/mozilla-tclp/Makefile b/chinese/mozilla-tclp/Makefile
index bf75e1d33c4c..6c90448df95a 100644
--- a/chinese/mozilla-tclp/Makefile
+++ b/chinese/mozilla-tclp/Makefile
@@ -9,13 +9,13 @@
 # And just download and install there.
 
 PORTNAME=	mozilla
-PORTVERSION=	0.9.9
+PORTVERSION=	1.0.0rc2
 CATEGORIES=	chinese www
 MASTER_SITES=	http://www.csie.ntu.edu.tw/~b7506051/mozilla/langpack/
 PKGNAMESUFFIX=	-tclp
-# Same as ftp://ftp.mozilla.org/pub/mozilla/l10n/lang/moz0.98/langzhtw.xpi.
+# Same as ftp://ftp.mozilla.org/pub/mozilla/l10n/lang/$MOZVER/langzhtw.xpi.
 # Use this to avoid checksum problems.
-DISTNAME=	langzhtw-0.9.9-0313
+DISTNAME=	langzhtw-1.0.0rc2-0516
 EXTRACT_SUFX=	.xpi
 
 MAINTAINER=	piaip@csie.ntu.edu.tw
@@ -39,17 +39,21 @@ MOZILLA_SH=	mozilla.xpg4
 
 post-extract:
 	${MKDIR} ${WRKSRC}/defaults/pref
-	${CP} ${FILESDIR}/unix.js ${WRKSRC}/defaults/pref
+	${CP} ${FILESDIR}/unix.js ${WRKSRC}/defaults/pref/.
+	${CP} ${FILESDIR}/user.js ${WRKSRC}/defaults/profile/.
+	${CP} ${FILESDIR}/user.js ${WRKSRC}/defaults/profile/TW/.
 	${CHMOD} -R a+rX ${WRKSRC}
 
 do-build:
 	${SED} -e "s;@PREFIX@;${PREFIX};g" \
 	${FILESDIR}/${MOZILLA_SH} > ${WRKDIR}/mozilla
 
+# The 'HOME=/tmp' was solving 1.0rc2 regxpcom bug
+
 do-install:
 	(cd ${PREFIX}/lib/mozilla; \
-	${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regxpcom; \
-	${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regchrome)
+	${SETENV} HOME=/tmp LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regxpcom; \
+	${SETENV} HOME=/tmp LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regchrome)
 	(cd ${PREFIX}/lib/mozilla/chrome; \
 	${MV} -f chrome.rdf chrome.rdf.orig; \
 	${MV} -f installed-chrome.txt installed-chrome.txt.orig)
@@ -60,14 +64,14 @@ do-install:
 	${MV} -f google.src google.src.orig)
 	${MV} -f ${PREFIX}/bin/mozilla ${PREFIX}/bin/mozilla.orig
 	${INSTALL_SCRIPT} ${WRKDIR}/mozilla ${PREFIX}/bin
-	(cd ${WRKSRC}; ${TAR} -cf - chrome defaults searchplugins) | \
+	(cd ${WRKSRC}; ${TAR} -cf - chrome defaults searchplugins res) | \
 	${TAR} -xf - -C ${PREFIX}/lib/mozilla
 	(cd ${PREFIX}/lib/mozilla/chrome; \
 	${CP} installed-chrome.txt.orig installed-chrome.txt; \
 	${CAT} ${FILESDIR}/installed-chrome.txt >> installed-chrome.txt)
 	(cd ${PREFIX}/lib/mozilla; \
-	${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regxpcom; \
-	${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regchrome)
+	${SETENV} HOME=/tmp LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regxpcom; \
+	${SETENV} HOME=/tmp LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regchrome)
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/chinese/mozilla-tclp/distinfo b/chinese/mozilla-tclp/distinfo
index 5ffeb4e93783..aaddbafed9a7 100644
--- a/chinese/mozilla-tclp/distinfo
+++ b/chinese/mozilla-tclp/distinfo
@@ -1 +1 @@
-MD5 (langzhtw-0.9.9-0313.xpi) = d2da9362f9cdb15287412abbbd4b40c2
+MD5 (langzhtw-1.0.0rc2-0516.xpi) = 2c22e391a612eceba3b725cf310d9ccc
diff --git a/chinese/mozilla-tclp/files/installed-chrome.txt b/chinese/mozilla-tclp/files/installed-chrome.txt
index 6af2d20c2c14..7acb78b1ddf3 100644
--- a/chinese/mozilla-tclp/files/installed-chrome.txt
+++ b/chinese/mozilla-tclp/files/installed-chrome.txt
@@ -10,6 +10,7 @@ locale,install,url,jar:resource:/chrome/zh-TW.jar!/locale/zh-TW/editor/
 locale,install,url,jar:resource:/chrome/zh-TW.jar!/locale/zh-TW/forms/
 locale,install,url,jar:resource:/chrome/zh-TW.jar!/locale/zh-TW/global/
 locale,install,url,jar:resource:/chrome/zh-TW.jar!/locale/zh-TW/help/
+locale,install,url,jar:resource:/chrome/zh-TW.jar!/locale/zh-TW/messenger-mdn/
 locale,install,url,jar:resource:/chrome/zh-TW.jar!/locale/zh-TW/messenger-smime/
 locale,install,url,jar:resource:/chrome/zh-TW.jar!/locale/zh-TW/messenger/
 locale,install,url,jar:resource:/chrome/zh-TW.jar!/locale/zh-TW/mozldap/
@@ -21,6 +22,9 @@ locale,install,url,jar:resource:/chrome/zh-TW.jar!/locale/zh-TW/wallet/
 locale,install,url,jar:resource:/chrome/zh-unix.jar!/locale/zh-TW/communicator-platform/
 locale,install,url,jar:resource:/chrome/zh-unix.jar!/locale/zh-TW/global-platform/
 locale,install,url,jar:resource:/chrome/zh-unix.jar!/locale/zh-TW/navigator-platform/
+locale,install,url,jar:resource:/chrome/zh-optional.jar!/locale/zh-TW/inspector/
+locale,install,url,jar:resource:/chrome/zh-optional.jar!/locale/zh-TW/venkman/
+locale,install,url,jar:resource:/chrome/zh-optional.jar!/locale/zh-TW/chatzilla/
 locale,install,select,zh-TW
 locale,install,select,TW
 skin,install,select,modern/1.0
diff --git a/chinese/mozilla-tclp/files/unix.js b/chinese/mozilla-tclp/files/unix.js
index cba1d05c5653..c1ccc53e4615 100644
--- a/chinese/mozilla-tclp/files/unix.js
+++ b/chinese/mozilla-tclp/files/unix.js
@@ -311,8 +311,8 @@ pref("font.min-size.fixed.zh-TW", 10);
 //pref("printer.font.xprint.rejectfontpattern", 
 //     "fname=-urw.*;scalable=false;outline_scaled=false;xdisplay=.*;xdpy=.*;ydpy=.*;xdevice=.*");
 
-// Chatzilla
 pref("mail.signature_date", 0);
+// Chatzilla
 pref("extensions.irc.charset", "Big5");
 
 // ps font
@@ -320,21 +320,21 @@ pref("extensions.irc.charset", "Big5");
 // to enumerate the list of langGroups
 // there should be a call to get the
 // langGroups; see bug 75054
-pref("print.psnativefont.ar", "");
-pref("print.psnativefont.el", "");
-pref("print.psnativefont.he", "");
-pref("print.psnativefont.ja", "");
-pref("print.psnativefont.ko", "");
-pref("print.psnativefont.th", "");
-pref("print.psnativefont.tr", "");
-pref("print.psnativefont.x-baltic", "");
-pref("print.psnativefont.x-central-euro", "");
-pref("print.psnativefont.x-cyrillic", "");
-pref("print.psnativefont.x-unicode", "");
-pref("print.psnativefont.x-user-def", "");
-pref("print.psnativefont.x-western", "");
-pref("print.psnativefont.zh-CN", "");
+pref("print.postscript.nativefont.ar", "");
+pref("print.postscript.nativefont.el", "");
+pref("print.postscript.nativefont.he", "");
+pref("print.postscript.nativefont.ja", "");
+pref("print.postscript.nativefont.ko", "");
+pref("print.postscript.nativefont.th", "");
+pref("print.postscript.nativefont.tr", "");
+pref("print.postscript.nativefont.x-baltic", "");
+pref("print.postscript.nativefont.x-central-euro", "");
+pref("print.postscript.nativefont.x-cyrillic", "");
+pref("print.postscript.nativefont.x-unicode", "");
+pref("print.postscript.nativefont.x-user-def", "");
+pref("print.postscript.nativefont.x-western", "");
+pref("print.postscript.nativefont.zh-CN", "");
 // Change lines below to your local system fonts
 // Check http://freebsd.sinica.edu.tw/~statue/zh-tut/web-browse.html
-pref("print.psnativecode.zh-TW", "big5");
-pref("print.psnativefont.zh-TW", "ArphicMingB5-Regular-ETen-B5-H");
+pref("print.postscript.nativecode.zh-TW", "big5");
+pref("print.postscript.nativefont.zh-TW", "ArphicMingB5-Regular-ETen-B5-H");
diff --git a/chinese/mozilla-tclp/files/user.js b/chinese/mozilla-tclp/files/user.js
new file mode 100644
index 000000000000..7b771f16725a
--- /dev/null
+++ b/chinese/mozilla-tclp/files/user.js
@@ -0,0 +1,36 @@
+// This is per-user pref
+
+// XIM Settings:
+//  Uncomment this line if your XIM not working
+ //user_pref("xim.input_style", "over-the-spot")
+
+// Anti-Alias fonts:
+//  Set the lines below to true if you want always aa
+ user_pref("font.scale.aa_bitmap.enable", true);
+ user_pref("font.scale.aa_bitmap.always", true);
+ user_pref("font.scale.aa_bitmap.always.zh-TW", true);
+
+//  Extra aa settings
+ //user_pref("font.scale.aa_bitmap.min", 6);
+ //user_pref("font.scale.aa_bitmap.undersize", 80);
+ //user_pref("font.scale.aa_bitmap.oversize", 120);
+ //user_pref("font.scale.aa_bitmap.min.ja",    12);
+ //user_pref("font.scale.aa_bitmap.always.ja", false);
+ //user_pref("font.scale.aa_bitmap.min.zh-TW",    12);
+ //user_pref("font.scale.bitmap.min.zh-TW",       16);
+ //user_pref("font.scale.bitmap.undersize.zh-TW", 80);
+ //user_pref("font.scale.bitmap.oversize.zh-TW",  120);
+ //user_pref("font.scale.outline.min.zh-TW",      10);
+
+// Minimum font sizes
+ //user_pref("font.min-size.variable.zh-TW", 10);
+ //user_pref("font.min-size.fixed.zh-TW", 10);
+
+// Chatzilla
+ user_pref("extensions.irc.charset", "Big5");
+
+// Printing 
+//  Change lines below to your local system fonts
+//  Check http://freebsd.sinica.edu.tw/~statue/zh-tut/web-browse.html
+ // user_pref("print.postscript.nativecode.zh-TW", "big5");
+ // user_pref("print.postscript.nativefont.zh-TW", "ArphicMingB5-Regular-ETen-B5-H");
diff --git a/chinese/mozilla-tclp/pkg-message b/chinese/mozilla-tclp/pkg-message
index f557141277cb..892ae7669199 100644
--- a/chinese/mozilla-tclp/pkg-message
+++ b/chinese/mozilla-tclp/pkg-message
@@ -1,11 +1,9 @@
-********************************
-If your XIM wouldn't work propery, try to make a file
-"${HOME}/.mozilla/${USER}/*.slt/user.js"
-with below content;
---
-user_pref("xim.input_style", "over-the-spot")
---
+***********************************************************************
+Edit the file "${HOME}/.mozilla/${USER}/*.slt/user.js"
+     or "/usr/X11R6/lib/mozilla/defaults/pref/unix.js"
+ to change XIM settings (if not working),
+ Anti-Alias settings, and Printing settings.
 If need printing, go /usr/ports/chinese/arphicttf to make WANT_GS6=yes
-Then go /usr/ports/chinese/ghostscript6 to make all install
-Check http://freebsd.sinica.edu.tw/~statue/zh-tut/web-browse.html for detail
-********************************
+ Then go /usr/ports/chinese/ghostscript6 to make all install
+For detail: http://freebsd.sinica.edu.tw/~statue/zh-tut/web-browse.html
+***********************************************************************
diff --git a/chinese/mozilla-tclp/pkg-plist b/chinese/mozilla-tclp/pkg-plist
index 0f66ff3ad84c..7aa86ae27ecd 100644
--- a/chinese/mozilla-tclp/pkg-plist
+++ b/chinese/mozilla-tclp/pkg-plist
@@ -1,5 +1,5 @@
-@exec env LD_LIBRARY_PATH=%D/lib/mozilla MOZILLA_FIVE_HOME=%D/lib/mozilla %D/lib/mozilla/regxpcom
-@exec env LD_LIBRARY_PATH=%D/lib/mozilla MOZILLA_FIVE_HOME=%D/lib/mozilla %D/lib/mozilla/regchrome
+@exec env HOME=/tmp LD_LIBRARY_PATH=%D/lib/mozilla MOZILLA_FIVE_HOME=%D/lib/mozilla %D/lib/mozilla/regxpcom
+@exec env HOME=/tmp LD_LIBRARY_PATH=%D/lib/mozilla MOZILLA_FIVE_HOME=%D/lib/mozilla %D/lib/mozilla/regchrome
 @exec mv %D/bin/mozilla %D/bin/mozilla.orig
 @exec mv %D/lib/mozilla/chrome/chrome.rdf %D/lib/mozilla/chrome/chrome.rdf.orig
 @exec mv %D/lib/mozilla/chrome/installed-chrome.txt %D/lib/mozilla/chrome/installed-chrome.txt.orig
@@ -14,6 +14,7 @@ lib/mozilla/chrome/zh-TW.jar
 lib/mozilla/chrome/zh-mac.jar
 lib/mozilla/chrome/zh-unix.jar
 lib/mozilla/chrome/zh-win.jar
+lib/mozilla/chrome/zh-optional.jar
 lib/mozilla/defaults/pref/unix.js
 lib/mozilla/defaults/profile/TW/chrome/userChrome.css
 lib/mozilla/defaults/profile/TW/chrome/userContent.css
@@ -22,8 +23,18 @@ lib/mozilla/defaults/profile/TW/localstore.rdf
 lib/mozilla/defaults/profile/TW/mimeTypes.rdf
 lib/mozilla/defaults/profile/TW/panels.rdf
 lib/mozilla/defaults/profile/TW/search.rdf
+lib/mozilla/defaults/profile/TW/user.js
+lib/mozilla/defaults/profile/user.js
 lib/mozilla/searchplugins/google.gif
 lib/mozilla/searchplugins/google.src
+lib/mozilla/searchplugins/google_en.gif
+lib/mozilla/searchplugins/google_en.src
+lib/mozilla/searchplugins/google_tw.gif
+lib/mozilla/searchplugins/google_tw.src
+lib/mozilla/res/mail_mozilla.gif
+lib/mozilla/res/mailnews_start_zhtw.html
+@exec env HOME=/tmp LD_LIBRARY_PATH=%D/lib/mozilla MOZILLA_FIVE_HOME=%D/lib/mozilla %D/lib/mozilla/regxpcom
+@exec env HOME=/tmp LD_LIBRARY_PATH=%D/lib/mozilla MOZILLA_FIVE_HOME=%D/lib/mozilla %D/lib/mozilla/regchrome
 @unexec mv %D/bin/mozilla.orig %D/bin/mozilla
 @unexec mv %D/lib/mozilla/chrome/chrome.rdf.orig %D/lib/mozilla/chrome/chrome.rdf
 @unexec mv %D/lib/mozilla/chrome/installed-chrome.txt.orig %D/lib/mozilla/chrome/installed-chrome.txt
@@ -32,3 +43,5 @@ lib/mozilla/searchplugins/google.src
 @unexec mv %D/lib/mozilla/searchplugins/google.src.orig %D/lib/mozilla/searchplugins/google.src
 @dirrm lib/mozilla/defaults/profile/TW/chrome
 @dirrm lib/mozilla/defaults/profile/TW
+@unexec env HOME=/tmp LD_LIBRARY_PATH=%D/lib/mozilla MOZILLA_FIVE_HOME=%D/lib/mozilla %D/lib/mozilla/regxpcom
+@unexec env HOME=/tmp LD_LIBRARY_PATH=%D/lib/mozilla MOZILLA_FIVE_HOME=%D/lib/mozilla %D/lib/mozilla/regchrome