Index: head/devel/ccache/Makefile
===================================================================
--- head/devel/ccache/Makefile	(revision 504138)
+++ head/devel/ccache/Makefile	(revision 504139)
@@ -1,163 +1,157 @@
 # Created by: Dominic Marks <d.marks@student.umist.ac.uk>
 # $FreeBSD$
 
 PORTNAME=	ccache
 #PORTVERSION must be set later due to depending on PORT_OPTIONS.
 PORTREVISION=	0
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/ccache/ccache/releases/download/v${DISTVERSION}/ \
 		LOCAL/bdrewery
 
 MAINTAINER=	bdrewery@FreeBSD.org
 COMMENT=	Tool to minimize the compile time of C/C++ programs
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/GPL-3.0.txt
 
 CONFLICTS_INSTALL?=	ccache-static-[0-9]* ccache-memcached-[0-9]* ccache-memcached-static-[0-9]*
 
 GNU_CONFIGURE=	yes
 
 HOWTO=		ccache-howto-freebsd.txt
 CCLINKDIR=	libexec/ccache
 SUB_FILES=	${HOWTO} world-ccache pkg-message ccache-update-links.sh
 
 PORTDOCS=	ccache-howto-freebsd.txt MANUAL.html MANUAL.adoc NEWS.adoc \
 		NEWS.html
 
 OPTIONS_DEFINE=	CLANGLINK LLVMLINK STATIC DOCS TINDERBOX MEMCACHED
 OPTIONS_DEFAULT=CLANGLINK LLVMLINK
 
 CLANGLINK_DESC=	Create clang compiler links if clang is installed
 LLVMLINK_DESC=	Create llvm compiler links if llvm is installed
 TINDERBOX_DESC=	Create tarball for tinderbox usage
 MEMCACHED_DESC=	Build in experimental Memcached support
 
 USES=		compiler
 
 MEMCACHED_EXTRA_PATCHES=	\
 				${FILESDIR}/extra-patch-memcached-configure.ac \
 				${FILESDIR}/extra-patch-memcached-Makefile.in
 MEMCACHED_CONFIGURE_ENABLE=	memcached
 MEMCACHED_USES=			autoreconf gmake pkgconfig
 MEMCACHED_LIB_DEPENDS=		libmemcached.so:databases/libmemcached
 MEMCACHED_LDFLAGS=		-L${LOCALBASE}/lib
 MEMCACHED_CFLAGS=		-I${LOCALBASE}/include
 
 STATIC_CONFIGURE_ENABLE=	static
 
 .if empty(OPTIONS_SLAVE:MMEMCACHED)
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-Makefile.in
 .endif
 
 .if defined(WITH_CCACHE_BUILD) && empty(OPTIONS_SLAVE:MMEMCACHED) && \
     !defined(NO_CCACHE_DEPEND)
 MEMCACHED_IGNORE=		MEMCACHED cannot be combined with WITH_CCACHE_BUILD.  Use devel/ccache-memcached
 # XXX: This needs more testing with Poudriere before enabling. Also bsd.options.mk support.
 #MEMCACHED_DEPENDS_ARGS+= NO_CCACHE_DEPEND=1
 .endif
 
 # Support WITH_CCACHE_BUILD but don't depend on it.
 NO_CCACHE_DEPEND=	yes
 
 OPTIONS_SUB=	yes
 
 STATIC_LDFLAGS+=	-static
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMEMCACHED}
 # Hack for libsasl2.a requiring HMAC_CTX_reset from hidden libntlm.a.
 STATIC_LDFLAGS+= -L${LOCALBASE}/lib/sasl2
 PORTVERSION=	3.5.dev.20180926
 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
 PORTVERSION=	3.7.1
 .endif
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_CCACHE_BUILD) && empty(OPTIONS_SLAVE:MMEMCACHED)
-.if !empty(BUILD_DEPENDS)
-.error MAINTAINER NOTE: Cannot have any BUILD_DEPENDS for default ccache packages: ${BUILD_DEPENDS}
-.endif
-.endif
-
 .  if ${COMPILER_TYPE} == clang
 CPPFLAGS+=	-DCC_IS_CLANG
 .  elif ${COMPILER_TYPE} == gcc
 CPPFLAGS+=	-DCC_IS_GCC
 .  endif
 
 PLIST_SUB+=	CCLINKDIR="${CCLINKDIR}"
 
 .if ${ARCH}=="i386"
 CCACHE_COMPILERS+=	icc icpc
 .endif
 
 GNU_COMPILERS+=		34 42 43 44 45 46 47 48 49 5 6 7 8 9
 CCACHE_COMPILERS+=	cc c++ CC gcc g++ ${GNU_COMPILERS:S|^|gcc|} ${GNU_COMPILERS:S|^|g++|}
 
 .if ${PORT_OPTIONS:MCLANGLINK}
 CLANG_COMPILERS+=	33 34 35 36 37 38 39 40 50 60 70 80 -devel
 CCACHE_COMPILERS+=	clang clang++ ${CLANG_COMPILERS:S|^|clang|} ${CLANG_COMPILERS:S|^|clang++|}
 .endif
 
 .if ${PORT_OPTIONS:MLLVMLINK}
 CCACHE_COMPILERS+=	llvm-gcc llvm-c++ llvm-g++
 .endif
 
 CCACHE_COMPILERS+=	${EXTRA_COMPILERS}
 SUB_LIST+=	CCACHE_COMPILERS="${CCACHE_COMPILERS}" \
 		CCLINKDIR="${CCLINKDIR}" \
 		ICCPREFIX="${LOCALBASE}/intel_cc_80/bin" \
 		HOWTO="${HOWTO}"
 
 post-patch-MEMCACHED-off:
 	@${REINPLACE_CMD} \
 	    -e 's,_XOPEN_SOURCE 600,_XOPEN_SOURCE 700,' \
 	    -e 's,_POSIX_C_SOURCE 200112L,_POSIX_C_SOURCE 200809L,' \
 	    ${WRKSRC}/configure
 
 post-build-TINDERBOX-on:
 	@${MKDIR} ${WRKDIR}/tb/opt
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${WRKDIR}/tb/opt
 .for l in ${CCACHE_COMPILERS}
 	@${LN} -sf ${PORTNAME} ${WRKDIR}/tb/opt/${l}
 .endfor
 	@${TAR} -C ${WRKDIR}/tb -cpf ${WRKSRC}/${PORTNAME}.tar opt
 
 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
 	${INSTALL_SCRIPT} ${WRKDIR}/ccache-update-links.sh \
 		${STAGEDIR}${PREFIX}/bin/ccache-update-links
 
 do-install-TINDERBOX-on:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.tar ${STAGEDIR}${DATADIR}
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/MANUAL.html ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/MANUAL.adoc ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/NEWS.adoc ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/NEWS.html ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKDIR}/${HOWTO} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.post.mk>