Fix build

* Add missing include file to PLIST.lightning
* Fix xulrunner pathes

6 files changed, 15 insertions, 14 deletions

diff --git a/mail/thunderbird/PLIST.lightning b/mail/thunderbird/PLIST.lightning
index aa0e75b8085..841f5ef7928 100644
--- a/mail/thunderbird/PLIST.lightning
+++ b/mail/thunderbird/PLIST.lightning
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.lightning,v 1.14 2012/11/23 07:17:53 ryoon Exp $
+@comment $NetBSD: PLIST.lightning,v 1.15 2012/11/23 11:08:05 ryoon Exp $
 include/thunderbird/calBaseCID.h
 include/thunderbird/calIAlarm.h
 include/thunderbird/calIAlarmService.h
@@ -15,6 +15,7 @@ include/thunderbird/calICalendarViewController.h
 include/thunderbird/calIChangeLog.h
 include/thunderbird/calIDateTime.h
 include/thunderbird/calIDateTimeFormatter.h
+include/thunderbird/calIDeletedItems.h
 include/thunderbird/calIDuration.h
 include/thunderbird/calIErrors.h
 include/thunderbird/calIEvent.h
diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo
index f54356864ef..5095bea5980 100644
--- a/mail/thunderbird/distinfo
+++ b/mail/thunderbird/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.107 2012/11/23 07:17:53 ryoon Exp $
+$NetBSD: distinfo,v 1.108 2012/11/23 11:08:05 ryoon Exp $
 
 SHA1 (enigmail-1.4.5.tar.gz) = 16d0450a9f5fb4de0e9cc5b9f8091dce4b070aaf
 RMD160 (enigmail-1.4.5.tar.gz) = 860a1ca813fd2ccae69ac0afe07affd39611e56a
@@ -56,7 +56,7 @@ SHA1 (patch-mg) = f660cfddc4fd49301df2bd31949b5845b8e08f46
 SHA1 (patch-mh) = fff2c712e23d9ffc909cf1a5a3303a155b386716
 SHA1 (patch-mi) = 4dd76f01a7c3463485ae6bcdc1df622f214419b5
 SHA1 (patch-mj) = f0b7ce3767423c17953bfa511f9e80da2f262543
-SHA1 (patch-mk) = 6a835bfbf4995c7499f5c9d6bf266429e327871e
+SHA1 (patch-mk) = abaad282567f82277fb58836617d91fa6024c51f
 SHA1 (patch-ml) = 71ea1c4f984b448d380ed94dabce988a74c4853f
 SHA1 (patch-mm) = 92d4a37be44cabe5f72c5352518a1a6566283163
 SHA1 (patch-mn) = 1d0293cce00aa5fa8aa6d0c37dade3c251ca7da6
@@ -93,15 +93,15 @@ SHA1 (patch-mozilla_media_libcubeb_src_Makefile.in) = 0477f3dbdf3ce595ebce4c18f0
 SHA1 (patch-mozilla_media_libsydneyaudio_src_sydney__audio__pulseaudio.c) = c12f98cd3e8797d4b2626b18d884c09d4e35d679
 SHA1 (patch-mozilla_netwerk_protocol_http_HttpChannelParent.cpp) = 4ce50fe017b56f7bb8d07d3d72a117bfea61f003
 SHA1 (patch-mozilla_storage_src_Makefile.in) = 302301fd992a58e472f72ae6dc9a226129354175
-SHA1 (patch-mozilla_xpcom_Makefile.in) = f7d495a53e207b3ca24df3337b3bb5a88ca9b34a
+SHA1 (patch-mozilla_xpcom_Makefile.in) = 73c9daf053f88dacb6b5f8351b29f57cc48c98a9
 SHA1 (patch-mozilla_xpcom_idl-parser_Makefile.in) = 282a06fc56e9fe6980560a3f288bc204a6324188
 SHA1 (patch-mozilla_xpcom_reflect_xptcall_src_md_unix_xptcinvoke__ppc__netbsd.cpp) = 58b06ebd1068edc06d3fe1f6464217da4c157e49
 SHA1 (patch-mozilla_xpcom_typelib_xpidl_Makefile.in) = addbabcf67b58605f6f8e4ccb674af7ab46d9d22
 SHA1 (patch-mp) = 6687d3583947cd3dc62f9005c38916a747326e3a
-SHA1 (patch-pa) = 659ce8e226b0683d667526df076ded8903aeb235
+SHA1 (patch-pa) = 3515d1f62dc874baa4b2ef21d699d5fadfe3765f
 SHA1 (patch-pb) = 6ffe3119c9968480de8702e35498cf1f3decba4f
 SHA1 (patch-pc) = 2edc09191a28be7368eca2ef05cf3faa3224d493
-SHA1 (patch-pd) = 99c58b5b6d145c5d19724acd04ce88abe61c0f3a
+SHA1 (patch-pd) = 0383adf29067da09c31a83c336174c943fe52ea3
 SHA1 (patch-pg) = 30b00a6a302c431dd2ea36afc7ee87d564dd7159
 SHA1 (patch-rc) = 46175f709b324d6a363378807eb5689aea52f065
 SHA1 (patch-toolkit_toolkit-tiers.mk) = da9e166c6ae48719370ed2fc979edf1eaeb7fdbd
