MFHead @ r275232

6 files changed, 405 insertions, 83 deletions

diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5
index fa90a162a532..83c180833451 100644
--- a/share/man/man5/src.conf.5
+++ b/share/man/man5/src.conf.5
@@ -1,7 +1,7 @@
 .\" DO NOT EDIT-- this file is automatically generated.
 .\" from FreeBSD: head/tools/build/options/makeman 255964 2013-10-01 07:22:04Z des
 .\" $FreeBSD$
-.Dd October 21, 2014
+.Dd November 26, 2014
 .Dt SRC.CONF 5
 .Os
 .Sh NAME
@@ -267,17 +267,17 @@ amd64/amd64, arm/arm, arm/armv6, arm/armv6hf, i386/i386 and pc98/i386.
 Set to not build
 .Xr cpp 1 .
 .It Va WITHOUT_CROSS_COMPILER
-.\" from FreeBSD: head/tools/build/options/WITHOUT_CROSS_COMPILER 264660 2014-04-18 17:03:58Z imp
+.\" from FreeBSD: head/tools/build/options/WITHOUT_CROSS_COMPILER 275138 2014-11-26 20:43:09Z gjb
 Set to not build any cross compiler in the cross-tools stage of buildworld.
 If you are compiling a different version of
-.Fx 
+.Fx
 than what is installed on the system, you will need to provide an alternate
 compiler with XCC to ensure success.
 If you are compiling with an identical version of
-.Fx 
+.Fx
 to the host, this option may be safely used.
 This option may also be safe when the host version of
-.Fx 
+.Fx
 is close to the sources being built, but all bets are off if there have
 been any changes to the toolchain between the versions.
 When set, it also enforces the following options:
@@ -396,8 +396,8 @@ This includes the device tree compiler (dtc) and libfdt support library.
 Set to not build or install programs
 for operating floppy disk driver.
 .It Va WITH_FMAKE
-.\" from FreeBSD: head/tools/build/options/WITH_FMAKE 266752 2014-05-27 15:52:27Z gjb
-Causes the old FreeBSD 
+.\" from FreeBSD: head/tools/build/options/WITH_FMAKE 275138 2014-11-26 20:43:09Z gjb
+Causes the old FreeBSD
 .Xr make 1
 program to be built and installed as fmake.
 .It Va WITHOUT_FMTREE
@@ -490,8 +490,8 @@ This is the default on platforms where gcc is the system compiler.
 It is a default setting on
 arm/armeb, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, powerpc/powerpc, powerpc/powerpc64 and sparc64/sparc64.
 .It Va WITHOUT_GNU_GREP_COMPAT
-.\" from FreeBSD: head/tools/build/options/WITHOUT_GNU_GREP_COMPAT 266752 2014-05-27 15:52:27Z gjb
-Set this option to omit the gnu extentions to grep from being included in 
+.\" from FreeBSD: head/tools/build/options/WITHOUT_GNU_GREP_COMPAT 273421 2014-10-21 20:44:33Z emaste
+Set this option to omit the gnu extensions to grep from being included in
 BSD grep.
 .It Va WITHOUT_GNU_SUPPORT
 .\" from FreeBSD: head/tools/build/options/WITHOUT_GNU_SUPPORT 156932 2006-03-21 07:50:50Z ru
@@ -531,6 +531,14 @@ Set to not build or install HyperV utilities.
 .It Va WITHOUT_ICONV
 .\" from FreeBSD: head/tools/build/options/WITHOUT_ICONV 254919 2013-08-26 17:15:56Z antoine
 Set to not build iconv as part of libc.
+.It Va WITHOUT_INCLUDES
+.\" from FreeBSD: head/tools/build/options/WITHOUT_INCLUDES 275138 2014-11-26 20:43:09Z gjb
+Set to not install header files.
+This option used to be spelled
+.Va NO_INCS .
+.Bf -symbolic
+The option does not work for build targets.
+.Ef
 .It Va WITHOUT_INET
 .\" from FreeBSD: head/tools/build/options/WITHOUT_INET 221266 2011-04-30 17:58:28Z bz
 Set to not build programs and libraries related to IPv4 networking.
