summaryrefslogtreecommitdiff
path: root/devel/xulrunner
diff options
context:
space:
mode:
Diffstat (limited to 'devel/xulrunner')
-rw-r--r--devel/xulrunner/distinfo4
-rw-r--r--devel/xulrunner/patches/patch-me18
2 files changed, 17 insertions, 5 deletions
diff --git a/devel/xulrunner/distinfo b/devel/xulrunner/distinfo
index 058d35de6db..fd8f1f0935c 100644
--- a/devel/xulrunner/distinfo
+++ b/devel/xulrunner/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.29 2010/04/02 20:28:24 tnn Exp $
+$NetBSD: distinfo,v 1.30 2010/04/21 15:26:00 tnn Exp $
SHA1 (firefox-3.6.3.source.tar.bz2) = f3bcd808356d16bdb26bfcf1a64a251488c4fd02
RMD160 (firefox-3.6.3.source.tar.bz2) = de556e8606bbc61cb7d20fe6f308f0c5e8b9dd77
@@ -38,7 +38,7 @@ SHA1 (patch-bg) = ab79e04b5ac1453157cfb57754613210c74c3b90
SHA1 (patch-ma) = a20b263ff14c841fd0ae1634962b90a41173b524
SHA1 (patch-mb) = b3ba0de4c70d9892a5427fe493e132bad72ae905
SHA1 (patch-md) = 6bf5242245b17fbd868a6a978eb5849726f81393
-SHA1 (patch-me) = f5a8e29fc004ef7696b67d260384ab23fd1658c2
+SHA1 (patch-me) = da6324dd21a40dd3cc7b7b9321a18bd11a3434fd
SHA1 (patch-mf) = 153dfd5cd611e4364fe1c540f4e8eb500115baff
SHA1 (patch-mg) = 75ddcceaffae0bdb6ecb4efd1b5ffca68a8ae8a8
SHA1 (patch-mi) = 787cb043bb7e687936afaf8f0c67b6b3a7b03e5b
diff --git a/devel/xulrunner/patches/patch-me b/devel/xulrunner/patches/patch-me
index 5e0a006524c..02aa85b2f06 100644
--- a/devel/xulrunner/patches/patch-me
+++ b/devel/xulrunner/patches/patch-me
@@ -1,10 +1,22 @@
-$NetBSD: patch-me,v 1.1.1.1 2009/08/05 02:59:48 tnn Exp $
+$NetBSD: patch-me,v 1.2 2010/04/21 15:26:00 tnn Exp $
Add DragonFly support.
+Disable assembly routines in freebl on Linux (PR pkg/43146)
---- security/nss/lib/freebl/Makefile.orig 2009-06-29 18:15:13.000000000 +0200
+--- security/nss/lib/freebl/Makefile.orig 2010-04-13 22:22:54.000000000 +0000
+++ security/nss/lib/freebl/Makefile
-@@ -212,7 +212,7 @@ endif
+@@ -154,7 +154,9 @@ ifeq ($(USE_N32),1)
+ endif
+ endif
+
+-ifeq ($(OS_TARGET),Linux)
++# pkgsrc PR pkg/43146
++#ifeq ($(OS_TARGET),Linux)
++ifeq (true, false)
+ ifeq ($(CPU_ARCH),x86_64)
+ ASFILES = arcfour-amd64-gas.s mpi_amd64_gas.s
+ ASFLAGS += -march=opteron -m64 -fPIC -Wa,--noexecstack
+@@ -224,7 +226,7 @@ endif
# to bind the blapi function references in FREEBLVector vector
# (ldvector.c) to the blapi functions defined in the freebl
# shared libraries.