Pullup ticket #4381 - requested by ryoon

www/firefox: bug fix

Revisions pulled up:
- www/firefox/Makefile                                          1.160 via patch
- www/firefox/distinfo                                          1.137 via patch
- www/firefox/patches/patch-browser_app_nsBrowserApp.cpp        deleted

---
   Module Name:	pkgsrc
   Committed By:	ryoon
   Date:		Sat Apr 19 23:16:39 UTC 2014

   Modified Files:
   	pkgsrc/www/firefox: Makefile distinfo
   Removed Files:
   	pkgsrc/www/firefox/patches: patch-browser_app_nsBrowserApp.cpp

   Log Message:
   Bump PKGREVISION

   * Do not set plugin environmental variable

3 files changed, 3 insertions, 15 deletions

diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 954335a1e9d..ebedc1b62ed 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.156 2014/03/20 21:02:00 ryoon Exp $
+# $NetBSD: Makefile,v 1.156.2.1 2014/04/21 07:30:36 tron Exp $
 
 FIREFOX_VER=	${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=	28.0
@@ -6,6 +6,7 @@ MOZ_BRANCH_MINOR=
 
 DISTNAME=	firefox-${FIREFOX_VER}.source
 PKGNAME=	firefox-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//}
+PKGREVISION=	4
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
 MASTER_SITES+=	${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/}
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index 23488263c36..becd72f8e91 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.135 2014/03/30 01:03:22 ryoon Exp $
+$NetBSD: distinfo,v 1.135.2.1 2014/04/21 07:30:36 tron Exp $
 
 SHA1 (firefox-28.0.source.tar.bz2) = f78517836ceca0cd2a0d3db1f282985c616e3fae
 RMD160 (firefox-28.0.source.tar.bz2) = 71124b36dca319eaa0de268ce4f6133f0ceca4f9
@@ -11,7 +11,6 @@ SHA1 (patch-as) = 3ce6e71d638ac1b6dec6737c92246e2dc7ff5d84
 SHA1 (patch-bf) = 75c971043e9f693203d6bd670b2c20c4952a7756
 SHA1 (patch-bg) = d6c02294765265d9e85cf49c22320d88573c2e25
 SHA1 (patch-bi) = 3dd927d93431afe000cd4a45b4d9920e63158a85
-SHA1 (patch-browser_app_nsBrowserApp.cpp) = 348227a30b25fda41b4f79235fc623f64ca8e8ba
 SHA1 (patch-browser_app_profile_firefox.js) = 108efbe1ae65669912d2f76caec546753e1ac8f3
 SHA1 (patch-browser_installer_package-manifest.in) = d5792a3c5dd7498d24ac0426aacf7d0b9a842c67
 SHA1 (patch-browser_locales_en-US_chrome_browser-region_region.properties) = 284d62596718d7f372c4e5214fd05adec043c93a
diff --git a/www/firefox/patches/patch-browser_app_nsBrowserApp.cpp b/www/firefox/patches/patch-browser_app_nsBrowserApp.cpp
deleted file mode 100644
index cfe7efb6e03..00000000000
--- a/www/firefox/patches/patch-browser_app_nsBrowserApp.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-browser_app_nsBrowserApp.cpp,v 1.1 2014/03/20 21:02:00 ryoon Exp $
-
---- browser/app/nsBrowserApp.cpp.orig	2014-03-15 05:19:07.000000000 +0000
-+++ browser/app/nsBrowserApp.cpp
-@@ -586,6 +586,7 @@ int main(int argc, char* argv[])
-   TriggerQuirks();
- #endif
- 
-+  setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko", 0);
-   int gotCounters;
- #if defined(XP_UNIX)
-   struct rusage initialRUsage;