@@ -668,8 +676,8 @@ Set to not build programs that support a legacy PC console; e.g.,
 and
 .Xr vidcontrol 8 .
 .It Va WITHOUT_LIB32
-.\" from FreeBSD: head/tools/build/options/WITHOUT_LIB32 156932 2006-03-21 07:50:50Z ru
-On amd64, set to not build 32-bit library set and a
+.\" from FreeBSD: head/tools/build/options/WITHOUT_LIB32 274664 2014-11-18 17:06:48Z imp
+On 64-bit platforms, set to not build 32-bit library set and a
 .Nm ld-elf32.so.1
 runtime linker.
 .It Va WITHOUT_LIBCPLUSPLUS
@@ -938,12 +946,11 @@ This includes
 .Xr rsh 1 ,
 etc.
 .It Va WITHOUT_RCS
-.\" from FreeBSD: head/tools/build/options/WITHOUT_RCS 271401 2014-09-10 19:00:17Z asomers
+.\" from FreeBSD: head/tools/build/options/WITHOUT_RCS 275138 2014-11-26 20:43:09Z gjb
 Set to not build
-.Xr rcs 1
-,
-.Xr etcupdate 8
-, and related utilities.
+.Xr rcs 1 ,
+.Xr etcupdate 8 ,
+and related utilities.
 .It Va WITHOUT_RESCUE
 .\" from FreeBSD: head/tools/build/options/WITHOUT_RESCUE 156932 2006-03-21 07:50:50Z ru
 Set to not build
@@ -1047,6 +1054,15 @@ See
 .Xr tests 7
 for more details.
 This also disables the build of all test-related dependencies, including ATF.
+When set, it also enforces the following options:
+.Pp
+.Bl -item -compact
+.It
+.Va WITHOUT_TESTS_SUPPORT
+.El
+.It Va WITHOUT_TESTS_SUPPORT
+.\" from FreeBSD: head/tools/build/options/WITHOUT_TESTS_SUPPORT 274665 2014-11-18 17:06:50Z imp
+Set to disables the build of all test-related dependencies, including ATF.
 .It Va WITHOUT_TEXTPROC
 .\" from FreeBSD: head/tools/build/options/WITHOUT_TEXTPROC 183242 2008-09-21 22:02:26Z sam
 Set to not build
@@ -1080,6 +1096,8 @@ When set, it also enforces the following options:
 .Va WITHOUT_GCC
 .It
 .Va WITHOUT_GDB
+.It
+.Va WITHOUT_INCLUDES
 .El
 .It Va WITHOUT_UNBOUND
 .\" from FreeBSD: head/tools/build/options/WITHOUT_UNBOUND 255597 2013-09-15 14:51:23Z des
@@ -1089,6 +1107,9 @@ and related programs.
 .It Va WITHOUT_USB
 .\" from FreeBSD: head/tools/build/options/WITHOUT_USB 156932 2006-03-21 07:50:50Z ru
 Set to not build USB-related programs and libraries.
+.It Va WITHOUT_USB_GADGET_EXAMPLES
+.\" from FreeBSD: head/tools/build/options/WITHOUT_USB_GADGET_EXAMPLES 274665 2014-11-18 17:06:50Z imp
+Set to build USB gadget kernel modules.
 .It Va WITHOUT_UTMPX
 .\" from FreeBSD: head/tools/build/options/WITHOUT_UTMPX 231530 2012-02-11 20:28:42Z ed
 Set to not build user accounting tools such as
diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile
index eef10fcbf95f..2012977bfcb6 100644
--- a/share/man/man9/Makefile
+++ b/share/man/man9/Makefile
@@ -1577,12 +1577,16 @@ MLINKS+=timeout.9 callout.9 \
 	timeout.9 callout_pending.9 \
 	timeout.9 callout_reset.9 \
 	timeout.9 callout_reset_curcpu.9 \
-	timeout.9 callout_reset_sbt.9 \
 	timeout.9 callout_reset_on.9 \
