Re: pkg/46056 (www/seamonkey does not compile on linux)

[cheusov%NetBSD.org@localhost]

Synopsis: www/seamonkey does not compile on linux

Responsible-Changed-From-To: linux-pkg-people->cheusov
Responsible-Changed-By: cheusov%NetBSD.org@localhost
Responsible-Changed-When: Fri, 24 Feb 2012 17:43:45 +0000
Responsible-Changed-Why:
Unless anyone objects, I'll commit the following patch
that works for me too.

Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/www/seamonkey/distinfo,v
retrieving revision 1.72
diff -u -r1.72 distinfo
--- distinfo    7 Jan 2012 20:44:32 -0000       1.72
+++ distinfo    24 Feb 2012 17:40:00 -0000
@@ -47,7 +47,7 @@
 SHA1 (patch-ma-toplevel) = 67ea79e29f6e9737ce76b8541ab8b3860eb02561
 SHA1 (patch-mb) = 8481afe61902cb16dfe35a5ee015cb4d43a54236
 SHA1 (patch-md) = 932c2b0237c9690da06533f0abfeabddf32d8f3e
-SHA1 (patch-me) = 66c15af6d7b07a4fec7ecd06cb9c9278b35a123e
+SHA1 (patch-me) = b7b853887b08fc55b45dbd19cd5a4a24f6c5224d
 SHA1 (patch-mf) = 14674ed31c912ef647a913cb93762dc963b96177
 SHA1 (patch-mg) = f33a92539ebe171b7bbbd83a54ad9ac2fdca249a
 SHA1 (patch-mh) = 36a434488f3389407c6ebce610c176464bc03c45
Index: patches/patch-am
===================================================================
RCS file: /cvsroot/pkgsrc/www/seamonkey/patches/patch-am,v
retrieving revision 1.1
diff -u -r1.1 patch-am
--- patches/patch-am    16 Mar 2010 10:59:10 -0000      1.1
+++ patches/patch-am    24 Feb 2012 17:40:00 -0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.1 2010/03/16 10:59:10 tnn Exp $
+$NetBSD$

 SHA1_Update conflicts with openssl which may be dynamically loaded
 at runtime via libcups or libgssapi so causing a crash due to using
Index: patches/patch-me
===================================================================
RCS file: /cvsroot/pkgsrc/www/seamonkey/patches/patch-me,v
retrieving revision 1.3
diff -u -r1.3 patch-me
--- patches/patch-me    11 Jul 2011 20:46:36 -0000      1.3
+++ patches/patch-me    24 Feb 2012 17:40:00 -0000
@@ -1,10 +1,22 @@
-$NetBSD: patch-me,v 1.3 2011/07/11 20:46:36 tnn Exp $
+$NetBSD: patch-me,v 1.2 2010/04/26 12:38:00 tnn Exp $

 Add DragonFly support.
+Disable assembly routines in freebl on Linux (PR pkg/43146)

---- mozilla/security/nss/lib/freebl/Makefile.orig      2009-06-29 
18:15:13.000000000 +0200
+--- mozilla/security/nss/lib/freebl/Makefile.orig      2010-03-17 
18:33:57.000000000 +0000
 +++ mozilla/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.