Fix PR pkg/48240 and bump PKGREVISION

* Use __fstat50 etc instead of fstat etc on NetBSD. Based on martin@'s patch
  for firefox 27.0.
  Restore session is recovered on NetBSD/amd64.

4 files changed, 94 insertions, 2 deletions

diff --git a/www/firefox24/Makefile b/www/firefox24/Makefile
index f556323923d..6ada9523c6a 100644
--- a/www/firefox24/Makefile
+++ b/www/firefox24/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/11/03 04:51:59 ryoon Exp $
+# $NetBSD: Makefile,v 1.2 2013/11/08 12:51:25 ryoon Exp $
 
 FIREFOX_VER=	${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=	24.1.0
@@ -6,6 +6,7 @@ MOZ_BRANCH_MINOR=	esr
 
 DISTNAME=	firefox-${FIREFOX_VER}.source
 PKGNAME=	firefox24-${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/firefox24/distinfo b/www/firefox24/distinfo
index eb369fa4aa2..2bab11a061f 100644
--- a/www/firefox24/distinfo
+++ b/www/firefox24/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2013/11/03 04:51:59 ryoon Exp $
+$NetBSD: distinfo,v 1.2 2013/11/08 12:51:25 ryoon Exp $
 
 SHA1 (firefox-24.1.0esr.source.tar.bz2) = faeed7eb315e9e0a380ab5081b96800590eb6154
 RMD160 (firefox-24.1.0esr.source.tar.bz2) = 5cb36d654ecbd89f9b77e1a96c2eff7d54c45b93
@@ -117,6 +117,8 @@ 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_osfile__unix__allthreads.jsm) = 0bb66da3445da1cab81b9ddf46e74b03070243af
+SHA1 (patch-toolkit_components_osfile_osfile__unix__back.jsm) = 73136e54fbc18d6b932dd5f2358a062220d0f8ef
+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
 SHA1 (patch-toolkit_toolkit.mozbuild) = 07e87d977cee59c0f5a5d14a8d41dc2a4230c01e
diff --git a/www/firefox24/patches/patch-toolkit_components_osfile_osfile__unix__back.jsm b/www/firefox24/patches/patch-toolkit_components_osfile_osfile__unix__back.jsm
new file mode 100644
index 00000000000..a3f12f817cf
--- /dev/null
+++ b/www/firefox24/patches/patch-toolkit_components_osfile_osfile__unix__back.jsm
@@ -0,0 +1,74 @@
+$NetBSD: patch-toolkit_components_osfile_osfile__unix__back.jsm,v 1.1 2013/11/08 12:51:25 ryoon Exp $
+
+Based on martin@'s patch for firefox 27.0
+
+* Use off_t for st_size
+* Use function name for NetBSD
+
+--- toolkit/components/osfile/osfile_unix_back.jsm.orig	2013-10-22 06:19:20.000000000 +0000
++++ toolkit/components/osfile/osfile_unix_back.jsm
+@@ -173,7 +173,7 @@
+          }
+ 
+          stat.add_field_at(OS.Constants.libc.OSFILE_OFFSETOF_STAT_ST_SIZE,
+-                        "st_size", Types.size_t.implementation);
++                        "st_size", Types.off_t.implementation);
+          Types.stat = stat.getType();
+        }
+ 
+@@ -400,10 +400,17 @@
+                     /*oflags*/Types.int,
+                     /*mode*/  Types.int);
+ 
++       if (OS.Constants.Sys.Name == "NetBSD") {
++       UnixFile.opendir =
++         declareFFI("__opendir30", ctypes.default_abi,
++                    /*return*/ Types.null_or_DIR_ptr,
++                    /*path*/   Types.path);
++       } else {
+        UnixFile.opendir =
+          declareFFI("opendir", ctypes.default_abi,
+                     /*return*/ Types.null_or_DIR_ptr,
+                     /*path*/   Types.path);
++       }
+ 
+        UnixFile.pread =
+          declareFFI("pread", ctypes.default_abi,
+@@ -437,6 +444,11 @@
+            declareFFI("readdir$INODE64", ctypes.default_abi,
+                      /*return*/Types.null_or_dirent_ptr,
+                       /*dir*/   Types.DIR.in_ptr); // For MacOS X
++       } else if (OS.Constants.Sys.Name == "NetBSD") {
++         UnixFile.readdir =
++           declareFFI("__readdir30", ctypes.default_abi,
++                      /*return*/Types.null_or_dirent_ptr,
++                      /*dir*/   Types.DIR.in_ptr); // Other Unices
+        } else {
+          UnixFile.readdir =
+            declareFFI("readdir", ctypes.default_abi,
+@@ -556,6 +568,25 @@
+          UnixFile.fstat = function stat(fd, buf) {
+            return fxstat(ver, fd, buf);
+          };
++       } else if (OS.Constants.Sys.Name == "NetBSD") {
++         UnixFile.stat =
++           declareFFI("__stat50", ctypes.default_abi,
++                      /*return*/ Types.negativeone_or_nothing,
++                      /*path*/   Types.path,
++                      /*buf*/    Types.stat.out_ptr
++                     );
++         UnixFile.lstat =
++           declareFFI("__lstat50", ctypes.default_abi,
++                      /*return*/ Types.negativeone_or_nothing,
++                      /*path*/   Types.path,
++                      /*buf*/    Types.stat.out_ptr
++                     );
++         UnixFile.fstat =
++           declareFFI("__fstat50", ctypes.default_abi,
++                      /*return*/ Types.negativeone_or_nothing,
++                      /*fd*/     Types.fd,
++                      /*buf*/    Types.stat.out_ptr
++                     );
+        } else {
+          // Mac OS X 32-bits, other Unix
+          UnixFile.stat =
diff --git a/www/firefox24/patches/patch-toolkit_components_osfile_osfile__unix__front.jsm b/www/firefox24/patches/patch-toolkit_components_osfile_osfile__unix__front.jsm
new file mode 100644
index 00000000000..582151f22f8
--- /dev/null
+++ b/www/firefox24/patches/patch-toolkit_components_osfile_osfile__unix__front.jsm
@@ -0,0 +1,15 @@
+$NetBSD: patch-toolkit_components_osfile_osfile__unix__front.jsm,v 1.1 2013/11/08 12:51:25 ryoon Exp $
+
+* Use off_t for st_size
+
+--- toolkit/components/osfile/osfile_unix_front.jsm.orig	2013-10-22 06:19:20.000000000 +0000
++++ toolkit/components/osfile/osfile_unix_front.jsm
+@@ -721,7 +721,7 @@
+      File.Info = function Info(stat) {
+        let isDir = (stat.st_mode & OS.Constants.libc.S_IFMT) == OS.Constants.libc.S_IFDIR;
+        let isSymLink = (stat.st_mode & OS.Constants.libc.S_IFMT) == OS.Constants.libc.S_IFLNK;
+-       let size = exports.OS.Shared.Type.size_t.importFromC(stat.st_size);
++       let size = exports.OS.Shared.Type.off_t.importFromC(stat.st_size);
+ 
+        let lastAccessDate = new Date(stat.st_atime * 1000);
+        let lastModificationDate = new Date(stat.st_mtime * 1000);