fix configure script to correctly configure with pthread.

5 files changed, 28 insertions, 6 deletions

diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index 6c63ae0a1d6..7da8ff0b3b0 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.112 2003/01/30 11:51:12 jlam Exp $
+# $NetBSD: Makefile,v 1.113 2003/02/02 08:08:04 taya Exp $
 
 MOZILLA=	mozilla
 MOZILLA_BIN=	mozilla-bin
 MOZ_VER=	1.2.1
 EXTRACT_SUFX=	.tar.bz2
-PKGREVISION=	4
+PKGREVISION=	5
 
 COMMENT=	Open-source version of the Netscape browser
 
diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common
index e6b1a7ab797..9e8963cccbd 100644
--- a/www/mozilla/Makefile.common
+++ b/www/mozilla/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.9 2003/01/02 05:41:56 grant Exp $
+# $NetBSD: Makefile.common,v 1.10 2003/02/02 08:08:04 taya Exp $
 
 MOZ_DIST_VER?=	${MOZ_VER}
 DISTNAME?=	mozilla-source-${MOZ_DIST_VER}
@@ -98,6 +98,7 @@ post-extract:
 
 pre-configure:
 	cd ${WRKSRC} && ${AUTOCONF}
+	cd ${WRKSRC}/nsprpub && ${AUTOCONF}
 
 post-build:
 	${ECHO} skin,install,select,classic/1.0 >> ${WRKSRC}/dist/bin/chrome/installed-chrome.txt
diff --git a/www/mozilla/buildlink2.mk b/www/mozilla/buildlink2.mk
index 4e51139a3d9..0ac4d404d42 100644
--- a/www/mozilla/buildlink2.mk
+++ b/www/mozilla/buildlink2.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.4 2002/12/24 06:10:29 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2003/02/02 08:08:04 taya Exp $
 #
 
 .if !defined(MOZILLA_BUILDLINK2_MK)
 MOZILLA_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			mozilla
-BUILDLINK_DEPENDS.mozilla?=		mozilla>=1.2.1nb1
+BUILDLINK_DEPENDS.mozilla?=		mozilla>=1.2.1nb5
 BUILDLINK_PKGSRCDIR.mozilla?=		../../www/mozilla
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.mozilla=mozilla
diff --git a/www/mozilla/distinfo b/www/mozilla/distinfo
index fb85ad2d7d4..8834686c23c 100644
--- a/www/mozilla/distinfo
+++ b/www/mozilla/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.35 2003/01/21 10:59:39 tron Exp $
+$NetBSD: distinfo,v 1.36 2003/02/02 08:08:04 taya Exp $
 
 SHA1 (mozilla-source-1.2.1.tar.bz2) = 3af707a14eb11e3f615ad7d2225cc7205faa4d36
 Size (mozilla-source-1.2.1.tar.bz2) = 30919648 bytes
@@ -14,3 +14,4 @@ SHA1 (patch-bb) = 6ad4068f3dad88dbc6c74679268f3a64a91bb2d8
 SHA1 (patch-be) = da2d741f7fbfa9538e3baab250a57b948335e2f6
 SHA1 (patch-bm) = 90293a32a571e58884a815b4ca18616bed4fb3af
 SHA1 (patch-bn) = fe5152d4f4bb8bd791249237f0dcd14e11ba27d1
+SHA1 (patch-bo) = 3828ea534a08b89c5ec843bd7a259bdf4729f7ec
diff --git a/www/mozilla/patches/patch-bo b/www/mozilla/patches/patch-bo
new file mode 100644
index 00000000000..56ba833a33e
--- /dev/null
+++ b/www/mozilla/patches/patch-bo
@@ -0,0 +1,20 @@
+$NetBSD: patch-bo,v 1.1 2003/02/02 08:08:05 taya Exp $
+
+--- ../Orig/mozilla/nsprpub/configure.in	2002-09-26 21:46:25.000000000 +0900
++++ ./nsprpub/configure.in	2003-01-31 00:45:26.000000000 +0900
+@@ -2127,7 +2127,14 @@
+ 	        _PTHREAD_LDFLAGS="-lc_r"
+ 	    fi
+ 	    ;;
+-    *-openbsd*|*-bsdi*|*-netbsd*)
++    *-netbsd*)
++	    AC_DEFINE(_REENTRANT)
++	    AC_DEFINE(_THREAD_SAFE)
++	    if test "$ac_cv_have_dash_pthread" = "yes"; then
++	        _PTHREAD_LDFLAGS="-pthread"
++	    fi
++	    ;;
++    *-openbsd*|*-bsdi*)
+ 	    AC_DEFINE(_THREAD_SAFE)
+ 	    dnl -pthread links in -lc_r, so don't specify it explicitly.
+ 	    if test "$ac_cv_have_dash_pthread" = "yes"; then