Index: head/net-p2p/monero-cli/Makefile =================================================================== --- head/net-p2p/monero-cli/Makefile (revision 481937) +++ head/net-p2p/monero-cli/Makefile (revision 481938) @@ -1,96 +1,100 @@ # Created by: Vasil Dimov # $FreeBSD$ PORTNAME= monero-cli # To build from an arbitrary git commit comment the following two lines -PORTVERSION= 0.12.3.0 -PORTREVISION= 3 +PORTVERSION= 0.13.0.2 +PORTREVISION= 0 DISTVERSIONPREFIX= v # and uncomment the following two lines #PORTVERSION= 0 #PKGNAMESUFFIX= -git-HEAD CATEGORIES= net-p2p finance MAINTAINER= vd@FreeBSD.org COMMENT= Private, secure, untraceable, decentralised digital currency (CLI) LICENSE= BSD3CLAUSE BROKEN_aarch64= fails to compile: the clang compiler does not support -march=native BROKEN_armv6= fails to compile: the clang compiler does not support -march=native BROKEN_armv7= fails to compile: the clang compiler does not support -march=native BROKEN_powerpc64= fails to compile: the clang compiler does not support -march=native LIB_DEPENDS= \ libboost_chrono.so:devel/boost-libs \ libboost_date_time.so:devel/boost-libs \ libboost_filesystem.so:devel/boost-libs \ libboost_program_options.so:devel/boost-libs \ libboost_regex.so:devel/boost-libs \ libboost_serialization.so:devel/boost-libs \ libboost_system.so:devel/boost-libs \ libboost_thread.so:devel/boost-libs \ libminiupnpc.so:net/miniupnpc \ libnorm.so:net/norm \ libpgm.so:net/openpgm \ + libsodium.so:security/libsodium \ libunbound.so:dns/unbound \ libunwind.so:devel/libunwind \ libzmq.so:net/libzmq4 BUILD_DEPENDS= ${LOCALBASE}/include/rapidjson/document.h:devel/rapidjson \ ${LOCALBASE}/include/zmq.hpp:net/cppzmq USES= cmake compiler:c++11-lib pkgconfig readline ssl USE_GITHUB= yes GH_ACCOUNT= monero-project GH_PROJECT= monero .if defined(PKGNAMESUFFIX) GH_TAGNAME= ${PKGNAMESUFFIX:C/-git-//} .endif CFLAGS+= -D_WANT_SEMUN OPTIONS_DEFINE= DOXYGEN DOXYGEN_BUILD_DEPENDS= dot:graphics/graphviz \ doxygen:devel/doxygen DOXYGEN_CMAKE_BOOL= BUILD_DOCUMENTATION .include # On FreeBSD 12.x the default ld(1) is LLVM's ld which needs an explicit -m option # when linking without any input .o on the command line, like: # /usr/bin/ld -melf_amd64 -r -b binary -o blocksdat.o blocks.dat # See Bug 226996 - net-p2p/monero-cli: fails to link with lld as the system linker # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=226996 .if ${OSVERSION} >= 1200000 ONLY_FOR_ARCHS= aarch64 amd64 i386 powerpc powerpc64 .if ${ARCH} == aarch64 LD_EMULATION= aarch64elf .elif ${ARCH} == amd64 LD_EMULATION= elf_amd64 .elif ${ARCH} == i386 LD_EMULATION= elf_i386_fbsd .elif ${ARCH} == powerpc LD_EMULATION= elf32ppc .elif ${ARCH} == powerpc64 LD_EMULATION= elf64ppc .endif -CMAKE_ARGS+= -DLD_RAW_FLAGS:STRING=-m${LD_EMULATION} +CMAKE_ARGS+= -DLD_RAW_FLAGS:STRING=-m${LD_EMULATION} \ + -DMANUAL_SUBMODULES:BOOL=ON .endif USE_RC_SUBR= monerod USERS= monero GROUPS= monero PLIST_FILES= \ + bin/monero-blockchain-ancestry \ bin/monero-blockchain-blackball \ + bin/monero-blockchain-depth \ bin/monero-blockchain-export \ bin/monero-blockchain-import \ bin/monero-blockchain-usage \ bin/monero-gen-trusted-multisig \ bin/monero-wallet-cli \ bin/monero-wallet-rpc \ bin/monerod .include Index: head/net-p2p/monero-cli/distinfo =================================================================== --- head/net-p2p/monero-cli/distinfo (revision 481937) +++ head/net-p2p/monero-cli/distinfo (revision 481938) @@ -1,3 +1,3 @@ -TIMESTAMP = 1531514319 -SHA256 (monero-project-monero-v0.12.3.0_GH0.tar.gz) = 06aba34ff695084a35576760deb0c9db66d06e56065d1b42a83fc2bbc32c4815 -SIZE (monero-project-monero-v0.12.3.0_GH0.tar.gz) = 8431327 +TIMESTAMP = 1539338181 +SHA256 (monero-project-monero-v0.13.0.2_GH0.tar.gz) = 613255b761083190e1c313a7cc8c7377938648ebfe1a670ddfa96708e1bc8d7b +SIZE (monero-project-monero-v0.13.0.2_GH0.tar.gz) = 8614595 Index: head/net-p2p/monero-cli/files/patch-external_CMakeLists.txt =================================================================== --- head/net-p2p/monero-cli/files/patch-external_CMakeLists.txt (revision 481937) +++ head/net-p2p/monero-cli/files/patch-external_CMakeLists.txt (revision 481938) @@ -1,42 +1,46 @@ ---- external/CMakeLists.txt.orig 2018-05-23 21:21:59.000000000 UTC -+++ external/CMakeLists.txt 2018-06-01 17:48:47.449100000 UTC -@@ -31,24 +31,27 @@ +--- external/CMakeLists.txt.orig 2018-10-12 11:58:33.398503000 +0200 ++++ external/CMakeLists.txt 2018-10-12 12:01:52.063061000 +0200 +@@ -31,25 +31,28 @@ # This is broken up into two parts: first we check for miniupnp, compile it if we can't # find it, and thereafter we check for libunbound, and compile it if we can't find it. -# We always compile if we are building statically to reduce static dependency issues... -# ...except for FreeBSD, because FreeBSD is a special case that doesn't play well with -# others. find_package(Miniupnpc REQUIRED) -message(STATUS "Using in-tree miniupnpc") -+if(NOT MINIUPNPC_FOUND OR STATIC) -+ message(STATUS "Using in-tree miniupnpc") - -add_subdirectory(miniupnp/miniupnpc) -+ add_subdirectory(miniupnp/miniupnpc) - -set_property(TARGET libminiupnpc-static PROPERTY FOLDER "external") -if(MSVC) - set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -wd4244 -wd4267") -elseif(NOT MSVC) - set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-undef -Wno-unused-result -Wno-unused-value") -endif() +-if(CMAKE_SYSTEM_NAME MATCHES "NetBSD") +- set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -D_NETBSD_SOURCE") +-endif() ++if(NOT MINIUPNPC_FOUND OR STATIC) ++ message(STATUS "Using in-tree miniupnpc") ++ add_subdirectory(miniupnp/miniupnpc) + set_property(TARGET libminiupnpc-static PROPERTY FOLDER "external") + if(MSVC) + set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -wd4244 -wd4267") + elseif(NOT MSVC) + set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-undef -Wno-unused-result -Wno-unused-value") ++ endif() ++ if(CMAKE_SYSTEM_NAME MATCHES "NetBSD") ++ set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -D_NETBSD_SOURCE") + endif() -set(UPNP_LIBRARIES "libminiupnpc-static" PARENT_SCOPE) + set(UPNP_LIBRARIES "libminiupnpc-static" PARENT_SCOPE) +else() + message(STATUS "Found miniupnpc shared library (${MINIUPNP_LIBRARY})") + set(UPNP_LIBRARIES ${MINIUPNP_LIBRARY} PARENT_SCOPE) + set(UPNP_INCLUDE_DIR ${MINIUPNP_INCLUDE_DIR} PARENT_SCOPE) +endif() find_package(Unbound)