r274961 through r275075

2014-11-25 21:43:01 +00:00 · 2014-11-25 21:43:01 +00:00 · 2c97f721e7
commit 2c97f721e7
parent 71369fed66 ee5a34ecba
562 changed files with 3229 additions and 2059 deletions
--- a/2
+++ b/2
@ -48,7 +48,6 @@ cd(4)		ken	Pre-commit review requested.
 pass(4)		ken	Pre-commit review requested.
 ch(4)		ken	Pre-commit review requested.
 em(4)		jfv	Pre-commit review requested.
-tdfx(4)		cokane  Just keep me informed of changes, try not to break it.
 sendmail	gshapiro	Pre-commit review requested.
 etc/mail	gshapiro	Pre-commit review requested.
 				Keep in sync with -STABLE.
@ -118,7 +117,6 @@ lib/libc/stdtime	edwin   Heads-up appreciated, since parts of this code
 				is maintained by a third party source.
 sbin/routed	bms	Pre-commit review; notify vendor at rhyolite.com
 isci(4)		jimharris	Pre-commit review requested.
-3dfx		cokane		Pre-commit review preferred.
 cmx		daniel@roe.ch	Pre-commit review preferred.
 filemon		obrien		Pre-commit review preferred.
 sysdoc		trhodes		Pre-commit review preferred.
--- a/bin/csh/Makefile
+++ b/bin/csh/Makefile
@ -40,8 +40,7 @@ MLINKS= csh.1 tcsh.1
 # utilities of the same name are handled with the associated manpage,
 # builtin.1 in share/man/man1/.

-DPADD=	${LIBTERMCAPW} ${LIBCRYPT}
-LDADD=	-ltermcapw -lcrypt
+LIBADD=	termcapw crypt

 LINKS=	${BINDIR}/csh ${BINDIR}/tcsh

--- a/bin/df/Makefile
+++ b/bin/df/Makefile
@ -9,7 +9,6 @@ SRCS=	df.c vfslist.c

 CFLAGS+= -I${MOUNT}

-DPADD=	${LIBUTIL} ${LIBXO}
-LDADD=	-lutil -lxo
+LIBADD=	xo util

 .include <bsd.prog.mk>
--- a/bin/ed/Makefile
+++ b/bin/ed/Makefile
@ -9,8 +9,7 @@ MLINKS=	ed.1 red.1

 .if ${MK_OPENSSL} != "no" && ${MK_ED_CRYPTO} != "no"
 CFLAGS+=-DDES
-DPADD=	${LIBCRYPTO}
-LDADD=	-lcrypto
+LIBADD=	crypto
 .endif

 .include <bsd.prog.mk>
--- a/bin/ls/Makefile
+++ b/bin/ls/Makefile
@ -5,14 +5,12 @@

 PROG=	ls
 SRCS=	cmp.c ls.c print.c util.c
-DPADD=	${LIBUTIL}
-LDADD=	-lutil
+LIBADD=	util

 .if !defined(RELEASE_CRUNCH) && \
 	${MK_LS_COLORS} != no
 CFLAGS+= -DCOLORLS
-DPADD+=	${LIBTERMCAPW}
-LDADD+=	-ltermcapw
+LIBADD+=	termcapw
 .endif

 .include <bsd.prog.mk>
--- a/bin/pkill/Makefile
+++ b/bin/pkill/Makefile
@ -5,8 +5,7 @@

 PROG=	pkill

-DPADD=	${LIBKVM}
-LDADD=	-lkvm
+LIBADD=	kvm

 LINKS=	${BINDIR}/pkill ${BINDIR}/pgrep
 MLINKS=	pkill.1 pgrep.1
--- a/bin/ps/Makefile
+++ b/bin/ps/Makefile
@ -11,7 +11,6 @@ SRCS=	fmt.c keyword.c nlist.c print.c ps.c
 # on large systems.
 #
 CFLAGS+=-DLAZY_PS
-DPADD=	${LIBM} ${LIBKVM} ${LIBJAIL}
-LDADD=	-lm -lkvm -ljail
+LIBADD=	m kvm jail

 .include <bsd.prog.mk>
--- a/bin/rmail/Makefile
+++ b/bin/rmail/Makefile
@ -14,11 +14,7 @@ MAN=	rmail.8
 WARNS?=	2
 CFLAGS+=-I${SENDMAIL_DIR}/include -I.

-LIBSMDIR=	${.OBJDIR}/../../lib/libsm
-LIBSM=		${LIBSMDIR}/libsm.a
-
-DPADD=	${LIBSM}
-LDADD=	${LIBSM}
+LIBADD=	sm

 SRCS+=	sm_os.h
 CLEANFILES+=sm_os.h
--- a/bin/sh/Makefile
+++ b/bin/sh/Makefile
@ -18,8 +18,7 @@ SRCS= ${SHSRCS} ${GENSRCS} ${GENHDRS}
 # utilities of the same name are handled with the associated manpage,
 # builtin.1 in share/man/man1/.

-DPADD= ${LIBEDIT} ${LIBTERMCAPW}
-LDADD= -ledit -ltermcapw
+LIBADD=	edit

 CFLAGS+=-DSHELL -I. -I${.CURDIR}
 # for debug:
--- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c
+++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c
@ -1211,13 +1211,13 @@ dt_module_update(dtrace_hdl_t *dtp, struct kld_file_stat *k_stat)
 #if defined(__FreeBSD__)
 		if (sh.sh_size == 0)
 			continue;
