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

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/df9a815582ca
branches:  trunk
changeset: 626482:df9a815582ca
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Wed Nov 13 14:17:11 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/firefox24/Makefile                                                       |   4 +-
 www/firefox24/distinfo                                                       |   4 +-
 www/firefox24/patches/patch-toolkit_components_osfile_osfile__unix__back.jsm |  12 +++++----
 3 files changed, 11 insertions(+), 9 deletions(-)

diffs (77 lines):

diff -r 25455938cf54 -r df9a815582ca www/firefox24/Makefile
--- a/www/firefox24/Makefile    Wed Nov 13 14:13:13 2013 +0000
+++ b/www/firefox24/Makefile    Wed Nov 13 14:17:11 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2013/11/10 15:08:31 ryoon Exp $
+# $NetBSD: Makefile,v 1.4 2013/11/13 14:17:11 ryoon Exp $
 
 FIREFOX_VER=   ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=    24.1.0
@@ -6,7 +6,7 @@
 
 DISTNAME=      firefox-${FIREFOX_VER}.source
 PKGNAME=       firefox24-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//}
-PKGREVISION=   1
+PKGREVISION=   2
 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 25455938cf54 -r df9a815582ca www/firefox24/distinfo
--- a/www/firefox24/distinfo    Wed Nov 13 14:13:13 2013 +0000
+++ b/www/firefox24/distinfo    Wed Nov 13 14:17:11 2013 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2013/11/08 12:51:25 ryoon Exp $
+$NetBSD: distinfo,v 1.3 2013/11/13 14:17:11 ryoon Exp $
 
 SHA1 (firefox-24.1.0esr.source.tar.bz2) = faeed7eb315e9e0a380ab5081b96800590eb6154
 RMD160 (firefox-24.1.0esr.source.tar.bz2) = 5cb36d654ecbd89f9b77e1a96c2eff7d54c45b93
@@ -117,7 +117,7 @@
 SHA1 (patch-security_manager_ssl_src_JARSignatureVerification.cpp) = e9749dfeb0d3fcb4637935322ffd1e0cad4f8ec3
 SHA1 (patch-security_manager_ssl_src_nsNSSComponent.cpp) = c4c96b7d3cb0c5dbcfe3820fd52421eec2592452
 SHA1 (patch-toolkit_components_osfile_osfile__unix__allthreads.jsm) = 0bb66da3445da1cab81b9ddf46e74b03070243af
-SHA1 (patch-toolkit_components_osfile_osfile__unix__back.jsm) = 73136e54fbc18d6b932dd5f2358a062220d0f8ef
+SHA1 (patch-toolkit_components_osfile_osfile__unix__back.jsm) = c5069994938d2b2640c527cc63aed186e174d235
 SHA1 (patch-toolkit_components_osfile_osfile__unix__front.jsm) = 0d8200b8c43dc4c56f5e3d53fd13f48d7ff6dc38
 SHA1 (patch-toolkit_library_Makefile.in) = 0c91d647f0f3a4653d39f11c9d8fd63611235932
 SHA1 (patch-toolkit_mozapps_update_updater_updater.cpp) = 6936e5408fc7f0110768f3fc8f27506c0e7879fa
diff -r 25455938cf54 -r df9a815582ca www/firefox24/patches/patch-toolkit_components_osfile_osfile__unix__back.jsm
--- a/www/firefox24/patches/patch-toolkit_components_osfile_osfile__unix__back.jsm      Wed Nov 13 14:13:13 2013 +0000
+++ b/www/firefox24/patches/patch-toolkit_components_osfile_osfile__unix__back.jsm      Wed Nov 13 14:17:11 2013 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-toolkit_components_osfile_osfile__unix__back.jsm,v 1.1 2013/11/08 12:51:25 ryoon Exp $
+$NetBSD: patch-toolkit_components_osfile_osfile__unix__back.jsm,v 1.2 2013/11/13 14:17:12 ryoon Exp $
 
 Based on martin@'s patch for firefox 27.0
 
@@ -46,25 +46,27 @@
         } else {
           UnixFile.readdir =
             declareFFI("readdir", ctypes.default_abi,
-@@ -556,6 +568,25 @@
+@@ -556,6 +568,27 @@
           UnixFile.fstat = function stat(fd, buf) {
             return fxstat(ver, fd, buf);
           };
 +       } else if (OS.Constants.Sys.Name == "NetBSD") {
++         // 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