Index: head/security/cryptopp/Makefile =================================================================== --- head/security/cryptopp/Makefile (revision 464183) +++ head/security/cryptopp/Makefile (revision 464184) @@ -1,113 +1,122 @@ # Created by: George Reid # $FreeBSD$ # Minor version bumps may not be ABI compatible and deskutils/cdcat # links to the static library, so bump PORTREVISION of dependent # ports when appropriate. -PORTNAME= cryptopp -PORTVERSION= 5.6.5 -PORTREVISION= 3 -CATEGORIES= security -MASTER_SITES= http://www.cryptopp.com/ -DISTNAME= cryptopp${PORTVERSION:S/.//g} +PORTNAME= cryptopp +PORTVERSION= 5.6.5 +PORTREVISION= 4 +CATEGORIES= security +MASTER_SITES= http://www.cryptopp.com/ +DISTNAME= cryptopp${PORTVERSION:S/.//g} -MAINTAINER= jhale@FreeBSD.org -COMMENT= Free C++ class library of Cryptographic Primitives +MAINTAINER= jhale@FreeBSD.org +COMMENT= Free C++ class library of Cryptographic Primitives -LICENSE= BSL -LICENSE_FILE= ${WRKSRC}/License.txt +LICENSE= BSL +LICENSE_FILE= ${WRKSRC}/License.txt -USES= cpe gmake zip:infozip -USE_LDCONFIG= yes +BROKEN_powerpc= does not compile; unrecognized C++ options -CPE_PRODUCT= crypto++ -CPE_VENDOR= cryptopp +USES= cpe gmake zip +USE_LDCONFIG= yes +CPE_PRODUCT= crypto++ +CPE_VENDOR= cryptopp -BROKEN_powerpc= does not compile; unrecognized C++ options - EXTRACT_BEFORE_ARGS= -aq NO_WRKSUBDIR= yes -CXXFLAGS+= -Wno-deprecated-declarations -fPIC -MAKEFILE= GNUmakefile -ALL_TARGET= static shared -TEST_TARGET= test +CXXFLAGS+= -Wno-deprecated-declarations -fPIC +MAKEFILE= GNUmakefile +ALL_TARGET= static shared -LIBVERSION= ${PORTVERSION:R:R} -PLIST_SUB+= LIBVERSION=${LIBVERSION} \ - PORTVERSION=${PORTVERSION} +SOVERSION= ${PORTVERSION:R:R} +PLIST_SUB+= SOVERSION=${SOVERSION} \ + 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_DEFAULT= THREADS TOOLS OPTIONS_SUB= yes # Always compile with -DNDEBUG for release. Otherwise, sensitive # information could be accessed if an assert triggers. # See ${WRKSRC}/Readme.txt for more details. FULL_DEBUG_DESC= Build with full debugging support (SECURITY RISK!!!) FULL_DEBUG_CXXFLAGS= -DCRYPTOPP_DEBUG FULL_DEBUG_CXXFLAGS_OFF=-DNDEBUG 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 .include .if ${PORT_OPTIONS:MSIMD} . if ${MACHINE_CPU:Msse2} USES+= compiler:c++14-lang CXXFLAGS+= -msse2 . else CXXFLAGS+= -DCRYPTOPP_DISABLE_ASM -DCRYPTOPP_DISABLE_SSE2 . endif . if ${MACHINE_CPU:Msse3} && ${MACHINE_CPU:Mssse3} CXXFLAGS+= -msse3 -mssse3 . else CXXFLAGS+= -DCRYPTOPP_DISABLE_SSE3 . endif . if ${MACHINE_CPU:Msse41} && ${MACHINE_CPU:Msse42} CXXFLAGS+= -msse4.1 -msse4.2 . else CXXFLAGS+= -DCRYPTOPP_DISABLE_SSE4 . endif .else CXXFLAGS+= -DCRYPTOPP_DISABLE_ASM .endif .include .if ${PORT_OPTIONS:MSIMD} && ${MACHINE_CPU:Msse2} && ${CHOSEN_COMPILER_TYPE} == gcc USE_GCC= yes .endif pre-configure-FULL_DEBUG-on: @${ECHO_CMD} @${ECHO_CMD} "----------------------------- WARNING!!! ----------------------------" @${ECHO_CMD} "You have chosen to compile with full debugging support. If an assert" @${ECHO_CMD} "triggers, sensitive information could possibly be egressed to the" @${ECHO_CMD} "filesystem via a core dump. If this is not your intention, hit CTRL-C" @${ECHO_CMD} "now and run 'make config clean' and disable the FULL_DEBUG option." @${ECHO_CMD} "---------------------------------------------------------------------" @${ECHO_CMD} @sleep 10 do-install: ${INSTALL_DATA} ${WRKSRC}/libcryptopp.a ${STAGEDIR}${PREFIX}/lib ${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 @${MKDIR} ${STAGEDIR}${PREFIX}/include/cryptopp (for i in `${FIND} ${WRKSRC}/ -name '*.h' \ -and -not -name 'dll.h' \ -and -not -name 'resource.h'`; do \ ${INSTALL_DATA} $$i ${STAGEDIR}${PREFIX}/include/cryptopp; \ done) do-install-DOCS-on: @${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 + ${INSTALL_DATA} ${WRKSRC}/TestData/usage.dat ${STAGEDIR}${DATADIR}/TestData .include Index: head/security/cryptopp/pkg-plist =================================================================== --- head/security/cryptopp/pkg-plist (revision 464183) +++ head/security/cryptopp/pkg-plist (revision 464184) @@ -1,148 +1,150 @@ +%%TOOLS%%bin/cryptest include/cryptopp/3way.h include/cryptopp/adler32.h include/cryptopp/aes.h include/cryptopp/algebra.h include/cryptopp/algparam.h include/cryptopp/arc4.h include/cryptopp/argnames.h include/cryptopp/asn.h include/cryptopp/authenc.h include/cryptopp/base32.h include/cryptopp/base64.h include/cryptopp/basecode.h include/cryptopp/bench.h include/cryptopp/blake2.h include/cryptopp/blowfish.h include/cryptopp/blumshub.h include/cryptopp/camellia.h include/cryptopp/cast.h include/cryptopp/cbcmac.h include/cryptopp/ccm.h include/cryptopp/chacha.h include/cryptopp/channels.h include/cryptopp/cmac.h include/cryptopp/config.h include/cryptopp/cpu.h include/cryptopp/crc.h include/cryptopp/cryptlib.h include/cryptopp/default.h include/cryptopp/des.h include/cryptopp/dh.h include/cryptopp/dh2.h include/cryptopp/dmac.h include/cryptopp/dsa.h include/cryptopp/eax.h include/cryptopp/ec2n.h include/cryptopp/eccrypto.h include/cryptopp/ecp.h include/cryptopp/elgamal.h include/cryptopp/emsa2.h include/cryptopp/eprecomp.h include/cryptopp/esign.h include/cryptopp/factory.h include/cryptopp/fhmqv.h include/cryptopp/files.h include/cryptopp/filters.h include/cryptopp/fips140.h include/cryptopp/fltrimpl.h include/cryptopp/gcm.h include/cryptopp/gf256.h include/cryptopp/gf2_32.h include/cryptopp/gf2n.h include/cryptopp/gfpcrypt.h include/cryptopp/gost.h include/cryptopp/gzip.h include/cryptopp/hex.h include/cryptopp/hkdf.h include/cryptopp/hmac.h include/cryptopp/hmqv.h include/cryptopp/hrtimer.h include/cryptopp/ida.h include/cryptopp/idea.h include/cryptopp/integer.h include/cryptopp/iterhash.h include/cryptopp/keccak.h include/cryptopp/lubyrack.h include/cryptopp/luc.h include/cryptopp/mars.h include/cryptopp/md2.h include/cryptopp/md4.h include/cryptopp/md5.h include/cryptopp/mdc.h include/cryptopp/mersenne.h include/cryptopp/misc.h include/cryptopp/modarith.h include/cryptopp/modes.h include/cryptopp/modexppc.h include/cryptopp/mqueue.h include/cryptopp/mqv.h include/cryptopp/nbtheory.h include/cryptopp/network.h include/cryptopp/nr.h include/cryptopp/oaep.h include/cryptopp/oids.h include/cryptopp/osrng.h include/cryptopp/ossig.h include/cryptopp/panama.h include/cryptopp/pch.h include/cryptopp/pkcspad.h include/cryptopp/polynomi.h include/cryptopp/pssr.h include/cryptopp/pubkey.h include/cryptopp/pwdbased.h include/cryptopp/queue.h include/cryptopp/rabin.h include/cryptopp/randpool.h include/cryptopp/rc2.h include/cryptopp/rc5.h include/cryptopp/rc6.h include/cryptopp/rdrand.h include/cryptopp/rijndael.h include/cryptopp/ripemd.h include/cryptopp/rng.h include/cryptopp/rsa.h include/cryptopp/rw.h include/cryptopp/safer.h include/cryptopp/salsa.h include/cryptopp/seal.h include/cryptopp/secblock.h include/cryptopp/seckey.h include/cryptopp/seed.h include/cryptopp/serpent.h include/cryptopp/serpentp.h include/cryptopp/sha.h include/cryptopp/sha3.h include/cryptopp/shacal2.h include/cryptopp/shark.h include/cryptopp/simple.h include/cryptopp/skipjack.h include/cryptopp/smartptr.h include/cryptopp/socketft.h include/cryptopp/sosemanuk.h include/cryptopp/square.h include/cryptopp/stdcpp.h include/cryptopp/strciphr.h include/cryptopp/tea.h include/cryptopp/tiger.h include/cryptopp/trap.h include/cryptopp/trdlocal.h include/cryptopp/trunhash.h include/cryptopp/ttmac.h include/cryptopp/twofish.h include/cryptopp/validate.h include/cryptopp/vmac.h include/cryptopp/wait.h include/cryptopp/wake.h include/cryptopp/whrlpool.h include/cryptopp/winpipes.h include/cryptopp/words.h include/cryptopp/xtr.h include/cryptopp/xtrcrypt.h include/cryptopp/zdeflate.h include/cryptopp/zinflate.h include/cryptopp/zlib.h lib/libcryptopp.a lib/libcryptopp.so -lib/libcryptopp.so.%%LIBVERSION%% +lib/libcryptopp.so.%%SOVERSION%% lib/libcryptopp.so.%%PORTVERSION%% +%%TOOLS%%%%DATADIR%%/TestData/usage.dat %%PORTDOCS%%%%DOCSDIR%%/README