Fix build

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

4 files changed, 8 insertions, 8 deletions

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}