summaryrefslogtreecommitdiff
path: root/devel/xulrunner
diff options
context:
space:
mode:
authortnn <tnn@pkgsrc.org>2010-04-26 12:47:08 +0000
committertnn <tnn@pkgsrc.org>2010-04-26 12:47:08 +0000
commitfe5e0a7dfb6adfeb735e07194c01a0a129cd9836 (patch)
treec01e6c04254c52b1fab2612d9be52c6d52e08929 /devel/xulrunner
parentbb4631421f2bcc6625909cdc10e11a34ea2b49f2 (diff)
downloadpkgsrc-fe5e0a7dfb6adfeb735e07194c01a0a129cd9836.tar.gz
fix linux PLIST issues
Diffstat (limited to 'devel/xulrunner')
-rw-r--r--devel/xulrunner/PLIST3
-rw-r--r--devel/xulrunner/distinfo3
-rw-r--r--devel/xulrunner/options.mk5
-rw-r--r--devel/xulrunner/patches/patch-mc15
4 files changed, 22 insertions, 4 deletions
diff --git a/devel/xulrunner/PLIST b/devel/xulrunner/PLIST
index 1fc475370e6..cac52ec4bbf 100644
--- a/devel/xulrunner/PLIST
+++ b/devel/xulrunner/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2010/03/30 11:29:36 tnn Exp $
+@comment $NetBSD: PLIST,v 1.21 2010/04/26 12:47:08 tnn Exp $
bin/xulrunner
${PLIST.jit}include/xulrunner/Allocator.h
${PLIST.jit}include/xulrunner/Assembler.h
@@ -100,6 +100,7 @@ include/xulrunner/inISearchProcess.h
include/xulrunner/jar-ds.h
include/xulrunner/jar.h
include/xulrunner/jarfile.h
+${PLIST.jemalloc}include/xulrunner/jemalloc.h
include/xulrunner/js-config.h
include/xulrunner/js.msg
include/xulrunner/jsapi.h
diff --git a/devel/xulrunner/distinfo b/devel/xulrunner/distinfo
index fd8f1f0935c..841d3b7b3de 100644
--- a/devel/xulrunner/distinfo
+++ b/devel/xulrunner/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.30 2010/04/21 15:26:00 tnn Exp $
+$NetBSD: distinfo,v 1.31 2010/04/26 12:47:08 tnn Exp $
SHA1 (firefox-3.6.3.source.tar.bz2) = f3bcd808356d16bdb26bfcf1a64a251488c4fd02
RMD160 (firefox-3.6.3.source.tar.bz2) = de556e8606bbc61cb7d20fe6f308f0c5e8b9dd77
@@ -37,6 +37,7 @@ SHA1 (patch-bf) = 6295d27762eb91162c00362306acbd47eeda61ac
SHA1 (patch-bg) = ab79e04b5ac1453157cfb57754613210c74c3b90
SHA1 (patch-ma) = a20b263ff14c841fd0ae1634962b90a41173b524
SHA1 (patch-mb) = b3ba0de4c70d9892a5427fe493e132bad72ae905
+SHA1 (patch-mc) = fc355347943e21f8d4fb9c873f336d5b2d04a68e
SHA1 (patch-md) = 6bf5242245b17fbd868a6a978eb5849726f81393
SHA1 (patch-me) = da6324dd21a40dd3cc7b7b9321a18bd11a3434fd
SHA1 (patch-mf) = 153dfd5cd611e4364fe1c540f4e8eb500115baff
diff --git a/devel/xulrunner/options.mk b/devel/xulrunner/options.mk
index 0d34188fd6e..1999f1d17c2 100644
--- a/devel/xulrunner/options.mk
+++ b/devel/xulrunner/options.mk
@@ -1,9 +1,9 @@
-# $NetBSD: options.mk,v 1.7 2010/03/16 15:57:02 tnn Exp $
+# $NetBSD: options.mk,v 1.8 2010/04/26 12:47:08 tnn Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.xulrunner
PKG_SUPPORTED_OPTIONS= debug mozilla-jemalloc gnome
-PLIST_VARS+= jit gnome debug
+PLIST_VARS+= jit gnome debug jemalloc
.if ${OPSYS} == "Linux" || ${OPSYS} == "SunOS"
PKG_SUGGESTED_OPTIONS+= mozilla-jemalloc
@@ -34,6 +34,7 @@ CONFIGURE_ARGS+= --disable-libnotify
.if !empty(PKG_OPTIONS:Mmozilla-jemalloc)
CONFIGURE_ARGS+= --enable-jemalloc
+PLIST.jemalloc= yes
.else
CONFIGURE_ARGS+= --disable-jemalloc
.endif
diff --git a/devel/xulrunner/patches/patch-mc b/devel/xulrunner/patches/patch-mc
new file mode 100644
index 00000000000..fae7a03721c
--- /dev/null
+++ b/devel/xulrunner/patches/patch-mc
@@ -0,0 +1,15 @@
+$NetBSD: patch-mc,v 1.1 2010/04/26 12:47:08 tnn Exp $
+
+Avoid extra file appearing in PLIST on Linux.
+
+--- security/nss/lib/freebl/manifest.mn.orig 2010-04-13 22:22:54.000000000 +0000
++++ security/nss/lib/freebl/manifest.mn
+@@ -72,7 +72,7 @@ endif
+
+ ifdef FREEBL_NO_DEPEND
+ LOWHASH_SRCS = stubs.c nsslowhash.c
+-LOWHASH_EXPORTS = nsslowhash.h
++#LOWHASH_EXPORTS = nsslowhash.h
+ MAPFILE_SOURCE = freebl_hash.def
+ else
+ MAPFILE_SOURCE = freebl.def