From 1761e6570efae18651ab2ccb661c29c54378e738 Mon Sep 17 00:00:00 2001
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Mon, 20 May 2019 17:06:34 +0000
Subject: [PATCH] Fix recursive dependency issue with gmake.

Add a hard .error so I don't miss this again.

PR:		237979
Submitted by:	tcberner, adamw (based on)
Pointyhat to:	bdrewery
---
 devel/ccache/Makefile                      | 18 ++++++++++++------
 devel/ccache/files/extra-patch-Makefile.in | 13 +++++++++++++
 devel/gettext-runtime/Makefile             |  1 -
 devel/gmake/Makefile                       |  2 --
 print/indexinfo/Makefile                   |  1 -
 5 files changed, 25 insertions(+), 10 deletions(-)
 create mode 100644 devel/ccache/files/extra-patch-Makefile.in

diff --git a/devel/ccache/Makefile b/devel/ccache/Makefile
index dd1249babf02..40d63d286964 100644
--- a/devel/ccache/Makefile
+++ b/devel/ccache/Makefile
@@ -33,25 +33,25 @@ 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 gmake
+USES=		compiler
 
 MEMCACHED_EXTRA_PATCHES=	\
 				${FILESDIR}/extra-patch-memcached-configure.ac \
 				${FILESDIR}/extra-patch-memcached-Makefile.in
 MEMCACHED_CONFIGURE_ENABLE=	memcached
-MEMCACHED_USES=			autoreconf pkgconfig
+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)
-# Don't allow autoreconf. We want no dependencies on this to keep
-# WITH_CCACHE_BUILD working.
-USES:=		${USES:Nautoreconf}
-
 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
@@ -85,6 +85,12 @@ PORTVERSION=	3.7.1
 
 .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
+.endif
+.endif
+
 .  if ${COMPILER_TYPE} == clang
 CPPFLAGS+=	-DCC_IS_CLANG
 .  elif ${COMPILER_TYPE} == gcc
diff --git a/devel/ccache/files/extra-patch-Makefile.in b/devel/ccache/files/extra-patch-Makefile.in
new file mode 100644
index 000000000000..458f388c93ed
--- /dev/null
+++ b/devel/ccache/files/extra-patch-Makefile.in
@@ -0,0 +1,13 @@
+--- Makefile.in.orig	2019-05-20 14:04:00 UTC
++++ Makefile.in
+@@ -126,10 +126,6 @@ install: ccache$(EXEEXT) @disable_man@ccache.1
+ clean:
+ 	rm -rf $(files_to_clean)
+ 
+-src/snprintf.o: CFLAGS += @no_implicit_fallthrough_warning@
+-$(zlib_objs): CPPFLAGS += -include config.h
+-$(zlib_objs): CFLAGS += @no_implicit_fallthrough_warning@
+-
+ src/zlib/libz.a: $(zlib_objs)
+ 	$(if $(quiet),@echo "  AR       $@")
+ 	$(Q)$(AR) cr $@ $(zlib_objs)
diff --git a/devel/gettext-runtime/Makefile b/devel/gettext-runtime/Makefile
index 824c3c23c02a..99e839efaa93 100644
--- a/devel/gettext-runtime/Makefile
+++ b/devel/gettext-runtime/Makefile
@@ -28,7 +28,6 @@ WRKSRC_SUBDIR=	gettext-runtime
 INFO=		autosprintf
 CPE_PRODUCT=	gettext
 CPE_VENDOR=	gnu
-NO_CCACHE=	yes
 
 .include <bsd.port.options.mk>
 
diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile
index 8cd2700f5c68..ab80a3066f6f 100644
--- a/devel/gmake/Makefile
+++ b/devel/gmake/Makefile
@@ -24,8 +24,6 @@ CONFIGURE_ARGS=	--program-prefix=g \
 USES=		cpe tar:bzip2
 CPE_VENDOR=	gnu
 
-NO_CCACHE=	yes
-
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
 
diff --git a/print/indexinfo/Makefile b/print/indexinfo/Makefile
index a46adab63e6a..1fd70e47cc13 100644
--- a/print/indexinfo/Makefile
+++ b/print/indexinfo/Makefile
@@ -15,7 +15,6 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	bapt
 INSTALL_TARGET=	install-strip
 PLIST_FILES=	bin/indexinfo
-NO_CCACHE=	yes
 
 .if exists(/usr/include/sys/capsicum.h)
 CFLAGS+=	-DHAVE_CAPSICUM