Module Name: src
Committed By: agc
Date: Sat Aug 7 04:18:54 UTC 2010
Modified Files:
src/crypto/external/bsd/netpgp/lib: Makefile config.h
src/crypto/external/bsd/netpgp/netpgpkeys: Makefile
Log Message:
new directory structure - look in the right place for libraries
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/crypto/external/bsd/netpgp/lib/Makefile
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/netpgp/lib/config.h
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/netpgp/netpgpkeys/Makefile
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/netpgp/lib/Makefile
diff -u src/crypto/external/bsd/netpgp/lib/Makefile:1.10 src/crypto/external/bsd/netpgp/lib/Makefile:1.11
--- src/crypto/external/bsd/netpgp/lib/Makefile:1.10 Mon Jul 26 06:40:38 2010
+++ src/crypto/external/bsd/netpgp/lib/Makefile Sat Aug 7 04:18:54 2010
@@ -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
Index: src/crypto/external/bsd/netpgp/lib/config.h
diff -u src/crypto/external/bsd/netpgp/lib/config.h:1.6 src/crypto/external/bsd/netpgp/lib/config.h:1.7
--- src/crypto/external/bsd/netpgp/lib/config.h:1.6 Fri Jul 9 05:37:30 2010
+++ src/crypto/external/bsd/netpgp/lib/config.h Sat Aug 7 04:18:54 2010
@@ -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
Index: src/crypto/external/bsd/netpgp/netpgpkeys/Makefile
diff -u src/crypto/external/bsd/netpgp/netpgpkeys/Makefile:1.1 src/crypto/external/bsd/netpgp/netpgpkeys/Makefile:1.2
--- src/crypto/external/bsd/netpgp/netpgpkeys/Makefile:1.1 Wed Jun 10 00:38:10 2009
+++ src/crypto/external/bsd/netpgp/netpgpkeys/Makefile Sat Aug 7 04:18:54 2010
@@ -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}
