From owner-svn-ports-all@freebsd.org Sat Oct 13 17:57:28 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 71AFB10D1255; Sat, 13 Oct 2018 17:57:28 +0000 (UTC) (envelope-from vd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 191948414B; Sat, 13 Oct 2018 17:57:28 +0000 (UTC) (envelope-from vd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0502D12501; Sat, 13 Oct 2018 17:57:28 +0000 (UTC) (envelope-from vd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9DHvRh9014826; Sat, 13 Oct 2018 17:57:27 GMT (envelope-from vd@FreeBSD.org) Received: (from vd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9DHvRQ2014825; Sat, 13 Oct 2018 17:57:27 GMT (envelope-from vd@FreeBSD.org) Message-Id: <201810131757.w9DHvRQ2014825@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vd set sender to vd@FreeBSD.org using -f From: Vasil Dimov Date: Sat, 13 Oct 2018 17:57:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r482004 - head/net-p2p/monero-cli X-SVN-Group: ports-head X-SVN-Commit-Author: vd X-SVN-Commit-Paths: head/net-p2p/monero-cli X-SVN-Commit-Revision: 482004 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Oct 2018 17:57:28 -0000 Author: vd Date: Sat Oct 13 17:57:27 2018 New Revision: 482004 URL: https://svnweb.freebsd.org/changeset/ports/482004 Log: net-p2p/monero-cli: fix compilation on FreeBSD < 12 -DMANUAL_SUBMODULES:BOOL=ON was mistakenly provided only on 12.x, should be used always. While I am here, pet portlint. Modified: head/net-p2p/monero-cli/Makefile Modified: head/net-p2p/monero-cli/Makefile ============================================================================== --- head/net-p2p/monero-cli/Makefile Sat Oct 13 17:55:13 2018 (r482003) +++ head/net-p2p/monero-cli/Makefile Sat Oct 13 17:57:27 2018 (r482004) @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= monero-cli -# To build from an arbitrary git commit comment the following two lines +# To build from an arbitrary git commit comment PORTVERSION and PORTREVISION (if present) PORTVERSION= 0.13.0.2 -PORTREVISION= 0 DISTVERSIONPREFIX= v # and uncomment the following two lines #PORTVERSION= 0 @@ -42,6 +41,7 @@ BUILD_DEPENDS= ${LOCALBASE}/include/rapidjson/document USES= cmake compiler:c++11-lib pkgconfig readline ssl USE_GITHUB= yes + GH_ACCOUNT= monero-project GH_PROJECT= monero .if defined(PKGNAMESUFFIX) @@ -62,7 +62,6 @@ DOXYGEN_CMAKE_BOOL= BUILD_DOCUMENTATION # 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 @@ -76,9 +75,11 @@ LD_EMULATION= elf32ppc LD_EMULATION= elf64ppc .endif -CMAKE_ARGS+= -DLD_RAW_FLAGS:STRING=-m${LD_EMULATION} \ - -DMANUAL_SUBMODULES:BOOL=ON +CMAKE_ARGS+= -DLD_RAW_FLAGS:STRING=-m${LD_EMULATION} + .endif + +CMAKE_ARGS+= -DMANUAL_SUBMODULES:BOOL=ON USE_RC_SUBR= monerod