Module Name: src
Committed By: joerg
Date: Wed Sep 11 23:04:11 UTC 2013
Modified Files:
src/crypto/external/bsd/heimdal/lib/libasn1: Makefile
src/crypto/external/bsd/heimdal/lib/libhdb: Makefile
src/crypto/external/bsd/heimdal/lib/libheimntlm: Makefile
src/crypto/external/bsd/heimdal/lib/libkadm5clnt: Makefile
src/crypto/external/bsd/heimdal/lib/libkadm5srv: Makefile
src/crypto/external/bsd/heimdal/lib/libkafs: Makefile
src/crypto/external/bsd/heimdal/lib/libkdc: Makefile
src/crypto/external/bsd/heimdal/lib/libkrb5: Makefile
src/crypto/external/bsd/libsaslc/lib: Makefile
src/external/bsd/bind/lib: Makefile
src/external/bsd/bind/lib/libbind9: Makefile
src/external/bsd/bind/lib/libdns: Makefile
src/external/bsd/bind/lib/libisccc: Makefile
src/external/bsd/bind/lib/libisccfg: Makefile
src/external/bsd/libdwarf/lib: Makefile
src/external/bsd/libevent/lib: Makefile
src/external/bsd/libevent/lib/libevent_openssl: Makefile
src/external/bsd/libevent/lib/libevent_pthreads: Makefile
src/external/bsd/openldap/bin: Makefile.inc
src/external/cddl/osnet/lib: Makefile
src/external/cddl/osnet/lib/libzfs: Makefile
src/external/cddl/osnet/lib/libzpool: Makefile
src/external/gpl2/lvm2/lib/libdevmapper: Makefile
src/lib: Makefile
src/lib/libdm: Makefile
src/lib/libisns: Makefile
src/lib/libp2k: Makefile
src/lib/libppath: Makefile
src/lib/libukfs: Makefile
src/lib/npf: mod.mk
src/share/mk: bsd.lua.mk
Log Message:
If a library needs a symbol from another library, pull that library in
explicitly, even if the DT_NEEDED closure would normally already ensure
the presence.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/heimdal/lib/libasn1/Makefile
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/lib/libhdb/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/heimdal/lib/libheimntlm/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/lib/libkadm5clnt/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/heimdal/lib/libkadm5srv/Makefile
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/heimdal/lib/libkafs/Makefile
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/heimdal/lib/libkdc/Makefile
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile
cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/libsaslc/lib/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/bind/lib/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/bind/lib/libbind9/Makefile
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/bind/lib/libdns/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/bind/lib/libisccc/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/bind/lib/libisccfg/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libdwarf/lib/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libevent/lib/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/bsd/libevent/lib/libevent_openssl/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/bsd/libevent/lib/libevent_pthreads/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/openldap/bin/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/lib/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/cddl/osnet/lib/libzfs/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/cddl/osnet/lib/libzpool/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/gpl2/lvm2/lib/libdevmapper/Makefile
cvs rdiff -u -r1.206 -r1.207 src/lib/Makefile
cvs rdiff -u -r1.2 -r1.3 src/lib/libdm/Makefile
cvs rdiff -u -r1.4 -r1.5 src/lib/libisns/Makefile
cvs rdiff -u -r1.2 -r1.3 src/lib/libp2k/Makefile
cvs rdiff -u -r1.2 -r1.3 src/lib/libppath/Makefile
cvs rdiff -u -r1.6 -r1.7 src/lib/libukfs/Makefile
cvs rdiff -u -r1.5 -r1.6 src/lib/npf/mod.mk
cvs rdiff -u -r1.4 -r1.5 src/share/mk/bsd.lua.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/lib/libasn1/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libasn1/Makefile:1.1 src/crypto/external/bsd/heimdal/lib/libasn1/Makefile:1.2
--- src/crypto/external/bsd/heimdal/lib/libasn1/Makefile:1.1 Wed Apr 13 19:16:48 2011
+++ src/crypto/external/bsd/heimdal/lib/libasn1/Makefile Wed Sep 11 23:04:09 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/04/13 19:16:48 elric Exp $
+# $NetBSD: Makefile,v 1.2 2013/09/11 23:04:09 joerg Exp $
USE_FORT?= yes # network protocol library
@@ -10,6 +10,7 @@ USE_FORT?= yes # network protocol librar
LIB= asn1
LIBDPLIBS+= com_err ${.CURDIR}/../libcom_err
+LIBDPLIBS+= roken ${.CURDIR}/../libroken
HEIMSRCS = \
asn1_err.et \
Index: src/crypto/external/bsd/heimdal/lib/libhdb/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libhdb/Makefile:1.2 src/crypto/external/bsd/heimdal/lib/libhdb/Makefile:1.3
--- src/crypto/external/bsd/heimdal/lib/libhdb/Makefile:1.2 Wed May 25 19:21:17 2011
+++ src/crypto/external/bsd/heimdal/lib/libhdb/Makefile Wed Sep 11 23:04:09 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/05/25 19:21:17 he Exp $
+# $NetBSD: Makefile,v 1.3 2013/09/11 23:04:09 joerg Exp $
USE_FORT?= yes # network protocol library
@@ -13,6 +13,7 @@ LIB= hdb
LIBDPLIBS+= hx509 ${HEIMBASE}/lib/libhx509 \
crypto ${SSLBASE}/lib/libcrypto \
+ krb5 ${HEIMBASE}/lib/libkrb5 \
asn1 ${HEIMBASE}/lib/libasn1 \
com_err ${HEIMBASE}/lib/libcom_err \
roken ${HEIMBASE}/lib/libroken \
Index: src/crypto/external/bsd/heimdal/lib/libheimntlm/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libheimntlm/Makefile:1.1 src/crypto/external/bsd/heimdal/lib/libheimntlm/Makefile:1.2
--- src/crypto/external/bsd/heimdal/lib/libheimntlm/Makefile:1.1 Wed Apr 13 19:16:51 2011
+++ src/crypto/external/bsd/heimdal/lib/libheimntlm/Makefile Wed Sep 11 23:04:09 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/04/13 19:16:51 elric Exp $
+# $NetBSD: Makefile,v 1.2 2013/09/11 23:04:09 joerg Exp $
USE_FORT?= yes # cryptographic software
@@ -11,8 +11,10 @@ NOLINT=
LIB= heimntlm
-LIBDPLIBS+= asn1 ${.CURDIR}/../libasn1 \
- krb5 ${.CURDIR}/../libkrb5 \
+LIBDPLIBS+= asn1 ${.CURDIR}/../libasn1 \
+ com_err ${.CURDIR}/../libcom_err \
+ crypto ${SSLBASE}/lib/libcrypto \
+ krb5 ${.CURDIR}/../libkrb5 \
roken ${.CURDIR}/../libroken
HEIMSRCS= ntlm_err.et ntlm.c
Index: src/crypto/external/bsd/heimdal/lib/libkadm5clnt/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libkadm5clnt/Makefile:1.2 src/crypto/external/bsd/heimdal/lib/libkadm5clnt/Makefile:1.3
--- src/crypto/external/bsd/heimdal/lib/libkadm5clnt/Makefile:1.2 Fri Apr 15 14:39:32 2011
+++ src/crypto/external/bsd/heimdal/lib/libkadm5clnt/Makefile Wed Sep 11 23:04:09 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/04/15 14:39:32 elric Exp $
+# $NetBSD: Makefile,v 1.3 2013/09/11 23:04:09 joerg Exp $
USE_FORT?= yes # network protocol library
@@ -12,6 +12,7 @@ NOLINT= # defined
LIB= kadm5clnt
LIBDPLIBS+= krb5 ${.CURDIR}/../libkrb5 \
+ com_err ${.CURDIR}/../libcom_err \
hdb ${.CURDIR}/../libhdb \
roken ${.CURDIR}/../libroken
Index: src/crypto/external/bsd/heimdal/lib/libkadm5srv/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libkadm5srv/Makefile:1.1 src/crypto/external/bsd/heimdal/lib/libkadm5srv/Makefile:1.2
--- src/crypto/external/bsd/heimdal/lib/libkadm5srv/Makefile:1.1 Wed Apr 13 19:16:52 2011
+++ src/crypto/external/bsd/heimdal/lib/libkadm5srv/Makefile Wed Sep 11 23:04:09 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/04/13 19:16:52 elric Exp $
+# $NetBSD: Makefile,v 1.2 2013/09/11 23:04:09 joerg Exp $
USE_FORT?= yes # network protocol library
@@ -12,6 +12,7 @@ NOLINT= # defined
LIB= kadm5srv
LIBDPLIBS+= krb5 ${.CURDIR}/../libkrb5 \
+ com_err ${.CURDIR}/../libcom_err \
hdb ${.CURDIR}/../libhdb \
roken ${.CURDIR}/../libroken
Index: src/crypto/external/bsd/heimdal/lib/libkafs/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libkafs/Makefile:1.1 src/crypto/external/bsd/heimdal/lib/libkafs/Makefile:1.2
--- src/crypto/external/bsd/heimdal/lib/libkafs/Makefile:1.1 Wed Apr 13 19:16:53 2011
+++ src/crypto/external/bsd/heimdal/lib/libkafs/Makefile Wed Sep 11 23:04:09 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/04/13 19:16:53 elric Exp $
+# $NetBSD: Makefile,v 1.2 2013/09/11 23:04:09 joerg Exp $
USE_FORT?= yes # network protocol library
@@ -12,6 +12,7 @@ NOLINT= # defined
LIB= kafs
LIBDPLIBS+= krb5 ${.CURDIR}/../libkrb5 \
+ asn1 ${.CURDIR}/../libasn1 \
roken ${.CURDIR}/../libroken
SRCS= afssys.c afskrb5.c common.c
Index: src/crypto/external/bsd/heimdal/lib/libkdc/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libkdc/Makefile:1.1 src/crypto/external/bsd/heimdal/lib/libkdc/Makefile:1.2
--- src/crypto/external/bsd/heimdal/lib/libkdc/Makefile:1.1 Wed Apr 13 19:16:53 2011
+++ src/crypto/external/bsd/heimdal/lib/libkdc/Makefile Wed Sep 11 23:04:09 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/04/13 19:16:53 elric Exp $
+# $NetBSD: Makefile,v 1.2 2013/09/11 23:04:09 joerg Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -11,7 +11,10 @@ NOLINT=
LIB= kdc
LIBDPLIBS+= krb5 ${.CURDIR}/../libkrb5 \
+ crypto ${SSLBASE}/lib/libcrypto \
hdb ${.CURDIR}/../libhdb \
+ hx509 ${.CURDIR}/../libhx509 \
+ asn1 ${.CURDIR}/../libasn1 \
heimntlm ${.CURDIR}/../libheimntlm \
roken ${.CURDIR}/../libroken
Index: src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile:1.6 src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile:1.7
--- src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile:1.6 Sun Jul 31 06:43:56 2011
+++ src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile Wed Sep 11 23:04:09 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2011/07/31 06:43:56 plunky Exp $
+# $NetBSD: Makefile,v 1.7 2013/09/11 23:04:09 joerg Exp $
USE_FORT?= yes # network protocol library
@@ -21,7 +21,8 @@ LIBDPLIBS+= hx509 ${HEIMBASE}/lib/libhx
com_err ${HEIMBASE}/lib/libcom_err \
roken ${HEIMBASE}/lib/libroken \
wind ${HEIMBASE}/lib/libwind \
- heimbase ${HEIMBASE}/lib/libheimbase
+ heimbase ${HEIMBASE}/lib/libheimbase \
+ crypt ${NETBSDSRCDIR}/lib/libcrypt
HEIMSRCS= krb_err.et krb5_err.et heim_err.et k524_err.et
Index: src/crypto/external/bsd/libsaslc/lib/Makefile
diff -u src/crypto/external/bsd/libsaslc/lib/Makefile:1.7 src/crypto/external/bsd/libsaslc/lib/Makefile:1.8
--- src/crypto/external/bsd/libsaslc/lib/Makefile:1.7 Fri Sep 23 15:24:35 2011
+++ src/crypto/external/bsd/libsaslc/lib/Makefile Wed Sep 11 23:04:09 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2011/09/23 15:24:35 jruoho Exp $
+# $NetBSD: Makefile,v 1.8 2013/09/11 23:04:09 joerg Exp $
.include <bsd.own.mk>
@@ -54,6 +54,7 @@ EXTDIST=${.CURDIR}/../dist
INCS+= saslc.h
INCSDIR=/usr/include
+LIBDPLIBS+= crypto ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto
LIBDPLIBS+= ssl ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libssl
.if (${MKKERBEROS} != "no")
LIBDPLIBS+= gssapi ${NETBSDSRCDIR}/crypto/external/bsd/heimdal/lib/libgssapi
Index: src/external/bsd/bind/lib/Makefile
diff -u src/external/bsd/bind/lib/Makefile:1.1 src/external/bsd/bind/lib/Makefile:1.2
--- src/external/bsd/bind/lib/Makefile:1.1 Sun Apr 12 03:46:10 2009
+++ src/external/bsd/bind/lib/Makefile Wed Sep 11 23:04:09 2013
@@ -1,9 +1,5 @@
-# $NetBSD: Makefile,v 1.1 2009/04/12 03:46:10 christos Exp $
+# $NetBSD: Makefile,v 1.2 2013/09/11 23:04:09 joerg Exp $
-# XXX These bind9/ISC libraries should depend on each other but the
-# XXX dependency ordering requires considerable investigation.
-# XXX Please preserve the order below so we know the order ISC links
-# XXX them in in their Makefiles.
-SUBDIR+= libbind9 libdns liblwres libisccfg libisccc libisc
+SUBDIR+= libisc liblwres .WAIT libdns libisccc .WAIT libisccfg .WAIT libbind9
.include <bsd.subdir.mk>
Index: src/external/bsd/bind/lib/libbind9/Makefile
diff -u src/external/bsd/bind/lib/libbind9/Makefile:1.1 src/external/bsd/bind/lib/libbind9/Makefile:1.2
--- src/external/bsd/bind/lib/libbind9/Makefile:1.1 Sun Apr 12 03:46:10 2009
+++ src/external/bsd/bind/lib/libbind9/Makefile Wed Sep 11 23:04:10 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2009/04/12 03:46:10 christos Exp $
+# $NetBSD: Makefile,v 1.2 2013/09/11 23:04:10 joerg Exp $
LIB=bind9
@@ -13,4 +13,8 @@ DIST= ${IDIST}/lib/bind9
SRCS= check.c getaddresses.c version.c
+LIBDPLIBS+= isc ${.CURDIR}/../libisc \
+ dns ${.CURDIR}/../libdns \
+ isccfg ${.CURDIR}/../libisccfg \
+
.include <bsd.lib.mk>
Index: src/external/bsd/bind/lib/libdns/Makefile
diff -u src/external/bsd/bind/lib/libdns/Makefile:1.11 src/external/bsd/bind/lib/libdns/Makefile:1.12
--- src/external/bsd/bind/lib/libdns/Makefile:1.11 Sat Jul 27 19:23:14 2013
+++ src/external/bsd/bind/lib/libdns/Makefile Wed Sep 11 23:04:10 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2013/07/27 19:23:14 christos Exp $
+# $NetBSD: Makefile,v 1.12 2013/09/11 23:04:10 joerg Exp $
LIB=dns
#USE_SHLIBDIR= yes
@@ -10,6 +10,8 @@ LIB=dns
DIST= ${IDIST}/lib/dns
.include "${DIST}/api"
+LIBDPLIBS+= isc ${.CURDIR}/../libisc
+
.PATH.c: ${DIST}/unix ${DIST}/sec/dst ${DIST}
CPPFLAGS+= -I${BIND_SRCDIR}/include/dns -I${DIST}
Index: src/external/bsd/bind/lib/libisccc/Makefile
diff -u src/external/bsd/bind/lib/libisccc/Makefile:1.1 src/external/bsd/bind/lib/libisccc/Makefile:1.2
--- src/external/bsd/bind/lib/libisccc/Makefile:1.1 Sun Apr 12 03:46:10 2009
+++ src/external/bsd/bind/lib/libisccc/Makefile Wed Sep 11 23:04:10 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2009/04/12 03:46:10 christos Exp $
+# $NetBSD: Makefile,v 1.2 2013/09/11 23:04:10 joerg Exp $
LIB=isccc
@@ -6,6 +6,8 @@ LIB=isccc
.include "${.CURDIR}/../Makefile.inc"
+LIBDPLIBS+= isc ${.CURDIR}/../libisc
+
DIST= ${IDIST}/lib/isccc
.include "${DIST}/api"
Index: src/external/bsd/bind/lib/libisccfg/Makefile
diff -u src/external/bsd/bind/lib/libisccfg/Makefile:1.1 src/external/bsd/bind/lib/libisccfg/Makefile:1.2
--- src/external/bsd/bind/lib/libisccfg/Makefile:1.1 Sun Apr 12 03:46:10 2009
+++ src/external/bsd/bind/lib/libisccfg/Makefile Wed Sep 11 23:04:10 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2009/04/12 03:46:10 christos Exp $
+# $NetBSD: Makefile,v 1.2 2013/09/11 23:04:10 joerg Exp $
LIB=isccfg
@@ -6,6 +6,9 @@ LIB=isccfg
.include "${.CURDIR}/../Makefile.inc"
+LIBDPLIBS+= isc ${.CURDIR}/../libisc \
+ dns ${.CURDIR}/../libdns
+
DIST= ${IDIST}/lib/isccfg
.include "${DIST}/api"
Index: src/external/bsd/libdwarf/lib/Makefile
diff -u src/external/bsd/libdwarf/lib/Makefile:1.2 src/external/bsd/libdwarf/lib/Makefile:1.3
--- src/external/bsd/libdwarf/lib/Makefile:1.2 Fri Jan 18 16:22:35 2013
+++ src/external/bsd/libdwarf/lib/Makefile Wed Sep 11 23:04:10 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2013/01/18 16:22:35 christos Exp $
+# $NetBSD: Makefile,v 1.3 2013/09/11 23:04:10 joerg Exp $
.include <bsd.init.mk>
@@ -26,4 +26,6 @@ CPPFLAGS+= -I${.CURDIR}
WITHOUT_MAN= yes
+LIBDPLIBS+= elf ${NETBSDSRCDIR}/external/bsd/libelf/lib
+
.include <bsd.lib.mk>
Index: src/external/bsd/libevent/lib/Makefile
diff -u src/external/bsd/libevent/lib/Makefile:1.2 src/external/bsd/libevent/lib/Makefile:1.3
--- src/external/bsd/libevent/lib/Makefile:1.2 Thu Apr 11 16:59:16 2013
+++ src/external/bsd/libevent/lib/Makefile Wed Sep 11 23:04:10 2013
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2013/04/11 16:59:16 christos Exp $
+# $NetBSD: Makefile,v 1.3 2013/09/11 23:04:10 joerg Exp $
.include <bsd.own.mk>
-SUBDIR= libevent
+SUBDIR= libevent .WAIT
.if ${MKCRYPTO} != "no"
SUBDIR+= libevent_openssl
.endif
Index: src/external/bsd/libevent/lib/libevent_openssl/Makefile
diff -u src/external/bsd/libevent/lib/libevent_openssl/Makefile:1.1 src/external/bsd/libevent/lib/libevent_openssl/Makefile:1.2
--- src/external/bsd/libevent/lib/libevent_openssl/Makefile:1.1 Thu Apr 11 16:59:17 2013
+++ src/external/bsd/libevent/lib/libevent_openssl/Makefile Wed Sep 11 23:04:10 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/04/11 16:59:17 christos Exp $
+# $NetBSD: Makefile,v 1.2 2013/09/11 23:04:10 joerg Exp $
.include <bsd.own.mk>
@@ -7,7 +7,9 @@ LIB=event_openssl
SRCS= \
bufferevent_openssl.c
-LIBDPLIBS+= crypto ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto \
- crypt ${NETBSDSRCDIR}/lib/libcrypt
+LIBDPLIBS+= \
+ event ${.CURDIR}/../libevent \
+ crypto ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto \
+ ssl ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libssl
.include <bsd.lib.mk>
Index: src/external/bsd/libevent/lib/libevent_pthreads/Makefile
diff -u src/external/bsd/libevent/lib/libevent_pthreads/Makefile:1.1 src/external/bsd/libevent/lib/libevent_pthreads/Makefile:1.2
--- src/external/bsd/libevent/lib/libevent_pthreads/Makefile:1.1 Thu Apr 11 16:59:17 2013
+++ src/external/bsd/libevent/lib/libevent_pthreads/Makefile Wed Sep 11 23:04:10 2013
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.1 2013/04/11 16:59:17 christos Exp $
+# $NetBSD: Makefile,v 1.2 2013/09/11 23:04:10 joerg Exp $
LIB=event_pthreads
COPTS+=-pthread
-SRCS= \
-evthread_pthread.c
+SRCS= evthread_pthread.c
-LIBDPLIBS+= pthread ${NETBSDSRCDIR}/lib/libpthread
+LIBDPLIBS+= \
+ event ${.CURDIR}/../libevent \
+ pthread ${NETBSDSRCDIR}/lib/libpthread
.include <bsd.lib.mk>
Index: src/external/bsd/openldap/bin/Makefile.inc
diff -u src/external/bsd/openldap/bin/Makefile.inc:1.3 src/external/bsd/openldap/bin/Makefile.inc:1.4
--- src/external/bsd/openldap/bin/Makefile.inc:1.3 Mon Mar 8 05:23:41 2010
+++ src/external/bsd/openldap/bin/Makefile.inc Wed Sep 11 23:04:10 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.3 2010/03/08 05:23:41 lukem Exp $
+# $NetBSD: Makefile.inc,v 1.4 2013/09/11 23:04:10 joerg Exp $
.include "../openldap.mk"
@@ -26,10 +26,10 @@ DPADD+= ${LDAPLIB.lutil}
LDADD+= -lldap
DPADD+= ${LIBLDAP}
-
-.if (${MKPIC} == "no" || (defined(LDSTATIC) && ${LDSTATIC} != ""))
LDADD+= -llber
DPADD+= ${LIBLBER}
+
+.if (${MKPIC} == "no" || (defined(LDSTATIC) && ${LDSTATIC} != ""))
.if ${MKCRYPTO} != "no"
DPADD+= ${LIBSSL} ${LIBCRYPTO}
LDADD+= -lssl -lcrypto
Index: src/external/cddl/osnet/lib/Makefile
diff -u src/external/cddl/osnet/lib/Makefile:1.4 src/external/cddl/osnet/lib/Makefile:1.5
--- src/external/cddl/osnet/lib/Makefile:1.4 Wed Feb 24 12:18:37 2010
+++ src/external/cddl/osnet/lib/Makefile Wed Sep 11 23:04:10 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2010/02/24 12:18:37 tron Exp $
+# $NetBSD: Makefile,v 1.5 2013/09/11 23:04:10 joerg Exp $
#
#
@@ -14,6 +14,7 @@ SUBDIR+= libavl
SUBDIR+= libnvpair
SUBDIR+= libumem
SUBDIR+= libuutil
+SUBDIR+= .WAIT
SUBDIR+= libzfs
SUBDIR+= libzpool
.endif
Index: src/external/cddl/osnet/lib/libzfs/Makefile
diff -u src/external/cddl/osnet/lib/libzfs/Makefile:1.6 src/external/cddl/osnet/lib/libzfs/Makefile:1.7
--- src/external/cddl/osnet/lib/libzfs/Makefile:1.6 Thu Jan 13 23:18:24 2011
+++ src/external/cddl/osnet/lib/libzfs/Makefile Wed Sep 11 23:04:10 2013
@@ -1,12 +1,19 @@
-# $NetBSD: Makefile,v 1.6 2011/01/13 23:18:24 haad Exp $
+# $NetBSD: Makefile,v 1.7 2013/09/11 23:04:10 joerg Exp $
.PATH: ${.CURDIR}/../../dist/common/zfs
.PATH: ${.CURDIR}/../../dist/common/fs/zfs
.PATH: ${.CURDIR}/../../dist/lib/libzfs/common
LIB= zfs
-DPADD= ${LIBUTIL}
-LDADD= -lutil
+
+LIBDPLIBS+= \
+ avl ${.CURDIR}/../libavl \
+ nvpair ${.CURDIR}/../libnvpair \
+ m ${NETBSDSRCDIR}/lib/libm \
+ pthread ${NETBSDSRCDIR}/lib/libpthread \
+ umem ${.CURDIR}/../libumem \
+ util ${NETBSDSRCDIR}/lib/libutil \
+ uutil ${.CURDIR}/../libuutil
# Local
SRCS= deviceid.c mnttab.c mkdirp.c zmount.c fsshare.c zone.c efi.c ucred.c stubs.c
Index: src/external/cddl/osnet/lib/libzpool/Makefile
diff -u src/external/cddl/osnet/lib/libzpool/Makefile:1.7 src/external/cddl/osnet/lib/libzpool/Makefile:1.8
--- src/external/cddl/osnet/lib/libzpool/Makefile:1.7 Fri Jun 21 19:16:01 2013
+++ src/external/cddl/osnet/lib/libzpool/Makefile Wed Sep 11 23:04:10 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2013/06/21 19:16:01 christos Exp $
+# $NetBSD: Makefile,v 1.8 2013/09/11 23:04:10 joerg Exp $
.include "${.CURDIR}/../../dist/uts/common/Makefile.files"
.include "../../Makefile.zfs"
@@ -9,9 +9,14 @@
.PATH: ${.CURDIR}/../../dist/uts/common/fs/zfs
.PATH: ${.CURDIR}/../../dist/uts/common/os
+LIBDPLIBS+= \
+ avl ${.CURDIR}/../libavl \
+ nvpair ${.CURDIR}/../libnvpair \
+ pthread ${NETBSDSRCDIR}/lib/libpthread \
+ umem ${.CURDIR}/../libumem \
+ z ${NETBSDSRCDIR}/lib/libz \
+
LIB= zpool
-DPADD= ${LIBPTHREAD} ${LIBZ}
-LDADD= -lpthread -lz
CPPFLAGS+= -std=c99
#CPPFLAGS+=-Wall -Wno-unknown-pragmas
Index: src/external/gpl2/lvm2/lib/libdevmapper/Makefile
diff -u src/external/gpl2/lvm2/lib/libdevmapper/Makefile:1.8 src/external/gpl2/lvm2/lib/libdevmapper/Makefile:1.9
--- src/external/gpl2/lvm2/lib/libdevmapper/Makefile:1.8 Thu May 26 12:56:26 2011
+++ src/external/gpl2/lvm2/lib/libdevmapper/Makefile Wed Sep 11 23:04:10 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2011/05/26 12:56:26 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2013/09/11 23:04:10 joerg Exp $
USE_SHLIBDIR= yes
USE_FORT?= no
@@ -21,7 +21,7 @@ CPPFLAGS+= -I${LIBDEVMAPPER_DISTDIR} \
CPPFLAGS+= -D__LIB_DEVMAPPER__
-LIBDPLIBS+= prop ${NETBSDSRCDIR}/lib/libprop
+LIBDPLIBS+= dm ${NETBSDSRCDIR}/lib/libdm
SRCS+= bitset.c hash.c list.c libdm-common.c libdm-file.c \
libdm-deptree.c libdm-string.c libdm-report.c \
Index: src/lib/Makefile
diff -u src/lib/Makefile:1.206 src/lib/Makefile:1.207
--- src/lib/Makefile:1.206 Wed Aug 21 03:18:05 2013
+++ src/lib/Makefile Wed Sep 11 23:04:10 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.206 2013/08/21 03:18:05 matt Exp $
+# $NetBSD: Makefile,v 1.207 2013/09/11 23:04:10 joerg Exp $
# from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91
.include <bsd.own.mk>
@@ -33,7 +33,7 @@ SUBDIR+= i18n_module
SUBDIR+= libarch \
libbluetooth libbsdmalloc libbz2 \
libcompat libcrypt \
- libintl libipsec libisns libkvm libm \
+ libintl libipsec libkvm libm \
libossaudio libpci libpmc libposix libprop libpthread \
libpthread_dbg libpuffs libresolv librmt librpcsvc librt \
libtelnet libterminfo \
@@ -69,7 +69,6 @@ SUBDIR+= ../external/bsd/am-utils/lib
SUBDIR+= ../external/bsd/flex/lib
SUBDIR+= ../external/bsd/tre/lib
-SUBDIR+= ../external/bsd/libdwarf/lib
SUBDIR+= ../external/bsd/libelf/lib
SUBDIR+= ../external/bsd/liblzf/lib
SUBDIR+= ../external/bsd/libpcap/lib
@@ -105,6 +104,7 @@ SUBDIR+= ../external/lgpl2/mpc/lib/libmp
#==================== 1st library dependency barrier ====================
SUBDIR+= .WAIT
+SUBDIR+= ../external/bsd/libdwarf/lib # depends on libelf
SUBDIR+= libcurses # depends on libterminfo
SUBDIR+= libdm # depends on libprop
SUBDIR+= libedit # depends on libterminfo
@@ -113,6 +113,7 @@ SUBDIR+= libppath # depends on libprop
SUBDIR+= libperfuse # depends on libpuffs
SUBDIR+= libquota # depends on libprop and librpcsvc
SUBDIR+= librefuse # depends on libpuffs
+SUBDIR+= libisns # depends on libpthread
.if (${MKRUMP} != "no")
SUBDIR+= librumpuser # depends on libpthread
SUBDIR+= librumphijack # depends on librumpclient and libpthread
Index: src/lib/libdm/Makefile
diff -u src/lib/libdm/Makefile:1.2 src/lib/libdm/Makefile:1.3
--- src/lib/libdm/Makefile:1.2 Wed Mar 21 05:36:24 2012
+++ src/lib/libdm/Makefile Wed Sep 11 23:04:10 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2012/03/21 05:36:24 matt Exp $
+# $NetBSD: Makefile,v 1.3 2013/09/11 23:04:10 joerg Exp $
USE_FORT?= no # network protocol library
LIB= dm
@@ -13,8 +13,7 @@ CPPFLAGS+= -I${.CURDIR}
INCS= dm.h
INCSDIR= /usr/include
-#LDADD+= -lprop
-#DPADD+= ${LIBPROP}
+LIBDPLIBS+= prop ${NETBSDSRCDIR}/lib/libprop
.ifdef RUMP_ACTION
CPPFLAGS+= -DRUMP_ACTION
Index: src/lib/libisns/Makefile
diff -u src/lib/libisns/Makefile:1.4 src/lib/libisns/Makefile:1.5
--- src/lib/libisns/Makefile:1.4 Wed Mar 21 05:37:42 2012
+++ src/lib/libisns/Makefile Wed Sep 11 23:04:10 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2012/03/21 05:37:42 matt Exp $
+# $NetBSD: Makefile,v 1.5 2013/09/11 23:04:10 joerg Exp $
.include <bsd.own.mk>
@@ -13,4 +13,6 @@ INCSDIR=/usr/include
WARNS?= 5
+LIBDPLIBS+= pthread ${.CURDIR}/../libpthread
+
.include <bsd.lib.mk>
Index: src/lib/libp2k/Makefile
diff -u src/lib/libp2k/Makefile:1.2 src/lib/libp2k/Makefile:1.3
--- src/lib/libp2k/Makefile:1.2 Thu Nov 27 16:14:46 2008
+++ src/lib/libp2k/Makefile Wed Sep 11 23:04:10 2013
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2008/11/27 16:14:46 pooka Exp $
+# $NetBSD: Makefile,v 1.3 2013/09/11 23:04:10 joerg Exp $
#
LIB= p2k
-LIBDPLIBS+= rump ${.CURDIR}/../librump \
+LIBDPLIBS+= puffs ${.CURDIR}/../libpuffs \
+ rump ${.CURDIR}/../librump \
rumpvfs ${.CURDIR}/../librumpvfs \
ukfs ${.CURDIR}/../libukfs
Index: src/lib/libppath/Makefile
diff -u src/lib/libppath/Makefile:1.2 src/lib/libppath/Makefile:1.3
--- src/lib/libppath/Makefile:1.2 Wed Mar 21 05:37:43 2012
+++ src/lib/libppath/Makefile Wed Sep 11 23:04:11 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2012/03/21 05:37:43 matt Exp $
+# $NetBSD: Makefile,v 1.3 2013/09/11 23:04:11 joerg Exp $
.include <bsd.own.mk>
@@ -14,6 +14,8 @@ PPATHLIBDIR=${NETBSDSRCDIR}/common/lib/l
SRCS+=ppath_malloc.c
+LIBDPLIBS+= prop ${NETBSDSRCDIR}/lib/libprop
+
LINTFLAGS+=-w
LIB= ppath
Index: src/lib/libukfs/Makefile
diff -u src/lib/libukfs/Makefile:1.6 src/lib/libukfs/Makefile:1.7
--- src/lib/libukfs/Makefile:1.6 Wed Mar 21 05:38:49 2012
+++ src/lib/libukfs/Makefile Wed Sep 11 23:04:11 2013
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.6 2012/03/21 05:38:49 matt Exp $
+# $NetBSD: Makefile,v 1.7 2013/09/11 23:04:11 joerg Exp $
#
WARNS= 2
LIB= ukfs
LIBDPLIBS+= rump ${.CURDIR}/../librump \
- rumpvfs ${.CURDIR}/../librumpvfs
+ rumpvfs ${.CURDIR}/../librumpvfs \
+ pthread ${.CURDIR}/../libpthread
CPPFLAGS+= -I${.CURDIR}
INCS= ukfs.h
Index: src/lib/npf/mod.mk
diff -u src/lib/npf/mod.mk:1.5 src/lib/npf/mod.mk:1.6
--- src/lib/npf/mod.mk:1.5 Wed Mar 13 13:16:38 2013
+++ src/lib/npf/mod.mk Wed Sep 11 23:04:11 2013
@@ -1,4 +1,4 @@
-# $NetBSD: mod.mk,v 1.5 2013/03/13 13:16:38 christos Exp $
+# $NetBSD: mod.mk,v 1.6 2013/09/11 23:04:11 joerg Exp $
.include <bsd.own.mk>
@@ -26,4 +26,6 @@ SHLIBINSTALLDIR=${LIBROOTDIR}/npf
LIB= ${MOD}
SRCS= npf${MOD}.c
+LIBDPLIBS+= npf ${NETBSDSRCDIR}/lib/libnpf
+
.include <bsd.lib.mk>
Index: src/share/mk/bsd.lua.mk
diff -u src/share/mk/bsd.lua.mk:1.4 src/share/mk/bsd.lua.mk:1.5
--- src/share/mk/bsd.lua.mk:1.4 Sun Oct 16 00:45:09 2011
+++ src/share/mk/bsd.lua.mk Wed Sep 11 23:04:11 2013
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.lua.mk,v 1.4 2011/10/16 00:45:09 mbalmer Exp $
+# $NetBSD: bsd.lua.mk,v 1.5 2013/09/11 23:04:11 joerg Exp $
#
# Build rules and definitions for Lua modules
@@ -144,6 +144,9 @@ ${LUA_TARG.${_M}}: ${LUA_OBJS.${_M}} ${D
.endif
+DPADD+= ${LIBLUA}
+LDADD+= -llua
+
##
## module install rules
lua-install: ${DESTDIR}${LUA_DEST.${_M}}/${LUA_NAME.${_M}}
