Reinstate the cryptest binary removed in r428022 as it may be useful to some

people. Since it was installed by default before, so it shall be now. It can
be toggled with the TOOLS option. For the regression tests to run, it must be
toggled OFF due to environment restrictions.

While here:
- Switch to plain USES=zip, it extracts fine with base unzip
- Clean up whitespace
- Fix portlint warnings
- Rename LIBVERSION variable to SOVERSION

PR:		222930
Submitted by:	Roberto Fernandez Cueto <roberfern@gmail.com>
This commit is contained in:
Jason E. Hale 2018-03-11 16:10:19 +00:00
parent 3d4c430d2c
commit a47a67e9fb
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=464184
2 changed files with 38 additions and 27 deletions

View file

@ -7,7 +7,7 @@
PORTNAME= cryptopp PORTNAME= cryptopp
PORTVERSION= 5.6.5 PORTVERSION= 5.6.5
PORTREVISION= 3 PORTREVISION= 4
CATEGORIES= security CATEGORIES= security
MASTER_SITES= http://www.cryptopp.com/ MASTER_SITES= http://www.cryptopp.com/
DISTNAME= cryptopp${PORTVERSION:S/.//g} DISTNAME= cryptopp${PORTVERSION:S/.//g}
@ -18,30 +18,28 @@ COMMENT= Free C++ class library of Cryptographic Primitives
LICENSE= BSL LICENSE= BSL
LICENSE_FILE= ${WRKSRC}/License.txt LICENSE_FILE= ${WRKSRC}/License.txt
USES= cpe gmake zip:infozip BROKEN_powerpc= does not compile; unrecognized C++ options
USE_LDCONFIG= yes
USES= cpe gmake zip
USE_LDCONFIG= yes
CPE_PRODUCT= crypto++ CPE_PRODUCT= crypto++
CPE_VENDOR= cryptopp CPE_VENDOR= cryptopp
BROKEN_powerpc= does not compile; unrecognized C++ options
EXTRACT_BEFORE_ARGS= -aq EXTRACT_BEFORE_ARGS= -aq
NO_WRKSUBDIR= yes NO_WRKSUBDIR= yes
CXXFLAGS+= -Wno-deprecated-declarations -fPIC CXXFLAGS+= -Wno-deprecated-declarations -fPIC
MAKEFILE= GNUmakefile MAKEFILE= GNUmakefile
ALL_TARGET= static shared ALL_TARGET= static shared
TEST_TARGET= test
LIBVERSION= ${PORTVERSION:R:R} SOVERSION= ${PORTVERSION:R:R}
PLIST_SUB+= LIBVERSION=${LIBVERSION} \ PLIST_SUB+= SOVERSION=${SOVERSION} \
PORTVERSION=${PORTVERSION} PORTVERSION=${PORTVERSION}
OPTIONS_DEFINE= DEBUG DOCS FULL_DEBUG THREADS OPTIONS_DEFINE= DEBUG DOCS FULL_DEBUG THREADS TOOLS
OPTIONS_DEFINE_amd64= SIMD OPTIONS_DEFINE_amd64= SIMD
OPTIONS_DEFINE_i386= SIMD OPTIONS_DEFINE_i386= SIMD
OPTIONS_DEFAULT= THREADS OPTIONS_DEFAULT= THREADS TOOLS
OPTIONS_SUB= yes OPTIONS_SUB= yes
# Always compile with -DNDEBUG for release. Otherwise, sensitive # Always compile with -DNDEBUG for release. Otherwise, sensitive
@ -52,6 +50,12 @@ FULL_DEBUG_CXXFLAGS= -DCRYPTOPP_DEBUG
FULL_DEBUG_CXXFLAGS_OFF=-DNDEBUG FULL_DEBUG_CXXFLAGS_OFF=-DNDEBUG
FULL_DEBUG_IMPLIES= DEBUG FULL_DEBUG_IMPLIES= DEBUG
# Disable this option to run the regression tests.
TOOLS_DESC= Install encryption/decryption tools
TOOLS_MAKE_ENV= CRYPTOPP_DATA_DIR=${DATADIR}/
TOOLS_ALL_TARGET= cryptest.exe
TOOLS_TEST_TARGET_OFF= test
THREADS_LDFLAGS= -lpthread THREADS_LDFLAGS= -lpthread
.include <bsd.port.options.mk> .include <bsd.port.options.mk>
@ -97,7 +101,7 @@ pre-configure-FULL_DEBUG-on:
do-install: do-install:
${INSTALL_DATA} ${WRKSRC}/libcryptopp.a ${STAGEDIR}${PREFIX}/lib ${INSTALL_DATA} ${WRKSRC}/libcryptopp.a ${STAGEDIR}${PREFIX}/lib
${INSTALL_LIB} ${WRKSRC}/libcryptopp.so ${STAGEDIR}${PREFIX}/lib/libcryptopp.so.${PORTVERSION} ${INSTALL_LIB} ${WRKSRC}/libcryptopp.so ${STAGEDIR}${PREFIX}/lib/libcryptopp.so.${PORTVERSION}
${LN} -fs libcryptopp.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libcryptopp.so.${LIBVERSION} ${LN} -fs libcryptopp.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libcryptopp.so.${SOVERSION}
${LN} -fs libcryptopp.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libcryptopp.so ${LN} -fs libcryptopp.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libcryptopp.so
@${MKDIR} ${STAGEDIR}${PREFIX}/include/cryptopp @${MKDIR} ${STAGEDIR}${PREFIX}/include/cryptopp
(for i in `${FIND} ${WRKSRC}/ -name '*.h' \ (for i in `${FIND} ${WRKSRC}/ -name '*.h' \
@ -110,4 +114,9 @@ do-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR} @${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/Readme.txt ${STAGEDIR}${DOCSDIR}/README ${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
${INSTALL_DATA} ${WRKSRC}/TestData/usage.dat ${STAGEDIR}${DATADIR}/TestData
.include <bsd.port.post.mk> .include <bsd.port.post.mk>

View file

@ -1,3 +1,4 @@
%%TOOLS%%bin/cryptest
include/cryptopp/3way.h include/cryptopp/3way.h
include/cryptopp/adler32.h include/cryptopp/adler32.h
include/cryptopp/aes.h include/cryptopp/aes.h
@ -143,6 +144,7 @@ include/cryptopp/zinflate.h
include/cryptopp/zlib.h include/cryptopp/zlib.h
lib/libcryptopp.a lib/libcryptopp.a
lib/libcryptopp.so lib/libcryptopp.so
lib/libcryptopp.so.%%LIBVERSION%% lib/libcryptopp.so.%%SOVERSION%%
lib/libcryptopp.so.%%PORTVERSION%% lib/libcryptopp.so.%%PORTVERSION%%
%%TOOLS%%%%DATADIR%%/TestData/usage.dat
%%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/README