firefox-33.1 has DuckDuckGo as a search option,

so remove related patches.

7 files changed, 4 insertions, 59 deletions

diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index a19725f54cf..6a890565f19 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.183 2014/11/10 20:55:56 ryoon Exp $
+# $NetBSD: Makefile,v 1.184 2014/11/15 22:04:59 szptvlfn Exp $
 
 FIREFOX_VER=	${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=	33.1
@@ -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=	1
 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/PLIST b/www/firefox/PLIST
index f728284a0bf..fc317e49c6f 100644
--- a/www/firefox/PLIST
+++ b/www/firefox/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.88 2014/11/10 20:55:56 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.89 2014/11/15 22:04:59 szptvlfn Exp $
 bin/firefox
 lib/firefox/application.ini
 lib/firefox/browser/blocklist.xml
@@ -1441,7 +1441,6 @@ lib/firefox/browser/modules/webrtcUI.jsm
 lib/firefox/browser/searchplugins/amazondotcom.xml
 lib/firefox/browser/searchplugins/bing.xml
 lib/firefox/browser/searchplugins/ddg.xml
-lib/firefox/browser/searchplugins/duckduckgo.xml
 lib/firefox/browser/searchplugins/eBay.xml
 lib/firefox/browser/searchplugins/google.xml
 lib/firefox/browser/searchplugins/twitter.xml
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index dda259d2062..09f0028a42b 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.168 2014/11/10 20:55:56 ryoon Exp $
+$NetBSD: distinfo,v 1.169 2014/11/15 22:04:59 szptvlfn Exp $
 
 SHA1 (firefox-33.1.source.tar.bz2) = bc87055d3b68e8458f07d0c04503b6aaed3771df
 RMD160 (firefox-33.1.source.tar.bz2) = d9fbb2d4caa4cd2a027c316584892a53fbaa33f5
@@ -13,11 +13,7 @@ SHA1 (patch-b2g_installer_package-manifest.in) = 56d73f510fb807ad11f40b0ceec5096
 SHA1 (patch-bf) = 75c971043e9f693203d6bd670b2c20c4952a7756
 SHA1 (patch-bg) = d6c02294765265d9e85cf49c22320d88573c2e25
 SHA1 (patch-browser_app_nsBrowserApp.cpp) = 00914f7656fff6785d737ce6e569a97fe39aafe8
-SHA1 (patch-browser_app_profile_firefox.js) = 108efbe1ae65669912d2f76caec546753e1ac8f3
 SHA1 (patch-browser_installer_package-manifest.in) = 83a0073525c607e05414688aa07035cc3f08e50a
-SHA1 (patch-browser_locales_en-US_chrome_browser-region_region.properties) = 284d62596718d7f372c4e5214fd05adec043c93a
-SHA1 (patch-browser_locales_en-US_searchplugins_duckduckgo.xml) = 69eca52185ac868e95041b5d87611ee32c2b6330
-SHA1 (patch-browser_locales_en-US_searchplugins_list.txt) = a6677b3a195b6c956858326e4e7474441823a47f
 SHA1 (patch-build_autoconf_compiler-opts.m4) = ccdc06a2b07b7664f9cb91bcc4fb29052dda8b07
 SHA1 (patch-build_autoconf_nss.m4) = bf65db126705a3a1ba294418b9380683ea401fc7
 SHA1 (patch-build_clang-plugin_configure) = eb5bf7774a938766bffd7636811801b96afd2280
diff --git a/www/firefox/patches/patch-browser_app_profile_firefox.js b/www/firefox/patches/patch-browser_app_profile_firefox.js
deleted file mode 100644
index cbecc2e0e1e..00000000000
--- a/www/firefox/patches/patch-browser_app_profile_firefox.js
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-browser_app_profile_firefox.js,v 1.3 2014/02/20 13:19:03 ryoon Exp $
-
---- browser/app/profile/firefox.js.orig	2013-09-10 03:43:20.000000000 +0000
-+++ browser/app/profile/firefox.js
-@@ -354,6 +354,7 @@ pref("browser.search.log", false);
- pref("browser.search.order.1",                "chrome://browser-region/locale/region.properties");
- pref("browser.search.order.2",                "chrome://browser-region/locale/region.properties");
- pref("browser.search.order.3",                "chrome://browser-region/locale/region.properties");
-+pref("browser.search.order.4",                "chrome://browser-region/locale/region.properties");
- 
- // search bar results always open in a new tab
- pref("browser.search.openintab", false);
diff --git a/www/firefox/patches/patch-browser_locales_en-US_chrome_browser-region_region.properties b/www/firefox/patches/patch-browser_locales_en-US_chrome_browser-region_region.properties
deleted file mode 100644
index 914065b4cfd..00000000000
--- a/www/firefox/patches/patch-browser_locales_en-US_chrome_browser-region_region.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-browser_locales_en-US_chrome_browser-region_region.properties,v 1.3 2014/02/20 13:19:03 ryoon Exp $
-
---- browser/locales/en-US/chrome/browser-region/region.properties.orig	2013-09-10 03:43:22.000000000 +0000
-+++ browser/locales/en-US/chrome/browser-region/region.properties
-@@ -9,6 +9,7 @@ browser.search.defaultenginename=Google
- browser.search.order.1=Google
- browser.search.order.2=Yahoo
- browser.search.order.3=Bing
-+browser.search.order.4=DuckDuckGo
- 
- # This is the default set of web based feed handlers shown in the reader
- # selection UI
diff --git a/www/firefox/patches/patch-browser_locales_en-US_searchplugins_duckduckgo.xml b/www/firefox/patches/patch-browser_locales_en-US_searchplugins_duckduckgo.xml
deleted file mode 100644
index 8e6fa78a342..00000000000
--- a/www/firefox/patches/patch-browser_locales_en-US_searchplugins_duckduckgo.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-browser_locales_en-US_searchplugins_duckduckgo.xml,v 1.3 2014/02/20 13:19:03 ryoon Exp $
-
---- browser/locales/en-US/searchplugins/duckduckgo.xml.orig	2013-09-14 15:17:46.000000000 +0000
-+++ browser/locales/en-US/searchplugins/duckduckgo.xml
-@@ -0,0 +1,11 @@
-+<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
-+<ShortName>DuckDuckGo</ShortName>
-+<Description>We believe in better search and not tracking.</Description>
-+<InputEncoding>UTF-8</InputEncoding>
-+<Image height="16" width="16" type="image/x-icon">data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAANcNAADXDQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJmlk8pf6+v3s/v7+++zr/fcnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnIOwBJyDscCcg7PZttJ7/7Pfs//////++xO7/S5GA/ycg7P8nIOz2JyDscCcg7AEAAAAAAAAAAAAAAAAnIOwBJyDstScg7P8nIOz/Y8p5/2fHZf9Yv0z/YcF2/1rBUv8nIOz/JyDs/ycg7P8nIOy1JyDsAQAAAAAAAAAAJyDscCcg7P8nIOz/JyDs/4jQoP/p9+n//////05X3v9LkYD/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAJyDsJicg7PYnIOz/JyDs/zUu7f/+/v////////////89N+7/JyDs/yUo7f8nIOz/JyDs/ycg7P8nIOz2JyDsJicg7IAnIOz/JyDs/ycg7P9hXPH////////////t/P//GIr2/wfD+/8Gyfz/DKv5/yM57/8nIOz/JyDs/ycg7H8nIOyzJyDs/ycg7P8nIOz/jov1////////////Otz9/w3G/P8cWfH/JSvt/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDs5icg7P8nIOz/JyDs/7u5+f///////////27l/v8E0v3/BNL9/wTQ/f8Oofn/IT7v/ycg7P8nIOz/JyDs5icg7OYnIOz/JyDs/ycg7P/p6P3/uWsC////////////5fr//6Po/f8Thfb/DKv5/w6f+f8nIOz/JyDs/ycg7OYnIOyzJyDs/ycg7P8nIOz/9/b+/////////////////7lrAv/V1Pv/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDsgCcg7P8nIOz/JyDs/8/N+///////////////////////iIX1/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDsfycg7CYnIOz2JyDs/ycg7P9FP+7/q6n4/+7u/f/n5v3/fXn0/yoj7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7CYAAAAAJyDscCcg7P8nIOz/wsD6/+no/f/Y1/z/eHTz/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAAAAAACcg7AEnIOy1JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7LUnIOwBAAAAAAAAAAAAAAAAJyDsAScg7HAnIOz2JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7HAnIOwBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJicg7IAnIOyzJyDs5icg7OYnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAA+B8AAPAPAADAAwAAwAMAAIABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAABAACAAQAAwAMAAMADAADwDwAA+B8AAA==</Image>
-+<Url type="text/html" method="GET" template="https://duckduckgo.com/">
-+<Param name="q" value="{searchTerms}"/>
-+<Param name="t" value="freebsd"/>
-+</Url>
-+<SearchForm>https://duckduckgo.com/</SearchForm>
-+</SearchPlugin>
diff --git a/www/firefox/patches/patch-browser_locales_en-US_searchplugins_list.txt b/www/firefox/patches/patch-browser_locales_en-US_searchplugins_list.txt
deleted file mode 100644
index 9dc20e87a78..00000000000
--- a/www/firefox/patches/patch-browser_locales_en-US_searchplugins_list.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-browser_locales_en-US_searchplugins_list.txt,v 1.3 2014/02/20 13:19:03 ryoon Exp $
-
---- browser/locales/en-US/searchplugins/list.txt.orig	2013-09-10 03:43:22.000000000 +0000
-+++ browser/locales/en-US/searchplugins/list.txt
-@@ -1,5 +1,6 @@
- amazondotcom
- bing
-+duckduckgo
- eBay
- google
- twitter