[src/trunk]: src/crypto/external/bsd/netpgp Move the netpgp directory (for th...

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

details:   https://anonhg.NetBSD.org/src/rev/b33e5ab0a820
branches:  trunk
changeset: 327473:b33e5ab0a820
user:      agc <agc%NetBSD.org@localhost>
date:      Sun Mar 09 00:24:47 2014 +0000

description:
Move the netpgp directory (for the executable) under the bin reachover
directory

diffstat:

 crypto/external/bsd/netpgp/bin/Makefile        |   3 ++-
 crypto/external/bsd/netpgp/bin/netpgp/Makefile |  26 ++++++++++++++++++++++++++
 crypto/external/bsd/netpgp/netpgp/Makefile     |  25 -------------------------
 3 files changed, 28 insertions(+), 26 deletions(-)

diffs (70 lines):

diff -r f344992820fb -r b33e5ab0a820 crypto/external/bsd/netpgp/bin/Makefile
--- a/crypto/external/bsd/netpgp/bin/Makefile   Sun Mar 09 00:18:29 2014 +0000
+++ b/crypto/external/bsd/netpgp/bin/Makefile   Sun Mar 09 00:24:47 2014 +0000
@@ -1,5 +1,6 @@
-#      $NetBSD: Makefile,v 1.4 2012/11/20 05:26:25 agc Exp $
+#      $NetBSD: Makefile,v 1.5 2014/03/09 00:24:47 agc Exp $
 
+SUBDIR+=       netpgp
 SUBDIR+=       netpgpverify
 
 .include <bsd.subdir.mk>
diff -r f344992820fb -r b33e5ab0a820 crypto/external/bsd/netpgp/bin/netpgp/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/crypto/external/bsd/netpgp/bin/netpgp/Makefile    Sun Mar 09 00:24:47 2014 +0000
@@ -0,0 +1,26 @@
+#      $NetBSD: Makefile,v 1.2 2014/03/09 00:24:47 agc Exp $
+
+.include <bsd.own.mk>
+
+PROG=          netpgp
+BINDIR=                /usr/bin
+
+CPPFLAGS+=     -I${EXTDIST}/include
+
+LIBNETPGPDIR!= cd ${.CURDIR}/../../lib && ${PRINTOBJDIR}
+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}
+
+MAN=           netpgp.1
+
+EXTDIST=       ${.CURDIR}/../../dist
+.PATH: ${EXTDIST}/src/netpgp
+
+.include <bsd.prog.mk>
diff -r f344992820fb -r b33e5ab0a820 crypto/external/bsd/netpgp/netpgp/Makefile
--- a/crypto/external/bsd/netpgp/netpgp/Makefile        Sun Mar 09 00:18:29 2014 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-#      $NetBSD: Makefile,v 1.4 2012/07/10 19:38:17 christos Exp $
-
-.include <bsd.own.mk>
-
-PROG=          netpgp
-BINDIR=                /usr/bin
-
-CPPFLAGS+=     -I${.CURDIR}/../dist/include
-
-LIBNETPGPDIR!= cd ${.CURDIR}/../lib && ${PRINTOBJDIR}
-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}
-
-MAN=           netpgp.1
-
-.PATH: ${.CURDIR}/../dist/src/netpgp
-
-.include <bsd.prog.mk>