Merge from HEAD.

11 files changed, 197 insertions, 76 deletions

diff --git a/mk/bsd.options.mk b/mk/bsd.options.mk
index 423b26fef8c..a165724362a 100644
--- a/mk/bsd.options.mk
+++ b/mk/bsd.options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.options.mk,v 1.9.4.1 2004/11/22 22:48:04 tv Exp $
+# $NetBSD: bsd.options.mk,v 1.9.4.2 2004/11/28 20:11:32 tv Exp $
 #
 # This Makefile fragment provides boilerplate code for standard naming
 # conventions for handling per-package build options.
@@ -160,19 +160,7 @@ PKG_FAIL_REASON+=	"\"${_opt_}\" is not a supported build option."
 .  endif
 .endfor
 
-# Store the result in the +BUILD_INFO file so we can query for the build
-# options using "pkg_info -Q PKG_OPTIONS <pkg>".
-BUILD_DEFS_FIXED+=	PKG_OPTIONS
-
-.if defined(PKG_SUPPORTED_OPTIONS)
-.PHONY: supported-options-message
-pre-extract: supported-options-message
-supported-options-message:
-.  if !empty(PKG_SUPPORTED_OPTIONS)
-	@${ECHO} "=========================================================================="
-	@${ECHO} "The supported build options for this package are:"
-	@${ECHO} ""
-	@${ECHO} "${PKG_SUPPORTED_OPTIONS}" | ${XARGS} -n 1 | ${SORT} |	\
+_PKG_OPTIONS_WORDWRAP_FILTER=						\
 	${AWK} '							\
 		BEGIN { printwidth = 40; line = "" }			\
 		{							\
@@ -187,6 +175,28 @@ supported-options-message:
 		}							\
 		END { if (length(line) > 0) print "	"line }		\
 	'
+
+# Store the result in the +BUILD_INFO file so we can query for the build
+# options using "pkg_info -Q PKG_OPTIONS <pkg>".
+BUILD_DEFS_FIXED+=	PKG_OPTIONS
+
+.if defined(PKG_SUPPORTED_OPTIONS)
+.PHONY: supported-options-message
+pre-extract: supported-options-message
+supported-options-message:
+.  if !empty(PKG_SUPPORTED_OPTIONS)
+	@${ECHO} "=========================================================================="
+	@${ECHO} "The supported build options for this package are:"
+	@${ECHO} ""
+	@${ECHO} "${PKG_SUPPORTED_OPTIONS}" | ${XARGS} -n 1 | ${SORT} |	\
+		${_PKG_OPTIONS_WORDWRAP_FILTER}
+.    if !empty(PKG_OPTIONS)
+	@${ECHO} ""
+	@${ECHO} "The currently selected options are:"
+	@${ECHO} ""
+	@${ECHO} "${PKG_OPTIONS}" | ${XARGS} -n 1 | ${SORT} |		\
+		${_PKG_OPTIONS_WORDWRAP_FILTER}
+.    endif
 	@${ECHO} ""
 	@${ECHO} "You can select which build options to use by setting the following"
 	@${ECHO} "variables.  Their current value is shown:"
diff --git a/mk/bsd.pkg.use.mk b/mk/bsd.pkg.use.mk
index fc3eb49c365..10a830d1357 100644
--- a/mk/bsd.pkg.use.mk
+++ b/mk/bsd.pkg.use.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.use.mk,v 1.1.2.1 2004/11/22 22:48:05 tv Exp $
+#	$NetBSD: bsd.pkg.use.mk,v 1.1.2.2 2004/11/28 20:11:32 tv Exp $
 #
 # Turn USE_* macros into proper depedency logic.  Included near the top of
 # bsd.pkg.mk, after bsd.prefs.mk.
@@ -183,17 +183,7 @@ USE_PERL5:=		run
 _PERL5_DEPMETHOD=	DEPENDS
 .  endif
 _PERL5_DEPENDS=		{perl>=${_PERL5_REQD},perl-thread>=${_PERL5_REQD}}
