ports/84794: [PATCH] chinese/firefox-zh_CN: fix error(Google search parament)

[chinsan]

>Number:         84794
>Category:       ports
>Synopsis:       [PATCH] chinese/firefox-zh_CN: fix error(Google search parament)
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Aug 11 11:10:12 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     chinsan
>Release:        FreeBSD 5.4-STABLE i386
>Organization:
FreeBSD Taiwan
>Environment:
System: FreeBSD chinsan.twbbs.org 5.4-STABLE FreeBSD 5.4-STABLE #2: Sat Jul 30 16:27:25 CST 2005 root at chinsan.twbbs.org:/usr/obj/usr/src/sys/TAKAKO i386
>Description:

        - fix error(Google search parament)
          Ref: http://forum.moztw.org/viewtopic.php?p=41848

        - update some settings (including CJK Printing setting)
        - make Makefile more shorter

        Thanks.

>How-To-Repeat:
>Fix:

--- firefox-zh_CN.diff begins here ---
diff -ruN firefox-zh_CN.orig/Makefile firefox-zh_CN/Makefile
--- firefox-zh_CN.orig/Makefile	Thu Aug 11 18:29:49 2005
+++ firefox-zh_CN/Makefile	Thu Aug 11 18:53:23 2005
@@ -7,10 +7,11 @@
 
 PORTNAME=	firefox
 PORTVERSION=	1.0.6
+PORTREVISION=	1
 CATEGORIES=	chinese www
 MASTER_SITES=	http://bbs.ilc.edu.tw/~chinsan/firefox/
 PKGNAMESUFFIX=	-zh_CN
-DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}.${PORTVERSION}
+DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}.${PORTVERSION}b
 
 # Maintainership available: drop me a line if interested :p
 MAINTAINER=	chinsan.tw at gmail.com
@@ -20,9 +21,7 @@
 RUN_DEPENDS=	${FIREFOX}:${PORTSDIR}/www/firefox
 
 USE_X_PREFIX=	yes
-USE_ZIP=	yes
 NO_BUILD=	yes
-EXTRACT_BEFORE_ARGS=	-qo
 
 FIREFOX=	${PORTNAME}
 FIREFOX_HOME=	${PREFIX}/lib/${FIREFOX}
@@ -35,7 +34,7 @@
 .include <bsd.port.pre.mk>
 
 do-install:
