Convert to use pthread.buildlink.mk.

12 files changed, 65 insertions, 51 deletions

diff --git a/audio/icecast/Makefile b/audio/icecast/Makefile
index 2423d0d1a34..d15cd1c6ae5 100644
--- a/audio/icecast/Makefile
+++ b/audio/icecast/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2002/05/15 07:28:51 martti Exp $
+# $NetBSD: Makefile,v 1.8 2002/08/01 06:40:50 jlam Exp $
 #
 
 DISTNAME=	icecast-1.3.12
@@ -9,18 +9,23 @@ MAINTAINER=	hubertf@netbsd.org
 HOMEPAGE=	http://www.icecast.org/
 COMMENT=	Internet broadcasting system using Mpeg Layer III streaming
 
-DEPENDS+=	unproven-pthreads>=0.17:../../devel/unproven-pthreads
-DEPENDS+=	readline-4.*:../../devel/readline
+PTHREAD_OPTS+=		native
+GNU_CONFIGURE=		# defined
+CONFIGURE_ARGS+=	--with-readline \
+			--with-libwrap \
+			--with-python \
+			--with-python-includes=${LOCALBASE}/include \
+			--with-python-libraries=${LOCALBASE}/lib
+CFLAGS+=		-I${BUILDLINK_DIR}/include/readline
 
-GNU_CONFIGURE=	YES
-CONFIGURE_ARGS+=--with-readline \
-		--with-libwrap \
-		--with-python \
-		--with-python-includes=${LOCALBASE}/include \
-		--with-python-libraries=${LOCALBASE}/lib
-R=		${LOCALBASE}/include/readline
-P=		${LOCALBASE}/pthreads
-CONFIGURE_ENV+=	 CC='$P/bin/pgcc -I$P/include -I$R -L$P/lib' \
-		CXX='$P/bin/pg++ -I$P/include -I$R -L$P/lib'
+.include "../../devel/readline/buildlink.mk"
+.include "../../security/tcp_wrappers/buildlink.mk"
+.include "../../mk/pthread.buildlink.mk"
+
+.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "none")
+.  include "../../devel/unproven-pthreads/buildlink.mk"
+PGCC=		${CC} -I${BUILDLINK_PREFIX.unproven-pthreads}/pthreads/include
+CONFIGURE_ENV+=	CC="${PGCC}"
+.endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms/Makefile b/audio/xmms/Makefile
index 48f81dacc43..28b0a59850d 100644
--- a/audio/xmms/Makefile
+++ b/audio/xmms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2002/06/25 08:17:33 abs Exp $
+# $NetBSD: Makefile,v 1.29 2002/08/01 06:40:51 jlam Exp $
 # FreeBSD: ports/audio/xmms/Makefile,v 1.9 2000/02/11 01:46:12 cpiazza Exp
 
 DISTNAME=	xmms-1.2.7
@@ -44,7 +44,3 @@ post-patch:
 .include "../../mk/ossaudio.buildlink.mk"
 .include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
-
-.if (${PTHREAD_TYPE} == pth)	# XXX Remove after pth-syscall becomes pth
-CPPFLAGS+=		-D_POSIX_THREAD_SYSCALL_SOFT=1
-.endif
diff --git a/comms/gsmlib/Makefile b/comms/gsmlib/Makefile
index 7995b98e590..675d24b4a81 100644
--- a/comms/gsmlib/Makefile
+++ b/comms/gsmlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/06/17 11:29:58 grant Exp $
+# $NetBSD: Makefile,v 1.2 2002/08/01 06:40:51 jlam Exp $
 #
 
 DISTNAME=	gsmlib-1.9
@@ -18,7 +18,8 @@ USE_BUILDLINK_ONLY=	YES
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--without-included-gettext
 CONFIGURE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
+PTHREAD_OPTS+=		require
 
 .include "../../devel/gettext-lib/buildlink.mk"
