From nobody@FreeBSD.org  Fri Jun 26 08:05:52 2009
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0EF2D1065674
	for <freebsd-gnats-submit@FreeBSD.org>; 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 <freebsd-gnats-submit@FreeBSD.org>; 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 <freebsd-gnats-submit@FreeBSD.org>; 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 <zhoushuqun@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: A patch to fix the patch file of xpi-foxyproxy about the function getDefaultPath
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: wahjava@gmail.com

>Number:         136062
>Category:       ports
>Synopsis:       A patch to fix the patch file of www/xpi-foxyproxy about the function getDefaultPath
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    nork
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jun 26 08:10:01 UTC 2009
>Closed-Date:    Tue Jul 14 03:57:10 UTC 2009
>Last-Modified:  Tue Jul 14 04:00:02 UTC 2009
>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:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Sat Jun 27 07:16:14 UTC 2009 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=136062 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: wahjava@gmail.com
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/136062: A patch to fix the patch file of www/xpi-foxyproxy about the function getDefaultPath
Date: Sat, 27 Jun 2009 07:16:13 UT

 Maintainer of www/xpi-foxyproxy,
 
 Please note that PR ports/136062 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/136062
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: wahjava@gmail.com (Ashish SHUKLA)
To: bug-followup@FreeBSD.org,zhoushuqun@gmail.com
Cc:  
Subject: Re: ports/136062: A patch to fix the patch file of www/xpi-foxyproxy about the function getDefaultPath
Date: Tue, 14 Jul 2009 07:55:49 +0530

 Hi,
 
 Apologies for the delay in replying to this PR.
 
 Thanks for the fix. It seems this fix is not needed anymore as it is
 included in the upstream.
 
 I'm attaching the diff which updates the port to the latest version
 (2.13). The 'files' directory is removed from the port.
 
 Thanks
 -- 
 Ashish SHUKLA

