From owner-svn-ports-all@freebsd.org Wed Oct 3 20:21:31 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 A021B10AC58A; Wed, 3 Oct 2018 20:21:31 +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.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 55FE48DD4D; Wed, 3 Oct 2018 20:21:31 +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 50F211BE33; Wed, 3 Oct 2018 20:21:31 +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 w93KLVl3009169; Wed, 3 Oct 2018 20:21:31 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w93KLU8R009165; Wed, 3 Oct 2018 20:21:30 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201810032021.w93KLU8R009165@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Wed, 3 Oct 2018 20:21:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r481187 - head/devel/ccache X-SVN-Group: ports-head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head/devel/ccache X-SVN-Commit-Revision: 481187 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: Wed, 03 Oct 2018 20:21:31 -0000 Author: bdrewery Date: Wed Oct 3 20:21:30 2018 New Revision: 481187 URL: https://svnweb.freebsd.org/changeset/ports/481187 Log: - MEMCACHED with no DOCS: Remove dependency on asciidoc which is required for ccache.1 to be generated due to being a development branch. Modified: head/devel/ccache/Makefile head/devel/ccache/pkg-plist Modified: head/devel/ccache/Makefile ============================================================================== --- head/devel/ccache/Makefile Wed Oct 3 20:11:33 2018 (r481186) +++ head/devel/ccache/Makefile Wed Oct 3 20:21:30 2018 (r481187) @@ -75,8 +75,11 @@ USE_GITHUB= yes GH_TAGNAME= f7712082106bef085515f86ae47e7dbbd2a48b57 MASTER_SITES= DISTINFO_FILE= ${MASTERDIR}/distinfo.memcached +.if ${PORT_OPTIONS:MDOCS} BUILD_DEPENDS+= ${LOCALBASE}/bin/a2x:textproc/asciidoc ALL_TARGET= all docs +PLIST_FILES+= man/man1/ccache.1.gz +.endif .else # Only needed pre-3.5 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-configure.ac @@ -130,7 +133,11 @@ post-build-TINDERBOX-on: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/ccache ${STAGEDIR}${PREFIX}/bin + # Memcached uses the 3.5 dev branch which requires asciidoc to generate + # ccache.1. +.if !${PORT_OPTIONS:MMEMCACHED} || ${PORT_OPTIONS:MDOCS} ${INSTALL_MAN} ${WRKSRC}/doc/ccache.1 ${STAGEDIR}${PREFIX}/man/man1 +.endif ${MKDIR} ${STAGEDIR}${PREFIX}/${CCLINKDIR}/world ${INSTALL_SCRIPT} ${WRKDIR}/world-ccache \ ${STAGEDIR}${PREFIX}/${CCLINKDIR}/world/ccache Modified: head/devel/ccache/pkg-plist ============================================================================== --- head/devel/ccache/pkg-plist Wed Oct 3 20:11:33 2018 (r481186) +++ head/devel/ccache/pkg-plist Wed Oct 3 20:21:30 2018 (r481187) @@ -1,6 +1,6 @@ bin/ccache bin/ccache-update-links -man/man1/ccache.1.gz +%%NO_MEMCACHED%%man/man1/ccache.1.gz %%CCLINKDIR%%/world/ccache %%TINDERBOX%%%%DATADIR%%/ccache.tar @postexec echo "Create compiler links..."