From owner-svn-ports-head@freebsd.org Tue Apr 17 18:00:40 2018 Return-Path: Delivered-To: svn-ports-head@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 B2BD4F8E3BC; Tue, 17 Apr 2018 18:00:40 +0000 (UTC) (envelope-from adridg@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 686366D0D3; Tue, 17 Apr 2018 18:00:40 +0000 (UTC) (envelope-from adridg@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 4AB9F7DD6; Tue, 17 Apr 2018 18:00:40 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3HI0egQ076354; Tue, 17 Apr 2018 18:00:40 GMT (envelope-from adridg@FreeBSD.org) Received: (from adridg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3HI0doZ076352; Tue, 17 Apr 2018 18:00:39 GMT (envelope-from adridg@FreeBSD.org) Message-Id: <201804171800.w3HI0doZ076352@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adridg set sender to adridg@FreeBSD.org using -f From: Adriaan de Groot Date: Tue, 17 Apr 2018 18:00:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r467620 - in head/devel/cmake: . files X-SVN-Group: ports-head X-SVN-Commit-Author: adridg X-SVN-Commit-Paths: in head/devel/cmake: . files X-SVN-Commit-Revision: 467620 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Apr 2018 18:00:40 -0000 Author: adridg Date: Tue Apr 17 18:00:39 2018 New Revision: 467620 URL: https://svnweb.freebsd.org/changeset/ports/467620 Log: Fix stage-qa problems with devel/cmake Linking to base libarchive is disallowed by stage-qa, so restore USES=libarchive (to avoid the bundled libarchive and to link to ports libarchive) and drop the pkg(8) generator for CPack, since libpkg in turn pulls in base libarchive. PR: 227372 Approved by: tcberner (mentor, implicit) Modified: head/devel/cmake/Makefile head/devel/cmake/files/InitialCache.cmake Modified: head/devel/cmake/Makefile ============================================================================== --- head/devel/cmake/Makefile Tue Apr 17 17:19:58 2018 (r467619) +++ head/devel/cmake/Makefile Tue Apr 17 18:00:39 2018 (r467620) @@ -4,6 +4,7 @@ PORTNAME= cmake # Remember to update devel/cmake-doc and devel/cmake-gui as well. DISTVERSION= 3.11.0 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= https://www.cmake.org/files/v${PORTVERSION:R}/ @@ -19,7 +20,7 @@ LIB_DEPENDS= libcurl.so:ftp/curl \ libuv.so:devel/libuv \ librhash.so:security/rhash -USES= compiler:c++11-lang ncurses +USES= compiler:c++11-lang libarchive ncurses HAS_CONFIGURE= yes CONFIGURE_ENV= MAKE=make Modified: head/devel/cmake/files/InitialCache.cmake ============================================================================== --- head/devel/cmake/files/InitialCache.cmake Tue Apr 17 17:19:58 2018 (r467619) +++ head/devel/cmake/files/InitialCache.cmake Tue Apr 17 18:00:39 2018 (r467620) @@ -15,14 +15,5 @@ set(LIBLZMA_INCLUDE_DIR "/usr/include" CACHE PATH set(LIBLZMA_LIBRARY "/usr/lib/liblzma.so" CACHE PATH "LibLZMA library to link against.") -# Similarly for libarchive -set(LibArchive_INCLUDE_DIR "/usr/include" CACHE PATH - "Directory where LibArchive headers are located.") -set(LibArchive_LIBRARY "/usr/lib/libthr.so;/usr/lib/libarchive.so" CACHE PATH - "LibArchive library to link against.") - -# Modern FreeBSD systems are assumed to have libpkg installed, -# so enable its use in CPack for the direct generation of FreeBSD -# packages from software (outside of ports, say) that uses CMake. -set(CPACK_ENABLE_FREEBSD_PKG ON CACHE BOOL "Enable pkg(8) generator in CPack") - +# Don't even try +set(CPACK_ENABLE_FREEBSD_PKG OFF CACHE BOOL "Enable pkg(8) generator in CPack")