-#
-# On platforms that have native pthreads, default to installing the
-# threaded perl.  This can be overridden by explicitly setting
-# PERL5_USE_THREADS.
-#
-.  if exists(/usr/include/pthread.h) && \
-      !empty(PREFER_NATIVE_PTHREADS:M[yY][eE][sS])
-PERL5_PKGSRCDIR?=	../../lang/perl58-thread
-.  else
 PERL5_PKGSRCDIR?=	../../lang/perl58
-.  endif
 .  if !defined(BUILDLINK_DEPENDS.perl)
 ${_PERL5_DEPMETHOD}+=	${_PERL5_DEPENDS}:${PERL5_PKGSRCDIR}
 .  endif
diff --git a/mk/bsd.sites.mk b/mk/bsd.sites.mk
index 7b78287e2f7..d613eec7753 100644
--- a/mk/bsd.sites.mk
+++ b/mk/bsd.sites.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.sites.mk,v 1.20 2004/11/22 17:12:42 wiz Exp $
+# $NetBSD: bsd.sites.mk,v 1.20.2.1 2004/11/28 20:11:32 tv Exp $
 #
 # Default MASTER_SITES
 
@@ -114,16 +114,16 @@ MASTER_SITE_GNOME+=     \
 	ftp://ftp.mirror.ac.uk/sites/ftp.gnome.org/pub/
 
 MASTER_SITE_SOURCEFORGE+=	\
+	http://aleron.dl.sourceforge.net/sourceforge/ \
 	http://belnet.dl.sourceforge.net/sourceforge/ \
 	http://cesnet.dl.sourceforge.net/sourceforge/ \
-	http://easynews.dl.sourceforge.net/sourceforge/ \
 	http://heanet.dl.sourceforge.net/sourceforge/ \
-	http://keihanna.dl.sourceforge.net/sourceforge/ \
+	http://internap.dl.sourceforge.net/sourceforge/ \
+	http://jaist.dl.sourceforge.net/sourceforge/ \
 	http://mesh.dl.sourceforge.net/sourceforge/ \
 	http://optusnet.dl.sourceforge.net/sourceforge/ \
 	http://ovh.dl.sourceforge.net/sourceforge/ \
 	http://puzzle.dl.sourceforge.net/sourceforge/ \
-	http://switch.dl.sourceforge.net/sourceforge/ \
 	http://umn.dl.sourceforge.net/sourceforge/ \
 	http://unc.dl.sourceforge.net/sourceforge/ \
 	http://voxel.dl.sourceforge.net/sourceforge/ \
diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk
index 7800b2042aa..c2cdffbd2e7 100644
--- a/mk/buildlink3/bsd.buildlink3.mk
+++ b/mk/buildlink3/bsd.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.163.2.2 2004/11/23 18:25:35 tv Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.163.2.3 2004/11/28 20:11:32 tv Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -91,7 +91,7 @@ BUILDLINK_BINDIR=	${BUILDLINK_DIR}/bin
 BUILDLINK_SRCDIR=	${.CURDIR}/../../mk/buildlink3
 BUILDLINK_X11_DIR=	${BUILDLINK_DIR:H}/.x11-buildlink
 
-.PHONY: pre-buildlink do-buildlink post-buildlink
+.PHONY: do-buildlink
 
 # Prepend ${BUILDLINK_BINDIR} to the PATH.
 PREPEND_PATH+=	${BUILDLINK_BINDIR}
@@ -1079,11 +1079,9 @@ ${WRAPPER_TMPDIR}/transform-libtool: ${BUILDLINK_SRCDIR}/transform-libtool
 			 -e "s|@PWD@|${PWD_CMD:Q}|g"			\
 		| ${_WRAP_SH_CRUNCH_FILTER} > ${.TARGET}
 
-WRAPPER_TARGETS+=	pre-buildlink do-buildlink post-buildlink
+WRAPPER_TARGETS+=	do-buildlink
 
-pre-buildlink: .OPTIONAL
 do-buildlink: .OPTIONAL
-post-buildlink: .OPTIONAL
 
 .endif	# PHASES_AFTER_WRAPPER
 ###
diff --git a/mk/compiler/xlc.mk b/mk/compiler/xlc.mk
index 969a4e61210..7e33499e64a 100644
--- a/mk/compiler/xlc.mk
+++ b/mk/compiler/xlc.mk
@@ -1,4 +1,4 @@
-# $NetBSD: xlc.mk,v 1.2.2.1 2004/11/23 20:54:12 tv Exp $
+# $NetBSD: xlc.mk,v 1.2.2.2 2004/11/28 20:11:32 tv Exp $
 
 .if !defined(COMPILER_XLC_MK)
 COMPILER_XLC_MK=	defined
