Mon Sep 3 15:27:32 2012 UTC ()
Fix DragonFly build again. Thank you, marino@.


(ryoon)
diff -r1.101 -r1.102 pkgsrc/mail/thunderbird/distinfo
diff -r1.2 -r1.3 pkgsrc/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_dir__reader__bsd.h
cvs diff -r1.101 -r1.102 pkgsrc/mail/thunderbird/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/thunderbird/distinfo 2012/09/02 12:27:50 1.101
+++ pkgsrc/mail/thunderbird/distinfo 2012/09/03 15:27:31 1.102
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.101 2012/09/02 12:27:50 ryoon Exp $ 1$NetBSD: distinfo,v 1.102 2012/09/03 15:27:31 ryoon Exp $
2 2
3SHA1 (enigmail-1.4.4.tar.gz) = a1601191a3a421b2e94e7ff833300da72267d7ac 3SHA1 (enigmail-1.4.4.tar.gz) = a1601191a3a421b2e94e7ff833300da72267d7ac
4RMD160 (enigmail-1.4.4.tar.gz) = f362b2f205ed151c2127db381c393394995ca8aa 4RMD160 (enigmail-1.4.4.tar.gz) = f362b2f205ed151c2127db381c393394995ca8aa
5Size (enigmail-1.4.4.tar.gz) = 1269444 bytes 5Size (enigmail-1.4.4.tar.gz) = 1269444 bytes
6SHA1 (lightning-1.7.source.tar.bz2) = 217bfec0003b88e741b563b1e160e4f72ae6362d 6SHA1 (lightning-1.7.source.tar.bz2) = 217bfec0003b88e741b563b1e160e4f72ae6362d
7RMD160 (lightning-1.7.source.tar.bz2) = 8392026bcac493f095e3d68b37d0e27984859804 7RMD160 (lightning-1.7.source.tar.bz2) = 8392026bcac493f095e3d68b37d0e27984859804
8Size (lightning-1.7.source.tar.bz2) = 106226977 bytes 8Size (lightning-1.7.source.tar.bz2) = 106226977 bytes
9SHA1 (thunderbird-15.0.source.tar.bz2) = 00733bf56cbecde0677f2f083f8e2ce3c7379d25 9SHA1 (thunderbird-15.0.source.tar.bz2) = 00733bf56cbecde0677f2f083f8e2ce3c7379d25
10RMD160 (thunderbird-15.0.source.tar.bz2) = 99c57aafd5fc400ec650de7bce810bc81c624743 10RMD160 (thunderbird-15.0.source.tar.bz2) = 99c57aafd5fc400ec650de7bce810bc81c624743
11Size (thunderbird-15.0.source.tar.bz2) = 105942186 bytes 11Size (thunderbird-15.0.source.tar.bz2) = 105942186 bytes
12SHA1 (patch-aa) = 627e93e5b61a12bc6de3cdf0e596ed9d1618353b 12SHA1 (patch-aa) = 627e93e5b61a12bc6de3cdf0e596ed9d1618353b
13SHA1 (patch-aa-toplevel) = 3e46b3ef5e15883c882995f4de41704890605d1d 13SHA1 (patch-aa-toplevel) = 3e46b3ef5e15883c882995f4de41704890605d1d
14SHA1 (patch-ab) = 7432f73e9771260849d99e14008164bd3d564bf8 14SHA1 (patch-ab) = 7432f73e9771260849d99e14008164bd3d564bf8
@@ -60,27 +60,27 @@ SHA1 (patch-mi) = 2dfb916de4e24a2e41ed8f @@ -60,27 +60,27 @@ SHA1 (patch-mi) = 2dfb916de4e24a2e41ed8f
60SHA1 (patch-mj) = f0b7ce3767423c17953bfa511f9e80da2f262543 60SHA1 (patch-mj) = f0b7ce3767423c17953bfa511f9e80da2f262543
61SHA1 (patch-mk) = 6a835bfbf4995c7499f5c9d6bf266429e327871e 61SHA1 (patch-mk) = 6a835bfbf4995c7499f5c9d6bf266429e327871e
62SHA1 (patch-ml) = 71ea1c4f984b448d380ed94dabce988a74c4853f 62SHA1 (patch-ml) = 71ea1c4f984b448d380ed94dabce988a74c4853f
63SHA1 (patch-mm) = 9646a964a86ecbea49d8ea308b5f5811aa65040a 63SHA1 (patch-mm) = 9646a964a86ecbea49d8ea308b5f5811aa65040a
64SHA1 (patch-mn) = 1d0293cce00aa5fa8aa6d0c37dade3c251ca7da6 64SHA1 (patch-mn) = 1d0293cce00aa5fa8aa6d0c37dade3c251ca7da6
65SHA1 (patch-mozilla_build_autoconf_nss.m4) = 4c726f98a5139eba2b4a4c34288c08092bfb90b3 65SHA1 (patch-mozilla_build_autoconf_nss.m4) = 4c726f98a5139eba2b4a4c34288c08092bfb90b3
66SHA1 (patch-mozilla_config_system-headers) = 55fbb269bb1d42cc50a1520a2733f75bce9436b1 66SHA1 (patch-mozilla_config_system-headers) = 55fbb269bb1d42cc50a1520a2733f75bce9436b1
67SHA1 (patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp) = 66d5533eedd9221613c711486d38a5f0c65b4a62 67SHA1 (patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp) = 66d5533eedd9221613c711486d38a5f0c65b4a62
68SHA1 (patch-mozilla_dom_plugins_ipc_PluginModuleChild.h) = ff7237f365df1d0bd6eaa8992854f29fe1870319 68SHA1 (patch-mozilla_dom_plugins_ipc_PluginModuleChild.h) = ff7237f365df1d0bd6eaa8992854f29fe1870319
69SHA1 (patch-mozilla_gfx_thebes_gfxPlatform.cpp) = b4107fea2b683cec7be6c6179c4ecfe6b6a901ee 69SHA1 (patch-mozilla_gfx_thebes_gfxPlatform.cpp) = b4107fea2b683cec7be6c6179c4ecfe6b6a901ee
70SHA1 (patch-mozilla_ipc_chromium_Makefile.in) = 5b1cd2c6b9e9c21df504aafe85013445a7e9425e 70SHA1 (patch-mozilla_ipc_chromium_Makefile.in) = 5b1cd2c6b9e9c21df504aafe85013445a7e9425e
71SHA1 (patch-mozilla_ipc_chromium_chromium-config.mk) = 3a502f13a41636f2e793f03fb041d267e6dadb71 71SHA1 (patch-mozilla_ipc_chromium_chromium-config.mk) = 3a502f13a41636f2e793f03fb041d267e6dadb71
72SHA1 (patch-mozilla_ipc_chromium_src_base_base__paths.h) = 1550fd2f3961ded7a17e821208d1bfe6f549e6ac 72SHA1 (patch-mozilla_ipc_chromium_src_base_base__paths.h) = 1550fd2f3961ded7a17e821208d1bfe6f549e6ac
73SHA1 (patch-mozilla_ipc_chromium_src_base_dir__reader__bsd.h) = f9f95a520c95d9ee95cf1e270ace3594e36fe6db 73SHA1 (patch-mozilla_ipc_chromium_src_base_dir__reader__bsd.h) = 1a7779a9fd682739caeb7219548f5d2d479fc302
74SHA1 (patch-mozilla_ipc_chromium_src_base_dir__reader__posix.h) = 0c95e25bc77d775c37be342087c5e6591c90de8d 74SHA1 (patch-mozilla_ipc_chromium_src_base_dir__reader__posix.h) = 0c95e25bc77d775c37be342087c5e6591c90de8d
75SHA1 (patch-mozilla_ipc_chromium_src_base_file__util__linux.cc) = 9e0e8d4e8a4254fca93b37f51eb4940c8f82bd5e 75SHA1 (patch-mozilla_ipc_chromium_src_base_file__util__linux.cc) = 9e0e8d4e8a4254fca93b37f51eb4940c8f82bd5e
76SHA1 (patch-mozilla_ipc_chromium_src_base_message__loop.cc) = c8b5440d8886c97a54a759cad49cb129304a29de 76SHA1 (patch-mozilla_ipc_chromium_src_base_message__loop.cc) = c8b5440d8886c97a54a759cad49cb129304a29de
77SHA1 (patch-mozilla_ipc_chromium_src_base_platform__thread.h) = b39c8cfa98fcf0c78e63b234c705f6efce9577d8 77SHA1 (patch-mozilla_ipc_chromium_src_base_platform__thread.h) = b39c8cfa98fcf0c78e63b234c705f6efce9577d8
78SHA1 (patch-mozilla_ipc_chromium_src_base_process__util.h) = f73dd24bcde49fdafe0495589efc81a96ccb3b5f 78SHA1 (patch-mozilla_ipc_chromium_src_base_process__util.h) = f73dd24bcde49fdafe0495589efc81a96ccb3b5f
79SHA1 (patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc) = 1383847d6a1236e7de51f032dc8141c53212bfb1 79SHA1 (patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc) = 1383847d6a1236e7de51f032dc8141c53212bfb1
80SHA1 (patch-mozilla_ipc_chromium_src_base_process__util__posix.cc) = 975f5409bf51654b033b07f3ed31af637c3c3c2e 80SHA1 (patch-mozilla_ipc_chromium_src_base_process__util__posix.cc) = 975f5409bf51654b033b07f3ed31af637c3c3c2e
81SHA1 (patch-mozilla_ipc_chromium_src_base_ref__counted.h) = 78cef1e5f8c1270060a7defdaa4fef8eb482f542 81SHA1 (patch-mozilla_ipc_chromium_src_base_ref__counted.h) = 78cef1e5f8c1270060a7defdaa4fef8eb482f542
82SHA1 (patch-mozilla_ipc_chromium_src_base_third__party_nspr_prtime.cc) = 6597dbd50643a8455e377961d2caa29a16496d13 82SHA1 (patch-mozilla_ipc_chromium_src_base_third__party_nspr_prtime.cc) = 6597dbd50643a8455e377961d2caa29a16496d13
83SHA1 (patch-mozilla_ipc_chromium_src_base_time__posix.cc) = 5f08406a92d5bc2f6cbd524fa4ac77dadb7cafdb 83SHA1 (patch-mozilla_ipc_chromium_src_base_time__posix.cc) = 5f08406a92d5bc2f6cbd524fa4ac77dadb7cafdb
84SHA1 (patch-mozilla_ipc_chromium_src_chrome_common_file__descriptor__set__posix.h) = 885d4b060c2f8982db99ed3c0cab0ebffd79b1f6 84SHA1 (patch-mozilla_ipc_chromium_src_chrome_common_file__descriptor__set__posix.h) = 885d4b060c2f8982db99ed3c0cab0ebffd79b1f6
85SHA1 (patch-mozilla_ipc_chromium_src_chrome_common_ipc__channel__posix.cc) = f4a090285e084d4efa42c0280f26fe003eaad706 85SHA1 (patch-mozilla_ipc_chromium_src_chrome_common_ipc__channel__posix.cc) = f4a090285e084d4efa42c0280f26fe003eaad706
86SHA1 (patch-mozilla_ipc_chromium_src_chrome_common_ipc__message__utils.h) = eb1e68191669e61fe95f9b93a4a960c8826d5323 86SHA1 (patch-mozilla_ipc_chromium_src_chrome_common_ipc__message__utils.h) = eb1e68191669e61fe95f9b93a4a960c8826d5323
cvs diff -r1.2 -r1.3 pkgsrc/mail/thunderbird/patches/Attic/patch-mozilla_ipc_chromium_src_base_dir__reader__bsd.h (expand / switch to unified diff)

