From f1e7f114b214d71aec997d6ad833667a11cb1a33 Mon Sep 17 00:00:00 2001
From: taya <taya@pkgsrc.org>
Date: Wed, 10 Mar 2004 12:51:45 +0000
Subject: make this compile on -current. bump PKGREVISION

---
 www/mozilla-stable/Makefile         |  4 ++--
 www/mozilla-stable/distinfo         |  4 ++--
 www/mozilla-stable/patches/patch-bb | 23 ++++++++++++++++++-----
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/www/mozilla-stable/Makefile b/www/mozilla-stable/Makefile
index 22c05ce240b..91534ace6e8 100644
--- a/www/mozilla-stable/Makefile
+++ b/www/mozilla-stable/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2004/01/20 19:29:38 snj Exp $
+# $NetBSD: Makefile,v 1.15 2004/03/10 12:51:45 taya Exp $
 
-PKGREVISION=	2
+PKGREVISION=	3
 MOZILLA=	mozilla-stable
 MOZILLA_BIN=	mozilla-bin
 DISTNAME=	mozilla-${MOZ_DIST_VER}
diff --git a/www/mozilla-stable/distinfo b/www/mozilla-stable/distinfo
index 8ec23e22f45..9e7fde317ab 100644
--- a/www/mozilla-stable/distinfo
+++ b/www/mozilla-stable/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2004/01/15 08:12:37 wiz Exp $
+$NetBSD: distinfo,v 1.8 2004/03/10 12:51:45 taya Exp $
 
 SHA1 (mozilla-1.4.1.tar.bz2) = e44aee7c8b3e3d13bdd2d654662694d14a0e40c3
 Size (mozilla-1.4.1.tar.bz2) = 32132892 bytes
@@ -13,7 +13,7 @@ SHA1 (patch-ag) = 99b1849e5c634c277c57834cb8ab7a6af4bc7357
 SHA1 (patch-am) = a016a23caf3ff46dd5eaeac54fec2d059f68e555
 SHA1 (patch-aw) = be0e726ba8fbde4a9650786dc6f8ec04e9669c3d
 SHA1 (patch-ba) = 63baf096f81c96bdb7fc56c00939a07a01a672dd
-SHA1 (patch-bb) = 70e07fb06469157d49df8a5b9bc90378820d902e
+SHA1 (patch-bb) = c5350823464250546f95d1c0962ba7ba6a16aa2f
 SHA1 (patch-be) = f8046c3bd5c29214d5b9ace250fcf83e57a361fd
 SHA1 (patch-bm) = 7fa8e9701df888a52329b4ecc76ad166038fce06
 SHA1 (patch-bn) = 475190596a9d143b659ff95d23c8b024acf41d88
diff --git a/www/mozilla-stable/patches/patch-bb b/www/mozilla-stable/patches/patch-bb
index 86a651e805a..7d7c939c159 100644
--- a/www/mozilla-stable/patches/patch-bb
+++ b/www/mozilla-stable/patches/patch-bb
@@ -1,8 +1,8 @@
-$NetBSD: patch-bb,v 1.3 2003/11/27 23:36:42 taya Exp $
+$NetBSD: patch-bb,v 1.4 2004/03/10 12:51:45 taya Exp $
 
 diff -ru ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.h ./nsprpub/pr/include/md/_netbsd.h
---- ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.h	2003-01-17 08:09:14.000000000 +0900
-+++ ./nsprpub/pr/include/md/_netbsd.h	2003-03-14 16:59:00.000000000 +0900
+--- ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.h	2003-09-12 02:24:53.000000000 +0900
++++ ./nsprpub/pr/include/md/_netbsd.h	2004-02-21 16:47:07.000000000 +0900
 @@ -48,12 +48,20 @@
  #define _PR_SI_ARCHITECTURE "m68k"
  #elif defined(__powerpc__)
@@ -24,7 +24,20 @@ diff -ru ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.h ./nsprpub/pr/include/md
  #endif
  
  #if defined(__ELF__)
-@@ -107,7 +115,17 @@
+@@ -86,6 +94,12 @@
+ #define _PR_INET6_PROBE
+ #endif
+ 
++#if __NetBSD_Version__ >= 106370000
++/* NetBSD 1.6ZK */
++#define _PR_HAVE_GETPROTO_R
++#define _PR_HAVE_GETPROTO_R_INT
++#endif
++
+ #define USE_SETJMP
+ 
+ #ifndef _PR_PTHREADS
+@@ -108,7 +122,17 @@
  }
  #define	_MD_GET_SP(_thread)	CONTEXT(_thread)[2]
  #endif
@@ -43,7 +56,7 @@ diff -ru ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.h ./nsprpub/pr/include/md
  #define _MD_INIT_CONTEXT(_thread, _sp, _main, status)			\
  {									\
      sigsetjmp(CONTEXT(_thread), 1);					\
-@@ -149,7 +167,7 @@
+@@ -150,7 +174,7 @@
  }
  #define	_MD_GET_SP(_thread)	CONTEXT(_thread)[32]
  #endif
-- 
cgit v1.2.3