From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jun 26 08:10:01 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 99C41106566C for ; Fri, 26 Jun 2009 08:10:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 740B58FC1B for ; Fri, 26 Jun 2009 08:10:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n5Q8A1Cb066066 for ; Fri, 26 Jun 2009 08:10:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n5Q8A1pX066065; Fri, 26 Jun 2009 08:10:01 GMT (envelope-from gnats) Resent-Date: Fri, 26 Jun 2009 08:10:01 GMT Resent-Message-Id: <200906260810.n5Q8A1pX066065@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Sutra Zhou Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0EF2D1065674 for ; Fri, 26 Jun 2009 08:05:52 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id F0EA58FC14 for ; Fri, 26 Jun 2009 08:05:51 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id n5Q85pwE027234 for ; Fri, 26 Jun 2009 08:05:51 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id n5Q85p23027233; Fri, 26 Jun 2009 08:05:51 GMT (envelope-from nobody) Message-Id: <200906260805.n5Q85p23027233@www.freebsd.org> Date: Fri, 26 Jun 2009 08:05:51 GMT From: Sutra Zhou To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/136062: A patch to fix the patch file of xpi-foxyproxy about the function getDefaultPath X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Jun 2009 08:10:01 -0000 >Number: 136062 >Category: ports >Synopsis: A patch to fix the patch file of xpi-foxyproxy about the function getDefaultPath >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Jun 26 08:10:01 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Sutra Zhou >Release: >Organization: >Environment: >Description: When this port update to 2.9 (http://www.freebsd.org/cgi/cvsweb.cgi/ports/www/xpi-foxyproxy/files/patch-components_foxyproxy.js.diff?r1=text&tr1=1.1&r2=text&tr2=1.2), the patch file introduce an error as the line "return f;", this line should be deleted. >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruN /usr/ports/www/xpi-foxyproxy.old/Makefile /usr/ports/www/xpi-foxyproxy/Makefile --- /usr/ports/www/xpi-foxyproxy.old/Makefile 2009-06-26 15:39:33.000000000 +0800 +++ /usr/ports/www/xpi-foxyproxy/Makefile 2009-06-26 15:44:22.000000000 +0800 @@ -7,6 +7,7 @@ PORTNAME= foxyproxy PORTVERSION= 2.9 +PORTREVISION= 1 DISTVERSIONSUFFIX= -fx+sm+tb CATEGORIES= www diff -ruN /usr/ports/www/xpi-foxyproxy.old/files/patch-components_foxyproxy.js /usr/ports/www/xpi-foxyproxy/files/patch-components_foxyproxy.js --- /usr/ports/www/xpi-foxyproxy.old/files/patch-components_foxyproxy.js 2009-06-26 15:39:33.000000000 +0800 +++ /usr/ports/www/xpi-foxyproxy/files/patch-components_foxyproxy.js 2009-06-26 15:53:57.000000000 +0800 @@ -3,7 +3,7 @@ --- components/foxyproxy.js.orig +++ components/foxyproxy.js -@@ -424,15 +424,13 @@ +@@ -424,15 +424,12 @@ }, getDefaultPath : function() { @@ -14,7 +14,7 @@ + var file = CC["@mozilla.org/file/local;1"].createInstance(CI.nsILocalFile); + var dir = CC["@mozilla.org/file/directory_service;1"].getService(CI.nsIProperties).get("ProfD", CI.nsILocalFile); // dump("settings file: " + f.path + "\n"); - return f; +- return f; - // file.initWithPath(dir.path); - // file.appendRelativePath("foxyproxy.xml"); - // return file; >Release-Note: >Audit-Trail: >Unformatted: