Index: branches/2016Q4/audio/clementine-player/Makefile =================================================================== --- branches/2016Q4/audio/clementine-player/Makefile (revision 428042) +++ branches/2016Q4/audio/clementine-player/Makefile (revision 428043) @@ -1,207 +1,208 @@ # Created by: Veniamin Gvozdikov # $FreeBSD$ PORTNAME= clementine PORTVERSION= 1.3.1 +PORTREVISION= 1 CATEGORIES= audio PKGNAMESUFFIX= -player MAINTAINER= sbruno@FreeBSD.org COMMENT= Cross-platform music player based on Amarok 1.4 LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs LIB_DEPENDS= libtag.so:audio/taglib \ libchromaprint.so:audio/chromaprint \ libprotobuf.so:devel/protobuf \ libqca.so:devel/qca \ libqjson.so:devel/qjson \ libfftw3.so:math/fftw3 \ libechonest.so:audio/libechonest \ libcryptopp.so:security/cryptopp USE_GITHUB= yes GH_ACCOUNT= ${PORTNAME}${PKGNAMESUFFIX} GH_PROJECT= Clementine USES= cmake \ compiler:c++11-lib \ desktop-file-utils \ execinfo \ gettext-tools \ pkgconfig \ sqlite USE_GL= glew CONFLICTS_BUILD= qt-3.* USE_QT4= corelib \ dbus \ gui \ imageformats \ qmake_build \ linguist_build \ moc_build \ network \ opengl \ qtestlib \ rcc_build \ sql \ uic_build \ webkit \ xml USE_GSTREAMER1= cdparanoia \ chromaprint \ faac \ faad \ flac \ lame \ mad \ neon \ shout2 \ soup \ taglib \ twolame \ vorbis INSTALLS_ICONS= yes CFLAGS+= -Wno-inconsistent-missing-override \ -Wno-unused-variable \ -Wno-unused-function CMAKE_ARGS+= -DCMAKE_LIBRARY_PATH:PATH="${LOCALBASE}/lib:${PREFIX}/lib" \ -DENABLE_DBUS=ON \ -DENABLE_SPOTIFY_BLOB=OFF \ -DCRYPTOPP_LIBS=${LOCALBASE}/lib/libcryptopp.so \ -DCRYPTOPP_INCLUDEDIR=${LOCALBASE}/include/cryptopp \ -DCRYPTOPP_LIBDIR=${LOCALBASE}/lib \ -DCRYPTOPP_LDFLAGS=-lcryptopp \ -DCRYPTOPP_LIBRARIES=cryptopp \ -DCRYPTOPP_LIBRARY_DIRS=${LOCALBASE}/lib \ -DCRYPTOPP_cryptopp_INCLUDEDIR=${LOCALBASE}/include/cryptopp \ -DCRYPTOPP_cryptopp_LIBDIR=${LOCALBASE}/lib \ -DCRYPTOPP_FOUND=1 OPTIONS_DEFINE= AMAZON \ AUDIOCD \ BOX \ BREAKPAD \ DEVICEKIT \ DROPBOX \ GIO \ GOOGLE_DRIVE \ GPOD \ LASTFM \ MOODBAR \ MTP \ PULSEAUDIO \ SKYDRIVE \ VISUALISATION \ WIIMOTEDEV OPTIONS_SUB= VISUALISATION AMAZON_DESC= Amazon Drive support AUDIOCD_DESC= Devices: Audio CD support BOX_DESC= Box Drive support BREAKPAD_DESC= Crash reporting DEVICEKIT_DESC= Devices: DeviceKit backend DROPBOX_DESC= Dropbox Support GIO_DESC= Devices: GIO device backend GOOGLE_DRIVE_DESC= Google Drive support GPOD_DESC= iPod support LASTFM_DESC= Support Last.fm service (requires ruby) MOODBAR_DESC= Moodbar Support MTP_DESC= MTP device support PULSEAUDIO_DESC= Enable Pulseaudio Support SKYDRIVE_DESC= Microsoft SkyDrive Support VISUALISATION_DESC= Visualisations from projectM WIIMOTEDEV_DESC= Wiimote support OPTIONS_DEFAULT= AMAZON \ AUDIOCD \ BOX \ DEVICEKIT \ DROPBOX \ GIO \ GOOGLE_DRIVE \ GPOD \ LASTFM \ MOODBAR \ MTP \ SKYDRIVE \ VISUALISATION \ WIIMOTEDEV AMAZON_CMAKE_ON= -DENABLE_AMAZON_CLOUD_DRIVE=ON AMAZON_CMAKE_OFF= -DENABLE_AMAZON_CLOUD_DRIVE=OFF AUDIOCD_LIB_DEPENDS= libcdio.so:sysutils/libcdio AUDIOCD_CMAKE_ON= -DENABLE_AUDIOCD=ON AUDIOCD_CMAKE_OFF= -DENABLE_AUDIOCD=OFF BOX_BUILD_DEPENDS= sparsehash>=2.0.2:devel/sparsehash BOX_CMAKE_ON= -DENABLE_BOX=ON BOX_CMAKE_OFF= -DENABLE_BOX=OFF BREAKPAD_CMAKE_ON= -DENABLE_BREAKPAD=ON BREAKPAD_CMAKE_OFF= -DENABLE_BREAKPAD=OFF DEVICEKIT_CMAKE_ON= -DENABLE_DEVICEKIT=ON DEVICEKIT_CMAKE_OFF= -DENABLE_DEVICEKIT=OFF DROPBOX_BUILD_DEPENDS= sparsehash>=2.0.2:devel/sparsehash DROPBOX_CMAKE_ON= -DENABLE_DROPBOX=ON DROPBOX_CMAKE_OFF= -DENABLE_DROPBOX=OFF GIO_USE= GNOME=glib20 GIO_CMAKE_ON= -DENABLE_GIO=ON GIO_CMAKE_OFF= -DENABLE_GIO=OFF GOOGLE_DRIVE_BUILD_DEPENDS= sparsehash>=2.0.2:devel/sparsehash GOOGLE_DRIVE_CMAKE_ON= -DENABLE_GOOGLE_DRIVE=ON GOOGLE_DRIVE_CMAKE_OFF= -DENABLE_GOOGLE_DRIVE=OFF GPOD_LIB_DEPENDS= libgpod.so:audio/libgpod \ libplist.so:devel/libplist \ libusbmuxd.so:comms/libusbmuxd GPOD_CMAKE_ON= -DENABLE_LIBGPOD=ON GPOD_CMAKE_OFF= -DENABLE_LIBGPOD=OFF LASTFM_LIB_DEPENDS= liblastfm.so:audio/liblastfm LASTFM_CMAKE_ON= -DENABLE_LIBLASTFM=ON LASTFM_CMAKE_OFF= -DENABLE_LIBLASTFM=OFF MOODBAR_CMAKE_ON= -DENABLE_MOODBAR=ON MOODBAR_CMAKE_OFF= -DENABLE_MOODBAR=OFF MTP_LIB_DEPENDS= libmtp.so:multimedia/libmtp MTP_CMAKE_ON= -DENABLE_LIBMTP=ON MTP_CMAKE_OFF= -DENABLE_LIBMTP=OFF PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_CMAKE_ON= -DENABLE_LIBPULSE=ON PULSEAUDIO_CMAKE_OFF= -DENABLE_LIBPULSE=OFF SKYDRIVE_BUILD_DEPENDS= sparsehash>=2.0.2:devel/sparsehash SKYDRIVE_CMAKE_ON= -DENABLE_SKYDRIVE=ON SKYDRIVE_CMAKE_OFF= -DENABLE_SKYDRIVE=OFF VISUALISATION_CMAKE_ON= -DENABLE_VISUALISATIONS=ON VISUALISATION_CMAKE_OFF=-DENABLE_VISUALISATIONS=OFF WIIMOTEDEV_CMAKE_ON= -DENABLE_WIIMOTEDEV=ON WIIMOTEDEV_CMAKE_OFF= -DENABLE_WIIMOTEDEV=OFF .include .if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 39 CXXFLAGS+= -Wno-undefined-var-template .endif .include Index: branches/2016Q4/deskutils/cdcat/Makefile =================================================================== --- branches/2016Q4/deskutils/cdcat/Makefile (revision 428042) +++ branches/2016Q4/deskutils/cdcat/Makefile (revision 428043) @@ -1,88 +1,88 @@ # Created by: Aren Tyr # $FreeBSD$ PORTNAME= cdcat PORTVERSION= 2.3.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= deskutils MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Qt based tool for offline CD/DVD/disk catalogs LICENSE= GPLv2 MPL LICENSE_COMB= multi BUILD_DEPENDS= cryptopp>0:security/cryptopp LIB_DEPENDS= libtar.so:devel/libtar \ libexif.so:graphics/libexif \ libmediainfo.so:multimedia/libmediainfo \ libzen.so:multimedia/libzen CONFIGURE_WRKSRC= ${WRKSRC}/src BUILD_WRKSRC= ${CONFIGURE_WRKSRC} USES= libtool qmake:norecursive tar:bzip2 USE_QT4= corelib gui xml linguisttools_build moc_build uic_build QMAKE_ARGS= LIBS+="${LOCALBASE}/lib/libcryptopp.a" \ LIBS+="-lz -lbz2 -ltar -lexif -lmediainfo -lzen" \ DEFINES+="MEDIAINFO_STATIC" \ DEFINES+="MEDIAINFO_UNICODE" \ DEFINES+="USE_LIBEXIF" QMAKE_SOURCE_PATH= ${BUILD_WRKSRC}/${PORTNAME}.pro INSTALLS_ICONS= yes PORTDOCS= Authors ChangeLog README TRANSLATORS_README PLIST_FILES= bin/${PORTNAME} %%DATADIR%%/${PORTNAME}.png .for lang in cz de el es fr hu id it pl pt ru sk sr PLIST_FILES+= %%DATADIR%%/translations/${PORTNAME}_${lang}.qm .endfor .for size in 16 22 32 48 64 PLIST_FILES+= share/icons/hicolor/${size}x${size}/apps/${PORTNAME}_logo.png .endfor PLIST_FILES+= share/icons/hicolor/scalable/apps/${PORTNAME}_logo.svg DESKTOP_ENTRIES="CdCat" "Hyper's CD Catalog" "${DATADIR}/${PORTNAME}.png" \ "${PORTNAME}" "AudioVideo;Qt;" "" OPTIONS_DEFINE= DOCS post-patch: @${REINPLACE_CMD} -e \ '/USE_LIB7ZIP/s|^|#| ; \ /LIBS/s|^|#|' ${BUILD_WRKSRC}/${PORTNAME}.pro @${REINPLACE_CMD} -e \ 's|/dev/sr0|/dev/cd0|' ${BUILD_WRKSRC}/config.cpp .for i in newdbdialog.cpp wdbfile.h @${REINPLACE_CMD} -e \ 's|crypto++/|cryptopp/|' ${BUILD_WRKSRC}/${i} .endfor pre-configure: @${LRELEASE} ${BUILD_WRKSRC}/${PORTNAME}.pro do-install: ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME} \ ${STAGEDIR}${PREFIX}/bin @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.png \ ${STAGEDIR}${DATADIR} @${MKDIR} ${STAGEDIR}${DATADIR}/translations ${INSTALL_DATA} ${BUILD_WRKSRC}/lang/*.qm \ ${STAGEDIR}${DATADIR}/translations @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}_logo.svg \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps .for size in 16 22 32 48 64 @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${size}x${size}/apps ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}_logo_${size}x${size}.png \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/${size}x${size}/apps/${PORTNAME}_logo.png .endfor do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor .include Index: branches/2016Q4/multimedia/kvazaar/Makefile =================================================================== --- branches/2016Q4/multimedia/kvazaar/Makefile (revision 428042) +++ branches/2016Q4/multimedia/kvazaar/Makefile (revision 428043) @@ -1,59 +1,59 @@ # $FreeBSD$ PORTNAME= kvazaar DISTVERSIONPREFIX= v DISTVERSION?= 1.0.0 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= multimedia MAINTAINER= jbeich@FreeBSD.org COMMENT= H.265/HEVC encoder implemented in C LICENSE= LGPL21+ USE_GITHUB= yes GH_ACCOUNT= ultravideo GH_PROJECT= greatest:greatest GH_TAGNAME= v0.9.2-78-g60e25ce:greatest # 1.0.0 release actually GH_SUBDIR= greatest:greatest CONFLICTS_INSTALL?= ${PORTNAME}-devel USES= autoreconf compiler:c11 libtool pathfix PATHFIX_MAKEFILEIN= Makefile.am GNU_CONFIGURE= yes TEST_TARGET= check INSTALL_TARGET= install-strip USE_LDCONFIG= yes OPTIONS_DEFINE= ASM CRYPTOPP OPTIONS_DEFAULT=ASM ASM_BUILD_DEPENDS= ${ASM_BUILD_DEPENDS_${ARCH}} ASM_BUILD_DEPENDS_amd64=yasm:devel/yasm ASM_BUILD_DEPENDS_i386= yasm:devel/yasm ASM_CONFIGURE_ENABLE= asm CRYPTOPP_DESC= Selective encryption via Crypto++ library CRYPTOPP_LIB_DEPENDS= libcryptopp.so:security/cryptopp CRYPTOPP_USES= localbase pkgconfig CRYPTOPP_CONFIGURE_ENV= cryptopp_CFLAGS=" " cryptopp_LIBS="-lcryptopp" CRYPTOPP_CONFIGURE_WITH=cryptopp post-patch: @${REINPLACE_CMD} 's/x86_64/&|amd64/' ${WRKSRC}/configure.ac post-patch-CRYPTOPP-on: # XXX Force C++ linking to avoid error with Clang @${ECHO_CMD} nodist_EXTRA_kvazaar_tests_SOURCES \ = dummy.cpp >>${WRKSRC}/tests/Makefile.am post-patch-CRYPTOPP-off: # XXX autoconf cannot ignore unexpanded but unused m4 macros @${REINPLACE_CMD} -i .cryptopp.bak \ -e '/PKG_CHECK_MODULES/,/^[[:space:]]*)/d' \ ${WRKSRC}/configure.ac pre-install: do-test .include Index: branches/2016Q4/net-p2p/amule/Makefile =================================================================== --- branches/2016Q4/net-p2p/amule/Makefile (revision 428042) +++ branches/2016Q4/net-p2p/amule/Makefile (revision 428043) @@ -1,136 +1,137 @@ # Created by: Ganael LAPLANCHE # $FreeBSD$ PORTNAME= amule PORTVERSION= 2.3.2 +PORTREVISION= 1 CATEGORIES= net-p2p MASTER_SITES= SF/${PORTNAME}/aMule/${PORTVERSION} DISTNAME= aMule-${PORTVERSION} MAINTAINER= bar@FreeBSD.org COMMENT= All-platform eMule p2p client LICENSE= GPLv2 GPLv3 LICENSE_COMB= dual LIB_DEPENDS= libcryptopp.so:security/cryptopp CONFLICTS= amule-devel-[0-9]* USES= bison desktop-file-utils gmake perl5 pkgconfig shebangfix \ tar:xz USE_PERL5= build USE_WX= 2.8 WX_CONF_ARGS= absolute GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-denoise-level=0 CONFIGURE_ENV= LEX="${FLEX}" PKG_CONFIG="${PKG_CONFIG}" \ docdir='$${prefix}/${DOCSDIR_REL}' CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -lpthread -L${LOCALBASE}/lib OPTIONS_DEFINE= ALC ALCC AMULECMD AMULEDAEMON AMULEGUI CAS DEBUG DOCS ED2K \ FILEVIEW GEOIP MMAP MONOLITHIC NLS PLASMAMULE UPNP \ WEBSERVER WXCAS XAS ALC_DESC= Compile aMule Link Creator for GUI ALCC_DESC= Compile aMule Link Creator for console AMULECMD_DESC= Compile aMule command line client AMULEDAEMON_DESC= Compile aMule daemon version AMULEGUI_DESC= Compile aMule remote GUI CAS_DESC= Compile aMule Statistics for console ED2K_DESC= Compile aMule ed2k links handler FILEVIEW_DESC= Compile file viewer for console (EXPERIMENTAL) MMAP_DESC= Use mapped memory MONOLITHIC_DESC= Compile monolithic aMule PLASMAMULE_DESC= Compile aMule plasma applet and engine WXCAS_DESC= Compile aMule Statistics for GUI XAS_DESC= Install XChat2 plugin OPTIONS_DEFAULT=ALC ALCC AMULECMD AMULEDAEMON AMULEGUI CAS ED2K \ FILEVIEW MONOLITHIC WEBSERVER WXCAS XAS OPTIONS_SUB= yes SHEBANG_FILES= src/utils/scripts/*.pl src/utils/xas/*.pl src/libs/ec/*.pl LICENSE_FILE_GPLv2=${WRKSRC}/docs/COPYING DEBUG_CONFIGURE_ON= --enable-debug NLS_USES= gettext NLS_CONFIGURE_OFF= --disable-nls ALC_CONFIGURE_ON= --enable-alc ALCC_CONFIGURE_ON= --enable-alcc AMULECMD_CONFIGURE_ON= --enable-amulecmd AMULEDAEMON_CONFIGURE_ON= --enable-amule-daemon AMULEDAEMON_USE= RC_SUBR=amuled AMULEGUI_CONFIGURE_ON= --enable-amule-gui CAS_CONFIGURE_ON= --enable-cas CAS_LIB_DEPENDS= libgd.so:graphics/gd ED2K_CONFIGURE_OFF= --disable-ed2k FILEVIEW_CONFIGURE_ON= --enable-fileview GEOIP_CONFIGURE_ON= --enable-geoip GEOIP_LIB_DEPENDS= libGeoIP.so:net/GeoIP MMAP_CONFIGURE_ON= --enable-mmap MONOLITHIC_CONFIGURE_OFF= --disable-monolithic PLASMAMULE_CONFIGURE_ON= --enable-plasmamule PLASMAMULE_USES= kde:4 PLASMAMULE_USE= KDE=kdelibs QT4=dbus,gui,moc_build PLASMAMULE_CONFIGURE_ENV= \ ac_cv_path_KDE4_CONFIG=${KDE_PREFIX}/bin/kde4-config \ KBUILDSYCOCA=${KDE_PREFIX}/bin/kbuildsycoca4 \ UPDATE_MIME_DATABASE=/usr/bin/true UPNP_LIB_DEPENDS= libupnp.so:devel/upnp UPNP_CONFIGURE_OFF= --disable-upnp WEBSERVER_CONFIGURE_ON= --enable-webserver WXCAS_CONFIGURE_ON= --enable-wxcas XAS_CONFIGURE_ON= --enable-xas XAS_USE= PERL5+=run .include .if ${ARCH} == "i386" && ( ${OSVERSION} >= 1000024 || ${CXX:T} == "clang++" ) CPPFLAGS+= -DCRYPTOPP_DISABLE_ASM .endif .if ${PORT_OPTIONS:MED2K} CONFLICTS+= ed2k-hash* .endif post-patch: .SILENT ${REINPLACE_CMD} -e 's/test.*-print-file-name.*`/true/' \ -e '/if.*test/s/==/=/' \ ${WRKSRC}/configure .if ! ${PORT_OPTIONS:MDOCS} ${REINPLACE_CMD} 's/install-data-am:.*/install-data-am:/' \ ${WRKSRC}/docs/Makefile.in .endif .if ${PORT_OPTIONS:MPLASMAMULE} ${REINPLACE_CMD} -e 's|@prefix@|${KDE_PREFIX}|' \ -e 's|LDFLAGS =|& -L${KDE_PREFIX}/lib |' \ ${WRKSRC}/src/utils/plasmamule/Makefile.in .endif post-install: .if ${PORT_OPTIONS:MFILEVIEW} ${INSTALL_PROGRAM} ${WRKSRC}/src/utils/fileview/mulefileview ${STAGEDIR}${PREFIX}/bin .endif .include Index: branches/2016Q4/net-p2p/amule-devel/Makefile =================================================================== --- branches/2016Q4/net-p2p/amule-devel/Makefile (revision 428042) +++ branches/2016Q4/net-p2p/amule-devel/Makefile (revision 428043) @@ -1,143 +1,143 @@ # Created by: Ganael LAPLANCHE # $FreeBSD$ PORTNAME= amule PORTVERSION= 10964 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-p2p MASTER_SITES= http://amule.sourceforge.net/tarballs/ PKGNAMESUFFIX= -devel DISTNAME= aMule-SVN-r${PORTVERSION} MAINTAINER= bar@FreeBSD.org COMMENT= All-platform eMule p2p client LICENSE= GPLv2 GPLv3 LICENSE_COMB= dual LIB_DEPENDS= libcryptopp.so:security/cryptopp CONFLICTS= amule-[0-9]* USES= bison desktop-file-utils gmake perl5 pkgconfig shebangfix \ tar:bzip2 USE_PERL5= build USE_WX= 2.8 WX_CONF_ARGS= absolute GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-denoise-level=0 CONFIGURE_ENV= LEX="${FLEX}" PKG_CONFIG="${PKG_CONFIG}" \ docdir='$${prefix}/${DOCSDIR_REL}' CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -lpthread -L${LOCALBASE}/lib OPTIONS_DEFINE= ALC ALCC AMULECMD AMULEDAEMON AMULEGUI CAS DEBUG DOCS ED2K \ FILEVIEW GEOIP MMAP MONOLITHIC NLS OPTIMIZED_CFLAGS PLASMAMULE UPNP \ WEBSERVER WXCAS XAS ALC_DESC= Compile aMule Link Creator for GUI ALCC_DESC= Compile aMule Link Creator for console AMULECMD_DESC= Compile aMule command line client AMULEDAEMON_DESC= Compile aMule daemon version AMULEGUI_DESC= Compile aMule remote GUI CAS_DESC= Compile aMule Statistics for console ED2K_DESC= Compile aMule ed2k links handler FILEVIEW_DESC= Compile file viewer for console (EXPERIMENTAL) MMAP_DESC= Use mapped memory MONOLITHIC_DESC= Compile monolithic aMule PLASMAMULE_DESC= Compile aMule plasma applet and engine WXCAS_DESC= Compile aMule Statistics for GUI XAS_DESC= Install XChat2 plugin OPTIONS_DEFAULT=ALC ALCC AMULECMD AMULEDAEMON AMULEGUI CAS ED2K \ FILEVIEW MONOLITHIC WEBSERVER WXCAS XAS OPTIONS_SUB= yes SHEBANG_FILES= src/utils/scripts/*.pl src/utils/xas/*.pl src/libs/ec/*.pl LICENSE_FILE_GPLv2=${WRKSRC}/docs/COPYING DEBUG_CONFIGURE_ON= --enable-debug NLS_USES= gettext NLS_CONFIGURE_OFF= --disable-nls ALC_CONFIGURE_ON= --enable-alc ALCC_CONFIGURE_ON= --enable-alcc AMULECMD_CONFIGURE_ON= --enable-amulecmd AMULEDAEMON_CONFIGURE_ON= --enable-amule-daemon AMULEDAEMON_USE= RC_SUBR=amuled AMULEGUI_CONFIGURE_ON= --enable-amule-gui CAS_CONFIGURE_ON= --enable-cas CAS_LIB_DEPENDS= libgd.so:graphics/gd ED2K_CONFIGURE_OFF= --disable-ed2k FILEVIEW_CONFIGURE_ON= --enable-fileview GEOIP_CONFIGURE_ON= --enable-geoip GEOIP_LIB_DEPENDS= libGeoIP.so:net/GeoIP MMAP_CONFIGURE_ON= --enable-mmap MONOLITHIC_CONFIGURE_OFF= --disable-monolithic PLASMAMULE_CONFIGURE_ON= --enable-plasmamule PLASMAMULE_USES= kde:4 PLASMAMULE_USE= KDE=kdelibs QT4=dbus,gui,moc_build PLASMAMULE_CONFIGURE_ENV= \ ac_cv_path_KDE4_CONFIG=${KDE_PREFIX}/bin/kde4-config \ KBUILDSYCOCA=${KDE_PREFIX}/bin/kbuildsycoca4 \ UPDATE_MIME_DATABASE=/usr/bin/true UPNP_LIB_DEPENDS= libupnp.so:devel/upnp UPNP_CONFIGURE_OFF= --disable-upnp WEBSERVER_CONFIGURE_ON= --enable-webserver WXCAS_CONFIGURE_ON= --enable-wxcas XAS_CONFIGURE_ON= --enable-xas XAS_USE= PERL5+=run .include .if ${ARCH} == "i386" && ( ${OSVERSION} >= 1000024 || ${CXX:T} == "clang++" ) CPPFLAGS+= -DCRYPTOPP_DISABLE_ASM .endif .if ${PORT_OPTIONS:MED2K} CONFLICTS+= ed2k-hash* .endif .if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} CONFIGURE_ARGS+= --enable-optimize .endif post-patch: .SILENT ${REINPLACE_CMD} -e 's/test.*-print-file-name.*`/true/' \ -e '/if.*test/s/==/=/' \ ${WRKSRC}/configure .if ! ${PORT_OPTIONS:MDOCS} ${REINPLACE_CMD} 's/install-data-am:.*/install-data-am:/' \ ${WRKSRC}/docs/Makefile.in .endif .if ${PORT_OPTIONS:MPLASMAMULE} ${REINPLACE_CMD} -e 's|@prefix@|${KDE_PREFIX}|' \ -e 's|LDFLAGS =|& -L${KDE_PREFIX}/lib |' \ ${WRKSRC}/src/utils/plasmamule/Makefile.in .endif post-install: .if ${PORT_OPTIONS:MFILEVIEW} ${INSTALL_PROGRAM} ${WRKSRC}/src/utils/fileview/mulefileview ${STAGEDIR}${PREFIX}/bin .endif .include Index: branches/2016Q4/security/cryptopp/Makefile =================================================================== --- branches/2016Q4/security/cryptopp/Makefile (revision 428042) +++ branches/2016Q4/security/cryptopp/Makefile (revision 428043) @@ -1,73 +1,112 @@ # 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.2 -PORTREVISION= 2 +PORTVERSION= 5.6.5 CATEGORIES= security -MASTER_SITES= SF \ - http://www.cryptopp.com/ +MASTER_SITES= http://www.cryptopp.com/ DISTNAME= cryptopp${PORTVERSION:S/.//g} -MAINTAINER= delphij@FreeBSD.org +MAINTAINER= jhale@FreeBSD.org COMMENT= Free C++ class library of Cryptographic Primitives -OPTIONS_DEFINE= DEBUG DOCS GCC STATIC THREADS -OPTIONS_DEFAULT= THREADS -STATIC_DESC= Build static version only (no shared libs) +LICENSE= BSL +LICENSE_FILE= ${WRKSRC}/License.txt -.include +USES= cpe gmake zip:infozip +USE_LDCONFIG= yes -NO_WRKSUBDIR= yes +CPE_PRODUCT= crypto++ +CPE_VENDOR= cryptopp + +BROKEN_powerpc= does not compile; unrecognized C++ options + EXTRACT_BEFORE_ARGS= -aq -USES= gmake zip:infozip +NO_WRKSUBDIR= yes + +CXXFLAGS+= -Wno-deprecated-declarations -fPIC MAKEFILE= GNUmakefile +ALL_TARGET= static shared +TEST_TARGET= test -LIBVERSION= 0 -PLIST_SUB+= LIBVERSION=${LIBVERSION} -PLIST_SUB+= PORTVERSION=${PORTVERSION} +LIBVERSION= ${PORTVERSION:R:R} +PLIST_SUB+= LIBVERSION=${LIBVERSION} \ + PORTVERSION=${PORTVERSION} -.if !${PORT_OPTIONS:MDEBUG} -CXXFLAGS+= -DNDEBUG -.endif +OPTIONS_DEFINE= DEBUG DOCS FULL_DEBUG THREADS +OPTIONS_DEFINE_amd64= SIMD +OPTIONS_DEFINE_i386= SIMD +OPTIONS_DEFAULT= THREADS +OPTIONS_SUB= yes -.if ${PORT_OPTIONS:MGCC} -USE_GCC= yes -.endif +# 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 -.if ${PORT_OPTIONS:MSTATIC} -PLIST_SUB+= DYNAMIC_ENABLED="@comment " +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 -PLIST_SUB+= DYNAMIC_ENABLED="" -MAKE_ARGS= all libcryptopp.so -CXXFLAGS+= -fPIC -USE_LDCONFIG= yes +CXXFLAGS+= -DCRYPTOPP_DISABLE_ASM .endif -.if ${PORT_OPTIONS:MTHREADS} -LDFLAGS+= -lpthread +.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_PROGRAM} ${WRKSRC}/cryptest.exe ${STAGEDIR}${PREFIX}/bin/cryptest ${INSTALL_DATA} ${WRKSRC}/libcryptopp.a ${STAGEDIR}${PREFIX}/lib - ${MKDIR} ${STAGEDIR}${PREFIX}/include/cryptopp + ${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 + @${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) -.if !${PORT_OPTIONS:MSTATIC} - ${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.${LIBVERSION} ${STAGEDIR}${PREFIX}/lib/libcryptopp.so -.endif - ${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/cryptopp - ${CP} ${WRKSRC}/Readme.txt ${STAGEDIR}${PREFIX}/share/doc/cryptopp/README - ${CP} ${WRKSRC}/License.txt ${STAGEDIR}${PREFIX}/share/doc/cryptopp/License -.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64" -BROKEN= Does not compile on sparc64: unrecognized C++ options -.endif +do-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/Readme.txt ${STAGEDIR}${DOCSDIR}/README -.include +.include Index: branches/2016Q4/security/cryptopp/distinfo =================================================================== --- branches/2016Q4/security/cryptopp/distinfo (revision 428042) +++ branches/2016Q4/security/cryptopp/distinfo (revision 428043) @@ -1,2 +1,3 @@ -SHA256 (cryptopp562.zip) = 5cbfd2fcb4a6b3aab35902e2e0f3b59d9171fee12b3fc2b363e1801dfec53574 -SIZE (cryptopp562.zip) = 1137964 +TIMESTAMP = 1480818667 +SHA256 (cryptopp565.zip) = a75ef486fe3128008bbb201efee3dcdcffbe791120952910883b26337ec32c34 +SIZE (cryptopp565.zip) = 4220843 Index: branches/2016Q4/security/cryptopp/files/patch-nbtheory.cpp =================================================================== --- branches/2016Q4/security/cryptopp/files/patch-nbtheory.cpp (revision 428042) +++ branches/2016Q4/security/cryptopp/files/patch-nbtheory.cpp (nonexistent) @@ -1,21 +0,0 @@ ---- nbtheory.cpp.orig 2013-05-22 00:16:26.761193859 +0000 -+++ nbtheory.cpp 2013-05-22 00:15:29.401256454 +0000 -@@ -307,7 +307,18 @@ - - bool PrimeSieve::NextCandidate(Integer &c) - { -+#if defined(__clang__) && defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 1101 -+ // Workaround for a bug in libc++ in std::find on std::vector -+ std::vector::iterator pos = m_sieve.begin()+m_next; -+ for (std::vector::iterator end = m_sieve.end(); pos != end; ++pos) -+ { -+ if (*pos == false) -+ break; -+ } -+ bool safe = SafeConvert(pos - m_sieve.begin(), m_next); -+#else - bool safe = SafeConvert(std::find(m_sieve.begin()+m_next, m_sieve.end(), false) - m_sieve.begin(), m_next); -+#endif - assert(safe); - if (m_next == m_sieve.size()) - { Property changes on: branches/2016Q4/security/cryptopp/files/patch-nbtheory.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2016Q4/security/cryptopp/files/patch-wake.cpp =================================================================== --- branches/2016Q4/security/cryptopp/files/patch-wake.cpp (revision 428042) +++ branches/2016Q4/security/cryptopp/files/patch-wake.cpp (nonexistent) @@ -1,20 +0,0 @@ ---- wake.cpp.orig -+++ wake.cpp -@@ -25,13 +25,13 @@ void WAKE_Base::GenKey(word32 k0, word32 k1, word32 k2, word32 k3) - CRYPTOPP_COMPILE_ASSERT(sizeof(x) == 4); - static int tt[10]= { - 0x726a8f3b, // table -- 0xe69a3b5c, -- 0xd3c71fe5, -- 0xab3c73d2, -+ static_cast(0xe69a3b5c), -+ static_cast(0xd3c71fe5), -+ static_cast(0xab3c73d2), - 0x4d3a8eb3, - 0x0396d6e8, - 0x3d4c2f7a, -- 0x9ee27cf3, } ; -+ static_cast(0x9ee27cf3), } ; - t[0] = k0; - t[1] = k1; - t[2] = k2; Property changes on: branches/2016Q4/security/cryptopp/files/patch-wake.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2016Q4/security/cryptopp/files/patch-GNUmakefile =================================================================== --- branches/2016Q4/security/cryptopp/files/patch-GNUmakefile (revision 428042) +++ branches/2016Q4/security/cryptopp/files/patch-GNUmakefile (revision 428043) @@ -1,26 +1,40 @@ ---- ./GNUmakefile.orig 2013-02-20 15:30:52.000000000 -0500 -+++ ./GNUmakefile 2014-02-05 14:26:22.994957010 -0500 -@@ -1,4 +1,4 @@ --CXXFLAGS = -DNDEBUG -g -O2 -+#CXXFLAGS = -DNDEBUG -g -O2 - # -O3 fails to link on Cygwin GCC version 4.5.3 - # -fPIC is supported. Please report any breakage of -fPIC as a bug. - # CXXFLAGS += -fPIC -@@ -38,8 +38,6 @@ - ifneq ($(GCC42_OR_LATER),0) - ifeq ($(UNAME),Darwin) - CXXFLAGS += -arch x86_64 -arch i386 --else --CXXFLAGS += -march=native +--- GNUmakefile.orig 2016-10-10 23:49:54 UTC ++++ GNUmakefile +@@ -41,7 +41,7 @@ SUNCC_511_OR_LATER := $(shell $(CXX) -V + SUNCC_512_OR_LATER := $(shell $(CXX) -V 2>&1 | $(EGREP) -c "CC: (Sun|Studio) .* (5\.1[2-9]|5\.[2-9]|6\.)") + SUNCC_513_OR_LATER := $(shell $(CXX) -V 2>&1 | $(EGREP) -c "CC: (Sun|Studio) .* (5\.1[3-9]|5\.[2-9]|6\.)") + +-HAS_SOLIB_VERSION := $(IS_LINUX) ++HAS_SOLIB_VERSION := 1 + + # Fixup SunOS + ifeq ($(IS_SUN),1) +@@ -126,11 +126,6 @@ ifeq ($(IS_X86)$(IS_X32)$(IS_CYGWIN)$(IS endif - endif -@@ -165,7 +163,7 @@ - $(RANLIB) $@ + # Guard use of -march=native +-ifeq ($(GCC42_OR_LATER)$(IS_NETBSD),10) +- CXXFLAGS += -march=native +-else ifneq ($(CLANG_COMPILER)$(INTEL_COMPILER),00) +- CXXFLAGS += -march=native +-else + # GCC 3.3 and "unknown option -march=" + # Ubuntu GCC 4.1 compiler crash with -march=native + # NetBSD GCC 4.8 compiler and "bad value (native) for -march= switch" +@@ -140,7 +135,6 @@ else + else ifeq ($(SUN_COMPILER)$(IS_X86),01) + CXXFLAGS += -m32 + endif # X86/X32/X64 +-endif - libcryptopp.so: $(LIBOBJS) -- $(CXX) -shared -o $@ $(LIBOBJS) -+ $(CXX) -shared -o $@ $(CXXFLAGS) $(LDFLAGS) $(LIBOBJS) + # Aligned access required for -O3 and above due to vectorization + UNALIGNED_ACCESS := $(shell $(EGREP) -c "^[[:space:]]*//[[:space:]]*\#[[:space:]]*define[[:space:]]*CRYPTOPP_NO_UNALIGNED_DATA_ACCESS" config.h) +@@ -404,7 +398,7 @@ ifeq ($(HAS_SOLIB_VERSION),1) + # Full version suffix for shared library + SOLIB_VERSION_SUFFIX=.$(LIB_MAJOR).$(LIB_MINOR).$(LIB_PATCH) + # Different patchlevels are compatible, minor versions are not +-SOLIB_COMPAT_SUFFIX=.$(LIB_MAJOR).$(LIB_MINOR) ++SOLIB_COMPAT_SUFFIX=.$(LIB_MAJOR) + SOLIB_FLAGS=-Wl,-soname,libcryptopp.so$(SOLIB_COMPAT_SUFFIX) + endif # HAS_SOLIB_VERSION - cryptest.exe: libcryptopp.a $(TESTOBJS) - $(CXX) -o $@ $(CXXFLAGS) $(TESTOBJS) ./libcryptopp.a $(LDFLAGS) $(LDLIBS) Index: branches/2016Q4/security/cryptopp/files/patch-config.h =================================================================== --- branches/2016Q4/security/cryptopp/files/patch-config.h (revision 428042) +++ branches/2016Q4/security/cryptopp/files/patch-config.h (revision 428043) @@ -1,29 +1,33 @@ ---- config.h.orig 2013-02-20 14:30:54.000000000 +0000 +The definition of CRYPTOPP_BOOL_ALIGN16_ENABLED was incorrect for i386. +For NetBSD, this resulted in the inability to build cryptopp on i386. +On FreeBSD, it built, but deskutils/cdcat choked on it while building on +FreeBSD 10/i386 and FreeBSD 11/i386. (PR: 192199) + +--- config.h.orig 2016-10-10 23:49:54 UTC +++ config.h -@@ -290,12 +290,6 @@ NAMESPACE_END - #define CRYPTOPP_BOOL_AESNI_INTRINSICS_AVAILABLE 0 +@@ -534,12 +534,6 @@ NAMESPACE_END + # endif #endif --#if CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE || CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE || defined(CRYPTOPP_X64_MASM_AVAILABLE) -- #define CRYPTOPP_BOOL_ALIGN16_ENABLED 1 +-#if CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE || CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE || CRYPTOPP_BOOL_NEON_INTRINSICS_AVAILABLE || defined(CRYPTOPP_X64_MASM_AVAILABLE) +- #define CRYPTOPP_BOOL_ALIGN16 1 -#else -- #define CRYPTOPP_BOOL_ALIGN16_ENABLED 0 +- #define CRYPTOPP_BOOL_ALIGN16 0 -#endif - // how to allocate 16-byte aligned memory (for SSE2) #if defined(CRYPTOPP_MSVC6PP_OR_LATER) #define CRYPTOPP_MM_MALLOC_AVAILABLE -@@ -307,6 +301,13 @@ NAMESPACE_END +@@ -553,6 +547,12 @@ NAMESPACE_END #define CRYPTOPP_NO_ALIGNED_ALLOC #endif -+#if CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE || CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE || defined(CRYPTOPP_X64_MASM_AVAILABLE) || !defined(CPRYPTO_NO_ALIGNED_ALLOC) -+ #define CRYPTOPP_BOOL_ALIGN16_ENABLED 1 ++#if CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE || CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE || CRYPTOPP_BOOL_NEON_INTRINSICS_AVAILABLE || defined(CRYPTOPP_X64_MASM_AVAILABLE) || !defined(CPRYPTO_NO_ALIGNED_ALLOC) ++ #define CRYPTOPP_BOOL_ALIGN16 1 +#else -+ #define CRYPTOPP_BOOL_ALIGN16_ENABLED 0 ++ #define CRYPTOPP_BOOL_ALIGN16 0 +#endif + -+ - // how to disable inlining - #if defined(_MSC_VER) && _MSC_VER >= 1300 - # define CRYPTOPP_NOINLINE_DOTDOTDOT + // Apple always provides 16-byte aligned, and tells us to use calloc + // http://developer.apple.com/library/mac/documentation/Performance/Conceptual/ManagingMemory/Articles/MemoryAlloc.html + Index: branches/2016Q4/security/cryptopp/files/patch-misc.h =================================================================== --- branches/2016Q4/security/cryptopp/files/patch-misc.h (revision 428042) +++ branches/2016Q4/security/cryptopp/files/patch-misc.h (revision 428043) @@ -1,54 +1,62 @@ ---- misc.h.orig 2010-08-06 18:46:18.000000000 +0000 -+++ misc.h 2013-05-22 08:43:01.949194748 +0000 -@@ -405,17 +405,13 @@ - return order == GetNativeByteOrder(); - } - +This fixes a warning triggered by testing an unsigned parameter +against 0. The patch solves this by creating a different template +for signed case. (PR: 178827) + +--- misc.h.orig 2016-10-10 23:49:54 UTC ++++ misc.h +@@ -529,8 +529,10 @@ inline bool SafeConvert(T1 from, T2 &to) + //! \param value the value to convert + //! \param base the base to use during the conversion + //! \returns the string representation of value in base. +template struct IsUnsigned {}; + template --std::string IntToString(T a, unsigned int base = 10) -+std::string IntToStringImpl(T a, unsigned int base, IsUnsigned) +-std::string IntToString(T value, unsigned int base = 10) ++std::string IntToStringImpl(T value, unsigned int base, IsUnsigned) { - if (a == 0) + // Hack... set the high bit for uppercase. + static const unsigned int HIGH_BIT = (1U << 31); +@@ -541,12 +543,6 @@ std::string IntToString(T value, unsigne + if (value == 0) return "0"; + - bool negate = false; -- if (a < 0) +- if (value < 0) - { - negate = true; -- a = 0-a; // VC .NET does not like -a +- value = 0-value; // VC .NET does not like -a - } std::string result; - while (a > 0) + while (value > 0) { -@@ -423,11 +419,30 @@ - result = char((digit < 10 ? '0' : ('a' - 10)) + digit) + result; - a /= base; +@@ -554,11 +550,30 @@ std::string IntToString(T value, unsigne + result = char((digit < 10 ? '0' : (CH - 10)) + digit) + result; + value /= base; } + return result; +} + +template -+std::string IntToStringImpl(T a, unsigned int base, IsUnsigned) ++std::string IntToStringImpl(T value, unsigned int base, IsUnsigned) +{ + bool negate = false; -+ if (a < 0) ++ if (value < 0) + { + negate = true; -+ a = 0-a; // VC .NET does not like -a ++ value = 0-value; // VC .NET does not like -a + } -+ std::string result = IntToStringImpl(a, base, IsUnsigned()); ++ std::string result = IntToStringImpl(value, base, IsUnsigned()); if (negate) result = "-" + result; return result; } +template -+std::string IntToString(T a, unsigned int base = 10) ++std::string IntToString(T value, unsigned int base = 10) +{ -+ return IntToStringImpl(a, base, IsUnsigned<(static_cast(-1) > 0)>()); ++ return IntToStringImpl(value, base, IsUnsigned<(static_cast(-1) > 0)>()); +} + - template - inline T1 SaturatingSubtract(const T1 &a, const T2 &b) - { + //! \brief Converts an unsigned value to a string + //! \param value the value to convert + //! \param base the base to use during the conversion Index: branches/2016Q4/security/cryptopp/pkg-plist =================================================================== --- branches/2016Q4/security/cryptopp/pkg-plist (revision 428042) +++ branches/2016Q4/security/cryptopp/pkg-plist (revision 428043) @@ -1,140 +1,148 @@ -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 -%%DYNAMIC_ENABLED%%lib/libcryptopp.so -%%DYNAMIC_ENABLED%%lib/libcryptopp.so.%%LIBVERSION%% -%%DYNAMIC_ENABLED%%lib/libcryptopp.so.%%PORTVERSION%% +lib/libcryptopp.so +lib/libcryptopp.so.%%LIBVERSION%% +lib/libcryptopp.so.%%PORTVERSION%% %%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/License Index: branches/2016Q4 =================================================================== --- branches/2016Q4 (revision 428042) +++ branches/2016Q4 (revision 428043) Property changes on: branches/2016Q4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r425256,427282,427478,428022