[src/trunk]: src/crypto/external/bsd/netpgp link libz and libbz2 into the net...

[agc <agc%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/79c55afafcf0
branches:  trunk
changeset: 782832:79c55afafcf0
user:      agc <agc%NetBSD.org@localhost>
date:      Thu Nov 22 04:05:57 2012 +0000

description:
link libz and libbz2 into the netpgpverify library, rather than into the
executable, via LIBDPLIBS.

diffstat:

 crypto/external/bsd/netpgp/bin/netpgpverify/Makefile |  5 +----
 crypto/external/bsd/netpgp/lib/verify/Makefile       |  7 ++++++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diffs (40 lines):

diff -r ff65d232e2d6 -r 79c55afafcf0 crypto/external/bsd/netpgp/bin/netpgpverify/Makefile
--- a/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile      Thu Nov 22 00:38:45 2012 +0000
+++ b/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile      Thu Nov 22 04:05:57 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2012/11/20 05:26:25 agc Exp $
+# $NetBSD: Makefile,v 1.3 2012/11/22 04:05:57 agc Exp $
 
 .include <bsd.own.mk>
 
@@ -15,9 +15,6 @@
 LDADD+=         -L${LIBNETPGPVERIFYDIR} -lnetpgpverify
 DPADD+=         ${LIBNETPGPVERIFYDIR}/libnetpgpverify.a
 
-LDADD+=         -lz -lbz2
-DPADD+=         ${LIBZ} ${LIBBZ2}
-
 EXTDIST= ${.CURDIR}/../../dist/src
 .PATH: ${EXTDIST}/netpgpverify
 
diff -r ff65d232e2d6 -r 79c55afafcf0 crypto/external/bsd/netpgp/lib/verify/Makefile
--- a/crypto/external/bsd/netpgp/lib/verify/Makefile    Thu Nov 22 00:38:45 2012 +0000
+++ b/crypto/external/bsd/netpgp/lib/verify/Makefile    Thu Nov 22 04:05:57 2012 +0000
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2012/11/20 05:26:26 agc Exp $
+# $NetBSD: Makefile,v 1.3 2012/11/22 04:05:57 agc Exp $
+
+.include <bsd.own.mk>
 
 LIB=netpgpverify
 SRCS=libverify.c b64.c pgpsum.c
@@ -13,6 +15,9 @@
 EXTDIST=${.CURDIR}/../../dist
 .PATH: ${EXTDIST}/src/libverify ${EXTDIST}/src/libdigest ${EXTDIST}/src/libbn ${EXTDIST}/src/librsa
 
+LIBDPLIBS+=     z               ${NETBSDSRCDIR}/lib/libz
+LIBDPLIBS+=     bz2             ${NETBSDSRCDIR}/lib/libbz2
+
 INCS=verify.h
 INCSDIR=/usr/include/netpgp