Mon Sep 3 15:47:49 2012 UTC ()
mail/thunderbird: Fix build for DragonFly

- kvm is still needed
- should fix FreeBSD as well


(marino)
diff -r1.102 -r1.103 pkgsrc/mail/thunderbird/distinfo
diff -r1.11 -r1.12 pkgsrc/mail/thunderbird/patches/patch-mm
diff -r1.4 -r1.5 pkgsrc/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc
cvs diff -r1.102 -r1.103 pkgsrc/mail/thunderbird/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/thunderbird/distinfo 2012/09/03 15:27:31 1.102
+++ pkgsrc/mail/thunderbird/distinfo 2012/09/03 15:47:49 1.103
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.102 2012/09/03 15:27:31 ryoon Exp $ 1$NetBSD: distinfo,v 1.103 2012/09/03 15:47:49 marino 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
@@ -50,43 +50,43 @@ SHA1 (patch-js_src_jscpucfg.h) = 493889d @@ -50,43 +50,43 @@ SHA1 (patch-js_src_jscpucfg.h) = 493889d
50SHA1 (patch-ldap_sdks_c-sdk_build.mk) = 171d81697d136abb6e02cb81445cd88fd8580de2 50SHA1 (patch-ldap_sdks_c-sdk_build.mk) = 171d81697d136abb6e02cb81445cd88fd8580de2
51SHA1 (patch-ma) = 9d66a2e90afa7b5dedc757dfa939bf9615ee7da1 51SHA1 (patch-ma) = 9d66a2e90afa7b5dedc757dfa939bf9615ee7da1
52SHA1 (patch-ma-toplevel) = 00d3464d03e2014dcb1c708ad94ab2bd03c7b2a7 52SHA1 (patch-ma-toplevel) = 00d3464d03e2014dcb1c708ad94ab2bd03c7b2a7
53SHA1 (patch-mb) = 36ddeba4276196109b5a72b77a2143dada92df34 53SHA1 (patch-mb) = 36ddeba4276196109b5a72b77a2143dada92df34
54SHA1 (patch-md) = ccb29b96c105b6c63d3c85967bed56840b974cf4 54SHA1 (patch-md) = ccb29b96c105b6c63d3c85967bed56840b974cf4
55SHA1 (patch-me) = 17b108eb9f0ec40ab34aa58f511a5c1ee6a3a127 55SHA1 (patch-me) = 17b108eb9f0ec40ab34aa58f511a5c1ee6a3a127
56SHA1 (patch-mf) = 5c2fb65285d309fdfdcbf7f1872504deefe236a1 56SHA1 (patch-mf) = 5c2fb65285d309fdfdcbf7f1872504deefe236a1
57SHA1 (patch-mg) = f660cfddc4fd49301df2bd31949b5845b8e08f46 57SHA1 (patch-mg) = f660cfddc4fd49301df2bd31949b5845b8e08f46
58SHA1 (patch-mh) = fff2c712e23d9ffc909cf1a5a3303a155b386716 58SHA1 (patch-mh) = fff2c712e23d9ffc909cf1a5a3303a155b386716
59SHA1 (patch-mi) = 2dfb916de4e24a2e41ed8f597c8609abb8caa29f 59SHA1 (patch-mi) = 2dfb916de4e24a2e41ed8f597c8609abb8caa29f
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) = 9bcdbe187524acb0cff940c9c97504d2d9f79797
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) = 1a7779a9fd682739caeb7219548f5d2d479fc302 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) = 63e9b82eba6936788871530d10a02c9d08491e39
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
87SHA1 (patch-mozilla_ipc_chromium_src_chrome_common_transport__dib.h) = c6ffcca539c25f58778ac9cc9cdee100e458f714 87SHA1 (patch-mozilla_ipc_chromium_src_chrome_common_transport__dib.h) = c6ffcca539c25f58778ac9cc9cdee100e458f714
88SHA1 (patch-mozilla_ipc_glue_SharedMemorySysV.h) = 5907b3b2a66f2a1afc4732d758aa958cb74dcbe9 88SHA1 (patch-mozilla_ipc_glue_SharedMemorySysV.h) = 5907b3b2a66f2a1afc4732d758aa958cb74dcbe9
89SHA1 (patch-mozilla_js_src_config_system-headers) = 17933be7c9573010c4866c14501764760a27030d 89SHA1 (patch-mozilla_js_src_config_system-headers) = 17933be7c9573010c4866c14501764760a27030d
90SHA1 (patch-mozilla_js_src_jsgc.cpp) = 6d05c98c75c78d0deb86d780a7ee5ac2a0e69bf2 90SHA1 (patch-mozilla_js_src_jsgc.cpp) = 6d05c98c75c78d0deb86d780a7ee5ac2a0e69bf2
91SHA1 (patch-mozilla_js_src_methodjit_MethodJIT.cpp) = eaadbba9c425f67bbd0e7688a0df757645129416 91SHA1 (patch-mozilla_js_src_methodjit_MethodJIT.cpp) = eaadbba9c425f67bbd0e7688a0df757645129416
92SHA1 (patch-mozilla_media_libsydneyaudio_src_sydney__audio__pulseaudio.c) = c12f98cd3e8797d4b2626b18d884c09d4e35d679 92SHA1 (patch-mozilla_media_libsydneyaudio_src_sydney__audio__pulseaudio.c) = c12f98cd3e8797d4b2626b18d884c09d4e35d679
cvs diff -r1.11 -r1.12 pkgsrc/mail/thunderbird/patches/Attic/patch-mm (expand / switch to unified diff)