-		if (is_elf_obj && (sh.sh_type == SHT_PROGBITS ||
-		    sh.sh_type == SHT_NOBITS)) {
+		if (sh.sh_type == SHT_PROGBITS || sh.sh_type == SHT_NOBITS) {
 			alignmask = sh.sh_addralign - 1;
 			mapbase += alignmask;
 			mapbase &= ~alignmask;
 			sh.sh_addr = mapbase;
-			dmp->dm_sec_offsets[elf_ndxscn(sp)] = sh.sh_addr;
+			if (is_elf_obj)
+				dmp->dm_sec_offsets[elf_ndxscn(sp)] = sh.sh_addr;
 			mapbase += sh.sh_size;
 		}
 #endif
--- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.c
+++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.c
@ -545,8 +545,9 @@ dt_probe_define(dt_provider_t *pvp, dt_probe_t *prp,

 	for (pip = prp->pr_inst; pip != NULL; pip = pip->pi_next) {
 		if (strcmp(pip->pi_fname, fname) == 0 &&
-		    ((rname == NULL && pip->pi_rname[0] == '\0') ||
-		    (rname != NULL && strcmp(pip->pi_rname, rname)) == 0))
+		    ((rname == NULL && pip->pi_rname == NULL) ||
+		    (rname != NULL && pip->pi_rname != NULL &&
+		    strcmp(pip->pi_rname, rname) == 0)))
 			break;
 	}

--- a/contrib/mdocml/lib.in
+++ b/contrib/mdocml/lib.in
@ -56,6 +56,7 @@ LINE("libftpio",	"FTP Connection Management Library (libftpio, \\-lftpio)")
 LINE("libform",		"Curses Form Library (libform, \\-lform)")
 LINE("libgeom",		"Userland API Library for Kernel GEOM subsystem (libgeom, \\-lgeom)")
 LINE("libgpib",		"General-Purpose Instrument Bus (GPIB) library (libgpib, \\-lgpib)")
+LINE("libgpio",		"General-Purpose Input Output (GPIO) library (libgpio, \\-lgpio)")
 LINE("libhammer",	"HAMMER Filesystem Userland Library (libhammer, \\-lhammer)")
 LINE("libi386",		"i386 Architecture Library (libi386, \\-li386)")
 LINE("libintl",		"Internationalized Message Handling Library (libintl, \\-lintl)")
--- a/contrib/netbsd-tests/lib/libc/sys/t_getcontext.c
+++ b/contrib/netbsd-tests/lib/libc/sys/t_getcontext.c
@ -51,7 +51,11 @@ run(int n, ...)
 	ATF_REQUIRE_EQ(n, DEPTH - calls - 1);

 	va_start(va, n);
+#if defined(__FreeBSD__) && defined(__amd64__)
+	for (i = 0; i < 5; i++) {
+#else
 	for (i = 0; i < 9; i++) {
+#endif
 		ia = va_arg(va, int);
 		ATF_REQUIRE_EQ(i, ia);
 	}
@ -101,13 +105,6 @@ ATF_TC_BODY(setcontext_link, tc)
 	ucontext_t save;
 	volatile int i = 0; /* avoid longjmp clobbering */

-#ifdef __FreeBSD__
-#ifdef __amd64__
-	atf_tc_expect_fail("setcontext in this testcase fails on "
-	    "FreeBSD/amd64 with rc == -1/errno == EINVAL; see PR # 194828");
-#endif
-#endif
-
 	for (i = 0; i < DEPTH; ++i) {
 		ATF_REQUIRE_EQ(getcontext(&uc[i]), 0);

@ -115,21 +112,20 @@ ATF_TC_BODY(setcontext_link, tc)
 		uc[i].uc_stack.ss_size = STACKSZ;
 		uc[i].uc_link = (i > 0) ? &uc[i - 1] : &save;

+#if defined(__FreeBSD__) && defined(__amd64__)
+		/* FreeBSD/amd64 only permits up to 6 arguments. */
+		makecontext(&uc[i], (void *)run, 6, i,
+			0, 1, 2, 3, 4);
+#else
 		makecontext(&uc[i], (void *)run, 10, i,
 			0, 1, 2, 3, 4, 5, 6, 7, 8);
+#endif
 	}

 	ATF_REQUIRE_EQ(getcontext(&save), 0);

-#ifdef __FreeBSD__
-	if (calls == 0) {
-		int rc = setcontext(&uc[DEPTH-1]);
-		ATF_REQUIRE_EQ_MSG(rc, 0, "%d != 0; (errno = %d)", rc, errno);
-	}
-#else
 	if (calls == 0)
 		ATF_REQUIRE_EQ(setcontext(&uc[DEPTH-1]), 0);
-#endif
 }

 ATF_TP_ADD_TCS(tp)
--- a/gnu/lib/libdialog/Makefile
+++ b/gnu/lib/libdialog/Makefile
@ -13,8 +13,7 @@ SRCS=		argv.c arrows.c buildlist.c buttons.c calendar.c checklist.c \
 INCS=		dialog.h dlg_colors.h dlg_config.h dlg_keys.h
 MAN=		dialog.3

-DPADD=		${LIBNCURSESW} ${LIBM}
-LDADD=		-lncursesw -lm
+LIBADD=		ncursesw m

 CFLAGS+= 	-I${.CURDIR} -I${DIALOG} -D_XOPEN_SOURCE_EXTENDED -DGCC_UNUSED=__unused
 .PATH:		${DIALOG}
--- a/gnu/lib/libgcc/Makefile
+++ b/gnu/lib/libgcc/Makefile
@ -28,8 +28,7 @@ CFLAGS+=	-DIN_GCC -DIN_LIBGCC2 -D__GCC_FLOAT_NOT_NEEDED \
 		-I${.CURDIR}/../../usr.bin/cc/cc_tools

 LDFLAGS+=	-nodefaultlibs
-DPADD+=		${LIBC}
-LDADD+=		-lc
+LIBADD+=	c

 OBJS=		# added to below in various ways depending on TARGET_CPUARCH

@ -119,8 +118,7 @@ LIB1ASMSRC =	lib1funcs.asm
 LIB1ASMFUNCS =  _dvmd_tls _bb_init_func
 LIB2ADDEH =	unwind-arm.c libunwind.S pr-support.c unwind-c.c
 # Some compilers generate __aeabi_ functions libgcc_s is missing
-DPADD+=		${LIBCOMPILER_RT}
-LDADD+=		-lcompiler_rt
+LIBADD+=	compiler_rt
 .endif

 .if ${TARGET_CPUARCH} == mips
--- a/gnu/lib/libreadline/readline/Makefile
+++ b/gnu/lib/libreadline/readline/Makefile
@ -23,7 +23,6 @@ ${.OBJDIR}/${_h}:	${SRCDIR}/${_h}
 	${INSTALL} ${.ALLSRC} ${.TARGET}
 .endfor

-DPADD=	${LIBTERMCAPW}
-LDADD=	-ltermcapw
+LIBADD=	ncursesw

 .include <bsd.lib.mk>
--- a/gnu/lib/libstdc++/Makefile
+++ b/gnu/lib/libstdc++/Makefile
@ -23,8 +23,8 @@ CXXFLAGS+=	-fno-implicit-templates -ffunction-sections -fdata-sections \
 		-Wno-deprecated
 PO_CXXFLAGS=	${CXXFLAGS:N-ffunction-sections}

-DPADD=		${LIBM}
-LDADD=		-lm  -Wl,-f,libsupc++.so.1
+LIBADD+=	m
+LDADD=		-Wl,-f,libsupc++.so.1

 # libstdc++ sources
 SRCS+=	bitmap_allocator.cc pool_allocator.cc \
--- a/gnu/usr.bin/dialog/Makefile
+++ b/gnu/usr.bin/dialog/Makefile
@ -3,8 +3,7 @@
 DIALOG=	${.CURDIR}/../../../contrib/dialog
 PROG=   dialog

-DPADD=	${LIBDIALOG} ${LIBNCURSESW} ${LIBM}
-LDADD=	-ldialog -lncursesw -lm
+LIBADD=	dialog ncursesw m
 CFLAGS+= -I${.CURDIR} -I${DIALOG}
 .PATH:	${DIALOG}

--- a/gnu/usr.bin/diff/Makefile
+++ b/gnu/usr.bin/diff/Makefile
@ -26,8 +26,7 @@ CFLAGS+=-I${DESTDIR}/usr/include/gnu

 SUBDIR+=doc

-DPADD=	${LIBGNUREGEX}
-LDADD=	-lgnuregex
+LIBADD+=	gnuregex

 .if ${MK_TESTS} != "no"
 SUBDIR+=	tests
--- a/gnu/usr.bin/gdb/gdb/Makefile
+++ b/gnu/usr.bin/gdb/gdb/Makefile
@ -11,8 +11,9 @@ GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a
 # global symbols visible.
 LDFLAGS+= -Wl,-E

-DPADD=	${GDBLIBS} ${BULIBS} ${LIBM} ${LIBREADLINE} ${LIBTERMCAPW} ${LIBGNUREGEX}
-LDADD=	${GDBLIBS} ${BULIBS} -lm ${LDREADLINE} -ltermcapw -lgnuregex
+DPADD=	${GDBLIBS} ${BULIBS}
+LDADD=	${GDBLIBS} ${BULIBS}
+LIBADD+=	m readline ncursesw gnuregex

 .include <bsd.prog.mk>
 CFLAGS+=	-DDEBUGDIR=\"${DEBUGDIR}\"
--- a/gnu/usr.bin/gdb/gdbtui/Makefile
+++ b/gnu/usr.bin/gdb/gdbtui/Makefile
@ -12,7 +12,8 @@ GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a
 # global symbols visible.
 LDFLAGS+= -Wl,-E

-DPADD=	${GDBLIBS} ${BULIBS} ${LIBM} ${LIBREADLINE} ${LIBTERMCAPW} ${LIBGNUREGEX}
-LDADD=	${GDBLIBS} ${BULIBS} -lm ${LDREADLINE} -ltermcapw -lgnuregex
+DPADD=	${GDBLIBS} ${BULIBS}
+LDADD=	${GDBLIBS} ${BULIBS}
+LIBADD+=	m readline ncursesw gnuregex

 .include <bsd.prog.mk>
--- a/gnu/usr.bin/gdb/kgdb/Makefile
+++ b/gnu/usr.bin/gdb/kgdb/Makefile
@ -8,10 +8,9 @@ BULIBS= ${OBJ_BU}/libbfd/libbfd.a ${OBJ_BU}/libopcodes/libopcodes.a \
 	${OBJ_BU}/libiberty/libiberty.a
 GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a

-DPADD=	${GDBLIBS} ${BULIBS} ${LIBKVM} ${LIBM} ${LIBREADLINE} ${LIBTERMCAPW} \
-	${LIBGNUREGEX}
-LDADD=	${GDBLIBS} ${BULIBS} -lkvm${GDB_SUFFIX} -lm ${LDREADLINE} -ltermcapw \
-	-lgnuregex
+DPADD=	${GDBLIBS} ${BULIBS} ${LIBKVM}
+LDADD=	${GDBLIBS} ${BULIBS} -lkvm${GDB_SUFFIX}
+LIBADD+=	m readline ncursesw gnuregex

 .if defined(GDB_CROSS_DEBUGGER)
 CFLAGS+= -Wl,-export-dynamic
--- a/gnu/usr.bin/grep/Makefile
+++ b/gnu/usr.bin/grep/Makefile
@ -22,8 +22,7 @@ LINKS+=	${BINDIR}/grep ${BINDIR}/egrep \
 MLINKS=	grep.1 egrep.1 grep.1 fgrep.1
 .endif

-DPADD=	${LIBGNUREGEX} ${LIBBZ2}
-LDADD=	-lgnuregex -lbz2
+LIBADD=	gnuregex bz2

 .if ${MK_BSD_GREP} != "yes"
 LINKS+=	${BINDIR}/grep ${BINDIR}/bzgrep \
@ -33,8 +32,7 @@ MLINKS+=grep.1 bzgrep.1 grep.1 bzegrep.1 grep.1 bzfgrep.1
 .endif

 .if defined(GREP_LIBZ) && !empty(GREP_LIBZ)
-LDADD+=	-lz
-DPADD+=	${LIBZ}
+LIBADD+=	z
 CFLAGS+=-DHAVE_LIBZ=1
 .if ${MK_BSD_GREP} != "yes"
 LINKS+=	${BINDIR}/grep ${BINDIR}/zgrep \
--- a/kerberos5/Makefile.inc
+++ b/kerberos5/Makefile.inc
@ -16,9 +16,6 @@ LDAPCFLAGS=	-I${OPENLDAPBASE}/include -DOPENLDAP=1 -DLDAP_DEPRECATED=1
 LDAPLDFLAGS=	-L${OPENLDAPBASE}/lib -Wl,-rpath,${OPENLDAPBASE}/lib
 .endif

-LIBVERS=	${.OBJDIR}/../../lib/libvers/libvers.a
-LIBSL=		${.OBJDIR}/../../lib/libsl/libsl.a
-
 .if defined(SRCS)

 ETSRCS=	\
--- a/kerberos5/lib/libasn1/Makefile
+++ b/kerberos5/lib/libasn1/Makefile
@ -3,8 +3,7 @@
 LIB=	asn1
 LDFLAGS=	-Wl,--no-undefined
 INCS=	asn1_err.h asn1-common.h heim_asn1.h der.h der-protos.h der-private.h
-LDADD=	-lcom_err -lroken
-DPADD=	${LIBCOM_ERR} ${LIBROKEN}
+LIBADD=	com_err roken
 VERSION_MAP=	${.CURDIR}/version.map

 SRCS=	asn1_err.c \
--- a/kerberos5/lib/libgssapi_krb5/Makefile
+++ b/kerberos5/lib/libgssapi_krb5/Makefile
@ -2,9 +2,7 @@

 LIB=	gssapi_krb5
 LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined
-LDADD=	-lgssapi -lkrb5 -lhx509 -lcrypto -lroken -lasn1 -lcom_err -lcrypt
-DPADD=	${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBCRYPTO} ${LIBROKEN} ${LIBASN1} \
-	${LIBCOM_ERR} ${LIBCRYPT}
+LIBADD=	gssapi krb5 crypto roken asn1 com_err
 SHLIB_MAJOR=	10

 INCS=	${KRB5DIR}/lib/gssapi/gssapi/gssapi_krb5.h
--- a/kerberos5/lib/libgssapi_ntlm/Makefile
+++ b/kerberos5/lib/libgssapi_ntlm/Makefile
@ -2,8 +2,7 @@

 LIB=	gssapi_ntlm
 LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined
-LDADD=	-lcrypto -lgssapi -lkrb5 -lhx509 -lheimntlm -lroken
-DPADD=	${LIBCRYPTO} ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBHEIMNTLM} ${LIBROKEN}
+LIBADD=	crypto gssapi krb5 heimntlm roken
 SHLIB_MAJOR=	10

 SRCS=	accept_sec_context.c \
