Module Name: src
Committed By: agc
Date: Tue Jun 9 00:56:15 UTC 2009
Modified Files:
src/crypto/external/bsd/netpgp/dist: tst
src/crypto/external/bsd/netpgp/netpgp: Makefile
src/crypto/external/bsd/netpgp/netpgpverify: Makefile
Log Message:
Adapt to the new directory structure
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/crypto/external/bsd/netpgp/dist/tst
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/netpgp/netpgp/Makefile
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/netpgp/netpgpverify/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/dist/tst
diff -u src/crypto/external/bsd/netpgp/dist/tst:1.9 src/crypto/external/bsd/netpgp/dist/tst:1.10
--- src/crypto/external/bsd/netpgp/dist/tst:1.9 Mon Jun 8 06:19:31 2009
+++ src/crypto/external/bsd/netpgp/dist/tst Tue Jun 9 00:56:15 2009
@@ -22,10 +22,10 @@
echo "======> attempt to verify an unsigned file"
/usr/bin/netpgp --verify a || passed=$(expr $passed + 1)
echo "======> encrypt/decrypt 10809 file"
-cp src/bin/netpgp.1 b
+cp src/netpgp/netpgp.1 b
/usr/bin/netpgp --encrypt b
/usr/bin/netpgp --decrypt b.gpg
-diff src/bin/netpgp.1 b && passed=$(expr $passed + 1)
+diff src/netpgp/netpgp.1 b && passed=$(expr $passed + 1)
echo "======> encrypt/decrypt 180938 file"
cp configure c
/usr/bin/netpgp --encrypt c
Index: src/crypto/external/bsd/netpgp/netpgp/Makefile
diff -u src/crypto/external/bsd/netpgp/netpgp/Makefile:1.1 src/crypto/external/bsd/netpgp/netpgp/Makefile:1.2
--- src/crypto/external/bsd/netpgp/netpgp/Makefile:1.1 Mon Jun 8 06:13:07 2009
+++ src/crypto/external/bsd/netpgp/netpgp/Makefile Tue Jun 9 00:56:15 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2009/06/08 06:13:07 agc Exp $
+# $NetBSD: Makefile,v 1.2 2009/06/09 00:56:15 agc Exp $
.include <bsd.own.mk>
@@ -13,8 +13,6 @@
LDADD+= -lcrypto -lz -lbz2
DPADD+= ${LIBCRYPTO} ${LIBZ} ${LIBBZ2}
-#LDADD+= -lz -lbz2
-#DPADD+= ${LIBZ} ${LIBBZ2}
MAN= netpgp.1
@@ -23,6 +21,6 @@
# errors. For now, just set WARNS off.
WARNS= 0
-.PATH: ${.CURDIR}/../dist/src/bin
+.PATH: ${.CURDIR}/../dist/src/netpgp
.include <bsd.prog.mk>
Index: src/crypto/external/bsd/netpgp/netpgpverify/Makefile
diff -u src/crypto/external/bsd/netpgp/netpgpverify/Makefile:1.2 src/crypto/external/bsd/netpgp/netpgpverify/Makefile:1.3
--- src/crypto/external/bsd/netpgp/netpgpverify/Makefile:1.2 Mon Jun 8 06:29:33 2009
+++ src/crypto/external/bsd/netpgp/netpgpverify/Makefile Tue Jun 9 00:56:15 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/06/08 06:29:33 agc Exp $
+# $NetBSD: Makefile,v 1.3 2009/06/09 00:56:15 agc Exp $
PROG= netpgpverify
BINDIR= /usr/bin
@@ -18,6 +18,6 @@
EXTDIST=${.CURDIR}/../dist
-.PATH: ${EXTDIST}/src/lib ${EXTDIST}/src/bin
+.PATH: ${EXTDIST}/src/netpgpverify
.include <bsd.prog.mk>
