Upgrade to version 1.1

PR:	ports/45263
Submitted by:	maintainer

12 files changed, 34 insertions, 36 deletions

diff --git a/japanese/mozilla-jlp-devel/Makefile b/japanese/mozilla-jlp-devel/Makefile
index 897579008c41..9891380b2651 100644
--- a/japanese/mozilla-jlp-devel/Makefile
+++ b/japanese/mozilla-jlp-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mozilla
-PORTVERSION=	1.0.1
+PORTVERSION=	1.1
 #PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	japanese www
@@ -14,7 +14,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www2.starcat.ne.jp/~unha/jlp/
 MASTER_SITE_SUBDIR=	jlpmoz
 PKGNAMESUFFIX=	-jlp
-DISTNAME=	${PORTNAME}1.0.1rc1-jajppack-kv0.10
+DISTNAME=	${PORTNAME}${PORTVERSION}-jajppack-kv0.8
 EXTRACT_SUFX=	.xpi
 
 MAINTAINER=	yatt@msc.biglobe.ne.jp
@@ -31,10 +31,13 @@ EXTRACT_BEFORE_ARGS=	-qo
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 400020
-MOZILLA_SH=	mozilla.noxpg4
+.if ${OSVERSION} >= 450002
+LOCALENAME=	ja_JP.eucJP
+.elif ${OSVERSION} >= 400020
+LOCALENAME=	ja_JP.EUC
 .else
-MOZILLA_SH=	mozilla.xpg4
+LOCALENAME=	ja_JP.EUC
+LIBXPG4=	LD_PRELOAD=/usr/lib/libxpg4.so.2; export LD_PRELOAD
 .endif
 
 post-extract:
@@ -42,8 +45,10 @@ post-extract:
 	${CP} ${FILESDIR}/unix.js ${WRKSRC}/defaults/pref
 
 do-build:
