From a72b57264aab8473f04de5c0ca93c22ab0816e39 Mon Sep 17 00:00:00 2001
From: drochner <drochner@pkgsrc.org>
Date: Wed, 21 Mar 2012 10:40:25 +0000
Subject: [PATCH] -make libxul.so link against libkvm on NetBSD because it
 contains  references to its functions  (patch-xulrunner_app_Makefile.in is
 probably unnecessary now, didn't   test) -propagate dependency on nspr -- at
 least the .pc file refers to it bump PKGREV

---
 devel/xulrunner/Makefile         | 3 ++-
 devel/xulrunner/buildlink3.mk    | 3 ++-
 devel/xulrunner/distinfo         | 4 ++--
 devel/xulrunner/patches/patch-mm | 7 ++++---
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/devel/xulrunner/Makefile b/devel/xulrunner/Makefile
index bede7e69616d..171c69fb334a 100644
--- a/devel/xulrunner/Makefile
+++ b/devel/xulrunner/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.69 2012/03/15 08:30:06 ryoon Exp $
+# $NetBSD: Makefile,v 1.70 2012/03/21 10:40:25 drochner Exp $
 
 .include "dist.mk"
 PKGNAME=	xulrunner-${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
+PKGREVISION=	1
 CATEGORIES=	devel www
 
 MAINTAINER=	tnn@NetBSD.org
diff --git a/devel/xulrunner/buildlink3.mk b/devel/xulrunner/buildlink3.mk
index a9310747cc8a..76a553340c0f 100644
--- a/devel/xulrunner/buildlink3.mk
+++ b/devel/xulrunner/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.23 2012/03/15 08:30:06 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.24 2012/03/21 10:40:25 drochner Exp $
 
 BUILDLINK_TREE+=	xulrunner
 
@@ -22,6 +22,7 @@ pkgbase := xulrunner
 . include "../../devel/libgnomeui/buildlink3.mk"
 . include "../../sysutils/gnome-vfs/buildlink3.mk"
 .endif
+.include "../../devel/nspr/buildlink3.mk"
 .endif # XULRUNNER_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-xulrunner
diff --git a/devel/xulrunner/distinfo b/devel/xulrunner/distinfo
index 31490b48a346..0c8e6eec754a 100644
--- a/devel/xulrunner/distinfo
+++ b/devel/xulrunner/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.63 2012/03/15 08:30:06 ryoon Exp $
+$NetBSD: distinfo,v 1.64 2012/03/21 10:40:25 drochner Exp $
 
 SHA1 (firefox-11.0.source.tar.bz2) = 0b05f91b81803010502cf89f54c3d0187fb63d7e
 RMD160 (firefox-11.0.source.tar.bz2) = 13b7c7327063625904d00b58a6d6f15c04918e92
@@ -73,7 +73,7 @@ SHA1 (patch-mi) = 1a031ea9be110822995094c84f77c3c68f5c2a39
 SHA1 (patch-mj) = 197fab0e00256dedc8a5f181ee0d0d6e42d8177f
 SHA1 (patch-mk) = 5020178423260e37aa736f4fa4d5ec46ed48b7ea
 SHA1 (patch-ml) = ffec4dcae4a4e3683eebfc3e8aaafe15fa27443e
-SHA1 (patch-mm) = fd6d36c3a5d500417575a92d3b3dfdb8b3395810
+SHA1 (patch-mm) = 9b99265bdcb39b917171ed13861afb3a6cd03eb6
 SHA1 (patch-mn) = a59f31b58547657b96a45a2753aab93866940203
 SHA1 (patch-mp) = 18d2490b6bcd4f017cbf2734a920c3830bfe8856
 SHA1 (patch-nsprpub_pr_include_md__dragonfly.cfg) = 9888fa5070d2201a8912be33a32ae32f1d26f8ce
diff --git a/devel/xulrunner/patches/patch-mm b/devel/xulrunner/patches/patch-mm
index d7c06b4000e1..b87b27c54eb2 100644
--- a/devel/xulrunner/patches/patch-mm
+++ b/devel/xulrunner/patches/patch-mm
@@ -1,8 +1,8 @@
-$NetBSD: patch-mm,v 1.8 2012/03/11 12:03:51 marino Exp $
+$NetBSD: patch-mm,v 1.9 2012/03/21 10:40:25 drochner Exp $
 
---- toolkit/library/Makefile.in.orig	2012-02-16 06:40:54.000000000 +0000
+--- toolkit/library/Makefile.in.orig	2012-03-13 01:37:16.000000000 +0000
 +++ toolkit/library/Makefile.in
-@@ -209,6 +209,18 @@ EXTRA_DSO_LDOPTS += -lelf -ldemangle
+@@ -554,6 +554,19 @@ EXTRA_DSO_LDOPTS += -lelf -ldemangle
  endif
  endif
  
@@ -12,6 +12,7 @@ $NetBSD: patch-mm,v 1.8 2012/03/11 12:03:51 marino Exp $
 +endif
 +
 +ifeq ($(OS_ARCH),NetBSD)
++OS_LIBS += $(call EXPAND_LIBNAME,kvm)
 +EXTRA_DSO_LDOPTS += -lossaudio
 +endif
 +ifdef PKGSRC_PULSEAUDIO