+	timeout.9 callout_reset_sbt.9 \
+	timeout.9 callout_reset_sbt_curcpu.9 \
 	timeout.9 callout_reset_sbt_on.9 \
 	timeout.9 callout_schedule.9 \
 	timeout.9 callout_schedule_curcpu.9 \
 	timeout.9 callout_schedule_on.9 \
+	timeout.9 callout_schedule_sbt.9 \
+	timeout.9 callout_schedule_sbt_curcpu.9 \
+	timeout.9 callout_schedule_sbt_on.9 \
 	timeout.9 callout_stop.9 \
 	timeout.9 untimeout.9
 MLINKS+=ucred.9 cred_update_thread.9 \
diff --git a/share/man/man9/timeout.9 b/share/man/man9/timeout.9
index fad86900512a..7202815a7824 100644
--- a/share/man/man9/timeout.9
+++ b/share/man/man9/timeout.9
@@ -51,6 +51,9 @@
 .Nm callout_schedule ,
 .Nm callout_schedule_curcpu ,
 .Nm callout_schedule_on ,
+.Nm callout_schedule_sbt ,
+.Nm callout_schedule_sbt_curcpu ,
+.Nm callout_schedule_sbt_on ,
 .Nm callout_stop ,
 .Nm timeout ,
 .Nm untimeout
@@ -106,6 +109,15 @@ struct callout_handle handle = CALLOUT_HANDLE_INITIALIZER(&handle);
 .Ft int
 .Fn callout_schedule_on "struct callout *c" "int ticks" "int cpu"
 .Ft int
+.Fn callout_schedule_sbt "struct callout *c" "sbintime_t sbt" \
+"sbintime_t pr" "int flags"
+.Ft int
+.Fn callout_schedule_sbt_curcpu "struct callout *c" "sbintime_t sbt" \
+"sbintime_t pr" "int flags"
+.Ft int
+.Fn callout_schedule_sbt_on "struct callout *c" "sbintime_t sbt" \
+"sbintime_t pr" "int cpu" "int flags"
+.Ft int
 .Fn callout_stop "struct callout *c"
 .Ft struct callout_handle
 .Fn timeout "timeout_t *func" "void *arg" "int ticks"
@@ -386,21 +398,24 @@ callouts are assigned to CPU 0.
 The
 .Fn callout_reset_on ,
 .Fn callout_reset_sbt_on ,
-and
 .Fn callout_schedule_on
+and
+.Fn callout_schedule_sbt_on
 functions assign the callout to CPU
 .Fa cpu .
 The
 .Fn callout_reset_curcpu ,
 .Fn callout_reset_sbt_curpu ,
-and
 .Fn callout_schedule_curcpu
+and
+.Fn callout_schedule_sbt_curcpu
 functions assign the callout to the current CPU.
 The
 .Fn callout_reset ,
 .Fn callout_reset_sbt ,
-and
 .Fn callout_schedule
+and
+.Fn callout_schedule_sbt
 functions schedule the callout to execute in the softclock thread of the CPU
 to which it is currently assigned.
 .Pp
diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree
index ad2d52ca9cee..7df15cc83535 100644
--- a/share/misc/bsd-family-tree
+++ b/share/misc/bsd-family-tree
@@ -296,30 +296,30 @@ FreeBSD 5.2           |      |                 |                       |
  |            \       |      |       |         |                       |
  *--FreeBSD    |      |      |    NetBSD 6.1.3 |                       |
  |   10.0      |      |      |       |         |                       |