@@ -47,6 +47,10 @@ CC_VERSION?=		IBM XL C
 PREPEND_PATH+=	${_XLC_DIR}/bin
 .endif
 
+# Most packages assume alloca is available without #pragma alloca, so
+# make it the default.
+CFLAGS+=-ma
+
 # Create compiler driver scripts in ${WRKDIR}.
 .for _target_ in ${_XLC_LINKS}
 .  if !target(${${_target_}})
diff --git a/mk/db1.builtin.mk b/mk/db1.builtin.mk
index 323ab04e053..0a47a0395cd 100644
--- a/mk/db1.builtin.mk
+++ b/mk/db1.builtin.mk
@@ -1,14 +1,14 @@
-# $NetBSD: db1.builtin.mk,v 1.5 2004/11/17 15:12:08 jlam Exp $
+# $NetBSD: db1.builtin.mk,v 1.5.2.1 2004/11/28 20:11:32 tv Exp $
 
 .for _lib_ in db db1
 .  if !defined(_BLNK_LIB_FOUND.${_lib_})
 _BLNK_LIB_FOUND.${_lib_}!=	\
-	if ${TEST} `${ECHO} /usr/lib/lib${_lib_}.*` = "/usr/lib/lib${_lib_}.*"; then \
-		${ECHO} "no";						\
-	elif ${TEST} `${ECHO} /lib/lib${_lib_}.*` = "/lib/lib${_lib_}.*"; then \
-		${ECHO} "no";						\
-	else								\
+	if ${TEST} "`${ECHO} /usr/lib/lib${_lib_}.*`" != "/usr/lib/lib${_lib_}.*"; then \
 		${ECHO} "yes";						\
+	elif ${TEST} "`${ECHO} /lib/lib${_lib_}.*`" != "/lib/lib${_lib_}.*"; then \
+		${ECHO} "yes";						\
+	else								\
+		${ECHO} "no";						\
 	fi
 BUILDLINK_VARS+=	_BLNK_LIB_FOUND.${_lib_}
 .  endif
diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf
index 8c8df0e3b80..5a66b0e6a24 100644
--- a/mk/defaults/mk.conf
+++ b/mk/defaults/mk.conf
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.14.2.1 2004/11/22 22:48:05 tv Exp $
+# $NetBSD: mk.conf,v 1.14.2.2 2004/11/28 20:11:32 tv Exp $
 #
 
 # A file providing defaults for pkgsrc and the packages collection.
@@ -1484,11 +1484,6 @@ LSOF_LESS_SECURE_SOCKETS?=	0
 #		1 (allow all sockets to be viewed at all times)
 # Default: 0
 
-LYNX_SCREEN_LIB?=	curses
-# Used in lynx and lynx-current to set which screen library to use.
-# Possible: slang, ncurses, curses.
-# Default: curses
-
 #M68060=
 # Used mostly by packages (e.g.:  gnupg, pgp2, ssh) which have fast
 # 68020/030/040 assembler routines for multiprecision arithmetic
@@ -2035,7 +2030,7 @@ USE_ESOUND?= YES
 # Possible: YES, or NO.
 # Default: YES
 
-#USE_GIF=
+USE_GIF?=	yes
 # Enable GIF support in qt1.  (disabled per default due to licensing
 # problems; future revisions might have no support at all)
 # Also used by tiff-library to enable LZW compression support.
