[pkgsrc/trunk]: pkgsrc/devel/nss Better fix for gcc4 build problem, suggested...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ea6fe950927e
branches:  trunk
changeset: 515125:ea6fe950927e
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sun Jun 25 15:25:35 2006 +0000

description:
Better fix for gcc4 build problem, suggested by martin@.

diffstat:

 devel/nss/distinfo         |   4 ++--
 devel/nss/patches/patch-af |  12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diffs (44 lines):

diff -r 16a1399f611c -r ea6fe950927e devel/nss/distinfo
--- a/devel/nss/distinfo        Sun Jun 25 14:53:00 2006 +0000
+++ b/devel/nss/distinfo        Sun Jun 25 15:25:35 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2006/06/25 14:53:00 wiz Exp $
+$NetBSD: distinfo,v 1.9 2006/06/25 15:25:35 wiz Exp $
 
 SHA1 (nss-3.9.2.tar.gz) = 017b748d92c5f7376bda78915d1b78b260b44133
 RMD160 (nss-3.9.2.tar.gz) = c9e41ac596af2e717da76546c3a5dfd37272c195
@@ -8,7 +8,7 @@
 SHA1 (patch-ac) = 9de8db092bb2a198fe426cc2c9cb4b4de6ebdb2a
 SHA1 (patch-ad) = 454ec464874b4e424de740edd78b79d30f11d6bb
 SHA1 (patch-ae) = ad64e308931d4eb5cbfb11ca897cd11688af5b4f
-SHA1 (patch-af) = a5092cfd09672a545a9401424ddce82f3399a689
+SHA1 (patch-af) = 49d70d4e1bc37b2984021ad64cf531010672e640
 SHA1 (patch-ag) = e99c7396f4a6b7430321124e7c03528ab6e7681c
 SHA1 (patch-ah) = 6c8c335d9ffe4a1dbc83a3b8defe05930d866a40
 SHA1 (patch-ai) = a68c262b67af7778024b6db350c044fe8474919e
diff -r 16a1399f611c -r ea6fe950927e devel/nss/patches/patch-af
--- a/devel/nss/patches/patch-af        Sun Jun 25 14:53:00 2006 +0000
+++ b/devel/nss/patches/patch-af        Sun Jun 25 15:25:35 2006 +0000
@@ -1,16 +1,16 @@
-$NetBSD: patch-af,v 1.3 2006/06/25 14:53:00 wiz Exp $
+$NetBSD: patch-af,v 1.4 2006/06/25 15:25:35 wiz Exp $
 
 Fix gcc4 error:
 error: array type has incomplete element type
 
---- lib/pki1/oiddata.h.orig    2006-06-25 06:03:14.000000000 +0000
+--- lib/pki1/oiddata.h.orig    2002-01-04 05:22:07.000000000 +0000
 +++ lib/pki1/oiddata.h
-@@ -43,7 +43,7 @@ static const char OIDDATA_CVS_ID[] = "@(
+@@ -43,6 +43,8 @@ static const char OIDDATA_CVS_ID[] = "@(
  #include "nsspki1t.h"
  #endif /* NSSPKI1T_H */
  
--extern const NSSOID nss_builtin_oids[];
-+extern const NSSOID *nss_builtin_oids;
++#include "pki1t.h"
++
+ extern const NSSOID nss_builtin_oids[];
  extern const PRUint32 nss_builtin_oid_count;
  
- /*extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];*/