Sat Nov 15 22:04:59 2014 UTC ()
firefox-33.1 has DuckDuckGo as a search option,
so remove related patches.


(szptvlfn)
diff -r1.183 -r1.184 pkgsrc/www/firefox/Makefile
diff -r1.88 -r1.89 pkgsrc/www/firefox/PLIST
diff -r1.168 -r1.169 pkgsrc/www/firefox/distinfo
diff -r1.3 -r0 pkgsrc/www/firefox/patches/patch-browser_app_profile_firefox.js
diff -r1.3 -r0 pkgsrc/www/firefox/patches/patch-browser_locales_en-US_chrome_browser-region_region.properties
diff -r1.3 -r0 pkgsrc/www/firefox/patches/patch-browser_locales_en-US_searchplugins_duckduckgo.xml
diff -r1.3 -r0 pkgsrc/www/firefox/patches/patch-browser_locales_en-US_searchplugins_list.txt
cvs diff -r1.183 -r1.184 pkgsrc/www/firefox/Makefile (expand / switch to unified diff)

--- pkgsrc/www/firefox/Makefile 2014/11/10 20:55:56 1.183
+++ pkgsrc/www/firefox/Makefile 2014/11/15 22:04:59 1.184
@@ -1,21 +1,22 @@ @@ -1,21 +1,22 @@
1# $NetBSD: Makefile,v 1.183 2014/11/10 20:55:56 ryoon Exp $ 1# $NetBSD: Makefile,v 1.184 2014/11/15 22:04:59 szptvlfn Exp $
2 2
3FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR} 3FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
4MOZ_BRANCH= 33.1 4MOZ_BRANCH= 33.1
5MOZ_BRANCH_MINOR=  5MOZ_BRANCH_MINOR=
6 6
7DISTNAME= firefox-${FIREFOX_VER}.source 7DISTNAME= firefox-${FIREFOX_VER}.source
8PKGNAME= firefox-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//} 8PKGNAME= firefox-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//}
 9PKGREVISION= 1