diff --git a/mk/dlopen.buildlink3.mk b/mk/dlopen.buildlink3.mk
new file mode 100644
index 00000000000..61b4a0282ad
--- /dev/null
+++ b/mk/dlopen.buildlink3.mk
@@ -0,0 +1,44 @@
+# $NetBSD: dlopen.buildlink3.mk,v 1.8.2.2 2004/11/28 20:11:32 tv Exp $
+#
+# This Makefile fragment is included by package Makefiles and
+# buildlink3.mk files for the packages that use dlopen().
+#
+DLOPEN_BUILDLINK3_MK:=	${DLOPEN_BUILDLINK3_MK}+
+
+.include "../../mk/bsd.prefs.mk"
+
+.if !empty(DLOPEN_BUILDLINK3_MK:M+)
+CHECK_BUILTIN.dl:=	yes
+.include "../../mk/dlopen.builtin.mk"
+CHECK_BUILTIN.dl:=	no
+.endif	# DLOPEN_BUILDLINK3_MK
+
+DL_AUTO_VARS?=	no
+
+.if !empty(USE_BUILTIN.dl:M[yY][eE][sS])
+BUILDLINK_PACKAGES:=		${BUILDLINK_PACKAGES:Ndl}
+BUILDLINK_PACKAGES+=		dl
+BUILDLINK_BUILTIN_MK.dl=	../../mk/dlopen.builtin.mk
+BUILDLINK_AUTO_VARS.dl=		${DL_AUTO_VARS}
+.elif ${OPSYS} == "Darwin"
+.  include "../../devel/dlcompat/buildlink3.mk"
+BUILDLINK_AUTO_VARS.dlcompat=	${DL_AUTO_VARS}
+.else
+PKG_SKIP_REASON=	"${PKGNAME} requires a working dlopen()."
+.endif
+
+.if !empty(DLOPEN_BUILDLINK3_MK:M+)
+#
+# Define user-visible DL_{CFLAGS,LDFLAGS,LIBS} as compiler options used
+# to compile/link code that uses dl*() functions.
+#
+DL_CFLAGS=	${BUILDLINK_CFLAGS.dl}
+DL_LDFLAGS=	${BUILDLINK_LDFLAGS.dl}
+DL_LIBS=	${BUILDLINK_LIBS.dl}
+CONFIGURE_ENV+=	DL_CFLAGS="${DL_CFLAGS}"
+CONFIGURE_ENV+=	DL_LDFLAGS="${DL_LDFLAGS}"
+CONFIGURE_ENV+=	DL_LIBS="${DL_LIBS}"
+MAKE_ENV+=	DL_CFLAGS="${DL_CFLAGS}"
+MAKE_ENV+=	DL_LDFLAGS="${DL_LDFLAGS}"
+MAKE_ENV+=	DL_LIBS="${DL_LIBS}"
+.endif	# DLOPEN_BUILDLINK3_MK
diff --git a/mk/dlopen.builtin.mk b/mk/dlopen.builtin.mk
new file mode 100644
index 00000000000..c5687b0dbf4
--- /dev/null
+++ b/mk/dlopen.builtin.mk
@@ -0,0 +1,86 @@
+# $NetBSD: dlopen.builtin.mk,v 1.6.2.2 2004/11/28 20:11:32 tv Exp $
+
+.for _lib_ in dl
+.  if !defined(_BLNK_LIB_FOUND.${_lib_})
+_BLNK_LIB_FOUND.${_lib_}!=	\
+	if ${TEST} "`${ECHO} /usr/lib/lib${_lib_}.*`" != "/usr/lib/lib${_lib_}.*"; then \
+		${ECHO} "yes";						\
+	elif ${TEST} "`${ECHO} /lib/lib${_lib_}.*`" != "/lib/lib${_lib_}.*"; then \
+		${ECHO} "yes";						\
+	else								\
+		${ECHO} "no";						\
+	fi
+BUILDLINK_VARS+=	_BLNK_LIB_FOUND.${_lib_}
+.  endif
+.endfor
+.undef _lib_
+
+.if !defined(IS_BUILTIN.dl)
+IS_BUILTIN.dl=		no
+.  if exists(/usr/include/dlfcn.h)
+IS_BUILTIN.dl=		yes
+.  endif
+BUILDLINK_VARS+=	IS_BUILTIN.dl
+.endif	# IS_BUILTIN.pthread
+
+.if !defined(USE_BUILTIN.dl)
+USE_BUILTIN.dl=		${IS_BUILTIN.dl}
+.  if ${OPSYS} == "Darwin"
+USE_BUILTIN.dl=		no	# Darwin uses devel/dlcompat
+.  endif
+.endif
+#
+# The following platforms require pthreads to be linked into the
+# application if it uses dlopen() or else the applications will core
+# dump when they dlopen a shared module that _is_ linked with pthread
+# support.
+#
+_DLOPEN_REQUIRE_PTHREAD_PLATFORMS=					\
+	NetBSD-2.[0-9]-* NetBSD-2.[0-9]_*-*				\
+	NetBSD-2.[0-8][0-9]*-* NetBSD-2.9[0-8]*-*			\
+	NetBSD-2.99.[0-9]-* NetBSD-2.99.10-*
+
+_DLOPEN_REQUIRE_PTHREADS?=	no
+.for _pattern_ in ${_DLOPEN_REQUIRE_PTHREAD_PLATFORMS}
+.  if !empty(MACHINE_PLATFORM:M${_pattern_})
+.    if !empty(PREFER_NATIVE_PTHREADS:M[yY][eE][sS])
+_DLOPEN_REQUIRE_PTHREADS=	yes
+.    endif
+.  endif
+.endfor
+#
+# DLOPEN_REQUIRE_PTHREADS is a user- and package-settable yes/no variable
+#	whose value decides whether pthread.buildlink3.mk is automatically
+#	included or not.  Its default value depends on whether native
+#	pthreads exist.
+#
+.if defined(DLOPEN_REQUIRE_PTHREADS)
+_DLOPEN_REQUIRE_PTHREADS:=      ${DLOPEN_REQUIRE_PTHREADS}
+.else
+DLOPEN_REQUIRE_PTHREADS=        ${_DLOPEN_REQUIRE_PTHREADS}
+.endif
+
+CHECK_BUILTIN.dl?=	no
+.if !empty(CHECK_BUILTIN.dl:M[nN][oO])
+
+.  if !empty(USE_BUILTIN.dl:M[yY][eE][sS])
+BUILDLINK_PREFIX.dl=	/usr
+.    if !empty(_BLNK_LIB_FOUND.dl:M[yY][eE][sS])
+#
+# No need to add this to BUILDLINK_LIBS.dl since most GNU configure
+# scripts already check for -ldl themselves.
+#
+BUILDLINK_LDADD.dl=	-ldl
+.    endif
+.    if !empty(_DLOPEN_REQUIRE_PTHREADS:M[yY][eE][sS])
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+.      include "../../mk/pthread.buildlink3.mk"
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+.      include "../../mk/pthread.builtin.mk"
+BUILDLINK_CFLAGS.dl+=	${PTHREAD_CFLAGS}
+BUILDLINK_LDFLAGS.dl+=	${PTHREAD_LDFLAGS}
+BUILDLINK_LIBS.dl+=	${PTHREAD_LIBS}
+.    endif
+.  endif # USE_BUILTIN.dl == yes
+
+.endif	# CHECK_BUILTIN.dl
diff --git a/mk/pthread.buildlink3.mk b/mk/pthread.buildlink3.mk
index 893f1742d27..391a8de81bd 100644
--- a/mk/pthread.buildlink3.mk
+++ b/mk/pthread.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: pthread.buildlink3.mk,v 1.17 2004/11/17 21:05:24 jlam Exp $
+# $NetBSD: pthread.buildlink3.mk,v 1.17.2.1 2004/11/28 20:11:32 tv Exp $
 #
 # The pthreads strategy for pkgsrc is to "bless" a particular pthread
 # package as the Official Pthread Replacement (OPR).  A package that uses
