set up the netpgp lib directory hierarchy a bit more logically

+ move libnetpgp to the same level as libnetpgpverify

+ fix up all paths to the new directory structure

Makefile

@@ -1,7 +1,6 @@
 #	$NetBSD$
 
 SUBDIR+=	libmj .WAIT
-SUBDIR+=	lib/verify .WAIT
 SUBDIR+=	lib .WAIT
 SUBDIR+=	bin
 

bin/hkpc/Makefile

@@ -6,7 +6,7 @@ PROG=hkpc
 BINDIR=/usr/bin
 SRCS=hkpc.c main.c
 
-LIBNETPGPDIR!=	cd ${.CURDIR}/../../lib && ${PRINTOBJDIR}
+LIBNETPGPDIR!=	cd ${.CURDIR}/../../lib/netpgp && ${PRINTOBJDIR}
 LDADD+=		-L${LIBNETPGPDIR} -lnetpgp
 DPADD+=		${LIBNETPGPDIR}/libnetpgp.a
 

bin/hkpd/Makefile

@@ -6,7 +6,7 @@ PROG=hkpd
 BINDIR=/usr/sbin
 SRCS=hkpd.c main.c
 
-LIBNETPGPDIR!=	cd ${.CURDIR}/../../lib && ${PRINTOBJDIR}
+LIBNETPGPDIR!=	cd ${.CURDIR}/../../lib/netpgp && ${PRINTOBJDIR}
 LDADD+=		-L${LIBNETPGPDIR} -lnetpgp
 DPADD+=		${LIBNETPGPDIR}/libnetpgp.a
 

bin/netpgp/Makefile

@@ -7,7 +7,7 @@ BINDIR=		/usr/bin
 
 CPPFLAGS+=	-I${EXTDIST}/include
 
-LIBNETPGPDIR!=	cd ${.CURDIR}/../../lib && ${PRINTOBJDIR}
+LIBNETPGPDIR!=	cd ${.CURDIR}/../../lib/netpgp && ${PRINTOBJDIR}
 LDADD+=		-L${LIBNETPGPDIR} -lnetpgp
 DPADD+=		${LIBNETPGPDIR}/libnetpgp.a
 

bin/netpgpkeys/Makefile

@@ -6,7 +6,7 @@ PROG=		netpgpkeys
 SRCS=		netpgpkeys.c
 BINDIR=		/usr/bin
 
-LIBNETPGPDIR!=	cd ${.CURDIR}/../../lib && ${PRINTOBJDIR}
+LIBNETPGPDIR!=	cd ${.CURDIR}/../../lib/netpgp && ${PRINTOBJDIR}
 LDADD+=		-L${LIBNETPGPDIR} -lnetpgp
 DPADD+=		${LIBNETPGPDIR}/libnetpgp.a
 

lib/Makefile

@@ -1,29 +1,6 @@
-# $NetBSD$
+#	$NetBSD$
 
-.include <bsd.own.mk>
+SUBDIR+=	netpgp .WAIT
+SUBDIR+=	verify
 
-USE_FORT?= yes
-
-LIB= netpgp
-SRCS+= compress.c create.c crypto.c
-SRCS+= keyring.c misc.c netpgp.c openssl_crypto.c packet-parse.c
-SRCS+= packet-print.c packet-show.c reader.c signature.c
-SRCS+= symmetric.c validate.c writer.c
-SRCS+= ssh2pgp.c bufgap.c
-CPPFLAGS+= -I${.CURDIR} -I${EXTDIST}/include
-MAN= libnetpgp.3
-
-EXTDIST=${.CURDIR}/../dist
-
-.PATH: ${EXTDIST}/include ${EXTDIST}/src/lib
-
-INCS+= netpgp.h
-INCSDIR=/usr/include
-
-OPENSSL=${NETBSDSRCDIR}/crypto/external/bsd/openssl
-LIBDPLIBS+=	mj		${.CURDIR}/../libmj
-LIBDPLIBS+=	crypto		${OPENSSL}/lib/libcrypto
-LIBDPLIBS+=	z		${NETBSDSRCDIR}/lib/libz
-LIBDPLIBS+=	bz2		${NETBSDSRCDIR}/lib/libbz2
-
-.include <bsd.lib.mk>
+.include <bsd.subdir.mk>