-.include "../../devel/pth/buildlink.mk"
+.include "../../mk/pthread.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/unixodbc/Makefile.common b/databases/unixodbc/Makefile.common
index 49c41c99fca..bc9992f52c3 100644
--- a/databases/unixodbc/Makefile.common
+++ b/databases/unixodbc/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2001/12/04 15:55:47 jlam Exp $
+# $NetBSD: Makefile.common,v 1.6 2002/08/01 06:40:52 jlam Exp $
 
 DISTNAME=	unixODBC-${ODBC_DIST_VERS}
 CATEGORIES=	databases
@@ -21,8 +21,7 @@ LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--enable-threads
-CONFIGURE_ARGS+=	--enable-gnuthreads
-CONFIGURE_ARGS+=	--with-pth=${BUILDLINK_DIR}
+PTHREAD_OPTS+=		require
 
 # Override the local definitions that point to the self-contained libtool
 # convenience library.  We want the one installed by pkgsrc.  Also override
@@ -59,4 +58,9 @@ fix-ltdl-and-lexlib:
 	done
 
 .include "../../devel/libtool/buildlink.mk"
-.include "../../devel/pth/buildlink.mk"
+.include "../../mk/pthread.buildlink.mk"
+
+.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth")
+CONFIGURE_ARGS+=	--enable-gnuthreads
+CONFIGURE_ARGS+=	--with-pth=${BUILDLINK_DIR}
+.endif
diff --git a/databases/unixodbc/buildlink.mk b/databases/unixodbc/buildlink.mk
index b1032cfecc6..1c383b3fb79 100644
--- a/databases/unixodbc/buildlink.mk
+++ b/databases/unixodbc/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1.1.1 2001/11/06 04:08:34 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.2 2002/08/01 06:40:52 jlam Exp $
 #
 # This Makefile fragment is included by packages that use unixodbc.
 #
@@ -37,8 +37,10 @@ BUILDLINK_FILES.unixodbc+=		lib/libodbccr.*
 BUILDLINK_FILES.unixodbc+=		lib/libodbcextras.*
 BUILDLINK_FILES.unixodbc+=		lib/libodbcinst.*
 
+PTHREAD_OPTS+=		require
+
 .include "../../devel/libtool/buildlink.mk"
-.include "../../devel/pth/buildlink.mk"
+.include "../../mk/pthread.buildlink.mk"
 
 BUILDLINK_TARGETS.unixodbc=	unixodbc-buildlink
 BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.unixodbc}
diff --git a/devel/SDL/Makefile b/devel/SDL/Makefile
index 58d70fd4620..e99300921ba 100644
--- a/devel/SDL/Makefile
+++ b/devel/SDL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2002/07/14 07:28:39 kristerw Exp $
+# $NetBSD: Makefile,v 1.37 2002/08/01 06:40:53 jlam Exp $
 #
 
 DISTNAME=	SDL-1.2.3
@@ -16,6 +16,7 @@ USE_BUILDLINK_ONLY=	YES
 
 GNU_CONFIGURE=		YES
 USE_GMAKE=		YES
+PTHREAD_OPTS+=		require
 
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
@@ -55,9 +56,9 @@ post-configure:
 	cd ${WRKSRC}/src/audio && ${CP} *.[ch] netbsd/
 
 .include "../../audio/esound/buildlink.mk"
-.include "../../devel/pth/buildlink.mk"
 .include "../../graphics/Mesa/buildlink.mk"
 .include "../../graphics/aalib-x11/buildlink.mk"
+.include "../../mk/pthread.buildlink.mk"
 .include "../../mk/ossaudio.buildlink.mk"
 .include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/SDL/buildlink.mk b/devel/SDL/buildlink.mk
index 4aad7335920..cb5df31ce7a 100644
--- a/devel/SDL/buildlink.mk
+++ b/devel/SDL/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.15 2002/06/25 06:54:43 tron Exp $
+# $NetBSD: buildlink.mk,v 1.16 2002/08/01 06:40:53 jlam Exp $
 #
 # This Makefile fragment is included by packages that use SDL.
 #