-	${SED} -e "s;@PREFIX@;${PREFIX};g" \
-	${FILESDIR}/${MOZILLA_SH} > ${WRKDIR}/mozilla
+	${SED} -e "s^@PREFIX@^${PREFIX}^g" \
+	       -e "s^@LOCALENAME@^${LOCALENAME}^g" \
+	       -e "s^@LIBXPG4@^${LIBXPG4}^g" \
+	${FILESDIR}/mozilla.sh > ${WRKDIR}/mozilla
 
 do-install:
 	(cd ${PREFIX}/lib/mozilla/chrome; \
diff --git a/japanese/mozilla-jlp-devel/distinfo b/japanese/mozilla-jlp-devel/distinfo
index 604922aa4e9c..a111cdc6164e 100644
--- a/japanese/mozilla-jlp-devel/distinfo
+++ b/japanese/mozilla-jlp-devel/distinfo
@@ -1 +1 @@
-MD5 (mozilla1.0.1rc1-jajppack-kv0.10.xpi) = 2723cde02d4ea5f2c560a858215dcb2b
+MD5 (mozilla1.1-jajppack-kv0.8.xpi) = 741b5ee203048b50853e68f0ec5e9395
diff --git a/japanese/mozilla-jlp-devel/files/mozilla.noxpg4 b/japanese/mozilla-jlp-devel/files/mozilla.sh
index 2a2428058e68..7e183ce1f581 100644
--- a/japanese/mozilla-jlp-devel/files/mozilla.noxpg4
+++ b/japanese/mozilla-jlp-devel/files/mozilla.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 
-LANG=ja_JP.EUC; export LANG
+LANG=@LOCALENAME@; export LANG
+@LIBXPG4@
 
 cd @PREFIX@/lib/mozilla
 exec ./mozilla "$@"
diff --git a/japanese/mozilla-jlp-devel/files/mozilla.xpg4 b/japanese/mozilla-jlp-devel/files/mozilla.xpg4
deleted file mode 100644
index 9f78b708f077..000000000000
--- a/japanese/mozilla-jlp-devel/files/mozilla.xpg4
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-LANG=ja_JP.EUC; export LANG
-LD_PRELOAD=/usr/lib/libxpg4.so.2; export LD_PRELOAD
-
-cd @PREFIX@/lib/mozilla
-exec ./mozilla "$@"
diff --git a/japanese/mozilla-jlp-devel/files/unix.js b/japanese/mozilla-jlp-devel/files/unix.js
index 87f166093c6b..0cbac492bfb9 100644
--- a/japanese/mozilla-jlp-devel/files/unix.js
+++ b/japanese/mozilla-jlp-devel/files/unix.js
@@ -176,7 +176,7 @@ pref("font.name.monospace.zh-CN", "isas-song ti-gb2312.1980-0");
 
 // zh-TW
 
-pref("font.default", "serif");
+pref("font.default", "sans-serif");
 pref("font.size.variable.ar", 16);
 pref("font.size.fixed.ar", 12);
 
@@ -334,7 +334,6 @@ pref("print.xprint.font.rejectfontpattern",
 
 /* Xprint print module prefs */
 pref("print.xprint.font.force_outline_scaled_fonts", true);
-pref("print.xprint.font.scale_bitmap_fonts_with_devscale", true);
 
 /* PostScript print module prefs */
 pref("print.postscript.paper_size",    "letter");
diff --git a/japanese/mozilla-jlp-devel/pkg-descr b/japanese/mozilla-jlp-devel/pkg-descr
index f4062e511717..c2afe58c3a48 100644
--- a/japanese/mozilla-jlp-devel/pkg-descr
+++ b/japanese/mozilla-jlp-devel/pkg-descr
@@ -3,6 +3,7 @@ performance and portability.
 
 Mozilla Japanese Language Pack (JLP) Japanizes Mozilla GUI, which is
 provided by Kazu Yamamoto, Ryoichi Furukawa and MARUYAMA Tsukasa.
+Latest JLPs maintained by Hidehiro Kozawa.
 
 WWW: http://www.mozilla.gr.jp/jlp/
 
diff --git a/japanese/mozilla-jlp/Makefile b/japanese/mozilla-jlp/Makefile
index 897579008c41..9891380b2651 100644
--- a/japanese/mozilla-jlp/Makefile
+++ b/japanese/mozilla-jlp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mozilla
-PORTVERSION=	1.0.1
+PORTVERSION=	1.1
 #PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	japanese www
@@ -14,7 +14,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www2.starcat.ne.jp/~unha/jlp/
 MASTER_SITE_SUBDIR=	jlpmoz
 PKGNAMESUFFIX=	-jlp
-DISTNAME=	${PORTNAME}1.0.1rc1-jajppack-kv0.10
+DISTNAME=	${PORTNAME}${PORTVERSION}-jajppack-kv0.8
 EXTRACT_SUFX=	.xpi
 
 MAINTAINER=	yatt@msc.biglobe.ne.jp
@@ -31,10 +31,13 @@ EXTRACT_BEFORE_ARGS=	-qo
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 400020
-MOZILLA_SH=	mozilla.noxpg4
+.if ${OSVERSION} >= 450002
+LOCALENAME=	ja_JP.eucJP
+.elif ${OSVERSION} >= 400020
+LOCALENAME=	ja_JP.EUC
 .else
-MOZILLA_SH=	mozilla.xpg4
+LOCALENAME=	ja_JP.EUC
+LIBXPG4=	LD_PRELOAD=/usr/lib/libxpg4.so.2; export LD_PRELOAD
 .endif
 
 post-extract:
@@ -42,8 +45,10 @@ post-extract:
 	${CP} ${FILESDIR}/unix.js ${WRKSRC}/defaults/pref
 
 do-build:
-	${SED} -e "s;@PREFIX@;${PREFIX};g" \
-	${FILESDIR}/${MOZILLA_SH} > ${WRKDIR}/mozilla
+	${SED} -e "s^@PREFIX@^${PREFIX}^g" \
+	       -e "s^@LOCALENAME@^${LOCALENAME}^g" \
+	       -e "s^@LIBXPG4@^${LIBXPG4}^g" \
+	${FILESDIR}/mozilla.sh > ${WRKDIR}/mozilla
 
 do-install:
 	(cd ${PREFIX}/lib/mozilla/chrome; \
diff --git a/japanese/mozilla-jlp/distinfo b/japanese/mozilla-jlp/distinfo
index 604922aa4e9c..a111cdc6164e 100644
--- a/japanese/mozilla-jlp/distinfo
+++ b/japanese/mozilla-jlp/distinfo
@@ -1 +1 @@
-MD5 (mozilla1.0.1rc1-jajppack-kv0.10.xpi) = 2723cde02d4ea5f2c560a858215dcb2b
+MD5 (mozilla1.1-jajppack-kv0.8.xpi) = 741b5ee203048b50853e68f0ec5e9395
diff --git a/japanese/mozilla-jlp/files/mozilla.noxpg4 b/japanese/mozilla-jlp/files/mozilla.sh
index 2a2428058e68..7e183ce1f581 100644
--- a/japanese/mozilla-jlp/files/mozilla.noxpg4
+++ b/japanese/mozilla-jlp/files/mozilla.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 
-LANG=ja_JP.EUC; export LANG
+LANG=@LOCALENAME@; export LANG
+@LIBXPG4@
 
 cd @PREFIX@/lib/mozilla
 exec ./mozilla "$@"
diff --git a/japanese/mozilla-jlp/files/mozilla.xpg4 b/japanese/mozilla-jlp/files/mozilla.xpg4
deleted file mode 100644
index 9f78b708f077..000000000000
--- a/japanese/mozilla-jlp/files/mozilla.xpg4
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-LANG=ja_JP.EUC; export LANG
-LD_PRELOAD=/usr/lib/libxpg4.so.2; export LD_PRELOAD
-
-cd @PREFIX@/lib/mozilla
-exec ./mozilla "$@"
diff --git a/japanese/mozilla-jlp/files/unix.js b/japanese/mozilla-jlp/files/unix.js
index 87f166093c6b..0cbac492bfb9 100644
--- a/japanese/mozilla-jlp/files/unix.js
+++ b/japanese/mozilla-jlp/files/unix.js
@@ -176,7 +176,7 @@ pref("font.name.monospace.zh-CN", "isas-song ti-gb2312.1980-0");
 
 // zh-TW
 
-pref("font.default", "serif");
+pref("font.default", "sans-serif");
 pref("font.size.variable.ar", 16);
 pref("font.size.fixed.ar", 12);
 
@@ -334,7 +334,6 @@ pref("print.xprint.font.rejectfontpattern",
 
 /* Xprint print module prefs */
 pref("print.xprint.font.force_outline_scaled_fonts", true);
-pref("print.xprint.font.scale_bitmap_fonts_with_devscale", true);
 
 /* PostScript print module prefs */
 pref("print.postscript.paper_size",    "letter");
diff --git a/japanese/mozilla-jlp/pkg-descr b/japanese/mozilla-jlp/pkg-descr
index f4062e511717..c2afe58c3a48 100644
--- a/japanese/mozilla-jlp/pkg-descr
+++ b/japanese/mozilla-jlp/pkg-descr
@@ -3,6 +3,7 @@ performance and portability.
 
 Mozilla Japanese Language Pack (JLP) Japanizes Mozilla GUI, which is
 provided by Kazu Yamamoto, Ryoichi Furukawa and MARUYAMA Tsukasa.
+Latest JLPs maintained by Hidehiro Kozawa.
 
 WWW: http://www.mozilla.gr.jp/jlp/