add pthread support.(but disabled now)

5 files changed, 50 insertions, 8 deletions

diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index fb1490d3633..d8a45ae281c 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.90 2002/06/23 02:20:07 kei Exp $
+# $NetBSD: Makefile,v 1.91 2002/07/04 03:45:30 taya Exp $
 
 MOZ_VER=	1.0
 DISTNAME=	mozilla-source-${MOZ_VER}
 PKGNAME=	mozilla-${MOZ_VER}
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/mozilla
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA:=mozilla${MOZ_VER}/src/}
@@ -66,9 +67,10 @@ SCRIPTS_ENV+=	BINGRP=${BINGRP}
 SCRIPTS_ENV+=	BINMODE=${BINMODE}
 SCRIPTS_ENV+=	SETENV=${SETENV}
 
-.include "../../mk/bsd.prefs.mk"
-
-.if (${OPSYS} == "NetBSD")
+# mozilla could be built with nathanw's pthread, but doesn't work now
+# so explicity disable pthread support now.
+# if you want to try pthread version of mozilla, remove # before !exists(...)
+.if (${OPSYS} == "NetBSD") # && !exists(/usr/include/pthread.h)
 CONFIGURE_ARGS+= --without-pthreads
 .endif
 
diff --git a/www/mozilla/distinfo b/www/mozilla/distinfo
index 473d6c3fa2d..8d50a00cdd1 100644
--- a/www/mozilla/distinfo
+++ b/www/mozilla/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.22 2002/06/06 02:05:57 taya Exp $
+$NetBSD: distinfo,v 1.23 2002/07/04 03:45:30 taya Exp $
 
 SHA1 (mozilla-source-1.0.tar.bz2) = 92d44f3196dca3182ffe64414fc0a574a5aa7416
 Size (mozilla-source-1.0.tar.bz2) = 29620700 bytes
-SHA1 (patch-ab) = 62041f6d8150eaee552f3b02cb1757ee691bd5e1
+SHA1 (patch-aa) = f1bbdd178534d889091c19f042abb08566cdae30
+SHA1 (patch-ab) = a95161cdd0aaf8761dd36fd88dddd35ff588fcd0
+SHA1 (patch-am) = f2579e2729d18335101ea46dc96fb7463c819ef3
 SHA1 (patch-aw) = d0e738f5ed84aaf390de56a6d741de0e8ee69d3a
 SHA1 (patch-ba) = f165b8b82e5d1f89ae7af12cf93566e116391f77
 SHA1 (patch-bb) = cff7139dd754fb9c800839b54c7697eb3fd32f93
diff --git a/www/mozilla/patches/patch-aa b/www/mozilla/patches/patch-aa
new file mode 100644
index 00000000000..e4cdf132fed
--- /dev/null
+++ b/www/mozilla/patches/patch-aa
@@ -0,0 +1,14 @@
+$NetBSD: patch-aa,v 1.20 2002/07/04 03:45:31 taya Exp $
+
+diff -ru ../Orig/mozilla/nsprpub/pr/src/pthreads/ptthread.c ./nsprpub/pr/src/pthreads/ptthread.c
+--- ../Orig/mozilla/nsprpub/pr/src/pthreads/ptthread.c	Wed Apr 10 12:17:39 2002
++++ ./nsprpub/pr/src/pthreads/ptthread.c	Sun Jun 30 16:30:39 2002
+@@ -360,7 +360,7 @@
+     /*
+      * Linux doesn't have pthread_attr_setstacksize.
+      */
+-#ifndef LINUX
++#if !defined(LINUX) && !defined(NETBSD)
+     rv = pthread_attr_setstacksize(&tattr, stackSize);
+     PR_ASSERT(0 == rv);
+ #endif
diff --git a/www/mozilla/patches/patch-ab b/www/mozilla/patches/patch-ab
index 3a10af208ad..403877e88f0 100644
--- a/www/mozilla/patches/patch-ab
+++ b/www/mozilla/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.23 2002/06/06 02:05:58 taya Exp $
+$NetBSD: patch-ab,v 1.24 2002/07/04 03:45:31 taya Exp $
 
 diff -ru ../Orig/mozilla/configure.in ./configure.in
 --- ../Orig/mozilla/configure.in	Tue May 28 04:29:12 2002
-+++ ./configure.in	Thu Jun  6 09:13:17 2002
++++ ./configure.in	Sun Jun 30 16:28:58 2002
 @@ -1014,6 +1014,13 @@
      if test "$LIBRUNPATH"; then
  	DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS"
@@ -17,3 +17,13 @@ diff -ru ../Orig/mozilla/configure.in ./configure.in
      ;;
  
  *-nto*) 
+@@ -1847,9 +1854,6 @@
+ 				CXXFLAGS="$CXXFLAGS -mt" 
+ 			fi
+ 			;;
+-	*-*-netbsd*)
+-		USE_PTHREADS=
+-		_PTHREAD_LDFLAGS=
+ 	esac
+ fi
+ 
diff --git a/www/mozilla/patches/patch-am b/www/mozilla/patches/patch-am
new file mode 100644
index 00000000000..78cf5d5eec4
--- /dev/null
+++ b/www/mozilla/patches/patch-am
@@ -0,0 +1,14 @@
+$NetBSD: patch-am,v 1.6 2002/07/04 03:45:32 taya Exp $
+
+diff -ru ../Orig/mozilla/nsprpub/pr/src/pthreads/ptio.c ./nsprpub/pr/src/pthreads/ptio.c
+--- ../Orig/mozilla/nsprpub/pr/src/pthreads/ptio.c	Fri Apr 12 03:14:39 2002
++++ ./nsprpub/pr/src/pthreads/ptio.c	Sun Jun 30 16:29:38 2002
+@@ -192,7 +192,7 @@
+ #elif defined(IRIX) || defined(OSF1) || defined(AIX) || defined(HPUX) \
+     || defined(LINUX) || defined(FREEBSD) || defined(BSDI) || defined(VMS) \
+     || defined(NTO) || defined(OPENBSD) || defined(DARWIN) \
+-    || defined(UNIXWARE)
++    || defined(UNIXWARE) || defined(NETBSD)
+ #define _PRSockOptVal_t void *
+ #else
+ #error "Cannot determine architecture"