From a50767eb922febec15d168339a26d59d2734e9e3 Mon Sep 17 00:00:00 2001
From: Ruslan Ermilov <ru@FreeBSD.org>
Date: Tue, 21 Mar 2006 11:00:54 +0000
Subject: [PATCH] Unbreak WITHOUT_LIBPHREAD/WITHOUT_LIBC_R option support,
 depending on platform.

---
 sbin/ggate/Makefile | 7 ++++++-
 usr.bin/Makefile    | 6 ++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/sbin/ggate/Makefile b/sbin/ggate/Makefile
index 03ef1ba594ef..4dd51410ad52 100644
--- a/sbin/ggate/Makefile
+++ b/sbin/ggate/Makefile
@@ -6,7 +6,12 @@ SUBDIR=	${_ggatec} \
 	${_ggated} \
 	ggatel
 
-.if ${MK_LIBPTHREAD} != "no"
+.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "sparc64"
+.if ${MK_LIBC_R} != "no"
+_ggatec=	ggatec
+_ggated=	ggated
+.endif
+.elif ${MK_LIBPTHREAD} != "no"
 _ggatec=	ggatec
 _ggated=	ggated
 .endif
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index 7b5b5a91a961..651e89708658 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -262,8 +262,14 @@ _calendar=	calendar
 .if ${MK_OPENSSL} != "no"
 _chkey=		chkey
 _newkey=	newkey
+.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "sparc64"
+.if ${MK_LIBC_R} != "no"
 _csup=		csup
 .endif
+.elif ${MK_LIBPTHREAD} != "no"
+_csup=		csup
+.endif
+.endif
 
 .if ${MK_HESIOD} != "no"
 _hesinfo=	hesinfo