@@ -144,7 +144,7 @@ PKG_SKIP_REASON= "${PKGNAME} requires a working pthreads implementation."
 .  endif
 .endif
 
-PTHREAD_AUTO_VARS?=	yes
+PTHREAD_AUTO_VARS?=	no
 
 .if ${PTHREAD_TYPE} == "native"
 BUILDLINK_PACKAGES:=		${BUILDLINK_PACKAGES:Npthread}
diff --git a/mk/pthread.builtin.mk b/mk/pthread.builtin.mk
index 4fd1a930611..b4b98d11f94 100644
--- a/mk/pthread.builtin.mk
+++ b/mk/pthread.builtin.mk
@@ -1,25 +1,19 @@
-# $NetBSD: pthread.builtin.mk,v 1.2 2004/11/20 05:19:12 grant Exp $
+# $NetBSD: pthread.builtin.mk,v 1.2.2.1 2004/11/28 20:11:32 tv Exp $
 
-.if !defined(_BLNK_LIBPTHREAD_FOUND)
-_BLNK_LIBPTHREAD_FOUND!=	\
-	if ${TEST} "`${ECHO} /usr/lib/libpthread.*`" = "/usr/lib/libpthread.*"; then \
-		${ECHO} "no";						\
-	elif ${TEST} "`${ECHO} /lib/libpthread.*`" = "/lib/libpthread.*"; then \
-		${ECHO} "no";						\
-	else								\
+.for _lib_ in pthread c_r rt
+.  if !defined(_BLNK_LIB_FOUND.${_lib_})
+_BLNK_LIB_FOUND.${_lib_}!=	\
+	if ${TEST} "`${ECHO} /usr/lib/lib${_lib_}.*`" != "/usr/lib/lib${_lib_}.*"; then \
 		${ECHO} "yes";						\
