[pkgsrc/trunk]: pkgsrc/www/firefox Fix PR pkg/48240 and bump PKGREVISION

[ryoon <ryoon%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4cfaaf890233
branches:  trunk
changeset: 626480:4cfaaf890233
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Wed Nov 13 14:12:31 2013 +0000

description:
Fix PR pkg/48240 and bump PKGREVISION

* Use *30 instead of *50. Restore session is recovered on NetBSD/amd64 5.2.
  Based on martin@'s patch on pkgsrc-users@.

diffstat:

 www/firefox/Makefile                                                               |   4 +-
 www/firefox/distinfo                                                               |   4 +-
 www/firefox/patches/patch-toolkit_components_osfile_modules_osfile__unix__back.jsm |  13 +++++----
 3 files changed, 11 insertions(+), 10 deletions(-)

diffs (78 lines):

diff -r 2a129dff9fa0 -r 4cfaaf890233 www/firefox/Makefile
--- a/www/firefox/Makefile      Wed Nov 13 13:51:14 2013 +0000
+++ b/www/firefox/Makefile      Wed Nov 13 14:12:31 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.144 2013/11/07 15:47:23 ryoon Exp $
+# $NetBSD: Makefile,v 1.145 2013/11/13 14:12:31 ryoon Exp $
 
 FIREFOX_VER=   ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=    25.0
@@ -6,7 +6,7 @@
 
 DISTNAME=      firefox-${FIREFOX_VER}.source
 PKGNAME=       firefox-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
 #MASTER_SITES+=        ${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/}
diff -r 2a129dff9fa0 -r 4cfaaf890233 www/firefox/distinfo
--- a/www/firefox/distinfo      Wed Nov 13 13:51:14 2013 +0000
+++ b/www/firefox/distinfo      Wed Nov 13 14:12:31 2013 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.123 2013/11/07 15:47:23 ryoon Exp $
+$NetBSD: distinfo,v 1.124 2013/11/13 14:12:31 ryoon Exp $
 
 SHA1 (firefox-25.0.source.tar.bz2) = 854722e283659d2b6b2eacd38f757b3c5b63a448
 RMD160 (firefox-25.0.source.tar.bz2) = f320994b6b2f2030b5a68bc28cdd6904d9ef8ce3
@@ -113,7 +113,7 @@
 SHA1 (patch-rc) = 2733724442a2cb49c5091146fd7e6001af686121
 SHA1 (patch-security_manager_ssl_src_JARSignatureVerification.cpp) = e9749dfeb0d3fcb4637935322ffd1e0cad4f8ec3
 SHA1 (patch-security_manager_ssl_src_nsNSSComponent.cpp) = c4c96b7d3cb0c5dbcfe3820fd52421eec2592452
-SHA1 (patch-toolkit_components_osfile_modules_osfile__unix__back.jsm) = 8d741f5a00c679a0e3859870a19a16bd58f9ba5d
+SHA1 (patch-toolkit_components_osfile_modules_osfile__unix__back.jsm) = de61b5ceaaea270bd298582c648704f4e68bebff
 SHA1 (patch-toolkit_components_osfile_modules_osfile__unix__front.jsm) = b05a21e1ecad8de6cd8057d2a3ee76167293cde2
 SHA1 (patch-toolkit_library_Makefile.in) = 0c91d647f0f3a4653d39f11c9d8fd63611235932
 SHA1 (patch-toolkit_mozapps_update_updater_updater.cpp) = 6936e5408fc7f0110768f3fc8f27506c0e7879fa
diff -r 2a129dff9fa0 -r 4cfaaf890233 www/firefox/patches/patch-toolkit_components_osfile_modules_osfile__unix__back.jsm
--- a/www/firefox/patches/patch-toolkit_components_osfile_modules_osfile__unix__back.jsm        Wed Nov 13 13:51:14 2013 +0000
+++ b/www/firefox/patches/patch-toolkit_components_osfile_modules_osfile__unix__back.jsm        Wed Nov 13 14:12:31 2013 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-toolkit_components_osfile_modules_osfile__unix__back.jsm,v 1.1 2013/11/07 15:47:23 ryoon Exp $
+$NetBSD: patch-toolkit_components_osfile_modules_osfile__unix__back.jsm,v 1.2 2013/11/13 14:12:31 ryoon Exp $
 
 Based on martin@'s patch for firefox 27.0
 
@@ -46,26 +46,27 @@
         } else {
           UnixFile.readdir =
             declareFFI("readdir", ctypes.default_abi,
-@@ -553,6 +565,26 @@
+@@ -553,6 +565,27 @@
           UnixFile.fstat = function stat(fd, buf) {
             return fxstat(ver, fd, buf);
           };
 +       } else if (OS.Constants.Sys.Name == "NetBSD") {
-+         // NetBSD 5.0 and newer
++         // NetBSD 5.0 uses *30, and netbsd-6 uses *50
++         let v = OS.Constants.libc.OSFILE_SIZEOF_TIME_T < 8 ? "30" : "50";
 +         UnixFile.stat =
-+           declareFFI("__stat50", ctypes.default_abi,
++           declareFFI("__stat"+v, ctypes.default_abi,
 +                      /*return*/ Types.negativeone_or_nothing,
 +                      /*path*/   Types.path,
 +                      /*buf*/    Types.stat.out_ptr
 +                     );
 +         UnixFile.lstat =
-+           declareFFI("__lstat50", ctypes.default_abi,
++           declareFFI("__lstat"+v, ctypes.default_abi,
 +                      /*return*/ Types.negativeone_or_nothing,
 +                      /*path*/   Types.path,
 +                      /*buf*/    Types.stat.out_ptr
 +                     );
 +         UnixFile.fstat =
-+           declareFFI("__fstat50", ctypes.default_abi,
++           declareFFI("__fstat"+v, ctypes.default_abi,
 +                      /*return*/ Types.negativeone_or_nothing,
 +                      /*fd*/     Types.fd,
 +                      /*buf*/    Types.stat.out_ptr