From owner-svn-ports-all@freebsd.org Thu Oct 10 20:10:01 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3D12E13090E; Thu, 10 Oct 2019 20:10:01 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46q2Hs0tJGz4WjM; Thu, 10 Oct 2019 20:10:01 +0000 (UTC) (envelope-from bdrewery@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 F0CF7716C; Thu, 10 Oct 2019 20:10:00 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x9AKA097055147; Thu, 10 Oct 2019 20:10:00 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x9AK9xur055103; Thu, 10 Oct 2019 20:09:59 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201910102009.x9AK9xur055103@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Thu, 10 Oct 2019 20:09:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r514247 - in head: Mk audio/tuxguitar graphics/rawtherapee lang/rust net/mpich2 X-SVN-Group: ports-head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: in head: Mk audio/tuxguitar graphics/rawtherapee lang/rust net/mpich2 X-SVN-Commit-Revision: 514247 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.29 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: Thu, 10 Oct 2019 20:10:01 -0000 Author: bdrewery Date: Thu Oct 10 20:09:59 2019 New Revision: 514247 URL: https://svnweb.freebsd.org/changeset/ports/514247 Log: - Add compat for NOCCACHE -> NO_CCACHE Modified: head/Mk/bsd.ccache.mk head/audio/tuxguitar/Makefile head/graphics/rawtherapee/Makefile head/lang/rust/Makefile head/net/mpich2/Makefile Modified: head/Mk/bsd.ccache.mk ============================================================================== --- head/Mk/bsd.ccache.mk Thu Oct 10 20:06:24 2019 (r514246) +++ head/Mk/bsd.ccache.mk Thu Oct 10 20:09:59 2019 (r514247) @@ -12,6 +12,10 @@ COMMANDS_Include_MAINTAINER= portmgr@FreeBSD.org _CCACHEMKINCLUDED= yes +.if defined(NOCCACHE) +NO_CCACHE= t +.endif + # HOME is always set to ${WRKDIR} now. Try to use /root/.ccache as default. .if defined(WITH_CCACHE_BUILD) && !defined(CCACHE_DIR) . if defined(USER) && ${USER} == root @@ -25,7 +29,7 @@ WARNING+= WITH_CCACHE_BUILD support disabled, please s # Support NO_CCACHE for common setups, require WITH_CCACHE_BUILD, and # don't use if ccache already set in CC .if !defined(NO_CCACHE) && defined(WITH_CCACHE_BUILD) && !${CC:M*ccache*} && \ - !defined(NO_BUILD) && !defined(NOCCACHE) + !defined(NO_BUILD) # Avoid depends loops between ccache and pkg . if !defined(NO_CCACHE_DEPEND) && \ Modified: head/audio/tuxguitar/Makefile ============================================================================== --- head/audio/tuxguitar/Makefile Thu Oct 10 20:06:24 2019 (r514246) +++ head/audio/tuxguitar/Makefile Thu Oct 10 20:09:59 2019 (r514247) @@ -36,7 +36,7 @@ USE_JAVA= yes USE_ANT= yes USE_LDCONFIG= yes JAVA_VERSION= 1.6+ -NOCCACHE= yes +NO_CCACHE= yes BUILD_WRKSRC= ${WRKSRC}/TuxGuitar SF2_DIR= ${LOCALBASE}/share/sounds/sf2 Modified: head/graphics/rawtherapee/Makefile ============================================================================== --- head/graphics/rawtherapee/Makefile Thu Oct 10 20:06:24 2019 (r514246) +++ head/graphics/rawtherapee/Makefile Thu Oct 10 20:09:59 2019 (r514247) @@ -73,7 +73,7 @@ INSTALLS_ICONS= yes CMAKE_ARGS+= -DPROC_TARGET_NUMBER="1" .endif -.if "${WITH_CCACHE_BUILD}" == "yes" && !defined(NO_CCACHE) && !defined(NOCCACHE) +.if "${WITH_CCACHE_BUILD}" == "yes" && !defined(NO_CCACHE) CMAKE_ARGS+= -DCMAKE_C_COMPILER_LAUNCHER=${CCACHE_BIN} \ -DCMAKE_CXX_COMPILER_LAUNCHER=${CCACHE_BIN} .endif Modified: head/lang/rust/Makefile ============================================================================== --- head/lang/rust/Makefile Thu Oct 10 20:06:24 2019 (r514246) +++ head/lang/rust/Makefile Thu Oct 10 20:09:59 2019 (r514247) @@ -140,7 +140,7 @@ post-patch-SOURCES-off: @${REINPLACE_CMD} -e 's/config.tools.*"src".*/false;/' \ ${WRKSRC}/src/bootstrap/install.rs -.if defined(WITH_CCACHE_BUILD) && !defined(NO_CCACHE) && !defined(NOCCACHE) +.if defined(WITH_CCACHE_BUILD) && !defined(NO_CCACHE) CCACHE_VALUE= "${CCACHE_BIN}" .else CCACHE_VALUE= false Modified: head/net/mpich2/Makefile ============================================================================== --- head/net/mpich2/Makefile Thu Oct 10 20:06:24 2019 (r514246) +++ head/net/mpich2/Makefile Thu Oct 10 20:09:59 2019 (r514247) @@ -53,7 +53,7 @@ FFLAGS= -O2 LDFLAGS+= -lpthread -lexecinfo MAKE_ENV= CCACHE_DISABLE=yes PACKAGE=${PORTNAME} -NOCCACHE= yes +NO_CCACHE= yes CONFLICTS= lam-7.* mpd-[0-9]* mpiexec-0.*