Index: Makefile
===================================================================
--- Makefile	(revision 509261)
+++ Makefile	(working copy)
@@ -202,10 +202,6 @@
 KAFKA_LIB_DEPENDS=		librdkafka.so:net/librdkafka
 KAFKA_PLIST_FILES=		lib/syslog-ng/libkafka.so
 
-# Move Gradle's home below ${WRKDIR} instead of using ${HOME}/.gradle
-_GRADLE_ENV=	GRADLE_USER_HOME=${WRKDIR}/gradle-home
-_GRADLE_RUN=	${SETENV} ${_GRADLE_ENV} gradle4 --no-daemon
-
 .include <bsd.port.pre.mk>
 
 .if !${PORT_OPTIONS:MJSON}
@@ -216,6 +212,9 @@
 	@${CP} ${WRKSRC}/scl/syslog-ng.conf ${WRKSRC}/scl/syslog-ng.conf.dist
 	@${CP} ${WRKSRC}/scl/scl.conf ${WRKSRC}/scl/scl.conf.sample
 
+post-patch-JAVA_MOD-on:
+	@${REINPLACE_CMD} 's,$$(GRADLE),& --no-daemon,g' ${WRKSRC}/Makefile.in
+
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	${INSTALL} -d ${STAGEDIR}${DOCSDIR}