9CATEGORIES= www 10CATEGORIES= www
10MASTER_SITES= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/} 11MASTER_SITES= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
11MASTER_SITES+= ${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/} 12MASTER_SITES+= ${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/}
12EXTRACT_SUFX= .tar.bz2 13EXTRACT_SUFX= .tar.bz2
13 14
14WRKSRC= ${WRKDIR}/mozilla-release 15WRKSRC= ${WRKDIR}/mozilla-release
15#WRKSRC= ${WRKDIR}/mozilla-beta 16#WRKSRC= ${WRKDIR}/mozilla-beta
16 17
17MAINTAINER= ryoon@NetBSD.org 18MAINTAINER= ryoon@NetBSD.org
18HOMEPAGE= http://www.mozilla.com/en-US/firefox/ 19HOMEPAGE= http://www.mozilla.com/en-US/firefox/
19COMMENT= Web browser with support for extensions (version ${MOZ_BRANCH:C/\..*//}) 20COMMENT= Web browser with support for extensions (version ${MOZ_BRANCH:C/\..*//})
20LICENSE= mpl-1.1 21LICENSE= mpl-1.1
21 22
cvs diff -r1.88 -r1.89 pkgsrc/www/firefox/PLIST (expand / switch to unified diff)

--- pkgsrc/www/firefox/PLIST 2014/11/10 20:55:56 1.88
+++ pkgsrc/www/firefox/PLIST 2014/11/15 22:04:59 1.89
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.88 2014/11/10 20:55:56 ryoon Exp $ 1@comment $NetBSD: PLIST,v 1.89 2014/11/15 22:04:59 szptvlfn Exp $
2bin/firefox 2bin/firefox
3lib/firefox/application.ini 3lib/firefox/application.ini
4lib/firefox/browser/blocklist.xml 4lib/firefox/browser/blocklist.xml
5lib/firefox/browser/chrome.manifest 5lib/firefox/browser/chrome.manifest
6${PLIST.nobranding}lib/firefox/browser/chrome/browser/content/branding/about-background.png 6${PLIST.nobranding}lib/firefox/browser/chrome/browser/content/branding/about-background.png
7lib/firefox/browser/chrome/browser/content/branding/about-logo.png 7lib/firefox/browser/chrome/browser/content/branding/about-logo.png
8lib/firefox/browser/chrome/browser/content/branding/about-logo@2x.png 8lib/firefox/browser/chrome/browser/content/branding/about-logo@2x.png
9lib/firefox/browser/chrome/browser/content/branding/about-wordmark.svg 9lib/firefox/browser/chrome/browser/content/branding/about-wordmark.svg
10lib/firefox/browser/chrome/browser/content/branding/about.png 10lib/firefox/browser/chrome/browser/content/branding/about.png
11lib/firefox/browser/chrome/browser/content/branding/aboutDialog.css 11lib/firefox/browser/chrome/browser/content/branding/aboutDialog.css
12lib/firefox/browser/chrome/browser/content/branding/icon128.png 12lib/firefox/browser/chrome/browser/content/branding/icon128.png
13lib/firefox/browser/chrome/browser/content/branding/icon16.png 13lib/firefox/browser/chrome/browser/content/branding/icon16.png
14lib/firefox/browser/chrome/browser/content/branding/icon32.png 14lib/firefox/browser/chrome/browser/content/branding/icon32.png
@@ -1431,27 +1431,26 @@ lib/firefox/browser/modules/sessionstore @@ -1431,27 +1431,26 @@ lib/firefox/browser/modules/sessionstore
1431lib/firefox/browser/modules/sessionstore/Utils.jsm 1431lib/firefox/browser/modules/sessionstore/Utils.jsm
1432lib/firefox/browser/modules/tabview/utils.jsm 1432lib/firefox/browser/modules/tabview/utils.jsm
1433lib/firefox/browser/modules/translation/BingTranslator.jsm 1433lib/firefox/browser/modules/translation/BingTranslator.jsm
1434lib/firefox/browser/modules/translation/LanguageDetector.jsm 1434lib/firefox/browser/modules/translation/LanguageDetector.jsm
1435lib/firefox/browser/modules/translation/Translation.jsm 1435lib/firefox/browser/modules/translation/Translation.jsm
1436lib/firefox/browser/modules/translation/TranslationContentHandler.jsm 1436lib/firefox/browser/modules/translation/TranslationContentHandler.jsm
1437lib/firefox/browser/modules/translation/TranslationDocument.jsm 1437lib/firefox/browser/modules/translation/TranslationDocument.jsm
1438lib/firefox/browser/modules/translation/cld-worker.js 1438lib/firefox/browser/modules/translation/cld-worker.js
1439lib/firefox/browser/modules/translation/cld-worker.js.mem 1439lib/firefox/browser/modules/translation/cld-worker.js.mem
1440lib/firefox/browser/modules/webrtcUI.jsm 1440lib/firefox/browser/modules/webrtcUI.jsm
1441lib/firefox/browser/searchplugins/amazondotcom.xml 1441lib/firefox/browser/searchplugins/amazondotcom.xml
1442lib/firefox/browser/searchplugins/bing.xml 1442lib/firefox/browser/searchplugins/bing.xml
1443lib/firefox/browser/searchplugins/ddg.xml 1443lib/firefox/browser/searchplugins/ddg.xml
1444lib/firefox/browser/searchplugins/duckduckgo.xml 
1445lib/firefox/browser/searchplugins/eBay.xml 1444lib/firefox/browser/searchplugins/eBay.xml
1446lib/firefox/browser/searchplugins/google.xml 1445lib/firefox/browser/searchplugins/google.xml
1447lib/firefox/browser/searchplugins/twitter.xml 1446lib/firefox/browser/searchplugins/twitter.xml
1448lib/firefox/browser/searchplugins/wikipedia.xml 1447lib/firefox/browser/searchplugins/wikipedia.xml
1449lib/firefox/browser/searchplugins/yahoo.xml 1448lib/firefox/browser/searchplugins/yahoo.xml
1450lib/firefox/chrome.manifest 1449lib/firefox/chrome.manifest
1451lib/firefox/chrome/chrome.manifest 1450lib/firefox/chrome/chrome.manifest
1452lib/firefox/chrome/en-US/locale/en-US/alerts/alert.dtd 1451lib/firefox/chrome/en-US/locale/en-US/alerts/alert.dtd
1453lib/firefox/chrome/en-US/locale/en-US/alerts/notificationNames.properties 1452lib/firefox/chrome/en-US/locale/en-US/alerts/notificationNames.properties
1454lib/firefox/chrome/en-US/locale/en-US/autoconfig/autoconfig.properties 1453lib/firefox/chrome/en-US/locale/en-US/autoconfig/autoconfig.properties
1455lib/firefox/chrome/en-US/locale/en-US/cookie/cookieAcceptDialog.dtd 1454lib/firefox/chrome/en-US/locale/en-US/cookie/cookieAcceptDialog.dtd
1456lib/firefox/chrome/en-US/locale/en-US/cookie/cookieAcceptDialog.properties 1455lib/firefox/chrome/en-US/locale/en-US/cookie/cookieAcceptDialog.properties
1457lib/firefox/chrome/en-US/locale/en-US/formautofill/requestAutocomplete.dtd 1456lib/firefox/chrome/en-US/locale/en-US/formautofill/requestAutocomplete.dtd
cvs diff -r1.168 -r1.169 pkgsrc/www/firefox/distinfo (expand / switch to unified diff)

--- pkgsrc/www/firefox/distinfo 2014/11/10 20:55:56 1.168
+++ pkgsrc/www/firefox/distinfo 2014/11/15 22:04:59 1.169
@@ -1,33 +1,29 @@ @@ -1,33 +1,29 @@
1$NetBSD: distinfo,v 1.168 2014/11/10 20:55:56 ryoon Exp $ 1$NetBSD: distinfo,v 1.169 2014/11/15 22:04:59 szptvlfn Exp $
2 2
3SHA1 (firefox-33.1.source.tar.bz2) = bc87055d3b68e8458f07d0c04503b6aaed3771df 3SHA1 (firefox-33.1.source.tar.bz2) = bc87055d3b68e8458f07d0c04503b6aaed3771df
4RMD160 (firefox-33.1.source.tar.bz2) = d9fbb2d4caa4cd2a027c316584892a53fbaa33f5 4RMD160 (firefox-33.1.source.tar.bz2) = d9fbb2d4caa4cd2a027c316584892a53fbaa33f5
5Size (firefox-33.1.source.tar.bz2) = 155321143 bytes 5Size (firefox-33.1.source.tar.bz2) = 155321143 bytes
6SHA1 (patch-aa) = 9975c507837d3894ca4915e5c5fd65264f1cd526 6SHA1 (patch-aa) = 9975c507837d3894ca4915e5c5fd65264f1cd526
7SHA1 (patch-ak) = ebbb0c0c6e7923acc056f15ebd11307726ec65dc 7SHA1 (patch-ak) = ebbb0c0c6e7923acc056f15ebd11307726ec65dc
8SHA1 (patch-al) = cca5df21d018bb9f428ad26d00718f33afe88ec5 8SHA1 (patch-al) = cca5df21d018bb9f428ad26d00718f33afe88ec5
9SHA1 (patch-ao) = ca7e6723a10b9f6e3306cd12557e1856727edee9 9SHA1 (patch-ao) = ca7e6723a10b9f6e3306cd12557e1856727edee9
10SHA1 (patch-as) = e20234ba1ce89035132c436fd3f77d0170cb3b42 10SHA1 (patch-as) = e20234ba1ce89035132c436fd3f77d0170cb3b42
11SHA1 (patch-b2g_installer_Makefile.in) = 7b3cca1da34c444c1055deec21723db909ec3d94 11SHA1 (patch-b2g_installer_Makefile.in) = 7b3cca1da34c444c1055deec21723db909ec3d94
12SHA1 (patch-b2g_installer_package-manifest.in) = 56d73f510fb807ad11f40b0ceec50961049549da 12SHA1 (patch-b2g_installer_package-manifest.in) = 56d73f510fb807ad11f40b0ceec50961049549da
13SHA1 (patch-bf) = 75c971043e9f693203d6bd670b2c20c4952a7756 13SHA1 (patch-bf) = 75c971043e9f693203d6bd670b2c20c4952a7756
14SHA1 (patch-bg) = d6c02294765265d9e85cf49c22320d88573c2e25 14SHA1 (patch-bg) = d6c02294765265d9e85cf49c22320d88573c2e25
15SHA1 (patch-browser_app_nsBrowserApp.cpp) = 00914f7656fff6785d737ce6e569a97fe39aafe8 15SHA1 (patch-browser_app_nsBrowserApp.cpp) = 00914f7656fff6785d737ce6e569a97fe39aafe8
16SHA1 (patch-browser_app_profile_firefox.js) = 108efbe1ae65669912d2f76caec546753e1ac8f3 
17SHA1 (patch-browser_installer_package-manifest.in) = 83a0073525c607e05414688aa07035cc3f08e50a 16SHA1 (patch-browser_installer_package-manifest.in) = 83a0073525c607e05414688aa07035cc3f08e50a
18SHA1 (patch-browser_locales_en-US_chrome_browser-region_region.properties) = 284d62596718d7f372c4e5214fd05adec043c93a 
19SHA1 (patch-browser_locales_en-US_searchplugins_duckduckgo.xml) = 69eca52185ac868e95041b5d87611ee32c2b6330 
20SHA1 (patch-browser_locales_en-US_searchplugins_list.txt) = a6677b3a195b6c956858326e4e7474441823a47f 
21SHA1 (patch-build_autoconf_compiler-opts.m4) = ccdc06a2b07b7664f9cb91bcc4fb29052dda8b07 17SHA1 (patch-build_autoconf_compiler-opts.m4) = ccdc06a2b07b7664f9cb91bcc4fb29052dda8b07
22SHA1 (patch-build_autoconf_nss.m4) = bf65db126705a3a1ba294418b9380683ea401fc7 18SHA1 (patch-build_autoconf_nss.m4) = bf65db126705a3a1ba294418b9380683ea401fc7
23SHA1 (patch-build_clang-plugin_configure) = eb5bf7774a938766bffd7636811801b96afd2280 19SHA1 (patch-build_clang-plugin_configure) = eb5bf7774a938766bffd7636811801b96afd2280
24SHA1 (patch-build_gyp.mozbuild) = 2842da0783d344dd12e86adde447f7cda6191518 20SHA1 (patch-build_gyp.mozbuild) = 2842da0783d344dd12e86adde447f7cda6191518
25SHA1 (patch-build_pgo_profileserver.py) = 8666187258e47c037f2065a19a5b38946fdc0f6c 21SHA1 (patch-build_pgo_profileserver.py) = 8666187258e47c037f2065a19a5b38946fdc0f6c
26SHA1 (patch-config_Makefile.in) = 296bd3bc33346cfcfa658fe641c2ee2ac67549f1 22SHA1 (patch-config_Makefile.in) = 296bd3bc33346cfcfa658fe641c2ee2ac67549f1
27SHA1 (patch-config_baseconfig.mk) = 07c295fbfbaeb969b336def32d8924729e332075 23SHA1 (patch-config_baseconfig.mk) = 07c295fbfbaeb969b336def32d8924729e332075
28SHA1 (patch-config_external_moz.build) = 99b10ed0e04f78f97678bd81cbc5da09aecf88e4 24SHA1 (patch-config_external_moz.build) = 99b10ed0e04f78f97678bd81cbc5da09aecf88e4
29SHA1 (patch-config_rules.mk) = ec74e2e385e95252a1325c8c9c859a0b2dcee693 25SHA1 (patch-config_rules.mk) = ec74e2e385e95252a1325c8c9c859a0b2dcee693
30SHA1 (patch-config_stl__wrappers_ios) = 00d723e2f2f252485350ede5833f0bb84c1235c1 26SHA1 (patch-config_stl__wrappers_ios) = 00d723e2f2f252485350ede5833f0bb84c1235c1
31SHA1 (patch-config_stl__wrappers_ostream) = 7be7fe36704ffbdc070a113b46b4f391a598206b 27SHA1 (patch-config_stl__wrappers_ostream) = 7be7fe36704ffbdc070a113b46b4f391a598206b
32SHA1 (patch-config_system-headers) = c586c07d96ba3bd6ac35247ed50eab0978ccc949 28SHA1 (patch-config_system-headers) = c586c07d96ba3bd6ac35247ed50eab0978ccc949
33SHA1 (patch-config_system__wrappers_unwind.h) = b3bdac0710179b9c8f8eabd824216d0114504491 29SHA1 (patch-config_system__wrappers_unwind.h) = b3bdac0710179b9c8f8eabd824216d0114504491
File Deleted: pkgsrc/www/firefox/patches/patch-browser_app_profile_firefox.js
File Deleted: pkgsrc/www/firefox/patches/Attic/patch-browser_locales_en-US_chrome_browser-region_region.properties
File Deleted: pkgsrc/www/firefox/patches/Attic/patch-browser_locales_en-US_searchplugins_duckduckgo.xml
File Deleted: pkgsrc/www/firefox/patches/Attic/patch-browser_locales_en-US_searchplugins_list.txt