Index: share/mk/src.libnames.mk
===================================================================
--- share/mk/src.libnames.mk
+++ share/mk/src.libnames.mk
@@ -7,7 +7,177 @@
 .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 \
+		ldns \
+		ssh \
+		ucl \
+		unbound
+_INTERNALIBS=	\
+		ohash \
+		sm
+
+_LIBRARIES=	\
+		archive \
+		atf_c \
+		atf_cxx \
+		bsdxml \
+		bsnmp \
+		bz2 \
+		cam \
+		capsicum \
+		casper \
+		cft \
+		crypt \
+		crypto \
+		cuse \
+		cxxrt \
+		devstat \
+		dialog \
+		dpv \
+		dwarf \
+		edit \
+		elf \
+		event \
+		execinfo \
+		fetch \
+		figpar \
+		geom \
+		gssapi \
+		ipsec \
+		jail \
+		kiconv \
+		kvm \
+		l \
+		ldns \
+		lzma \
+		m \
+		magic \
+		md \
+		memstat \
+		mp \
+		nandfs \
+		ncursesw \
+		nv \
+		opie \
+		pam \
+		pcap \
+		pjdlog \
+		proc \
+		procstat \
+		pthread \
+		radius \
+		rpcsec_gss \
+		rt \
+		sbuf \
+		sm \
+		smb \
+		ssh \
+		ssl \
+		stdthreads \
+		supcplusplus \
+		tacplus \
+		termcapw \
+		ucl \
+		ufs \
+		ulog \
+		usb \
+		util \
+		wrap \
+		y \
+		z
+
+archive_depend=	z bz2 lzma bsdxml
+.if ${MK_OPENSSL} != "no"
+archive_depend+=	crypto
+.else
+archive_depend+=	md
+.endif
+ssl_depend=	crypto
+ssh_depend=	crypto crypt
+edit_depend=	edit
+.if ${MK_OPENSSL} != "no"
+bsnmp_depend=	crypto
+.endif
+grom_depend=	bsdxml sbuf
+cam_depend=	sbuf
+casper_depend=	capsicum nv pjdlog
+capsicum_depend=	nv
+pjdlog_depend=	util
+opie_depend=	md
+usb_depend=	pthread
+unbound_depend=	pthread
+rt_depend=	pthread
+.if ${MK_OPENSSL} == "no"
+radius_depend=	md
+.else
+radius_depend=	crypto
+.endif
+procstat_depend=	kvm util elf
+.if ${MK_CXX} == "yes"
+.if ${MK_LIBCPLUSPLUS} != "no"
+proc_depend=	cxxrt
+.else
+proc_depend=	supcplusplus
+.endif
+.endif
+.if ${MK_CDDL} != "no"
+proc_depend+=	cft
+.endif
+mp_depend=	crypto
+memstat_depend=	kvm
+magic_depend=	z
+ldns_depend=	crypto
+.if ${MK_OPENSSL} != "no"
+fetch_depend=	ssl crypto
+.else
+fetch_depend=	md
+.endif
+execinfo_depend=	elf
+dwarf_depend=	elf
+dpv_depend=	dialog figpar util
+dialog_depend=	ncursesw m
+cuse_depend=	pthread
+atf_cxx_depend=	atf_c
+devstat_depend=	kvm
+
+# Define spacial cases
+LDADD_supcplusplus=	-lsupc++
+
+.for _l in ${_LIBRARIES}
+.if ${_PRIVATELIBS:M${_l}}
+LDADD+=		-L${LIB${_l:tu}DIR}
+.endif
+.if ${_INTERNALIBS:M${_l}}
+LDADD+=		-L${LIB${_l:tu}DIR}
+.endif
+DPADD_${_l}?=	${LIB${_l:tu}}
+LDADD_${_l}?=	-l${_l}
+.if defined(${_l}_depend) && defined(NO_SHARED)
+.for _d in ${${_l}_depend}
+DPADD_${_l}+=	${DPADD_${_d}}
+LDADD_${_l}+=	${LDADD_${_d}}
+.endfor
+.endif
+.endfor
+
+# ucl needs and exposes libm
+DPADD_ucl+=	${DPADD_m}
+LDADD_ucl+=	${LDADD_m}
+
+.for _l in ${LIBADD}
+.if ${_PRIVATELIBS:M${_l}}
+USEPRIVATELIB+=	${_l}
+.endif
+DPADD+=		${DPADD_${_l}}
+LDADD+=		${LDADD_${_l}}
+.endfor
 
 LIBATF_CDIR=	${ROOTOBJDIR}/lib/atf/libatf-c
 LDATF_C?=	${LIBATF_CDIR}/libatf-c.so
@@ -22,7 +192,7 @@
 LIBBSDSTAT?=	${LIBBSDSTATDIR}/libbsdstat.a
 
 LIBEVENTDIR=	${ROOTOBJDIR}/lib/libevent
-LDEVENT?=	${LIBEVENTDIR}/libevent.so
+LDEVENT?=	${LIBEVENTDIR}/libevent.a
 LIBEVENT?=	${LIBEVENTDIR}/libevent.a
 
 LIBHEIMIPCCDIR=	${ROOTOBJDIR}/kerberos5/lib/libheimipcc
@@ -57,10 +227,6 @@
 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
+LDSM?=		${LIBSMDIR}/libsm.a
+LIBSM?=		${LIBSMDIR}/libsm.a