Index: head/net-p2p/monero-cli/Makefile =================================================================== --- head/net-p2p/monero-cli/Makefile (revision 517377) +++ head/net-p2p/monero-cli/Makefile (revision 517378) @@ -1,106 +1,109 @@ # Created by: Vasil Dimov # $FreeBSD$ PORTNAME= monero-cli # To build from an arbitrary git commit comment PORTVERSION and PORTREVISION (if present) -PORTVERSION= 0.14.1.2 +PORTVERSION= 0.15.0.0 DISTVERSIONPREFIX= v -PORTREVISION= 2 # and uncomment the following two lines (use for example -git-HEAD or -git-b6420e1) #PORTVERSION= 0 #PKGNAMESUFFIX= -git-HEAD CATEGORIES= net-p2p finance MAINTAINER= vd@FreeBSD.org COMMENT= Private, secure, untraceable, decentralised digital currency (CLI) LICENSE= BSD3CLAUSE -BROKEN_i386= fails to compile: register r15d is only available in 64-bit mode +BROKEN_i386= fails to compile: register r15d is only available in 64-bit mode 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 \ 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-//} +GIT_COMMIT= ${PKGNAMESUFFIX:C/-git-//} +.else +GIT_COMMIT= ${DISTVERSIONPREFIX}${PORTVERSION} .endif +GH_TUPLE= monero-project:monero:${GIT_COMMIT} \ + tevador:RandomX:7567cef4c6192fb5356bbdd7:ext1/external/randomx \ + trezor:trezor-common:31a0073c62738:ext2/external/trezor-common + 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 .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} .endif # keep in sync with all platforms where libunwind is available .if (${ARCH} == amd64 || ${ARCH} == i386) LIB_DEPENDS+= libunwind.so:devel/libunwind .endif CMAKE_ARGS+= -DMANUAL_SUBMODULES:BOOL=ON USE_RC_SUBR= monerod USERS= monero GROUPS= monero PLIST_FILES= \ bin/monero-blockchain-ancestry \ bin/monero-blockchain-depth \ bin/monero-blockchain-export \ bin/monero-blockchain-import \ bin/monero-blockchain-mark-spent-outputs \ bin/monero-blockchain-prune \ bin/monero-blockchain-prune-known-spent-data \ bin/monero-blockchain-stats \ bin/monero-blockchain-usage \ + bin/monero-gen-ssl-cert \ 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 517377) +++ head/net-p2p/monero-cli/distinfo (revision 517378) @@ -1,3 +1,7 @@ -TIMESTAMP = 1563789399 -SHA256 (monero-project-monero-v0.14.1.2_GH0.tar.gz) = 4b167b4b44f85bc8ff0a557257f458f50b7fa99ab8b80f25d608c777068fe26f -SIZE (monero-project-monero-v0.14.1.2_GH0.tar.gz) = 9052395 +TIMESTAMP = 1573658988 +SHA256 (monero-project-monero-v0.15.0.0_GH0.tar.gz) = 310c578056df4a26819880b6bbcdd10b39f14da68783af84b2d6a7951c6ed2c5 +SIZE (monero-project-monero-v0.15.0.0_GH0.tar.gz) = 10383817 +SHA256 (tevador-RandomX-7567cef4c6192fb5356bbdd7_GH0.tar.gz) = 5f0a363aa693b85bf7f99968d56ffd4ffca32bb919f9d8b713a9a3ad50a319b7 +SIZE (tevador-RandomX-7567cef4c6192fb5356bbdd7_GH0.tar.gz) = 1708380 +SHA256 (trezor-trezor-common-31a0073c62738_GH0.tar.gz) = bccc20a8aa11655ed4d19a52e15a9afb6349c9d286de8a120b4f56162286069f +SIZE (trezor-trezor-common-31a0073c62738_GH0.tar.gz) = 1329164 Index: head/net-p2p/monero-cli/files/patch-src_cryptonote__basic_miner.cpp =================================================================== --- head/net-p2p/monero-cli/files/patch-src_cryptonote__basic_miner.cpp (revision 517377) +++ head/net-p2p/monero-cli/files/patch-src_cryptonote__basic_miner.cpp (nonexistent) @@ -1,28 +0,0 @@ ---- src/cryptonote_basic/miner.cpp.orig 2019-10-13 11:25:19 UTC -+++ src/cryptonote_basic/miner.cpp -@@ -61,7 +61,9 @@ - #include - #include - #include -+#if defined(__amd64__ ) || defined(__i386__) || defined(__x86_64__) - #include -+#endif - #include - #include - #include -@@ -1082,6 +1084,7 @@ namespace cryptonote - return boost::logic::tribool(boost::logic::indeterminate); - } - -+#if defined(__amd64__ ) || defined(__i386__) || defined(__x86_64__) - apm_info info; - if( ioctl(fd, APMIO_GETINFO, &info) == -1 ) { - close(fd); -@@ -1116,6 +1119,7 @@ namespace cryptonote - << "unexpected ac-line status (" << info.ai_acline << ") and " - << "battery status (" << info.ai_batt_stat << ")."); - return boost::logic::tribool(boost::logic::indeterminate); -+#endif - } - if( n != sizeof(ac) ) - { Property changes on: head/net-p2p/monero-cli/files/patch-src_cryptonote__basic_miner.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/net-p2p/monero-cli/files/patch-src_common_stack__trace.cpp =================================================================== --- head/net-p2p/monero-cli/files/patch-src_common_stack__trace.cpp (nonexistent) +++ head/net-p2p/monero-cli/files/patch-src_common_stack__trace.cpp (revision 517378) @@ -0,0 +1,18 @@ +--- src/common/stack_trace.cpp.orig 2019-11-04 14:13:39 UTC ++++ src/common/stack_trace.cpp +@@ -26,13 +26,14 @@ + // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF + // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +-#if !defined __GNUC__ || defined __MINGW32__ || defined __MINGW64__ || defined __ANDROID__ ++#if !defined __GNUC__ || defined __MINGW32__ || defined __MINGW64__ || defined __ANDROID__ || defined __FreeBSD__ + #define USE_UNWIND + #else + #define ELPP_FEATURE_CRASH_LOG 1 + #endif + #include "easylogging++/easylogging++.h" + ++#include + #include + #ifdef USE_UNWIND + #define UNW_LOCAL_ONLY Property changes on: head/net-p2p/monero-cli/files/patch-src_common_stack__trace.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property