From: wahjava@gmail.com (Ashish SHUKLA)
To: bug-followup@freebsd.org, zhoushuqun@gmail.com
Cc:  
Subject: Re: ports/136062: A patch to fix the patch file of www/xpi-foxyproxy about the function getDefaultPath
Date: Tue, 14 Jul 2009 07:57:40 +0530

 --=-=-=
 
 Sorry, forgot to attach the diff file.
 
 -- 
 Ashish SHUKLA
 
 --=-=-=
 Content-Disposition: attachment; filename=xpi-foxyproxy.diff
 Content-Description: diff
 
 diff -urN /usr/ports/www/xpi-foxyproxy/Makefile xpi-foxyproxy/Makefile
 --- /usr/ports/www/xpi-foxyproxy/Makefile	2009-06-03 03:02:53.000000000 +0530
 +++ xpi-foxyproxy/Makefile	2009-07-14 07:50:52.000000000 +0530
 @@ -6,7 +6,7 @@
  #
  
  PORTNAME=	foxyproxy
 -PORTVERSION=	2.9
 +PORTVERSION=	2.13
  DISTVERSIONSUFFIX=	-fx+sm+tb
  CATEGORIES=	www
  
 diff -urN /usr/ports/www/xpi-foxyproxy/distinfo xpi-foxyproxy/distinfo
 --- /usr/ports/www/xpi-foxyproxy/distinfo	2009-06-03 03:02:53.000000000 +0530
 +++ xpi-foxyproxy/distinfo	2009-07-14 07:39:29.000000000 +0530
 @@ -1,3 +1,3 @@
 -MD5 (xpi/foxyproxy-2.9-fx+sm+tb.xpi) = ea71be9f4ab3ee3e81c21160c5fb146f
 -SHA256 (xpi/foxyproxy-2.9-fx+sm+tb.xpi) = 1921ae4aafffc000d067930156a3a243a4e0f143b44fc60f121185bf5b113bea
 -SIZE (xpi/foxyproxy-2.9-fx+sm+tb.xpi) = 567733
 +MD5 (xpi/foxyproxy-2.13-fx+sm+tb.xpi) = 51eea61bcc733f05a883f120e2f110d1
 +SHA256 (xpi/foxyproxy-2.13-fx+sm+tb.xpi) = 14f3a696c4f95392161ea62c81fd5c6045cb83757e86a6c038dc6d1870860810
 +SIZE (xpi/foxyproxy-2.13-fx+sm+tb.xpi) = 610587
 diff -urN /usr/ports/www/xpi-foxyproxy/files/patch-components_foxyproxy.js xpi-foxyproxy/files/patch-components_foxyproxy.js
 --- /usr/ports/www/xpi-foxyproxy/files/patch-components_foxyproxy.js	2009-06-03 03:02:53.000000000 +0530
 +++ xpi-foxyproxy/files/patch-components_foxyproxy.js	1970-01-01 05:30:00.000000000 +0530
 @@ -1,26 +0,0 @@
 -
 -$FreeBSD: ports/www/xpi-foxyproxy/files/patch-components_foxyproxy.js,v 1.2 2009/06/02 21:32:53 miwi Exp $
 -
 ---- components/foxyproxy.js.orig
 -+++ components/foxyproxy.js
 -@@ -424,15 +424,13 @@
 -   },
 - 
 -   getDefaultPath : function() {
 --    //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);
 --    var f = settingsDir.clone();
 --    f.append("foxyproxy.xml");
 -+    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;
 --    // file.initWithPath(dir.path);
 --    // file.appendRelativePath("foxyproxy.xml");
 --    // return file;
 -+    file.initWithPath(dir.path);
 -+    file.appendRelativePath("foxyproxy.xml");
 -+    return file;
 -   },
 - 
 -   // Convert |o| from:
 diff -urN /usr/ports/www/xpi-foxyproxy/pkg-plist xpi-foxyproxy/pkg-plist
 --- /usr/ports/www/xpi-foxyproxy/pkg-plist	2009-06-03 03:02:53.000000000 +0530
 +++ xpi-foxyproxy/pkg-plist	2009-07-14 07:44:02.000000000 +0530
 @@ -8,7 +8,9 @@
  %%XPI_XPIDIR%%/chrome/content/blockedpagepattern.xul
  %%XPI_XPIDIR%%/chrome/content/chooseproxy.js
  %%XPI_XPIDIR%%/chrome/content/chooseproxy.xul
 +%%XPI_XPIDIR%%/chrome/content/colorvalidator.js
  %%XPI_XPIDIR%%/chrome/content/firefoxOptionsOverlay.xul
 +%%XPI_XPIDIR%%/chrome/content/firefoxOverlay-svg.xul
  %%XPI_XPIDIR%%/chrome/content/firefoxOverlay.xul
  %%XPI_XPIDIR%%/chrome/content/foxyproxy.css
  %%XPI_XPIDIR%%/chrome/content/foxyproxySongbird.css
 @@ -157,6 +159,10 @@
  %%XPI_XPIDIR%%/chrome/locale/uk-UA/foxyproxy.dtd
  %%XPI_XPIDIR%%/chrome/locale/uk-UA/foxyproxy.properties
  %%XPI_XPIDIR%%/chrome/locale/uk-UA/torwizhelp.dtd
 +%%XPI_XPIDIR%%/chrome/locale/vi-VN/amo.properties
 +%%XPI_XPIDIR%%/chrome/locale/vi-VN/foxyproxy.dtd
 +%%XPI_XPIDIR%%/chrome/locale/vi-VN/foxyproxy.properties
 +%%XPI_XPIDIR%%/chrome/locale/vi-VN/torwizhelp.dtd
  %%XPI_XPIDIR%%/chrome/locale/zh-CN/amo.properties
  %%XPI_XPIDIR%%/chrome/locale/zh-CN/foxyproxy.dtd
  %%XPI_XPIDIR%%/chrome/locale/zh-CN/foxyproxy.properties
 @@ -208,6 +214,7 @@
  @dirrm %%XPI_XPIDIR%%/chrome/locale/th-TH
  @dirrm %%XPI_XPIDIR%%/chrome/locale/tr-TR
  @dirrm %%XPI_XPIDIR%%/chrome/locale/uk-UA
 +@dirrm %%XPI_XPIDIR%%/chrome/locale/vi-VN
  @dirrm %%XPI_XPIDIR%%/chrome/locale/zh-CN
  @dirrm %%XPI_XPIDIR%%/chrome/locale/zh-TW
  @dirrm %%XPI_XPIDIR%%/chrome/locale
 
 --=-=-=--
State-Changed-From-To: feedback->analyzed 
State-Changed-By: nork 
State-Changed-When: Tue Jul 14 03:47:40 UTC 2009 
State-Changed-Why:  
I'll handle this. 


Responsible-Changed-From-To: freebsd-ports-bugs->nork 
Responsible-Changed-By: nork 
Responsible-Changed-When: Tue Jul 14 03:47:40 UTC 2009 
Responsible-Changed-Why:  
I'll handle this. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=136062 
State-Changed-From-To: analyzed->closed 
State-Changed-By: nork 
State-Changed-When: Tue Jul 14 03:56:59 UTC 2009 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=136062 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/136062: commit references a PR
Date: Tue, 14 Jul 2009 03:57:05 +0000 (UTC)

 nork        2009-07-14 03:56:51 UTC
 
   FreeBSD ports repository
 
   Modified files:
     www/xpi-foxyproxy    Makefile distinfo pkg-plist 
   Removed files:
     www/xpi-foxyproxy/files patch-components_foxyproxy.js 
   Log:
   Update to 2.13.
   
   PR:             ports/136062
   Reported by:    Sutra Zhou   zhoushuqun gmail com
   Submitted by:   Ashish SHUKLA   wahjava gmail com (maintainer)
   
   Revision  Changes    Path
   1.7       +1 -1      ports/www/xpi-foxyproxy/Makefile
   1.7       +3 -3      ports/www/xpi-foxyproxy/distinfo
   1.3       +0 -26     ports/www/xpi-foxyproxy/files/patch-components_foxyproxy.js (dead)
   1.7       +7 -0      ports/www/xpi-foxyproxy/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