--- a/kerberos5/lib/libgssapi_spnego/Makefile
+++ b/kerberos5/lib/libgssapi_spnego/Makefile
@ -2,8 +2,7 @@

 LIB=	gssapi_spnego
 LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined
-LDADD=	-lgssapi -lheimbase -lasn1 -lroken
-DPADD=	${LIBGSSAPI} ${LIBHEIMBASE} ${LIBASN1} ${LIBROKEN}
+LIBADD=	gssapi heimbase asn1 roken
 SHLIB_MAJOR=	10

 SRCS=	accept_sec_context.c \
--- a/kerberos5/lib/libhdb/Makefile
+++ b/kerberos5/lib/libhdb/Makefile
@ -3,8 +3,8 @@
 LIB=	hdb
 LDFLAGS=	-Wl,--no-undefined
 VERSION_MAP=	${KRB5DIR}/lib/hdb/version-script.map
-LDADD=	-lasn1 -lcom_err -lkrb5 -lroken -lheimsqlite
-DPADD=	${LIBASN1} ${LIBCOM_ERR} ${LIBKRB5} ${LIBROKEN} ${LIBHEIMSQLITE} ${LDAPDPADD}
+LIBADD=	asn1 com_err krb5 roken heimsqlite
+DPADD=	${LDAPDPADD}

 MAN=	HDB.3 hdb_entry_ex.3

--- a/kerberos5/lib/libheimbase/Makefile
+++ b/kerberos5/lib/libheimbase/Makefile
@ -2,7 +2,7 @@

 LIB=	heimbase
 LDFLAGS=	-Wl,--no-undefined
-LDADD=	-lpthread
+LIBADD=	pthread
 VERSION_MAP= ${KRB5DIR}/base/version-script.map

 INCS=	heimbase.h
--- a/kerberos5/lib/libheimipcc/Makefile
+++ b/kerberos5/lib/libheimipcc/Makefile
@ -2,8 +2,7 @@

 LIB=	heimipcc
 PRIVATELIB=
-LDADD=	-lheimbase -lroken -lpthread
-DPADD=	${LIBHEIMBASE} ${LIBROKEN} ${LIBPTHREAD}
+LIBADD=	heimbase roken pthread

 SRCS=	\
 	client.c \
--- a/kerberos5/lib/libheimipcs/Makefile
+++ b/kerberos5/lib/libheimipcs/Makefile
@ -2,9 +2,7 @@

 LIB=	heimipcs
 PRIVATELIB=
-LDADD=	-lheimbase -lroken
-LDFLAGS=	-pthread
-DPADD=	${LIBHEIMBASE} ${LIBROKEN}
+LIBADD=	heimbase roken pthread

 SRCS=	\
 	server.c \
--- a/kerberos5/lib/libheimntlm/Makefile
+++ b/kerberos5/lib/libheimntlm/Makefile
@ -2,8 +2,7 @@

 LIB=	heimntlm
 LDFLAGS=	-Wl,--no-undefined
-LDADD=	-lcrypto -lcom_err -lkrb5 -lroken
-DPADD=	${LIBCRYPTO} ${LIBCOM_ERR} ${LIBKRB5} ${LIBROKEN}
+LIBADD=	crypto com_err krb5 roken
 SRCS=	ntlm.c ntlm_err.c
 INCS=	heimntlm.h heimntlm-protos.h ntlm_err.h
 CFLAGS+=-I${KRB5DIR}/lib/ntlm -I${KRB5DIR}/lib/roken
--- a/kerberos5/lib/libheimsqlite/Makefile
+++ b/kerberos5/lib/libheimsqlite/Makefile
@ -2,8 +2,7 @@

 LIB=	heimsqlite
 SRCS=	sqlite3.c
-DPADD=	${LIBPTHREAD}
-LDADD=	-lpthread
+LIBADD=	pthread
 CFLAGS+=-I${KRB5DIR}/lib/sqlite

 .include <bsd.lib.mk>
--- a/kerberos5/lib/libhx509/Makefile
+++ b/kerberos5/lib/libhx509/Makefile
@ -3,8 +3,7 @@
 LIB=	hx509
 LDFLAGS=	-Wl,--no-undefined
 VERSION_MAP= ${KRB5DIR}/lib/hx509/version-script.map
-LDADD=	-lasn1 -lcom_err -lcrypto -lroken -lwind
-DPADD=	${LIBASN1} ${LIBCOM_ERR} ${LIBCRYPTO} ${LIBROKEN} ${LIBWIND}
+LIBADD=	asn1 com_err crypto roken wind

 MAN=	hx509.3 \
 	hx509_ca.3 \
--- a/kerberos5/lib/libkadm5clnt/Makefile
+++ b/kerberos5/lib/libkadm5clnt/Makefile
@ -2,8 +2,7 @@

 LIB=	kadm5clnt
 LDFLAGS=	-Wl,--no-undefined
-LDADD=	-lcom_err -lkrb5 -lroken
-DPADD=	${LIBCOM_ERR} ${LIBKRB5} ${LIBROKEN}
+LIBADD=	com_err krb5 roken

 INCS=	admin.h \
 	kadm5-private.h \
--- a/kerberos5/lib/libkadm5srv/Makefile
+++ b/kerberos5/lib/libkadm5srv/Makefile
@ -2,8 +2,7 @@

 LIB=	kadm5srv
 LDFLAGS=	-Wl,--no-undefined
-LDADD=	-lcom_err -lhdb -lkrb5 -lroken
-DPADD=	${LIBCOM_ERR} ${LIBHDB} ${LIBKRB5} ${LIBROKEN}
+LIBADD=	com_err hdb krb5 roken
 VERSION_MAP= ${KRB5DIR}/lib/kadm5/version-script.map
 MAN=	kadm5_pwcheck.3

--- a/kerberos5/lib/libkafs5/Makefile
+++ b/kerberos5/lib/libkafs5/Makefile
@ -1,9 +1,8 @@
 # $FreeBSD$

 LIB=	kafs5
-LDADD=	-lasn1 -lroken -lkrb5
 LDFLAGS=	-Wl,--no-undefined
-DPADD=	${LIBASN1} ${LIBKRB5} ${LIBROKEN}
+LIBADD=	asn1 krb5 roken
 INCS=	kafs.h
 MAN=	kafs5.3
 VERSION_MAP=	${.CURDIR}/version.map
--- a/kerberos5/lib/libkdc/Makefile
+++ b/kerberos5/lib/libkdc/Makefile
@ -3,9 +3,7 @@
 LIB=	kdc
 LDFLAGS=	-Wl,--no-undefined
 VERSION_MAP= ${KRB5DIR}/kdc/version-script.map
-LDADD=	-lroken -lhdb -lhx509 -lkrb5 -lheimntlm -lasn1 -lcrypt -lcrypto
-DPADD=	${LIBROKEN} ${LIBHDB} ${LIBHX509} ${LIBKRB5} ${LIBHEIMNTLM} \
-	${LIBASN1} ${LIBCRYPT} ${LIBCRYPTO}
+LIBADD=	roken hdb hx509 krb5 heimntlm asn1 crypto

 INCS=	kdc.h \
 	kdc-protos.h
--- a/kerberos5/lib/libkrb5/Makefile
+++ b/kerberos5/lib/libkrb5/Makefile
@ -3,9 +3,7 @@
 LIB=	krb5
 LDFLAGS=	-Wl,--no-undefined
 VERSION_MAP= ${KRB5DIR}/lib/krb5/version-script.map
-LDADD=	-lasn1 -lcom_err -lcrypt -lcrypto -lhx509 -lroken -lwind -lheimbase ${LDHEIMIPCC}
-DPADD=	${LIBASN1} ${LIBCOM_ERR} ${LIBCRYPT} ${LIBCRYPTO} ${LIBHX509} ${LIBROKEN} ${LIBWIND} ${LIBHEIMBASE} ${LIBHEIMIPCC}
-USEPRIVATELIB= heimipcc
+LIBADD=	asn1 com_err crypt crypto hx509 roken wind heimbase heimipcc

 INCS=	heim_err.h \
 	heim_threads.h \