- |             |      |      |       |         |               DragonFly 3.6.1
- |             |      |      |       |         |                       |
- |             |      |      |       |         |                       |
- |             |      |      |       |         |               DragonFly 3.6.2
- |             |      |      |    NetBSD 6.1.4 |                       |
- |             |      |      |                 |                       |
- |             |      |      |            OpenBSD 5.5                  |
- |             |      |      |                 |                       |
- |             |      |      |                 |               DragonFly 3.8.0
- |             |      |      |                 |                       |
- |             |      |      |                 |                       |
- |             |      |      |                 |               DragonFly 3.8.1
- |             |      |      |                 |                       |
- |             |      |      |                 |                       |
- |             |      |      |                 |               DragonFly 3.6.3
- |             |      |      |                 |                       |
- |          FreeBSD   |      |                 |                       |
- |            9.3     |      |                 |                       |
- |                    |      |                 |               DragonFly 3.8.2
- |                 Mac OS X  |                 |                       |
- |                   10.10   |                 |                       |
- |                    |      |                 |                       |
- |                    |      |                 |                       |
- |                    |      |                 |                       |
+ |     |       |      |      |       |         |               DragonFly 3.6.1
+ |     |       |      |      |       |         |                       |
+ |     |       |      |      |       |         |                       |
+ |     |       |      |      |       |         |               DragonFly 3.6.2
+ |     |       |      |      |    NetBSD 6.1.4 |                       |
+ |     |       |      |      |       |         |                       |
+ |     |       |      |      |       |    OpenBSD 5.5                  |
+ |     |       |      |      |       |         |                       |
+ |     |       |      |      |       |         |               DragonFly 3.8.0
+ |     |       |      |      |       |         |                       |
+ |     |       |      |      |       |         |                       |
+ |     |       |      |      |       |         |               DragonFly 3.8.1
+ |     |       |      |      |       |         |                       |
+ |     |       |      |      |       |         |                       |
+ |     |       |      |      |       |         |               DragonFly 3.6.3
+ |     |       |      |      |       |         |                       |
+ |     |    FreeBSD   |      |       |         |                       |
+ |     |      9.3     |      |       |         |                       |
+ |     |              |      |    NetBSD 6.1.5 |               DragonFly 3.8.2
+ |     |           Mac OS X  |                 |                       |
+ |     |             10.10   |                 |                       |
+ |     |              |      |            OpenBSD 5.6                  |
+ |  FreeBSD           |      |                 |                       |
+ |   10.1             |      |                 |               DragonFly 4.0.1
  |                    |      |                 |                       |
  |                    |      |                 |                       |
  |                    |      |                 |                       |
@@ -655,7 +655,11 @@ DragonFly 3.8.1		2014-06-16 [DFB]
 DragonFly 3.6.3		2014-06-17 [DFB]
 FreeBSD 9.3		2014-07-05 [FBD]
 DragonFly 3.8.2		2014-08-08 [DFB]
+NetBSD 6.1.5		2014-09-22 [NDB]
 Mac OS X 10.10		2014-10-16 [APL]
+OpenBSD 5.6		2014-11-01 [OBD]
+FreeBSD 10.1		2014-11-14 [FBD]
+DragonFly 4.0.1		2014-11-25 [DFB]
 
 Bibliography
 ------------------------
diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk
index 44d81586be71..00f0a0adf0cf 100644
--- a/share/mk/bsd.libnames.mk
+++ b/share/mk/bsd.libnames.mk
@@ -54,6 +54,7 @@ LIBFIGPAR?=	${DESTDIR}${LIBDIR}/libfigpar.a
 LIBFL?=		"don't use LIBFL, use LIBL"
 LIBFORM?=	${DESTDIR}${LIBDIR}/libform.a
 LIBG2C?=	${DESTDIR}${LIBDIR}/libg2c.a
+LIBGPIO?=	${DESTDIR}${LIBDIR}/libgpio.a
 LIBGEOM?=	${DESTDIR}${LIBDIR}/libgeom.a
 LIBGNUREGEX?=	${DESTDIR}${LIBDIR}/libgnuregex.a
 LIBGSSAPI?=	${DESTDIR}${LIBDIR}/libgssapi.a
@@ -90,33 +91,7 @@ LIBNGATM?=	${DESTDIR}${LIBDIR}/libngatm.a
 LIBNV?=		${DESTDIR}${LIBDIR}/libnv.a
 LIBNVPAIR?=	${DESTDIR}${LIBDIR}/libnvpair.a
 LIBOPIE?=	${DESTDIR}${LIBDIR}/libopie.a