--- pkgsrc/mail/thunderbird/patches/Attic/patch-mozilla_ipc_chromium_src_base_dir__reader__bsd.h 2012/09/02 12:27:50 1.2
+++ pkgsrc/mail/thunderbird/patches/Attic/patch-mozilla_ipc_chromium_src_base_dir__reader__bsd.h 2012/09/03 15:27:31 1.3
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: patch-mozilla_ipc_chromium_src_base_dir__reader__bsd.h,v 1.2 2012/09/02 12:27:50 ryoon Exp $ 1$NetBSD: patch-mozilla_ipc_chromium_src_base_dir__reader__bsd.h,v 1.3 2012/09/03 15:27:31 ryoon Exp $
2 2
3--- mozilla/ipc/chromium/src/base/dir_reader_bsd.h.orig 2012-09-02 06:26:34.000000000 +0000 3--- mozilla/ipc/chromium/src/base/dir_reader_bsd.h.orig 2012-09-03 10:39:55.000000000 +0000
4+++ mozilla/ipc/chromium/src/base/dir_reader_bsd.h 4+++ mozilla/ipc/chromium/src/base/dir_reader_bsd.h
5@@ -0,0 +1,108 @@ 5@@ -0,0 +1,112 @@
6+// Copyright (c) 2010 The Chromium Authors. All rights reserved. 6+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
7+// Use of this source code is governed by a BSD-style license that can be 7+// Use of this source code is governed by a BSD-style license that can be
8+// found in the LICENSE file. 8+// found in the LICENSE file.
9+ 9+
10+// derived from dir_reader_linux.h 10+// derived from dir_reader_linux.h
11+ 11+
12+#ifndef BASE_DIR_READER_BSD_H_ 12+#ifndef BASE_DIR_READER_BSD_H_
13+#define BASE_DIR_READER_BSD_H_ 13+#define BASE_DIR_READER_BSD_H_
14+#pragma once 14+#pragma once
15+ 15+
16+#include <dirent.h> 16+#include <dirent.h>
17+#include <errno.h> 17+#include <errno.h>
18+#include <fcntl.h> 18+#include <fcntl.h>
@@ -44,27 +44,31 @@ $NetBSD: patch-mozilla_ipc_chromium_src_ @@ -44,27 +44,31 @@ $NetBSD: patch-mozilla_ipc_chromium_src_
44+ if (HANDLE_EINTR(close(fd_))) 44+ if (HANDLE_EINTR(close(fd_)))
45+ DLOG(ERROR) << "Failed to close directory handle"; 45+ DLOG(ERROR) << "Failed to close directory handle";
46+ } 46+ }
47+ } 47+ }
48+ 48+
49+ bool IsValid() const { 49+ bool IsValid() const {
50+ return fd_ >= 0; 50+ return fd_ >= 0;
51+ } 51+ }
52+ 52+
53+ // Move to the next entry returning false if the iteration is complete. 53+ // Move to the next entry returning false if the iteration is complete.
54+ bool Next() { 54+ bool Next() {
55+ if (size_) { 55+ if (size_) {
56+ struct dirent* dirent = reinterpret_cast<struct dirent*>(&buf_[offset_]); 56+ struct dirent* dirent = reinterpret_cast<struct dirent*>(&buf_[offset_]);
 57+#ifdef OS_DRAGONFLY
 58+ offset_ += _DIRENT_DIRSIZ(dirent);
 59+#else
57+ offset_ += dirent->d_reclen; 60+ offset_ += dirent->d_reclen;
 61+#endif
58+ } 62+ }
59+ 63+
60+ if (offset_ != size_) 64+ if (offset_ != size_)
61+ return true; 65+ return true;
62+ 66+
63+#ifdef OS_OPENBSD 67+#ifdef OS_OPENBSD
64+ const int r = getdirentries(fd_, buf_, sizeof(buf_), basep_); 68+ const int r = getdirentries(fd_, buf_, sizeof(buf_), basep_);
65+#else 69+#else
66+ const int r = getdents(fd_, buf_, sizeof(buf_)); 70+ const int r = getdents(fd_, buf_, sizeof(buf_));
67+#endif 71+#endif
68+ if (r == 0) 72+ if (r == 0)
69+ return false; 73+ return false;
70+ if (r == -1) { 74+ if (r == -1) {