summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorjlam <jlam>2002-08-01 06:40:50 +0000
committerjlam <jlam>2002-08-01 06:40:50 +0000
commit0867e28c7927fd7e5cd40b1355543e7922adce58 (patch)
tree93296ffd4e5be2469b397b8d3fd76ecc02856c17 /www
parentff1f69737a3f95c8031b135a90c30c41d8cf1c5a (diff)
downloadpkgsrc-0867e28c7927fd7e5cd40b1355543e7922adce58.tar.gz
Convert to use pthread.buildlink.mk.
Diffstat (limited to 'www')
-rw-r--r--www/fcgi/Makefile9
-rw-r--r--www/mozilla/Makefile17
2 files changed, 14 insertions, 12 deletions
diff --git a/www/fcgi/Makefile b/www/fcgi/Makefile
index 88e0870fc61..a35036a67d3 100644
--- a/www/fcgi/Makefile
+++ b/www/fcgi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/06/24 19:32:08 tron Exp $
+# $NetBSD: Makefile,v 1.2 2002/08/01 06:40:55 jlam Exp $
DISTNAME= fcgi-2.2.2
CATEGORIES= www devel
@@ -8,11 +8,12 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://fastcgi.com/
COMMENT= FastCGI application development kit
-GNU_CONFIGURE= YES
USE_BUILDLINK_ONLY= YES
-USE_LIBTOOL= YES
+GNU_CONFIGURE= YES
+PTHREAD_OPTS+= require
+USE_LIBTOOL= YES
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-.include "../../devel/pth/buildlink.mk"
+.include "../../mk/pthread.buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index 210c37532ec..2858443631f 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.93 2002/07/24 19:45:31 jlam Exp $
+# $NetBSD: Makefile,v 1.94 2002/08/01 06:40:55 jlam Exp $
MOZ_VER= 1.0
DISTNAME= mozilla-source-${MOZ_VER}
@@ -67,14 +67,9 @@ SCRIPTS_ENV+= BINGRP=${BINGRP}
SCRIPTS_ENV+= BINMODE=${BINMODE}
SCRIPTS_ENV+= SETENV=${SETENV}
-# 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
+PTHREAD_OPTS+= native
-.if ${MACHINE_ARCH} == "m68k"
+.if ${MACHINE_ARCH} == "m68k"
DBG=
.else
CONFIGURE_ARGS+= --enable-optimize
@@ -98,4 +93,10 @@ post-build:
do-install:
${SETENV} ${SCRIPTS_ENV} ${SH} ${FILESDIR}/moz-install
+.include "../../mk/pthread.buildlink.mk"
+
+.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "none")
+CONFIGURE_ARGS+= --without-pthreads
+.endif
+
.include "../../mk/bsd.pkg.mk"