-
-# The static PAM library doesn't know its secondary dependencies,
-# so we have to specify them explicitly. Ths is an unfortunate,
-# but necessary departure from testing MK_ flags to define
-# values here.
 LIBPAM?=	${DESTDIR}${LIBDIR}/libpam.a
-MINUSLPAM=	-lpam
-.if defined(LDFLAGS) && !empty(LDFLAGS:M-static)
-.if ${MK_KERBEROS} != "no"
-LIBPAM+=	${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} \
-		${LIBROKEN} ${LIBCOM_ERR}
-MINUSLPAM+=	-lkrb5 -lhx509 -lasn1 -lcrypto -lcrypt -lroken -lcom_err
-.endif
-LIBPAM+=	${LIBRADIUS} ${LIBTACPLUS} ${LIBCRYPT} \
-		${LIBUTIL} ${LIBOPIE} ${LIBMD}
-MINUSLPAM+=	-lradius -ltacplus -lcrypt \
-		-lutil -lopie -lmd
-.if ${MK_OPENSSH} != "no"
-LIBPAM+=	${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT}
-MINUSLPAM+=	-lssh -lcrypto -lcrypt
-.endif
-.if ${MK_NIS} != "no"
-LIBPAM+=	${LIBYPCLNT}
-MINUSLPAM+=	-lypclnt
-.endif
-.endif
-
 LIBPANEL?=	${DESTDIR}${LIBDIR}/libpanel.a
 LIBPCAP?=	${DESTDIR}${LIBDIR}/libpcap.a
 LIBPJDLOG?=	${DESTDIR}${LIBDIR}/libpjdlog.a
diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk
index 7281c0a6b828..094897d06a1f 100644
--- a/share/mk/src.libnames.mk
+++ b/share/mk/src.libnames.mk
@@ -7,7 +7,273 @@
 .error src.libnames.mk cannot be included directly.
 .endif
 
