Index: Makefile
===================================================================
--- Makefile	(revision 451735)
+++ Makefile	(working copy)
@@ -7,7 +7,7 @@
 
 PORTNAME=		cryptopp
 PORTVERSION=		5.6.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=		security
 MASTER_SITES=		http://www.cryptopp.com/
 DISTNAME=		cryptopp${PORTVERSION:S/.//g}
@@ -38,12 +38,17 @@
 PLIST_SUB+=		LIBVERSION=${LIBVERSION} \
 			PORTVERSION=${PORTVERSION}
 
-OPTIONS_DEFINE=		DEBUG DOCS FULL_DEBUG THREADS
+OPTIONS_DEFINE=		DEBUG DOCS FULL_DEBUG THREADS TOOLS
 OPTIONS_DEFINE_amd64=	SIMD
 OPTIONS_DEFINE_i386=	SIMD
 OPTIONS_DEFAULT=	THREADS
 OPTIONS_SUB=		yes
 
+TOOLS_DESC=		Build the tools to encrypt or decrypt
+TOOLS_PLIST_FILES=	bin/cryptest ${DATADIR}/TestData/usage.dat
+TOOLS_ALL_TARGET=	cryptest.exe
+TOOLS_MAKE_ENV=		CRYPTOPP_DATA_DIR=${DATADIR}/
+
 # Always compile with -DNDEBUG for release. Otherwise, sensitive
 # information could be accessed if an assert triggers.
 # See ${WRKSRC}/Readme.txt for more details.
@@ -110,4 +115,11 @@
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/Readme.txt ${STAGEDIR}${DOCSDIR}/README
 
+do-install-TOOLS-on:
+	@${MKDIR} ${STAGEDIR}${DATADIR}/TestData
+	@${INSTALL_PROGRAM} ${WRKSRC}/cryptest.exe ${STAGEDIR}${PREFIX}/bin/cryptest
+	(for i in `${FIND} ${WRKSRC}/TestData -name '*.dat'` ; do \
+		${INSTALL_DATA} $$i ${STAGEDIR}${DATADIR}/TestData ; \
+	done)
+
 .include <bsd.port.post.mk>