[src/trunk]: src/crypto/external/bsd/netpgp revert previous change for LIBDPL...

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

details:   https://anonhg.NetBSD.org/src/rev/3d96ff5767fb
branches:  trunk
changeset: 782846:3d96ff5767fb
user:      agc <agc%NetBSD.org@localhost>
date:      Thu Nov 22 21:20:44 2012 +0000

description:
revert previous change for LIBDPLIBS until I have a chance to work out the
order for building pre-req libs

diffstat:

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

diffs (40 lines):

diff -r d220eb2c46a0 -r 3d96ff5767fb crypto/external/bsd/netpgp/bin/netpgpverify/Makefile
--- a/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile      Thu Nov 22 20:26:33 2012 +0000
+++ b/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile      Thu Nov 22 21:20:44 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2012/11/22 04:05:57 agc Exp $
+# $NetBSD: Makefile,v 1.4 2012/11/22 21:20:44 agc Exp $
 
 .include <bsd.own.mk>
 
@@ -15,6 +15,9 @@
 LDADD+=         -L${LIBNETPGPVERIFYDIR} -lnetpgpverify
 DPADD+=         ${LIBNETPGPVERIFYDIR}/libnetpgpverify.a
 
+LDADD+=         -lz -lbz2
+DPADD+=         ${LIBZ} ${LIBBZ2}
+
 EXTDIST= ${.CURDIR}/../../dist/src
 .PATH: ${EXTDIST}/netpgpverify
 
diff -r d220eb2c46a0 -r 3d96ff5767fb crypto/external/bsd/netpgp/lib/verify/Makefile
--- a/crypto/external/bsd/netpgp/lib/verify/Makefile    Thu Nov 22 20:26:33 2012 +0000
+++ b/crypto/external/bsd/netpgp/lib/verify/Makefile    Thu Nov 22 21:20:44 2012 +0000
@@ -1,6 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2012/11/22 04:05:57 agc Exp $
-
-.include <bsd.own.mk>
+# $NetBSD: Makefile,v 1.4 2012/11/22 21:20:44 agc Exp $
 
 LIB=netpgpverify
 SRCS=libverify.c b64.c pgpsum.c
@@ -15,9 +13,6 @@
 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