-ROOTOBJDIR=	${.OBJDIR:S/${.CURDIR}//}${.MAKE.MAKEFILES:M*/src.libnames.mk:H:H:H}
+.include <src.opts.mk>
+
+ROOTSRCDIR=	${.MAKE.MAKEFILES:M*/src.libnames.mk:H:H:H}
+ROOTOBJDIR=	${.OBJDIR:S/${.CURDIR}//}${ROOTSRCDIR}
+_PRIVATELIBS=	\
+		atf_c \
+		atf_cxx \
+		bsdstat \
+		heimipcc \
+		heimipcs \
+		ldns \
+		sqlite3 \
+		ssh \
+		ucl \
+		unbound
+
+_INTERNALIBS=	\
+		amu \
+		bsnmptools \
+		cron \
+		event \
+		fifolog \
+		ipf \
+		lpr \
+		mandoc \
+		netbsd \
+		ntp \
+		ohash \
+		opts \
+		parse \
+		readline \
+		sl \
+		sm \
+		smdb \
+		smutil \
+		telnet \
+		vers
+
+_LIBRARIES=	\
+		${_PRIVATELIBS} \
+		${_INTERNALIBS} \
+		alias \
+		archive \
+		asn1 \
+		auditd \
+		begemot \
+		bluetooth \
+		bsdxml \
+		bsm \
+		bsnmp \
+		bz2 \
+		c \
+		c_pic \
+		calendar \
+		cam \
+		capsicum \
+		casper \
+		com_err \
+		compiler_rt \
+		crypt \
+		crypto \
+		ctf \
+		cuse \
+		cxxrt \
+		devinfo \
+		devstat \
+		dialog \
+		dpv \
+		dwarf \
+		edit \
+		elf \
+		execinfo \
+		fetch \
+		figpar \
+		geom \
+		gnuregex \
+		gssapi \
+		gssapi_krb5 \
+		hdb \
+		heimbase \
+		heimntlm \
+		heimsqlite \
+		hx509 \
+		ipsec \
+		jail \
+		kadm5clnt \
+		kadm5srv \
+		kafs5 \
+		kdc \
+		kiconv \
+		krb5 \
+		kvm \
+		l \
+		lzma \
+		m \
+		magic \
+		mandoc \
+		md \
+		memstat \
+		mp \
+		nandfs \
+		ncursesw \
+		netgraph \
+		ngatm \
+		nv \
+		opie \
+		pam \
+		pcap \
+		pcsclite \
+		pjdlog \
+		pmc \
+		proc \
+		procstat \
+		pthread \
+		radius \
+		readline \
+		roken \
+		rpcsec_gss \
+		rpcsvc \
+		rt \
+		sbuf \
+		sdp \
+		sm \
+		smb \
+		ssl \
+		ssp_nonshared \
+		stdthreads \
+		supcplusplus \
+		tacplus \
+		termcapw \
+		ufs \
+		ugidfw \
+		ulog \
+		usb \
+		usbhid \
+		util \
+		vmmapi \
+		wind \
+		wrap \
+		xo \
+		y \
+		ypclnt \
+		z
+
+_DP_archive=	z bz2 lzma bsdxml
+.if ${MK_OPENSSL} != "no"
+_DP_archive+=	crypto
+.else
+_DP_archive+=	md
+.endif
+_DP_ssl=	crypto
+_DP_ssh=	crypto crypt
+.if ${MK_LDNS} != "no"
+_DP_ssh+=	ldns z
+.endif
+_DP_edit=	ncursesw
+.if ${MK_OPENSSL} != "no"
+_DP_bsnmp=	crypto
+.endif
+_DP_grom=	bsdxml sbuf
+_DP_cam=	sbuf
+_DP_casper=	capsicum nv pjdlog
+_DP_capsicum=	nv
+_DP_pjdlog=	util
+_DP_opie=	md
+_DP_usb=	pthread
+_DP_unbound=	pthread
+_DP_rt=	pthread
+.if ${MK_OPENSSL} == "no"
+_DP_radius=	md
+.else
+_DP_radius=	crypto
+.endif
+_DP_procstat=	kvm util elf
+.if ${MK_CXX} == "yes"
+.if ${MK_LIBCPLUSPLUS} != "no"
+_DP_proc=	cxxrt
+.else
+_DP_proc=	supcplusplus
+.endif
+.endif
+.if ${MK_CDDL} != "no"
+_DP_proc+=	ctf
+.endif
+_DP_mp=	crypto
+_DP_memstat=	kvm
+_DP_magic=	z
+_DP_ldns=	crypto
+.if ${MK_OPENSSL} != "no"
+_DP_fetch=	ssl crypto
+.else
+_DP_fetch=	md
+.endif
+_DP_execinfo=	elf
+_DP_dwarf=	elf
+_DP_dpv=	dialog figpar util
+_DP_dialog=	ncursesw m
+_DP_cuse=	pthread
+_DP_atf_cxx=	atf_c
+_DP_devstat=	kvm
+_DP_pam=	radius tacplus opie md util
+.if ${MK_KERBEROS} != "no"
+_DP_pam+=	krb5
+.endif
+.if ${MK_OPENSSH} != "no"
+_DP_pam+=	ssh
+.endif
+.if ${MK_NIS} != "no"
+_DP_pam+=	ypclnt
+.endif
+_DP_krb5+=	asn1 com_err crypt crypto hx509 roken wind heimbase heimipcc \
+		pthread
+_DP_gssapi_krb5+=	gssapi krb5 crypto roken asn1 com_err
+_DP_ucl=	m
+
+# Define spacial cases
+LDADD_supcplusplus=	-lsupc++
+LDADD_atf_c=	-L${LIBATF_CDIR} -latf-c
+LDADD_atf_cxx=	-L${LIBATF_CXXDIR} -latf-c++
+
+.for _l in ${_LIBRARIES}
+.if ${_PRIVATELIBS:M${_l}}
+LDADD_${_l}_L+=		-L${LIB${_l:tu}DIR}
+.endif
+.if ${_INTERNALIBS:M${_l}}
+LDADD_${_l}_L+=		-L${LIB${_l:tu}DIR}
+.endif
+DPADD_${_l}?=	${LIB${_l:tu}}
+LDADD_${_l}?=	${LDADD_${_l}_L} -l${_l}
+.if defined(_DP_${_l}) && defined(NO_SHARED)
+.for _d in ${_DP_${_l}}
+DPADD_${_l}+=	${DPADD_${_d}}
+LDADD_${_l}+=	${LDADD_${_d}}
+.endfor
+.endif
+.endfor
+
+DPADD_sqlite3+=	${DPADD_pthread}
+LDADD_sqlite3+=	${LDADD_pthread}
+
+DPADD_atf_cxx+=	${DPADD_atf_c}
+LDADD_atf_cxx+=	${LDADD_atf_c}
+
+DPADD_ipf+=	${DPADD_kvm}
+LDADD_ipf+=	${LDADD_kvm}
+
+# The following depends on libraries which are using pthread
+DPADD_hdb+=	${DPADD_pthread}
+LDADD_hdb+=	${LDADD_pthread}
+DPADD_kadm5srv+=	${DPADD_pthread}
+LDADD_kadm5srv+=	${LDADD_pthread}
+DPADD_krb5+=	${DPADD_pthread}
+LDADD_krb5+=	${LDADD_pthread}
+DPADD_gssapi_krb5+=	${DPADD_pthread}
+LDADD_gssapi_krb5+=	${LDADD_pthread}
+
+.for _l in ${LIBADD}
+.if ${_PRIVATELIBS:M${_l}}
+USEPRIVATELIB+=	${_l}
+.endif
+DPADD+=		${DPADD_${_l}}
+LDADD+=		${LDADD_${_l}}
+.endfor
+
+.if defined(USEPRIVATELIB)
+LDFLAGS+=	-rpath ${LIBPRIVATEDIR}
+.endif
 
 LIBATF_CDIR=	${ROOTOBJDIR}/lib/atf/libatf-c
 LDATF_C?=	${LIBATF_CDIR}/libatf-c.so
@@ -18,49 +284,86 @@ LDATF_CXX?=	${LIBATF_CXXDIR}/libatf-c++.so
 LIBATF_CXX?=	${LIBATF_CXXDIR}/libatf-c++.a
 
 LIBBSDSTATDIR=	${ROOTOBJDIR}/lib/libbsdstat
-LDBSDSTAT?=	${LIBBSDSTATDIR}/libbsdstat.so
 LIBBSDSTAT?=	${LIBBSDSTATDIR}/libbsdstat.a
 
 LIBEVENTDIR=	${ROOTOBJDIR}/lib/libevent
-LDEVENT?=	${LIBEVENTDIR}/libevent.so
 LIBEVENT?=	${LIBEVENTDIR}/libevent.a
 
 LIBHEIMIPCCDIR=	${ROOTOBJDIR}/kerberos5/lib/libheimipcc
-LDHEIMIPCC?=	${LIBHEIMIPCCDIR}/libheimipcc.so
 LIBHEIMIPCC?=	${LIBHEIMIPCCDIR}/libheimipcc.a
 
 LIBHEIMIPCSDIR=	${ROOTOBJDIR}/kerberos5/lib/libheimipcs
-LDHEIMIPCS?=	${LIBHEIMIPCSDIR}/libheimipcs.so
 LIBHEIMIPCS?=	${LIBHEIMIPCSDIR}/libheimipcs.a
 
 LIBLDNSDIR=	${ROOTOBJDIR}/lib/libldns
-LDLDNS?=	${LIBLDNSDIR}/libldns.so
 LIBLDNS?=	${LIBLDNSDIR}/libldns.a
 
 LIBSSHDIR=	${ROOTOBJDIR}/secure/lib/libssh
-LDSSH?=		${LIBSSHDIR}/libssh.so
 LIBSSH?=	${LIBSSHDIR}/libssh.a
 
 LIBUNBOUNDDIR=	${ROOTOBJDIR}/lib/libunbound
-LDUNBOUND?=	${LIBUNBOUNDDIR}/libunbound.so
 LIBUNBOUND?=	${LIBUNBOUNDDIR}/libunbound.a
 
 LIBUCLDIR=	${ROOTOBJDIR}/lib/libucl
-LDUCL?=		${LIBUCLDIR}/libucl.so
 LIBUCL?=	${LIBUCLDIR}/libucl.a
 
 LIBREADLINEDIR=	${ROOTOBJDIR}/gnu/lib/libreadline/readline
-LDREADLINE?=	${LIBREADLINEDIR}/libreadline.a
 LIBREADLINE?=	${LIBREADLINEDIR}/libreadline.a
 
 LIBOHASHDIR=	${ROOTOBJDIR}/lib/libohash
-LDOHASH?=	${LIBOHASHDIR}/libohash.a
 LIBOHASH?=	${LIBOHASHDIR}/libohash.a
 
 LIBSQLITE3DIR=	${ROOTOBJDIR}/lib/libsqlite3
-LDSQLITE3?=	${LIBSQLITE3DIR}/libsqlite3.so
 LIBSQLITE3?=	${LIBSQLITE3DIR}/libsqlite3.a
 
 LIBMANDOCDIR=	${ROOTOBJDIR}/lib/libmandoc
-LDMANDOC?=	${LIBMANDOCDIR}/libmandoc.a
 LIBMANDOC?=	${LIBMANDOCDIR}/libmandoc.a
+
+LIBSMDIR=	${ROOTOBJDIR}/lib/libsm
+LIBSM?=		${LIBSMDIR}/libsm.a
+
+LIBSMDBDIR=	${ROOTOBJDIR}/lib/libsmdb
+LIBSMDB?=	${LIBSMDBDIR}/libsmdb.a
+
+LIBSMUTILDIR=	${ROOTOBJDIR}/lib/libsmutil
+LIBSMUTIL?=	${LIBSMDBDIR}/libsmutil.a
+
+LIBNETBSDDIR?=	${ROOTOBJDIR}/lib/libnetbsd
+LIBNETBSD?=	${LIBNETBSDDIR}/libnetbsd.a
+
+LIBVERSDIR?=	${ROOTOBJDIR}/kerberos5/lib/libvers
+LIBVERS?=	${LIBVERSDIR}/libvers.a
+
+LIBSLDIR=	${ROOTOBJDIR}/kerberos5/lib/libsl
+LIBSL?=		${LIBSLDIR}/libsl.a
+
+LIBIPFDIR=	${ROOTOBJDIR}/sbin/ipf/libipf
+LIBIPF?=	${LIBIPFDIR}/libipf.a
+
+LIBTELNETDIR=	${ROOTOBJDIR}/lib/libtelnet
+LIBTELNET?=	${LIBIPFDIR}/libtelnet.a
+
+LIBCRONDIR=	${ROOTOBJDIR}/usr.sbin/cron/lib
+LIBCRON?=	${LIBCRONDIR}/libcron.a
+
+LIBNTPDIR=	${ROOTOBJDIR}/usr.sbin/ntp/libntp
+LIBNTP?=	${LIBNTPDIR}/libntp.a
+
+LIBOPTSDIR=	${ROOTOBJDIR}/usr.sbin/ntp/libopts
+LIBOTPS?=	${LIBOPTSDIR}/libopts.a
+
+LIBPARSEDIR=	${ROOTOBJDIR}/usr.sbin/ntp/libparse
+LIBPARSE?=	${LIBOPTSDIR}/libparse.a
+
+LIBLPRDIR=	${ROOTOBJDIR}/usr.sbin/lpr/common_source
+LIBLPR?=	${LIBOPTSDIR}/liblpr.a
+
+LIBFIFOLOGDIR=	${ROOTOBJDIR}/usr.sbin/fifolog/lib
+LIBFIFOLOG?=	${LIBOPTSDIR}/libfifolog.a
+
+LIBBSNMPTOOLSDIR=	${ROOTOBJDIR}/usr.sbin/bsnmpd/tools/libbsnmptools
+LIBBSNMPTOOLS?=	${LIBBSNMPTOOLSDIR}/libbsnmptools.a
+
+LIBAMUDIR=	${ROOTOBJDIR}/usr.sbin/amd/libamu
+LIBAMU?=	${LIBAMUDIR}/libamu/libamu.a
+