-	fi
-BUILDLINK_VARS+=	_BLNK_LIBPTHREAD_FOUND
-.endif
-.if !defined(_BLNK_LIBC_R_FOUND)
-_BLNK_LIBC_R_FOUND!=	\
-	if ${TEST} "`${ECHO} /usr/lib/libc_r.*`" = "/usr/lib/libc_r.*"; then \
-		${ECHO} "no";						\
-	else								\
+	elif ${TEST} "`${ECHO} /lib/lib${_lib_}.*`" != "/lib/lib${_lib_}.*"; then \
 		${ECHO} "yes";						\
+	else								\
+		${ECHO} "no";						\
 	fi
-BUILDLINK_VARS+=	_BLNK_LIBC_R_FOUND
-.endif
+BUILDLINK_VARS+=	_BLNK_LIB_FOUND.${_lib_}
+.  endif
+.endfor
+.undef _lib_
 
 .if !defined(IS_BUILTIN.pthread)
 IS_BUILTIN.pthread=	no
@@ -44,6 +38,7 @@ CHECK_BUILTIN.pthread?=	no
 
 .if !empty(USE_BUILTIN.pthread:M[yY][eE][sS])
 BUILDLINK_PREFIX.pthread=	/usr
+BUILDLINK_CFLAGS.pthread=	# empty
 BUILDLINK_LDFLAGS.pthread=	# empty
 
 # only pass -pthread on platforms known to support it.
@@ -53,24 +48,23 @@ BUILDLINK_LDFLAGS.pthread=	# empty
 .  if ${OPSYS} == "FreeBSD" || ${OPSYS} == "Linux" || ${OPSYS} == "NetBSD"
 BUILDLINK_CFLAGS.pthread+=	-pthread
 BUILDLINK_LDFLAGS.pthread+=	-pthread
+.  elif ${OPSYS} == "OSF1"
+BUILDLINK_CFLAGS.pthread+=	-pthread
 .  else
 BUILDLINK_CPPFLAGS.pthread+=	-D_REENTRANT
 .  endif
 
-.  if ${OPSYS} == "OSF1"
-BUILDLINK_CFLAGS.pthread+=	-pthread
-BUILDLINK_LDFLAGS.pthread+=	-lpthread -lrt
-BUILDLINK_CPPFLAGS.pthread+=	-pthread
-.  endif
-
 # Handle systems which have pthreads functions in libc_r such as
 # FreeBSD 5.x, or fall back to libc if we don't find libc_r.
 #
 .  if ${OPSYS} == "NetBSD"
 BUILDLINK_LIBS.pthread=		# empty
-.  elif !empty(_BLNK_LIBPTHREAD_FOUND:M[yY][eE][sS])
+.  elif !empty(_BLNK_LIB_FOUND.pthread:M[yY][eE][sS])
 BUILDLINK_LIBS.pthread=		-lpthread
-.  elif !empty(_BLNK_LIBC_R_FOUND:M[yY][eE][sS])
+.    if !empty(_BLNK_LIB_FOUND.rt:M[yY][eE][sS])
+BUILDLINK_LIBS.pthread+=	-lrt
+.    endif
+.  elif !empty(_BLNK_LIB_FOUND.c_r:M[yY][eE][sS])
 BUILDLINK_LIBS.pthread=		-lc_r
 .  else
 BUILDLINK_LIBS.pthread=		# empty