@ -628,3 +626,4 @@ CFLAGS+=	-I${KRB5DIR}/lib/krb5 \
 .include <bsd.lib.mk>

 .PATH: ${KRB5DIR}/lib/krb5 ${KRB5DIR}/lib/asn1 ${KRB5DIR}/include ${.CURDIR}/../../include ${KRB5DIR}/doc/doxyout/krb5/man/man3/
+USEPRIVATELIB= heimipcc
--- a/kerberos5/lib/libroken/Makefile
+++ b/kerberos5/lib/libroken/Makefile
@ -1,8 +1,7 @@
 # $FreeBSD$

 LIB=	roken
-LDADD=	-lcrypt
-DPADD=	${LIBCRYPT}
+LIBADD=	crypt
 VERSION_MAP=	${KRB5DIR}/lib/roken/version-script.map
 INCS=	roken.h \
 	roken-common.h \
--- a/kerberos5/lib/libwind/Makefile
+++ b/kerberos5/lib/libwind/Makefile
@ -3,8 +3,7 @@
 LIB=	wind
 LDFLAGS=	-Wl,--no-undefined
 VERSION_MAP= ${KRB5DIR}/lib/wind/version-script.map
-LDADD=	-lcom_err -lroken
-DPADD=	${LIBCOM_ERR} ${LIBROKEN}
+LIBADD=	com_err roken

 INCS=	wind.h \
 	wind_err.h
--- a/kerberos5/libexec/digest-service/Makefile
+++ b/kerberos5/libexec/digest-service/Makefile
@ -8,11 +8,7 @@ CFLAGS+=	-I${KRB5DIR}/kdc \
 		-I${KRB5DIR}/lib/ipc \
 		-I${KRB5DIR}/lib/wind \
 		-I${KRB5DIR}/lib/roken
-DPADD=	${LIBHDB} ${LIBKDC} ${LIBHEIMIPCS} ${LIBKRB5} ${LIBROKEN} ${LIBASN1} \
-	${LIBCRYPTO} ${LIBCRYPT} ${LIBVERS}
-LDADD=	-lhdb -lkdc ${LDHEIMIPCS} -lkrb5 -lroken -lasn1 -lcrypto -lcrypt \
-	${LIBVERS} -lheimntlm
-USEPRIVATELIB= heimipcs
+LIBADD=	hdb kdc heimipcs krb5 roken asn1 crypto vers heimntlm

 .include <bsd.prog.mk>

--- a/kerberos5/libexec/hprop/Makefile
+++ b/kerberos5/libexec/hprop/Makefile
@ -10,10 +10,9 @@ CFLAGS+=-I${KRB5DIR}/lib/hx509
 CFLAGS+=-I${KRB5DIR}/lib/ntlm
 CFLAGS+=-I${KRB5DIR}/kdc
 CFLAGS+=-I${.OBJDIR}/../../lib/libkrb5
-DPADD=	${LIBHDB} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
-	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
-LDADD=	-lhdb -lkrb5 -lhx509 -lroken ${LIBVERS} \
-	-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
+LIBADD=	hdb krb5 roken vers
+DPADD=	${LDAPDPADD}
+LDADD=	${LDAPLDADD}
 LDFLAGS=${LDAPLDFLAGS}

 .include <bsd.prog.mk>
--- a/kerberos5/libexec/hpropd/Makefile
+++ b/kerberos5/libexec/hpropd/Makefile
@ -4,10 +4,9 @@ PROG=	hpropd
 MAN=	hpropd.8
 CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 \
 	-I${KRB5DIR}/kdc ${LDAPCFLAGS}
-DPADD=	${LIBHDB} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
-	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
-LDADD=	-lhdb -lkrb5 -lhx509 -lroken ${LIBVERS} \
-	-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
+LIBADD=	hdb krb5 roken vers
+DPADD=	${LDAPDPADD}
+LDADD=	${LDAPLDADD}
 LDFLAGS=${LDAPLDFLAGS}

 .include <bsd.prog.mk>
--- a/kerberos5/libexec/ipropd-master/Makefile
+++ b/kerberos5/libexec/ipropd-master/Makefile
@ -5,10 +5,9 @@ MAN=	iprop.8
 SRCS=	ipropd_common.c ipropd_master.c kadm5_err.h
 CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
 	-I. ${LDAPCFLAGS}