--- pkgsrc/mail/thunderbird/patches/Attic/patch-mm 2012/09/02 06:43:41 1.11
+++ pkgsrc/mail/thunderbird/patches/Attic/patch-mm 2012/09/03 15:47:49 1.12
@@ -1,22 +1,23 @@ @@ -1,22 +1,23 @@
1$NetBSD: patch-mm,v 1.11 2012/09/02 06:43:41 ryoon Exp $ 1$NetBSD: patch-mm,v 1.12 2012/09/03 15:47:49 marino Exp $
2 2
3--- mozilla/toolkit/library/Makefile.in.orig 2012-08-25 00:31:32.000000000 +0000 3--- mozilla/toolkit/library/Makefile.in.orig 2012-08-25 00:31:32.000000000 +0000
4+++ mozilla/toolkit/library/Makefile.in 4+++ mozilla/toolkit/library/Makefile.in
5@@ -535,6 +535,19 @@ EXTRA_DSO_LDOPTS += -lelf -ldemangle 5@@ -535,6 +535,20 @@ EXTRA_DSO_LDOPTS += -lelf -ldemangle
6 endif 6 endif
7 endif 7 endif
8  8
9+ifneq (,$(filter DragonFly FreeBSD,$(OS_ARCH))) 9+ifneq (,$(filter DragonFly FreeBSD,$(OS_ARCH)))
 10+OS_LIBS += $(call EXPAND_LIBNAME,kvm)
10+EXTRA_DSO_LDOPTS += -lplc4 -lplds4 -lnspr4 -lnssutil3 11+EXTRA_DSO_LDOPTS += -lplc4 -lplds4 -lnspr4 -lnssutil3
11+endif 12+endif
12+ 13+
13+ifneq (,$(MOZ_CUBEB)$(MOZ_SYDNEYAUDIO)) 14+ifneq (,$(MOZ_CUBEB)$(MOZ_SYDNEYAUDIO))
14+ifeq ($(OS_ARCH),NetBSD) 15+ifeq ($(OS_ARCH),NetBSD)
15+EXTRA_DSO_LDOPTS += -lossaudio 16+EXTRA_DSO_LDOPTS += -lossaudio
16+endif 17+endif
17+ifdef PKGSRC_PULSEAUDIO 18+ifdef PKGSRC_PULSEAUDIO
18+EXTRA_DSO_LDOPTS += -lpulse 19+EXTRA_DSO_LDOPTS += -lpulse
19+endif 20+endif
20+endif 21+endif
21+ 22+
22 ifeq ($(OS_ARCH),WINNT) 23 ifeq ($(OS_ARCH),WINNT)
cvs diff -r1.4 -r1.5 pkgsrc/mail/thunderbird/patches/Attic/patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc (expand / switch to unified diff)

--- pkgsrc/mail/thunderbird/patches/Attic/patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc 2012/09/02 06:43:42 1.4
+++ pkgsrc/mail/thunderbird/patches/Attic/patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc 2012/09/03 15:47:49 1.5
@@ -1,31 +1,34 @@ @@ -1,31 +1,34 @@
1$NetBSD: patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc,v 1.4 2012/09/02 06:43:42 ryoon Exp $ 1$NetBSD: patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc,v 1.5 2012/09/03 15:47:49 marino Exp $
2 2
3--- mozilla/ipc/chromium/src/base/process_util_bsd.cc.orig 2012-08-31 13:56:11.000000000 +0000 3--- mozilla/ipc/chromium/src/base/process_util_bsd.cc.orig 2012-08-31 13:56:11.000000000 +0000
4+++ mozilla/ipc/chromium/src/base/process_util_bsd.cc 4+++ mozilla/ipc/chromium/src/base/process_util_bsd.cc
5@@ -0,0 +1,318 @@ 5@@ -0,0 +1,321 @@
6+// Copyright (c) 2008 The Chromium Authors. All rights reserved. 6+// Copyright (c) 2008 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 process_util_linux.cc and process_util_mac.cc 10+// derived from process_util_linux.cc and process_util_mac.cc
11+ 11+
12+#include "base/process_util.h" 12+#include "base/process_util.h"
13+ 13+
14+#include <sys/param.h> 14+#include <sys/param.h>
15+#include <sys/sysctl.h> 15+#include <sys/sysctl.h>
16+#include <sys/wait.h> 16+#include <sys/wait.h>
17+#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD) 17+#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD)
 18+_Pragma("GCC visibility push(default)")
 19+#include <kvm.h>
18+#include <sys/user.h> 20+#include <sys/user.h>
 21+_Pragma("GCC visibility pop")
19+#endif 22+#endif
20+ 23+
21+#include <ctype.h> 24+#include <ctype.h>
22+#include <fcntl.h> 25+#include <fcntl.h>
23+#include <kvm.h> 26+#include <kvm.h>
24+#include <unistd.h> 27+#include <unistd.h>
25+ 28+
26+#include <string> 29+#include <string>
27+ 30+
28+#include "base/debug_util.h" 31+#include "base/debug_util.h"
29+#include "base/eintr_wrapper.h" 32+#include "base/eintr_wrapper.h"
30+#include "base/file_util.h" 33+#include "base/file_util.h"
31+#include "base/logging.h" 34+#include "base/logging.h"