Sat Feb 8 09:36:48 2014 UTC ()
Fix broken distinfo


(ryoon)
diff -r1.130 -r1.131 pkgsrc/www/firefox/distinfo
cvs diff -r1.130 -r1.131 pkgsrc/www/firefox/distinfo (expand / switch to unified diff)

--- pkgsrc/www/firefox/distinfo 2014/02/08 09:36:00 1.130
+++ pkgsrc/www/firefox/distinfo 2014/02/08 09:36:47 1.131
@@ -1,24 +1,18 @@ @@ -1,24 +1,18 @@
1$NetBSD: distinfo,v 1.130 2014/02/08 09:36:00 ryoon Exp $ 1$NetBSD: distinfo,v 1.131 2014/02/08 09:36:47 ryoon Exp $
2 2
3<<<<<<< distinfo 
4SHA1 (firefox-27.0.source.tar.bz2) = ec2031385237e30be829817ac79caa8e80cc2a14 3SHA1 (firefox-27.0.source.tar.bz2) = ec2031385237e30be829817ac79caa8e80cc2a14
5RMD160 (firefox-27.0.source.tar.bz2) = d1c1381cbb243239804481e2891d80f0aa3131c2 4RMD160 (firefox-27.0.source.tar.bz2) = d1c1381cbb243239804481e2891d80f0aa3131c2
6Size (firefox-27.0.source.tar.bz2) = 129222806 bytes 5Size (firefox-27.0.source.tar.bz2) = 129222806 bytes
7======= 
8SHA1 (firefox-26.0.source.tar.bz2) = f7c6642d6f62aea8d4eced48dd27aba0634edcd5 
9RMD160 (firefox-26.0.source.tar.bz2) = cb791da22377519db44164bedd64254dc839e2b8 
10Size (firefox-26.0.source.tar.bz2) = 127526380 bytes 
11>>>>>>> 1.129 
12SHA1 (patch-aa) = 1013e198fc5bb157a88589625addc7256177d914 6SHA1 (patch-aa) = 1013e198fc5bb157a88589625addc7256177d914
13SHA1 (patch-ak) = 6e1788b8d233d11495482af37798cc29ff3f6598 7SHA1 (patch-ak) = 6e1788b8d233d11495482af37798cc29ff3f6598
14SHA1 (patch-al) = 917ae8caae707e7d6cb41f593367aba8d6004850 8SHA1 (patch-al) = 917ae8caae707e7d6cb41f593367aba8d6004850
15SHA1 (patch-ao) = e1086eca14e209a1fcc48aeb91b779c9c50c2875 9SHA1 (patch-ao) = e1086eca14e209a1fcc48aeb91b779c9c50c2875
16SHA1 (patch-as) = 766991fca5f2f76524504786f2ea00b29cc207ba 10SHA1 (patch-as) = 766991fca5f2f76524504786f2ea00b29cc207ba
17SHA1 (patch-bf) = b2130bac22e0dca2eb6f252cc1649d548ffa02d2 11SHA1 (patch-bf) = b2130bac22e0dca2eb6f252cc1649d548ffa02d2
18SHA1 (patch-bg) = eb5c2162a902ccc788fb2e0293e1c5aa93f3e923 12SHA1 (patch-bg) = eb5c2162a902ccc788fb2e0293e1c5aa93f3e923
19SHA1 (patch-bi) = 9ba4d545c27682eeba8aeaf7891baedccbd9173d 13SHA1 (patch-bi) = 9ba4d545c27682eeba8aeaf7891baedccbd9173d
20SHA1 (patch-browser_app_profile_firefox.js) = 972f5bdcc4559ab86fd3308d86e11b8a5b6653d9 14SHA1 (patch-browser_app_profile_firefox.js) = 972f5bdcc4559ab86fd3308d86e11b8a5b6653d9
21SHA1 (patch-browser_installer_package-manifest.in) = 6c494bb89b60d8be4b60e7f80efd14b532adc34a 15SHA1 (patch-browser_installer_package-manifest.in) = 6c494bb89b60d8be4b60e7f80efd14b532adc34a
22SHA1 (patch-browser_locales_en-US_chrome_browser-region_region.properties) = 8725955406abcce8a75fc9f64fdc101a692b4da7 16SHA1 (patch-browser_locales_en-US_chrome_browser-region_region.properties) = 8725955406abcce8a75fc9f64fdc101a692b4da7
23SHA1 (patch-browser_locales_en-US_searchplugins_duckduckgo.xml) = 39e5a2ce5b4d1b18985897b5a34bf0da893eed84 17SHA1 (patch-browser_locales_en-US_searchplugins_duckduckgo.xml) = 39e5a2ce5b4d1b18985897b5a34bf0da893eed84
24SHA1 (patch-browser_locales_en-US_searchplugins_list.txt) = 6af544b8f39db1901ff466003db37ef41adcab07 18SHA1 (patch-browser_locales_en-US_searchplugins_list.txt) = 6af544b8f39db1901ff466003db37ef41adcab07