diff --git a/mail/thunderbird/patches/patch-mk b/mail/thunderbird/patches/patch-mk
index f0d98129901..e6415d3c908 100644
--- a/mail/thunderbird/patches/patch-mk
+++ b/mail/thunderbird/patches/patch-mk
@@ -1,4 +1,4 @@
-$NetBSD: patch-mk,v 1.7 2012/09/02 06:43:41 ryoon Exp $
+$NetBSD: patch-mk,v 1.8 2012/11/23 11:08:06 ryoon Exp $
 
 Treat DragonFly like FreeBSD.
 
@@ -22,7 +22,7 @@ Treat DragonFly like FreeBSD.
  endif
  
 +ifeq ($(OS_ARCH),NetBSD)
-+EXTRA_DSO_LDOPTS += -Wl,-rpath,${PREFIX}/lib/xulrunner
++EXTRA_DSO_LDOPTS += -Wl,-rpath,${PREFIX}/lib/thunderbird
 +endif
 +
  #
diff --git a/mail/thunderbird/patches/patch-mozilla_xpcom_Makefile.in b/mail/thunderbird/patches/patch-mozilla_xpcom_Makefile.in
index 9187f68059f..2be394b4206 100644
--- a/mail/thunderbird/patches/patch-mozilla_xpcom_Makefile.in
+++ b/mail/thunderbird/patches/patch-mozilla_xpcom_Makefile.in
@@ -1,4 +1,4 @@
-$NetBSD: patch-mozilla_xpcom_Makefile.in,v 1.4 2012/09/02 06:43:43 ryoon Exp $
+$NetBSD: patch-mozilla_xpcom_Makefile.in,v 1.5 2012/11/23 11:08:06 ryoon Exp $
 
 --- mozilla/xpcom/Makefile.in.orig	2012-08-25 00:31:35.000000000 +0000
 +++ mozilla/xpcom/Makefile.in
@@ -7,7 +7,7 @@ $NetBSD: patch-mozilla_xpcom_Makefile.in,v 1.4 2012/09/02 06:43:43 ryoon Exp $
  endif
  
 +ifeq ($(OS_ARCH),NetBSD)
-+EXTRA_DSO_LDOPTS += -Wl,-rpath,${PREFIX}/lib/xulrunner-sdk/sdk/lib
++EXTRA_DSO_LDOPTS += -Wl,-rpath,${PREFIX}/lib/thunderbird-sdk/sdk/lib
 +endif
 +
  ifdef ENABLE_TESTS
diff --git a/mail/thunderbird/patches/patch-pa b/mail/thunderbird/patches/patch-pa
index 1888b8dc92f..d79e27b1272 100644
--- a/mail/thunderbird/patches/patch-pa
+++ b/mail/thunderbird/patches/patch-pa
@@ -1,4 +1,4 @@
-$NetBSD: patch-pa,v 1.7 2012/09/02 06:43:43 ryoon Exp $
+$NetBSD: patch-pa,v 1.8 2012/11/23 11:08:06 ryoon Exp $
 
 --- mozilla/xulrunner/installer/mozilla-js.pc.in.orig	2012-08-25 00:31:36.000000000 +0000
 +++ mozilla/xulrunner/installer/mozilla-js.pc.in
@@ -7,5 +7,5 @@ $NetBSD: patch-pa,v 1.7 2012/09/02 06:43:43 ryoon Exp $
  Version: %MOZILLA_VERSION%
  Requires: %NSPR_NAME% >= %NSPR_VERSION%
 -Libs: -L${sdkdir}/lib %MOZ_JS_LINK%
-+Libs: -Wl,-R${prefix}/lib/xulrunner -Wl,-R${prefix}/lib/xulrunner -L${prefix}/lib/xulrunner %MOZ_JS_LINK%
++Libs: -Wl,-R${prefix}/lib/thunderbird -Wl,-R${prefix}/lib/thunderbird-sdk -L${prefix}/lib/thunderbird %MOZ_JS_LINK%
  Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE
diff --git a/mail/thunderbird/patches/patch-pd b/mail/thunderbird/patches/patch-pd
index 17a5c70433a..69f04e06138 100644
--- a/mail/thunderbird/patches/patch-pd
+++ b/mail/thunderbird/patches/patch-pd
@@ -1,4 +1,4 @@
-$NetBSD: patch-pd,v 1.7 2012/09/02 06:43:43 ryoon Exp $
+$NetBSD: patch-pd,v 1.8 2012/11/23 11:08:06 ryoon Exp $
 
 --- mozilla/xulrunner/installer/mozilla-nss.pc.in.orig	2012-08-25 00:31:36.000000000 +0000
 +++ mozilla/xulrunner/installer/mozilla-nss.pc.in
@@ -7,5 +7,5 @@ $NetBSD: patch-pd,v 1.7 2012/09/02 06:43:43 ryoon Exp $
  Version: %MOZILLA_VERSION%
  Requires: %NSPR_NAME% >= %NSPR_VERSION%
 -Libs: -L${sdkdir}/lib -lsmime3 -lssl3 -lnss3 -lnssutil3
-+Libs: -Wl,-R${prefix}/lib/xulrunner -Wl,-R${prefix}/lib/xulrunner -L${prefix}/lib/xulrunner -lsmime3 -lssl3 -lnss3 -lnssutil3
++Libs: -Wl,-R${prefix}/lib/thunderbird -Wl,-R${prefix}/lib/thunderbird-sdk -L${prefix}/lib/xulrunner -lsmime3 -lssl3 -lnss3 -lnssutil3
  Cflags: -I${includedir}