-DPADD=	${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
-	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
-LDADD=	-lkadm5srv -lhdb -lkrb5 -lhx509 -lroken ${LIBVERS} \
-	-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
+LIBADD=	kadm5srv hdb krb5 roken vers
+DPADD=	${LDAPDPADD}
+LDADD=	${LDAPLDADD}
 LDFLAGS=${LDAPLDFLAGS}

 foo::
--- a/kerberos5/libexec/ipropd-slave/Makefile
+++ b/kerberos5/libexec/ipropd-slave/Makefile
@ -5,10 +5,9 @@ MAN=
 SRCS=	ipropd_common.c ipropd_slave.c kadm5_err.h
 CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
 	-I. ${LDAPCFLAGS}
-DPADD=	${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
-	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
-LDADD=	-lkadm5srv -lhdb -lkrb5 -lhx509 -lroken ${LIBVERS} \
-	-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
+LIBADD=	kadm5srv hdb krb5 roken vers
+DPADD=	${LDAPDPADD}
+LDADD=	${LDAPLDADD}
 LDFLAGS=${LDAPLDFLAGS}

 .include <bsd.prog.mk>
--- a/kerberos5/libexec/kadmind/Makefile
+++ b/kerberos5/libexec/kadmind/Makefile
@ -9,10 +9,9 @@ SRCS=	rpc.c \

 CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
 	${LDAPCFLAGS}
-DPADD=	${LIBKADM5SRV} ${LIBGSSAPI} ${LIBHDB} ${LIBKRB5} ${LIBROKEN} \
-	${LIBASN1} ${LIBVERS} ${LIBCRYPTO} ${LIBCRYPT} ${LDAPDPADD}
-LDADD=	-lkadm5srv -lgssapi -lhdb -lkrb5 -lroken \
-	-lasn1 ${LIBVERS} -lcrypto -lcrypt ${LDAPLDADD}
+LIBADD=	kadm5srv gssapi hdb krb5 roken vers
+DPADD=	${LDAPDPADD}
+LDADD=	${LDAPLDADD}
 LDFLAGS=${LDAPLDFLAGS}

 .include <bsd.prog.mk>
--- a/kerberos5/libexec/kcm/Makefile
+++ b/kerberos5/libexec/kcm/Makefile
@ -19,11 +19,9 @@ SRCS=	acl.c \

 CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
 	-I${KRB5DIR}/kcm -I${KRB5DIR}/lib/ipc ${LDAPCFLAGS}
-DPADD=	${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBHEIMNTLM} \
-	${LIBHEIMIPCS} ${LIBCRYPTO} ${LIBCRYPT} ${LIBVERS} ${LDAPDPADD}
-LDADD=	-lhdb -lkrb5 -lroken -lasn1 -lheimntlm ${LDHEIMIPCS} \
-	-lcrypto -lcrypt ${LIBVERS} ${LDAPLDADD}
-USEPRIVATELIB= heimipcs
+LIBADD=	krb5 roken heimntlm heimipcs crypto
+DPADD=	${LDAPDPADD}
+LDADD=	${LIBVERS} ${LDAPLDADD}
 LDFLAGS=${LDAPLDFLAGS}

 .include <bsd.prog.mk>
--- a/kerberos5/libexec/kdc/Makefile
+++ b/kerberos5/libexec/kdc/Makefile
@ -10,9 +10,7 @@ SRCS=	config.c \

 CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
 	-I${KRB5DIR}/kdc ${LDAPCFLAGS}
-DPADD=	${LIBKDC} ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBASN1} \
-	${LIBCRYPTO} ${LIBCRYPT} ${LIBVERS}
-LDADD=	-lkdc -lhdb -lkrb5 -lroken -lasn1 -lcrypto -lcrypt ${LIBVERS}
+LIBADD=	kdc hdb krb5 roken crypt vers

 .include <bsd.prog.mk>

--- a/kerberos5/libexec/kdigest/Makefile
+++ b/kerberos5/libexec/kdigest/Makefile
@ -5,10 +5,7 @@ MAN=	kdigest.8
 CFLAGS+=	-I${KRB5DIR}/lib/asn1 \
 		-I${KRB5DIR}/lib/roken \
 		-I${KRB5DIR}/lib/sl -I.
-DPADD=	${LIBKRB5} ${LIBHEIMNTLM} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \
-	${LIBCRYPT} ${LIBSL} ${LIBVERS} ${LIBEDIT}
-LDADD=	-lkrb5 -lheimntlm -lroken -lasn1 -lcrypto -lcrypt ${LIBSL} \
-	${LIBVERS} -ledit
+LIBADD=	krb5 heimntlm roken crypto edit sl vers
 SRCS=	kdigest.c \
 	kdigest-commands.c \
 	kdigest-commands.h
--- a/kerberos5/libexec/kfd/Makefile
+++ b/kerberos5/libexec/kfd/Makefile
@ -4,10 +4,7 @@ PROG=	kfd
 MAN=	kfd.8
 CFLAGS+=	-I${KRB5DIR}/lib/asn1 \
 		-I${KRB5DIR}/lib/roken
-DPADD=	${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \
-	${LIBCRYPT} ${LIBVERS}
-LDADD=	-lkrb5 -lroken -lasn1 -lcrypto -lcrypt \
-	${LIBVERS}
+LIBADD=	krb5 roken vers

 .include <bsd.prog.mk>

--- a/kerberos5/libexec/kimpersonate/Makefile
+++ b/kerberos5/libexec/kimpersonate/Makefile
@ -6,10 +6,7 @@ CFLAGS+=	-I${KRB5DIR}/lib/hx509 \
 		-I${KRB5DIR}/lib/asn1 \
 		-I${KRB5DIR}/lib/roken \
 		-I${KRB5DIR}/lib/sl -I.
-DPADD=	${LIBKAFS5} ${LIBKRB5} ${LIBHEIMNTLM} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \
-	${LIBCRYPT} ${LIBVERS}
-LDADD=	-lkafs5 -lkrb5 -lheimntlm -lroken -lasn1 -lcrypto -lcrypt \
-	${LIBVERS}
+LIBADD=	krb5 roken asn1 vers

 .include <bsd.prog.mk>

--- a/kerberos5/libexec/kpasswdd/Makefile
+++ b/kerberos5/libexec/kpasswdd/Makefile
@ -3,10 +3,9 @@
 PROG=	kpasswdd
 MAN=	kpasswdd.8
 CFLAGS+=-I${KRB5DIR}/lib/roken -I../../lib/libhdb ${LDAPCFLAGS}
-DPADD=	${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
-	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
-LDADD=	-lkadm5srv -lhdb -lkrb5 -lhx509 -lroken ${LIBVERS} \
-	-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
+LIBADD=	kadm5srv hdb krb5 roken vers asn1
+DPADD=	${LDAPDPADD}
+LDADD=	${LDAPLDADD}
 LDFLAGS=${LDAPLDFLAGS}

 .include <bsd.prog.mk>
--- a/kerberos5/tools/asn1_compile/Makefile
+++ b/kerberos5/tools/asn1_compile/Makefile
@ -3,8 +3,9 @@
 PROG=	asn1_compile
 MAN=
 LIBROKEN_A=	${.OBJDIR}/../../lib/libroken/libroken.a
-LDADD=	${LIBROKEN_A} ${LIBVERS}
-DPADD=	${LIBROKEN_A} ${LIBVERS}
+LIBADD=	vers
+LDADD=	${LIBROKEN_A}
+DPADD=	${LIBROKEN_A}

 SRCS=	\
 	asn1parse.y \
--- a/kerberos5/tools/slc/Makefile
+++ b/kerberos5/tools/slc/Makefile
@ -2,8 +2,9 @@

 PROG=	slc
 LIBROKEN_A=     ${.OBJDIR}/../../lib/libroken/libroken.a
-LDADD=  ${LIBROKEN_A} ${LIBVERS}
-DPADD=  ${LIBROKEN_A} ${LIBVERS}
+LIBADD=	vers
+LDADD=  ${LIBROKEN_A}
+DPADD=  ${LIBROKEN_A}
 MAN=

 SRCS=	roken.h \
--- a/kerberos5/usr.bin/hxtool/Makefile
+++ b/kerberos5/usr.bin/hxtool/Makefile
@ -6,8 +6,7 @@ CFLAGS+=	-I${KRB5DIR}/lib/hx509 \
 		-I${KRB5DIR}/lib/asn1 \
 		-I${KRB5DIR}/lib/roken \
 		-I${KRB5DIR}/lib/sl -I.
-DPADD=	${LIBHX509} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBSL} ${LIBVERS} ${LIBEDIT}
-LDADD=	-lhx509 -lroken -lasn1 -lcrypto -lcrypt ${LIBSL} ${LIBVERS} -ledit
+LIBADD=	hx509 roken asn1 crypto sl vers edit
 SRCS=	hxtool.c hxtool-commands.c hxtool-commands.h

 hxtool-commands.h: hxtool-commands.in
--- a/kerberos5/usr.bin/kadmin/Makefile
+++ b/kerberos5/usr.bin/kadmin/Makefile
@ -26,14 +26,9 @@ SRCS=	add_enctype.c \

 CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken \
 	-I${KRB5DIR}/lib/sl -I. ${LDAPCFLAGS}
-DPADD=	${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBHX509} \
-	${LIBSL} ${LIBROKEN} ${LIBVERS} ${LIBASN1} \
-	${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} \
-	${LIBEDIT} ${LIBNCURSESW} ${LDAPDPADD}
-LDADD=	-lkadm5clnt -lkadm5srv -lhdb -lkrb5 -lhx509 \
-	${LIBSL} -lroken ${LIBVERS} -lasn1 \
-	-lcrypto -lcrypt -lcom_err \
-	-ledit -lncursesw ${LDAPLDADD}
+LIBADD=	kadm5clnt kadm5srv hdb krb5 roken vers sl asn1 crypto edit
+DPADD=	${LDAPDPADD}
+LDADD=	${LDAPLDADD}
 LDFLAGS=${LDAPLDFLAGS}

 .include <bsd.prog.mk>
--- a/kerberos5/usr.bin/kcc/Makefile
+++ b/kerberos5/usr.bin/kcc/Makefile
@ -8,10 +8,7 @@ CFLAGS+=	-I${KRB5DIR}/lib/hx509 \
 		-I${KRB5DIR}/lib/asn1 \
 		-I${KRB5DIR}/lib/roken \
 		-I${KRB5DIR}/lib/sl -I.
-DPADD=	${LIBKRB5} ${LIBHEIMNTLM} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \
-	${LIBCRYPT} ${LIBKAFS5} ${LIBSL} ${LIBVERS} ${LIBEDIT}
-LDADD=	-lkrb5 -lheimntlm -lroken -lasn1 -lcrypto -lcrypt -lkafs5 ${LIBSL} \
-	${LIBVERS} -ledit
+LIBADD=	krb5 roken asn1 kafs5 edit sl vers
 SRCS=	kcc.c \
 	kcc-commands.c \
 	kcc-commands.h \
--- a/kerberos5/usr.bin/kdestroy/Makefile
+++ b/kerberos5/usr.bin/kdestroy/Makefile
@ -2,10 +2,7 @@

 PROG=	kdestroy
 CFLAGS+=-I${KRB5DIR}/lib/roken
-DPADD=	${LIBKAFS5} ${LIBKRB5} ${LIBHEIMNTLM} ${LIBROKEN} ${LIBVERS} \
-	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT}
-LDADD=	-lkafs5 -lkrb5 -lheimntlm -lroken ${LIBVERS} \
-	-lasn1 -lcrypto -lcrypt
+LIBADD=	kafs5 krb5 roken vers
 MAN=	kdestroy.1

 .include <bsd.prog.mk>
--- a/kerberos5/usr.bin/kf/Makefile
+++ b/kerberos5/usr.bin/kf/Makefile
@ -4,10 +4,7 @@ PROG=	kf
 MAN=	kf.1
 CFLAGS+=	-I${KRB5DIR}/lib/asn1 \
 		-I${KRB5DIR}/lib/roken
-DPADD=	${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \
-	${LIBCRYPT} ${LIBVERS}
-LDADD=	-lkrb5 -lroken -lasn1 -lcrypto -lcrypt \
-	${LIBVERS}
+LIBADD=	krb5 roken vers

 .include <bsd.prog.mk>

--- a/kerberos5/usr.bin/kgetcred/Makefile
+++ b/kerberos5/usr.bin/kgetcred/Makefile
@ -3,8 +3,7 @@
 PROG=	kgetcred
 CFLAGS+=	-I${KRB5DIR}/lib/asn1 \
 		-I${KRB5DIR}/lib/roken
-DPADD=	${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBVERS}
-LDADD=	-lkrb5 -lroken -lasn1 -lcrypto -lcrypt ${LIBVERS}
+LIBADD=	krb5 roken asn1 vers

 .include <bsd.prog.mk>

--- a/kerberos5/usr.bin/kinit/Makefile
+++ b/kerberos5/usr.bin/kinit/Makefile
@ -2,10 +2,7 @@

 PROG=	kinit
 CFLAGS+=-I${KRB5DIR}/lib/roken
-DPADD=	${LIBKAFS5} ${LIBKRB5} ${LIBHEIMNTLM} ${LIBROKEN} ${LIBVERS} \
-	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT}
-LDADD=	-lkafs5 -lkrb5 -lheimntlm -lroken ${LIBVERS} \
-	-lasn1 -lcrypto -lcrypt -lcom_err
+LIBADD=	kafs5 krb5 heimntlm roken crypto vers

 .include <bsd.prog.mk>

--- a/kerberos5/usr.bin/kpasswd/Makefile
+++ b/kerberos5/usr.bin/kpasswd/Makefile
@ -2,10 +2,7 @@

 PROG=	kpasswd
 CFLAGS+=-I${KRB5DIR}/lib/roken
-DPADD=	${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
-	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
-LDADD=	-lkrb5 -lhx509 -lroken ${LIBVERS} \
-	-lasn1 -lcrypto -lcrypt -lcom_err
+LIBADD=	hdb krb5 roken vers crypto

 .include <bsd.prog.mk>

--- a/kerberos5/usr.bin/ksu/Makefile
+++ b/kerberos5/usr.bin/ksu/Makefile
@ -8,10 +8,7 @@ PRECIOUSPROG=
 MAN=
 SRCS=	su.c
 CFLAGS+=-I${KRB5DIR}/lib/roken
-DPADD=	${LIBKAFS5} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
-	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
-LDADD=	-lkafs5 -lkrb5 -lhx509 -lroken ${LIBVERS} \
-	-lasn1 -lcrypto -lcrypt -lcom_err
+LIBADD=	kafs5 krb5 roken vers crypto crypt

 .include <bsd.prog.mk>

--- a/kerberos5/usr.bin/string2key/Makefile
+++ b/kerberos5/usr.bin/string2key/Makefile
@ -7,9 +7,7 @@ CFLAGS+=	-I${KRB5DIR}/kdc \
 		-I${KRB5DIR}/lib/krb5 \
 		-I${KRB5DIR}/lib/roken \
 		-I${KRB5DIR}/lib/windc
-DPADD=	${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \
-	${LIBCRYPT} ${LIBVERS}
-LDADD=	-lhdb -lkrb5 -lroken -lasn1 -lcrypto -lcrypt ${LIBVERS}
+LIBADD=	krb5 roken crypto vers

 .include <bsd.prog.mk>

--- a/kerberos5/usr.bin/verify_krb5_conf/Makefile
+++ b/kerberos5/usr.bin/verify_krb5_conf/Makefile
@ -3,10 +3,7 @@
 PROG=	verify_krb5_conf
 MAN=	verify_krb5_conf.8
 CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken
-DPADD=	${LIBKAFS5} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
-	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
-LDADD=	-lkafs5 -lkrb5 -lhx509 -lroken ${LIBVERS} \
-	-lasn1 -lcrypto -lcrypt -lcom_err
+LIBADD=	krb5 roken  vers

 .include <bsd.prog.mk>

--- a/kerberos5/usr.sbin/iprop-log/Makefile
+++ b/kerberos5/usr.sbin/iprop-log/Makefile
@ -8,10 +8,7 @@ CFLAGS+=	-I${KRB5DIR}/lib/kadm5 \
 		-I${KRB5DIR}/lib/roken \
 		-I${KRB5DIR}/lib/sl \
 		-I.
-DPADD=	${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} \
-	${LIBCRYPT} ${LIBSL} ${LIBROKEN} ${LIBVERS} ${LIBEDIT}
-LDADD=	-lkadm5srv -lhdb -lkrb5 -lasn1 -lcrypto -lcrypt ${LIBSL} -lroken \
-	${LIBVERS} -ledit
+LIBADD=	kadm5srv hdb krb5 roken edit sl vers

 iprop-commands.h: iprop-commands.in
 	${SLC} ${.ALLSRC:M*.in}
--- a/kerberos5/usr.sbin/kstash/Makefile
+++ b/kerberos5/usr.sbin/kstash/Makefile
@ -4,10 +4,9 @@ PROG=	kstash
 MAN=	kstash.8
 CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken \
 	-I${KRB5DIR}/kdc ${LDAPCFLAGS}
-DPADD=	${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
-	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LDAPDPADD}
-LDADD=	-lhdb -lkrb5 -lroken ${LIBVERS} \
-	-lasn1 -lcrypto -lcrypt ${LDAPLDADD}
+LIBADD=	hdb krb5 crypto vers
+DPADD=	${LDAPDPADD}
+LDADD=	${LDAPLDADD}
 LDFLAGS=${LDAPLDFLAGS}

 .include <bsd.prog.mk>
--- a/kerberos5/usr.sbin/ktutil/Makefile
+++ b/kerberos5/usr.sbin/ktutil/Makefile
@ -17,10 +17,7 @@ SRCS=	add.c \
 	rename.c

 CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/sl -I.
-DPADD=	${LIBKADM5CLNT} ${LIBKRB5} ${LIBSL} ${LIBROKEN} ${LIBVERS} \
-	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBEDIT}
-LDADD=	-lkadm5clnt -lkrb5 ${LIBSL} -lroken ${LIBVERS} \
-	-lasn1 -lcrypto -lcrypt -ledit
+LIBADD=	kadm5clnt krb5 roken crypto edit sl vers

 .include <bsd.prog.mk>

--- a/lib/Makefile
+++ b/lib/Makefile
@ -52,6 +52,7 @@ SUBDIR=	${SUBDIR_ORDERED} \
 	libfigpar \
 	libgeom \
 	${_libgpib} \
+	libgpio \
 	${_libgssapi} \
 	${_librpcsec_gss} \
 	${_libiconv_modules} \
--- a/lib/atf/libatf-c++/Makefile
+++ b/lib/atf/libatf-c++/Makefile
@ -33,8 +33,7 @@ PRIVATELIB=	true
 SHLIB_MAJOR=	2

 # libatf-c++ depends on the C version of the ATF library to build.
-DPADD=		${LIBATF_C}
-LDADD=		-latf-c
+LIBADD+=	atf_c

 LDFLAGS+=	-L${.OBJDIR}/../libatf-c

--- a/lib/libarchive/Makefile
+++ b/lib/libarchive/Makefile
@ -4,19 +4,9 @@
 LIBARCHIVEDIR=	${.CURDIR}/../../contrib/libarchive

 LIB=	archive
-DPADD=	${LIBZ}
-LDADD=	-lz

-DPADD+= ${LIBBZ2}
-LDADD+= -lbz2
-CFLAGS+= -DHAVE_BZLIB_H=1
-
-DPADD+= ${LIBLZMA}
-LDADD+= -llzma
-CFLAGS+= -DHAVE_LIBLZMA=1 -DHAVE_LZMA_H=1
-
-DPADD+= ${LIBBSDXML}
-LDADD+= -lbsdxml
+LIBADD=	z bz2 lzma bsdxml
+CFLAGS+= -DHAVE_BZLIB_H=1 -DHAVE_LIBLZMA=1 -DHAVE_LZMA_H=1

 # FreeBSD SHLIB_MAJOR value is managed as part of the FreeBSD system.
 # It has no real relation to the libarchive version number.
@ -27,11 +17,9 @@ CFLAGS+=	-I${.OBJDIR}

 .if ${MK_OPENSSL} != "no"
 CFLAGS+=	-DWITH_OPENSSL
-DPADD+=	${LIBCRYPTO}
-LDADD+=	-lcrypto
+LIBADD+=	crypto
 .else
-DPADD+=	${LIBMD}
-LDADD+=	-lmd
+LIBADD+=	md
 .endif

 .if ${MK_ICONV} != "no"
--- a/lib/libarchive/test/Makefile
+++ b/lib/libarchive/test/Makefile
@ -6,9 +6,8 @@ MAN=

 PROG=libarchive_test
 INTERNALPROG=yes  # Don't install this; it's just for testing
-DPADD=${LIBBZ2} ${LIBZ} ${LIBMD} ${LIBCRYPTO} ${LIBBSDXML}
 LDADD= -L ${.OBJDIR}/.. -larchive
-LDADD+= -lz -lbz2 -llzma -lmd -lcrypto -lbsdxml
+LIBADD=	z bz2 lzma md crypto bsdxml
 CFLAGS+= -g
 CFLAGS+= -I${.CURDIR}/.. -I${.OBJDIR}
 CFLAGS+= -I${LIBARCHIVEDIR}/libarchive -I${LIBARCHIVEDIR}/test_utils
--- a/lib/libbsnmp/libbsnmp/Makefile
+++ b/lib/libbsnmp/libbsnmp/Makefile
@ -15,8 +15,7 @@ CFLAGS+= -DHAVE_STDINT_H -DHAVE_INTTYPES_H -DQUADFMT='"llu"' -DQUADXFMT='"llx"'

 .if ${MK_OPENSSL} != "no"
 CFLAGS+= -DHAVE_LIBCRYPTO
-DPADD+= ${LIBCRYPTO}
-LDADD+= -lcrypto
+LIBADD=	crypto
 .endif

 SRCS=	asn1.c snmp.c snmpagent.c snmpclient.c snmpcrypto.c support.c
--- a/lib/libc++/Makefile
+++ b/lib/libc++/Makefile
@ -62,8 +62,7 @@ CFLAGS+=	-I${HDRDIR} -I${LIBCXXRTDIR} -nostdlib -DLIBCXXRT
 CXXFLAGS+=	-std=c++11
 .endif

-DPADD=		${LIBCXXRT}
-LDADD=		-lcxxrt
+LIBADD+=	cxxrt
 LDFLAGS+=	--verbose
 INCSGROUPS=	STD EXP EXT

--- a/lib/libc/Makefile
+++ b/lib/libc/Makefile
@ -44,13 +44,11 @@ CFLAGS+=${CANCELPOINTS_CFLAGS}
 #
 # Link with static libcompiler_rt.a.
 #
-DPADD+=	${LIBCOMPILER_RT}
 LDFLAGS+= -nodefaultlibs
-LDADD+= -lcompiler_rt
+LIBADD+=	compiler_rt

 .if ${MK_SSP} != "no"
-DPADD+= ${LIBSSP_NONSHARED}
-LDADD+= -lssp_nonshared
+LIBADD+=	ssp_nonshared
 .endif

 # Extras that live in either libc.a or libc_nonshared.a
--- a/lib/libc/gen/errlst.c
+++ b/lib/libc/gen/errlst.c
@ -158,7 +158,7 @@ const char *const sys_errlist[] = {
 };
 const int sys_nerr = sizeof(sys_errlist) / sizeof(sys_errlist[0]);

-#ifdef __PIC__
+#ifdef PIC
 __strong_reference(sys_errlist, __hidden_sys_errlist);
 __strong_reference(sys_nerr, __hidden_sys_nerr);
 #endif
--- a/lib/libc/gen/isnan.c
+++ b/lib/libc/gen/isnan.c
@ -40,7 +40,7 @@
 * time, when calling both functions.
 */

-#ifdef __PIC__
+#ifdef PIC
 __weak_reference(__isnan, isnan);
 __weak_reference(__isnanf, isnanf);

@ -61,4 +61,4 @@ __isnanf(float f)
 	u.f = f;
 	return (u.bits.exp == 255 && u.bits.man != 0);
 }
-#endif /* __PIC__ */
+#endif /* PIC */
--- a/lib/libc/gen/syslog.c
+++ b/lib/libc/gen/syslog.c
@ -261,26 +261,45 @@ vsyslog(int pri, const char *fmt, va_list ap)
 	connectlog();

 	/*
-	 * If the send() failed, there are two likely scenarios: 
+	 * If the send() fails, there are two likely scenarios: 
 	 *  1) syslogd was restarted
 	 *  2) /var/run/log is out of socket buffer space, which
 	 *     in most cases means local DoS.
-	 * We attempt to reconnect to /var/run/log[priv] to take care of
-	 * case #1 and keep send()ing data to cover case #2
-	 * to give syslogd a chance to empty its socket buffer.
+	 * If the error does not indicate a full buffer, we address
+	 * case #1 by attempting to reconnect to /var/run/log[priv]
+	 * and resending the message once.
 	 *
-	 * If we are working with a priveleged socket, then take
-	 * only one attempt, because we don't want to freeze a
+	 * If we are working with a privileged socket, the retry
+	 * attempts end there, because we don't want to freeze a
 	 * critical application like su(1) or sshd(8).
 	 *
+	 * Otherwise, we address case #2 by repeatedly retrying the
+	 * send() to give syslogd a chance to empty its socket buffer.
 	 */

 	if (send(LogFile, tbuf, cnt, 0) < 0) {
 		if (errno != ENOBUFS) {
+			/*
+			 * Scenario 1: syslogd was restarted
+			 * reconnect and resend once
+			 */
 			disconnectlog();
 			connectlog();
+			if (send(LogFile, tbuf, cnt, 0) >= 0) {
+				THREAD_UNLOCK();
+				return;
+			}
+			/*
+			 * if the resend failed, fall through to
+			 * possible scenario 2
+			 */
 		}
-		do {
+		while (errno == ENOBUFS) {
+			/*
+			 * Scenario 2: out of socket buffer space
+			 * possible DoS, fail fast on a privileged
+			 * socket
+			 */
 			if (status == CONNPRIV)
 				break;
 			_usleep(1);
@ -288,7 +307,7 @@ vsyslog(int pri, const char *fmt, va_list ap)
 				THREAD_UNLOCK();
 				return;
 			}
-		} while (errno == ENOBUFS);
+		}
 	} else {
 		THREAD_UNLOCK();
 		return;
@ -350,7 +369,7 @@ connectlog(void)
 		SyslogAddr.sun_family = AF_UNIX;

 		/*
-		 * First try priveleged socket. If no success,
+		 * First try privileged socket. If no success,
 		 * then try default socket.
 		 */
 		(void)strncpy(SyslogAddr.sun_path, _PATH_LOG_PRIV,
--- a/lib/libc/gen/tls.c
+++ b/lib/libc/gen/tls.c
@ -78,7 +78,7 @@ void __libc_free_tls(void *tls, size_t tcbsize, size_t tcbalign);
 #define TLS_VARIANT_II
 #endif

-#ifndef __PIC__
+#ifndef PIC

 #define round(size, align) \
 	(((size) + (align) - 1) & ~((align) - 1))
@ -107,7 +107,7 @@ __libc_tls_get_addr(void *ti __unused)
 	return (0);
 }

-#ifndef __PIC__
+#ifndef PIC

 #ifdef TLS_VARIANT_I

@ -264,14 +264,14 @@ __libc_free_tls(void *tcb __unused, size_t tcbsize __unused,
 {
 }

-#endif /* __PIC__ */
+#endif /* PIC */

 extern char **environ;

 void
 _init_tls()
 {
-#ifndef __PIC__
+#ifndef PIC
 	Elf_Addr *sp;
 	Elf_Auxinfo *aux, *auxp;
 	Elf_Phdr *phdr;
--- a/lib/libc/include/errlst.h
+++ b/lib/libc/include/errlst.h
@ -31,7 +31,7 @@

 #include <sys/cdefs.h>

-#ifdef __PIC__
+#ifdef PIC
 /* If the main executable imports these, do not use its copy from libc.so. */
 extern const char *const __hidden_sys_errlist[] __hidden;
 extern const int __hidden_sys_nerr __hidden;
--- a/lib/libc/net/base64.c
+++ b/lib/libc/net/base64.c
@ -199,6 +199,7 @@ b64_pton(src, target, targsize)
 	size_t targsize;
 {
 	int tarindex, state, ch;
+	u_char nextbyte;
 	char *pos;

 	state = 0;
@ -226,22 +227,28 @@ b64_pton(src, target, targsize)
 			break;
 		case 1:
 			if (target) {
-				if ((size_t)tarindex + 1 >= targsize)
+				if ((size_t)tarindex >= targsize)
 					return (-1);
 				target[tarindex]   |=  (pos - Base64) >> 4;
-				target[tarindex+1]  = ((pos - Base64) & 0x0f)
-							<< 4 ;
+				nextbyte = ((pos - Base64) & 0x0f) << 4;
+				if ((size_t)tarindex + 1 < targsize)
+					target[tarindex + 1] = nextbyte;
+				else if (nextbyte)
+					return (-1);
 			}
 			tarindex++;
 			state = 2;
 			break;
 		case 2:
 			if (target) {
-				if ((size_t)tarindex + 1 >= targsize)
+				if ((size_t)tarindex >= targsize)
 					return (-1);
 				target[tarindex]   |=  (pos - Base64) >> 2;
-				target[tarindex+1]  = ((pos - Base64) & 0x03)
-							<< 6;
+				nextbyte = ((pos - Base64) & 0x03) << 6;
+				if ((size_t)tarindex + 1 < targsize)
+					target[tarindex + 1] = nextbyte;
+				else if (nextbyte)
+					return (-1);
 			}
 			tarindex++;
 			state = 3;
@ -299,7 +306,8 @@ b64_pton(src, target, targsize)
 			 * zeros.  If we don't check them, they become a
 			 * subliminal channel.
 			 */
-			if (target && target[tarindex] != 0)
+			if (target && (size_t)tarindex < targsize &&
+			    target[tarindex] != 0)
 				return (-1);
 		}
 	} else {
--- a/lib/libc/net/getifaddrs.3
+++ b/lib/libc/net/getifaddrs.3
@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd May 21, 2013
+.Dd November 25, 2014
 .Dt GETIFADDRS 3
 .Os
 .Sh NAME
@ -110,19 +110,17 @@ if one exists, otherwise it is NULL.
 .Pp
 The
 .Li ifa_data
-field references address family specific data.
-For
-.Dv AF_LINK
-addresses it contains a pointer to the
+field references address family specific data
+in a pointer to the
 .Fa struct if_data
 (as defined in include file
-.In net/if.h )
-which contains various interface attributes and statistics.
-For all other address families, it contains a pointer to the
-.Fa struct ifa_data
-(as defined in include file
-.In net/if.h )
-which contains per-address interface statistics.
+.In net/if.h ) .
+For
+.Dv AF_LINK
+addresses,
+it contains various interface attributes and statistics.
+For all other address families,
+it contains per-address interface statistics.
 .Pp
 The data returned by
 .Fn getifaddrs
--- a/lib/libc/net/nsdispatch.c
+++ b/lib/libc/net/nsdispatch.c
@ -132,14 +132,17 @@ static	void			*nss_cache_cycle_prevention_func = NULL;
 #endif

 /*
- * When this is set to 1, nsdispatch won't use nsswitch.conf
- * but will consult the 'defaults' source list only.
- * NOTE: nested fallbacks (when nsdispatch calls fallback functions,
- *     which in turn calls nsdispatch, which should call fallback
- *     function) are not supported
+ * We keep track of nsdispatch() nesting depth in dispatch_depth.  When a
+ * fallback method is invoked from nsdispatch(), we temporarily set
+ * fallback_depth to the current dispatch depth plus one.  Subsequent
+ * calls at that exact depth will run in fallback mode (restricted to the
+ * same source as the call that was handled by the fallback method), while
+ * calls below that depth will be handled normally, allowing fallback
+ * methods to perform arbitrary lookups.
 */
 struct fb_state {
-	int	fb_dispatch;
+	int	dispatch_depth;
+	int	fallback_depth;
 };
 static	void	fb_endstate(void *);
 NSS_TLS_HANDLING(fb);
@ -613,6 +616,7 @@ _nsdispatch(void *retval, const ns_dtab disp_tab[], const char *database,
 	void		*mdata;
 	int		 isthreaded, serrno, i, result, srclistsize;
 	struct fb_state	*st;
+	int		 saved_depth;

 #ifdef NS_CACHING
 	nss_cache_data	 cache_data;
@ -644,7 +648,8 @@ _nsdispatch(void *retval, const ns_dtab disp_tab[], const char *database,
 		result = NS_UNAVAIL;
 		goto fin;
 	}
-	if (st->fb_dispatch == 0) {
+	++st->dispatch_depth;
+	if (st->dispatch_depth > st->fallback_depth) {
 		dbt = vector_search(&database, _nsmap, _nsmapsize, sizeof(*_nsmap),
 		    string_compare);
 		fb_method = nss_method_lookup(NSSRC_FALLBACK, database,
@ -713,12 +718,13 @@ _nsdispatch(void *retval, const ns_dtab disp_tab[], const char *database,
 				break;
 		} else {
 			if (fb_method != NULL) {
-				st->fb_dispatch = 1;
+				saved_depth = st->fallback_depth;
+				st->fallback_depth = st->dispatch_depth + 1;
 				va_start(ap, defaults);
 				result = fb_method(retval,
 				    (void *)srclist[i].name, ap);
 				va_end(ap);
-				st->fb_dispatch = 0;
+				st->fallback_depth = saved_depth;
 			} else
 				nss_log(LOG_DEBUG, "%s, %s, %s, not found, "
 				    "and no fallback provided",
@ -750,6 +756,7 @@ _nsdispatch(void *retval, const ns_dtab disp_tab[], const char *database,

 	if (isthreaded)
 		(void)_pthread_rwlock_unlock(&nss_lock);
+	--st->dispatch_depth;
 fin:
 	errno = serrno;
 	return (result);
--- a/lib/libc/sys/stack_protector.c
+++ b/lib/libc/sys/stack_protector.c
@ -115,6 +115,6 @@ __chk_fail(void)
 	__fail("buffer overflow detected; terminated");
 }

-#ifndef __PIC__
+#ifndef PIC
 __weak_reference(__stack_chk_fail, __stack_chk_fail_local);
 #endif
--- a/lib/libc/sys/stack_protector_compat.c
+++ b/lib/libc/sys/stack_protector_compat.c
@ -8,7 +8,7 @@ __FBSDID("$FreeBSD$");

 void __stack_chk_fail(void);

-#ifdef __PIC__
+#ifdef PIC
 void
 __stack_chk_fail_local_hidden(void)
 {
--- a/lib/libcam/Makefile
+++ b/lib/libcam/Makefile
@ -6,8 +6,7 @@ SRCS=		camlib.c scsi_cmdparse.c scsi_all.c scsi_da.c scsi_sa.c cam.c \
 		ata_all.c smp_all.c
 INCS=		camlib.h

-DPADD=		${LIBSBUF}
-LDADD=		-lsbuf
+LIBADD=		sbuf

 MAN=		cam.3 cam_cdbparse.3

--- a/lib/libcapsicum/Makefile
+++ b/lib/libcapsicum/Makefile
@ -21,8 +21,7 @@ INCS+=	libcapsicum_random.h
 INCS+=	libcapsicum_service.h
 INCS+=	libcapsicum_sysctl.h

-DPADD=	${LIBNV}
-LDADD=	-lnv
+LIBADD=	nv

 CFLAGS+=-I${.CURDIR}
 CFLAGS+=-I${.CURDIR}/../libnv
--- a/lib/libcasper/Makefile
+++ b/lib/libcasper/Makefile
@ -8,8 +8,7 @@ SHLIBDIR?=	/lib
 SRCS=	libcasper.c
 INCS=	libcasper.h

-DPADD=	${LIBCAPSICUM} ${LIBNV} ${LIBPJDLOG}
-LDADD=	-lcapsicum -lnv -lpjdlog
+LIBADD=	capsicum nv pjdlog

 CFLAGS+=-I${.CURDIR}
 CFLAGS+=-I${.CURDIR}/../libpjdlog
--- a/lib/libcrypt/tests/Makefile
+++ b/lib/libcrypt/tests/Makefile
@ -7,7 +7,6 @@ TESTSDIR= ${TESTSBASE}/lib/libcrypt
 ATF_TESTS_C= crypt_tests

 CFLAGS+= -I${.CURDIR:H}
-DPADD+=	${LIBCRYPT}
-LDADD+= -lcrypt
+LIBADD=	crypt

 .include <bsd.test.mk>
--- a/lib/libcuse/Makefile
+++ b/lib/libcuse/Makefile
@ -30,14 +30,12 @@ SHLIB_MINOR=	0
 SRCS=		cuse_lib.c
 INCS=		cuse.h
 MAN=		cuse.3
-PTHREAD_LIBS?=	-lpthread
 CFLAGS+=	-D_GNU_SOURCE
 .if defined(HAVE_DEBUG)
 CFLAGS+=	-g
 CFLAGS+=	-DHAVE_DEBUG
 .endif
-DPADD+=	${LIBPTHREAD}
-LDADD+=	${PTHREAD_LIBS}
+LIBADD=	pthread

 MLINKS=
 MLINKS+= cuse.3 cuse_alloc_unit_number.3
--- a/lib/libdevstat/Makefile
+++ b/lib/libdevstat/Makefile
@ -7,8 +7,7 @@ SHLIB_MAJOR= 7
 SRCS=	devstat.c
 INCS=	devstat.h

-DPADD=	${LIBKVM}
-LDADD=	-lkvm
+LIBADD=	kvm

 MAN=	devstat.3

--- a/lib/libdpv/Makefile
+++ b/lib/libdpv/Makefile
@ -6,8 +6,7 @@ INCS=		dpv.h
 MAN=		dpv.3
 MLINKS=		dpv.3 dpv_free.3

-DPADD=		${LIBDIALOG} ${LIBFIGPAR} ${LIBNCURSESW} ${LIBUTIL}
-LDADD=		-ldialog -lfigpar -lncursesw -lutil
+LIBADD=	dialog figpar util ncursesw

 SRCS=		dialog_util.c dialogrc.c dprompt.c dpv.c status.c util.c

--- a/lib/libdwarf/Makefile
+++ b/lib/libdwarf/Makefile
@ -96,8 +96,7 @@ sys/elf32.h sys/elf64.h sys/elf_common.h: ${.CURDIR}/../../sys/${.TARGET}
 	mkdir -p ${.OBJDIR}/sys
 	ln -sf ${.CURDIR}/../../sys/${.TARGET} ${.TARGET}

-LDADD+=		-lelf
-DPADD+=		${LIBELF}
+LIBADD+=	elf

 SHLIB_MAJOR=	4

--- a/lib/libedit/Makefile
+++ b/lib/libedit/Makefile
@ -10,8 +10,7 @@ OSRCS=	chared.c common.c el.c emacs.c fcns.c filecomplete.c help.c \
 	hist.c key.c map.c \
 	parse.c prompt.c read.c refresh.c search.c sig.c term.c tty.c vi.c

-DPADD=	${LIBNCURSESW}
-LDADD=	-lncursesw
+LIBADD=	ncursesw

 MAN=	editline.3 editrc.5

--- a/lib/libexecinfo/Makefile
+++ b/lib/libexecinfo/Makefile
@ -10,8 +10,7 @@ SHLIB_MAJOR=	1
 INCS=		execinfo.h
 SRCS=		backtrace.c symtab.c unwind.c

-DPADD=		${LIBELF}
-LDADD=		-lelf
+LIBADD=		elf

 MAN=		backtrace.3

--- a/lib/libfetch/Makefile
+++ b/lib/libfetch/Makefile
@ -16,11 +16,9 @@ CFLAGS+=	-DINET6

 .if ${MK_OPENSSL} != "no"
 CFLAGS+=	-DWITH_SSL
-DPADD=		${LIBSSL} ${LIBCRYPTO}
-LDADD=		-lssl -lcrypto
+LIBADD+=	ssl crypto
 .else
-DPADD=		${LIBMD}
-LDADD=		-lmd
+LIBADD+=	md
 .endif

 CFLAGS+=	-DFTP_COMBINE_CWDS
--- a/lib/libgeom/Makefile
+++ b/lib/libgeom/Makefile
@ -13,8 +13,7 @@ CFLAGS += -I${.CURDIR}

 WARNS?=	3

-DPADD=	${LIBBSDXML} ${LIBSBUF}
-LDADD=	-lbsdxml -lsbuf
+LIBADD+=	bsdxml sbuf

 MAN=	libgeom.3

--- a/lib/libgpio/Makefile
+++ b/lib/libgpio/Makefile
@ -0,0 +1,35 @@
+# $FreeBSD$
+
+LIB=	gpio
+SHLIB_MAJOR= 0
+
+SRCS=	gpio.c
+INCS=	libgpio.h
+MAN+=	gpio.3
+
+CFLAGS+= -I${.CURDIR}
+
+MLINKS=	gpio.3 gpio_open.3 \
+	gpio.3 gpio_open_device.3 \
+	gpio.3 gpio_close.3 \
+	gpio.3 gpio_pin_list.3 \
+	gpio.3 gpio_pin_config.3 \
+	gpio.3 gpio_pin_set_flags.3 \
+	gpio.3 gpio_pin_get.3 \
+	gpio.3 gpio_pin_set.3 \
+	gpio.3 gpio_pin_low.3 \
+	gpio.3 gpio_pin_high.3 \
+	gpio.3 gpio_pin_input.3 \
+	gpio.3 gpio_pin_output.3 \
+	gpio.3 gpio_pin_opendrain.3 \
+	gpio.3 gpio_pin_pushpull.3 \
+	gpio.3 gpio_pin_tristate.3 \
+	gpio.3 gpio_pin_pullup.3 \
+	gpio.3 gpio_pin_pulldown.3 \
+	gpio.3 gpio_pin_invin.3 \
+	gpio.3 gpio_pin_invout.3 \
+	gpio.3 gpio_pin_pulsate.3
+
+WARNS?=	6
+
+.include <bsd.lib.mk>
--- a/Show More
+++ b/Show More