@@ -26,18 +26,18 @@ BUILDLINK_FILES.SDL=	include/SDL/*
 BUILDLINK_FILES.SDL+=	lib/libSDL.*
 BUILDLINK_FILES.SDL+=	lib/libSDLmain.*
 
-.include "../../mk/bsd.prefs.mk"
-
 REPLACE_BUILDLINK_SED+=	\
 	-e "s|${BUILDLINK_CONFIG_WRAPPER.SDL}|${BUILDLINK_CONFIG.SDL}|g"
 
+PTHREAD_OPTS+=		require
+
 .if defined(SDL_USE_NAS)
-.include "../../audio/nas/buildlink.mk"
+.  include "../../audio/nas/buildlink.mk"
 .endif
 .include "../../audio/esound/buildlink.mk"
-.include "../../devel/pth/buildlink.mk"
 .include "../../graphics/Mesa/buildlink.mk"
 .include "../../graphics/aalib-x11/buildlink.mk"
+.include "../../mk/pthread.buildlink.mk"
 
 BUILDLINK_TARGETS.SDL=		SDL-buildlink
 BUILDLINK_TARGETS.SDL+=		SDL-buildlink-config-wrapper
diff --git a/graphics/clanlib/Makefile b/graphics/clanlib/Makefile
index 1aa6d9eb167..0848c328179 100644
--- a/graphics/clanlib/Makefile
+++ b/graphics/clanlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2002/03/13 17:37:04 fredb Exp $
+# $NetBSD: Makefile,v 1.26 2002/08/01 06:40:54 jlam Exp $
 
 DISTNAME=		ClanLib-0.4.4
 PKGREVISION=		1
@@ -13,6 +13,7 @@ USE_BUILDLINK_ONLY=	yes
 USE_X11BASE=		yes
 GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
+PTHREAD_OPTS+=		require
 
 .if ${MACHINE_ARCH} == "i386"
 CONFIGURE_ARGS+=	--enable-asm386
@@ -38,7 +39,7 @@ post-patch:
 .include "../../graphics/hermes/buildlink.mk"
 .include "../../graphics/png/buildlink.mk"
 .include "../../graphics/Mesa/buildlink.mk"
-.include "../../devel/pth/buildlink.mk"
+.include "../../mk/pthread.buildlink.mk"
 .include "../../mk/ossaudio.buildlink.mk"
 .include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/clanlib/buildlink.mk b/graphics/clanlib/buildlink.mk
index 1ffc8624f6a..62245d275b4 100644
--- a/graphics/clanlib/buildlink.mk
+++ b/graphics/clanlib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.9 2002/03/13 17:37:04 fredb Exp $
+# $NetBSD: buildlink.mk,v 1.10 2002/08/01 06:40:54 jlam Exp $
 #
 # This Makefile fragment is included by packages that use ClanLib.
 #
@@ -35,10 +35,12 @@ BUILDLINK_FILES.ClanLib+=	include/ClanLib/Magick/*
 BUILDLINK_FILES.ClanLib+=	include/ClanLib/MikMod/*
 BUILDLINK_FILES.ClanLib+=	include/ClanLib/png/*
 
+PTHREAD_OPTS+=		require
+
 .include "../../graphics/hermes/buildlink.mk"
 .include "../../graphics/png/buildlink.mk"
 .include "../../graphics/Mesa/buildlink.mk"
-.include "../../devel/pth/buildlink.mk"
+.include "../../mk/pthread.buildlink.mk"
 
 BUILDLINK_TARGETS.ClanLib=	ClanLib-buildlink
 BUILDLINK_TARGETS.ClanLib+=	ClanLib-buildlink-config-wrapper
diff --git a/graphics/sodipodi/Makefile b/graphics/sodipodi/Makefile
index 1e61e8d1339..faf884263e6 100644
--- a/graphics/sodipodi/Makefile
+++ b/graphics/sodipodi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/07/12 22:51:27 mycroft Exp $
+# $NetBSD: Makefile,v 1.6 2002/08/01 06:40:54 jlam Exp $
 #
 
 DISTNAME=	sodipodi-0.23
@@ -17,7 +17,7 @@ USE_GMAKE=		YES
 USE_LIBTOOL=		YES
 USE_X11BASE=		YES
 
-PTHREAD_TYPE=	native pth
+PTHREAD_OPTS+=		require
 
 .include "../../devel/bonobo/buildlink.mk"
 .include "../../devel/gettext-lib/buildlink.mk"
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"