-	echo "===> Backup setting files..."
+	@${ECHO_MSG} "===> Backup setting files..."
 	(cd ${FIREFOX_HOME}; \
 	${MV} -f browserconfig.properties browserconfig.properties.orig)
 	(cd ${FIREFOX_HOME}/defaults/pref; \
@@ -43,21 +42,22 @@
 	(cd ${FIREFOX_HOME}/defaults/profile; \
 	${MV} -f bookmarks.html bookmarks.html.orig)
 	(cd ${FIREFOX_HOME}/chrome; \
+	${MV} -f browser.jar browser.jar.orig; \
 	${MV} -f chrome.rdf chrome.rdf.orig; \
 	${MV} -f installed-chrome.txt installed-chrome.txt.orig)
 
-	echo "===> Copying locale files..."
-	(cd ${WRKDIR}; ${TAR} -cf - *) | \
+	@${ECHO_MSG} "===> Copying locale files..."
+	(cd ${WRKSRC}; ${TAR} -cf - *) | \
 	${TAR} -xf - -C ${FIREFOX_HOME}
 
-	echo "===> Cleaning Chrome's registry..."
+	@${ECHO_MSG} "===> Cleaning Chrome's registry..."
 	${RM} -rf ${FIREFOX_HOME}/chrome/overlayinfo
 	${RM} -f ${FIREFOX_HOME}/chrome/*.rdf
 	${MKDIR} ${FIREFOX_HOME}/chrome/overlayinfo
 	${RM} -f ${FIREFOX_HOME}/component.reg
 	${RM} -rf ${FIREFOX_HOME}/extensions
 
-	echo "===> Building Chrome's registry..."
+	@${ECHO_MSG} "===> Building Chrome's registry..."
 	(cd ${FIREFOX_HOME} || exit 1 ; \
 	./run-mozilla.sh ${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. \
 		${REGXPCOM} || true ; \
diff -ruN firefox-zh_CN.orig/distinfo firefox-zh_CN/distinfo
--- firefox-zh_CN.orig/distinfo	Thu Aug 11 18:29:49 2005
+++ firefox-zh_CN/distinfo	Thu Aug 11 18:49:37 2005
@@ -1,2 +1,2 @@
-MD5 (firefox-zh_CN.1.0.6.zip) = 145fe7a90a8a0916933f9df146743522
-SIZE (firefox-zh_CN.1.0.6.zip) = 134655
+MD5 (firefox-zh_CN.1.0.6b.tar.gz) = 116d6fd4c0d4ada1161af83707f962e3
+SIZE (firefox-zh_CN.1.0.6b.tar.gz) = 449525
diff -ruN firefox-zh_CN.orig/pkg-plist firefox-zh_CN/pkg-plist
--- firefox-zh_CN.orig/pkg-plist	Thu Aug 11 18:29:49 2005
+++ firefox-zh_CN/pkg-plist	Thu Aug 11 18:33:58 2005
@@ -1,9 +1,11 @@
 @exec mv %D/lib/%%FIREFOX%%/browserconfig.properties %D/lib/%%FIREFOX%%/browserconfig.properties.orig
+ at exec mv %D/lib/%%FIREFOX%%/chrome/browser.jar %D/lib/%%FIREFOX%%/chrome/browser.jar.orig
 @exec mv %D/lib/%%FIREFOX%%/chrome/chrome.rdf %D/lib/%%FIREFOX%%/chrome/chrome.rdf.orig
 @exec mv %D/lib/%%FIREFOX%%/chrome/installed-chrome.txt %D/lib/%%FIREFOX%%/chrome/installed-chrome.txt.orig
 @exec mv %D/lib/%%FIREFOX%%/defaults/pref/firefox-l10n.js %D/lib/%%FIREFOX%%/defaults/pref/firefox-l10n.js.orig
 @exec mv %D/lib/%%FIREFOX%%/defaults/profile/bookmarks.html %D/lib/%%FIREFOX%%/defaults/profile/bookmarks.html.orig
 lib/%%FIREFOX%%/browserconfig.properties
+lib/%%FIREFOX%%/chrome/browser.jar
 lib/%%FIREFOX%%/chrome/chrome.rdf
 lib/%%FIREFOX%%/chrome/installed-chrome.txt
 lib/%%FIREFOX%%/chrome/zh-CN.jar
@@ -17,6 +19,7 @@
 lib/%%FIREFOX%%/searchplugins/FreeBSD_PR.png
 lib/%%FIREFOX%%/searchplugins/FreeBSD_PR.src
 @unexec mv %D/lib/%%FIREFOX%%/browserconfig.properties.orig %D/lib/%%FIREFOX%%/browserconfig.properties
+ at unexec mv %D/lib/%%FIREFOX%%/chrome/browser.jar.orig %D/lib/%%FIREFOX%%/chrome/browser.jar
 @unexec mv %D/lib/%%FIREFOX%%/chrome/chrome.rdf.orig %D/lib/%%FIREFOX%%/chrome/chrome.rdf
 @unexec mv %D/lib/%%FIREFOX%%/chrome/installed-chrome.txt.orig %D/lib/%%FIREFOX%%/chrome/installed-chrome.txt
 @unexec mv %D/lib/%%FIREFOX%%/defaults/pref/firefox-l10n.js.orig %D/lib/%%FIREFOX%%/defaults/pref/firefox-l10n.js
--- firefox-zh_CN.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: