Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 3 Oct 2018 20:21:30 +0000 (UTC)
From:      Bryan Drewery <bdrewery@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r481187 - head/devel/ccache
Message-ID:  <201810032021.w93KLU8R009165@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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..."



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201810032021.w93KLU8R009165>