[src/trunk]: src/crypto/external/bsd/netpgp new directory structure - look in...

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

details:   https://anonhg.NetBSD.org/src/rev/2db4f56f9db9
branches:  trunk
changeset: 756885:2db4f56f9db9
user:      agc <agc%NetBSD.org@localhost>
date:      Sat Aug 07 04:18:54 2010 +0000

description:
new directory structure - look in the right place for libraries

diffstat:

 crypto/external/bsd/netpgp/lib/Makefile        |  4 ++--
 crypto/external/bsd/netpgp/lib/config.h        |  6 +++---
 crypto/external/bsd/netpgp/netpgpkeys/Makefile |  6 +++++-
 3 files changed, 10 insertions(+), 6 deletions(-)

diffs (71 lines):

diff -r 4dc30a7916d7 -r 2db4f56f9db9 crypto/external/bsd/netpgp/lib/Makefile
--- a/crypto/external/bsd/netpgp/lib/Makefile   Sat Aug 07 04:17:49 2010 +0000
+++ b/crypto/external/bsd/netpgp/lib/Makefile   Sat Aug 07 04:18:54 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2010/07/26 06:40:38 agc Exp $
+# $NetBSD: Makefile,v 1.11 2010/08/07 04:18:54 agc Exp $
 
 .include <bsd.own.mk>
 
@@ -10,7 +10,6 @@
 SRCS+= packet-print.c packet-show.c reader.c signature.c
 SRCS+= symmetric.c validate.c writer.c
 SRCS+= ssh2pgp.c fastctype.c bufgap.c
-SRCS+= mj.c
 CPPFLAGS+= -I${.CURDIR} -I${EXTDIST}/include
 MAN= libnetpgp.3
 WARNS=5
@@ -22,6 +21,7 @@
 INCS+= netpgp.h
 INCSDIR=/usr/include
 
+LIBDPLIBS+=    mj      ${.CURDIR}/../libmj
 LIBDPLIBS+=    crypto  ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto
 LIBDPLIBS+=    z       ${NETBSDSRCDIR}/lib/libz
 LIBDPLIBS+=    bz2     ${NETBSDSRCDIR}/lib/libbz2
diff -r 4dc30a7916d7 -r 2db4f56f9db9 crypto/external/bsd/netpgp/lib/config.h
--- a/crypto/external/bsd/netpgp/lib/config.h   Sat Aug 07 04:17:49 2010 +0000
+++ b/crypto/external/bsd/netpgp/lib/config.h   Sat Aug 07 04:18:54 2010 +0000
@@ -125,19 +125,19 @@
 #define PACKAGE_NAME "netpgp"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "netpgp 20100707"
+#define PACKAGE_STRING "netpgp 20100708"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "netpgp"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "20100707"
+#define PACKAGE_VERSION "20100708"
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "20100707"
+#define VERSION "20100708"
 
 /* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>,
    <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
diff -r 4dc30a7916d7 -r 2db4f56f9db9 crypto/external/bsd/netpgp/netpgpkeys/Makefile
--- a/crypto/external/bsd/netpgp/netpgpkeys/Makefile    Sat Aug 07 04:17:49 2010 +0000
+++ b/crypto/external/bsd/netpgp/netpgpkeys/Makefile    Sat Aug 07 04:18:54 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2009/06/10 00:38:10 agc Exp $
+#      $NetBSD: Makefile,v 1.2 2010/08/07 04:18:54 agc Exp $
 
 .include <bsd.own.mk>
 
@@ -11,6 +11,10 @@
 LDADD+=                -L${LIBNETPGPDIR} -lnetpgp
 DPADD+=                ${LIBNETPGPDIR}/libnetpgp.a
 
+LIBMJDIR!=     cd ${.CURDIR}/../libmj && ${PRINTOBJDIR}
+LDADD+=                -L${LIBMJDIR} -lmj
+DPADD+=                ${LIBMJDIR}/libmj.a
+
 LDADD+=                -lcrypto -lz -lbz2
 DPADD+=                ${LIBCRYPTO} ${LIBZ} ${LIBBZ2}