Index: branches/2020Q1/net-p2p/c-lightning/Makefile
===================================================================
--- branches/2020Q1/net-p2p/c-lightning/Makefile	(revision 522631)
+++ branches/2020Q1/net-p2p/c-lightning/Makefile	(revision 522632)
@@ -1,76 +1,77 @@
 # Created by: Vasil Dimov <vd@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	c-lightning
 # To build from an arbitrary git commit comment PORTVERSION and PORTREVISION (if present)
 PORTVERSION=	0.8.0
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 # and uncomment the following two lines (use for example -git-HEAD or -git-f8d8348c)
 #PORTVERSION=	0
 #PKGNAMESUFFIX=	-git-f8d8348c
 CATEGORIES=	net-p2p finance
 
 MAINTAINER=	vd@FreeBSD.org
 COMMENT=	Lightning Network implementation in C
 
 LICENSE=	MIT
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mako>=1.0.14:textproc/py-mako@${PY_FLAVOR}
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libsodium.so:security/libsodium \
 		libsqlite3.so:databases/sqlite3
 RUN_DEPENDS=	bitcoin-cli:net-p2p/bitcoin-utils
 
 USES=		autoreconf:build gettext gmake libtool python:3.5+,build
 BINARY_ALIAS=	python=${PYTHON_CMD} python3=${PYTHON_CMD}
 ALL_TARGET=	default
 
 OPTIONS_DEFINE=		COMPATIBILITY DEVELOPER EXPERIMENTAL
 OPTIONS_RADIO=		TESTING
 OPTIONS_RADIO_TESTING=	ASAN VALGRIND
 
 COMPATIBILITY_CONFIGURE_ENABLE=	compat
 COMPATIBILITY_DESC=		Compatibility mode, good to disable to see if your software breaks
 DEVELOPER_CONFIGURE_ENABLE=	developer
 DEVELOPER_DESC=			Developer mode, good for testing
 EXPERIMENTAL_CONFIGURE_ENABLE=	experimental-features
 EXPERIMENTAL_DESC=		Enable experimental features
 ASAN_CONFIGURE_ENABLE=		address-sanitizer
 ASAN_DESC=			Compile with address-sanitizer
 VALGRIND_CONFIGURE_ENABLE=	valgrind
 VALGRIND_DESC=			Run tests with Valgrind
 
 OPTIONS_DEFAULT=COMPATIBILITY
 
 HAS_CONFIGURE=	yes
 
 USE_GITHUB=	yes
 .if defined(PKGNAMESUFFIX)
 GIT_COMMIT=	${PKGNAMESUFFIX:C/-git-//}
 .else
 GIT_COMMIT=	${DISTVERSIONPREFIX}${PORTVERSION}
 .endif
 GH_TUPLE=	ElementsProject:lightning:${GIT_COMMIT} \
 		ElementsProject:libwally-core:release_0.7.4:ext1/external/libwally-core \
 		ianlancetaylor:libbacktrace:5a99ff7fed66b8e:ext2/external/libbacktrace \
 		zserge:jsmn:v1.0.0:ext3/external/jsmn
 
 USERS=		c-lightning
 GROUPS=		c-lightning
 
 USE_RC_SUBR=	lightningd
 
 SUB_FILES=	lightningd-bitcoin.conf.sample pkg-message
 SUB_LIST=	U="${USERS}" G="${GROUPS}" LIGHTNINGD_BASE_DIR="${DESTDIR}/var/db/c-lightning"
 PLIST_SUB=	U="${USERS}" G="${GROUPS}"
 
 post-patch:
 	${REINPLACE_CMD} -e 's|cd external|unset CFLAGS \&\& cd external|' \
 		${WRKSRC}/external/Makefile
 
 post-install:
 	${INSTALL_DATA} \
 		${WRKDIR}/lightningd-bitcoin.conf.sample \
 		${STAGEDIR}${PREFIX}/etc/lightningd-bitcoin.conf.sample
 
 .include <bsd.port.mk>
Index: branches/2020Q1/net-p2p/c-lightning/files/lightningd.in
===================================================================
--- branches/2020Q1/net-p2p/c-lightning/files/lightningd.in	(revision 522631)
+++ branches/2020Q1/net-p2p/c-lightning/files/lightningd.in	(revision 522632)
@@ -1,44 +1,53 @@
 #!/bin/sh
 # $FreeBSD$
 
 # PROVIDE: lightningd
 # REQUIRE: LOGIN cleanvar
 # KEYWORD: shutdown
 
 # Add the following to %%LOCALBASE%%/etc/rc.conf.d/lightningd to influence
 # the behavior of this script (default values are listed):
 #
 # lightningd_enable="NO"  # change to "YES" to enable
 # lightningd_user="%%U%%"
 # lightningd_group="%%G%%"
 # lightningd_base_dir="%%LIGHTNINGD_BASE_DIR%%"
 # lightningd_network="bitcoin"
 # lightningd_conf="%%PREFIX%%/etc/lightningd-${lightningd_network}.conf"
 # lightningd_extra_args=""  # See lightningd --help
 
 . /etc/rc.subr
 
 name="lightningd"
 rcvar=lightningd_enable
 
 load_rc_config ${name}
 
 : ${lightningd_enable:="NO"}
 : ${lightningd_user:="%%U%%"}
 : ${lightningd_group:="%%G%%"}
 : ${lightningd_base_dir:="%%LIGHTNINGD_BASE_DIR%%"}
 : ${lightningd_network:="bitcoin"}
 : ${lightningd_conf:="%%PREFIX%%/etc/${name}-${lightningd_network}.conf"}
 
 pidfile="${lightningd_base_dir}/lightningd-${lightningd_network}.pid"
 command="%%PREFIX%%/bin/lightningd"
 command_args=""
 command_args="${command_args} --lightning-dir=${lightningd_base_dir}"
 command_args="${command_args} --network=${lightningd_network}"
 command_args="${command_args} --daemon"
+# service(8) would execute us with LOCALBASE stripped out from PATH,
+# thus specify the full path to bitcoin-cli.
+command_args="${command_args} --bitcoin-cli=%%LOCALBASE%%/bin/bitcoin-cli"
+# bitcoin-cli(1) tries to create its "datadir" (by default ${HOME}/.bitcoin)
+# if it does not exist. Provide something that already exists to avoid the
+# creation of unnecessary empty directories.
+command_args="${command_args} --bitcoin-datadir=${lightningd_base_dir}"
 
 if [ -e "${lightningd_conf}" ] ; then
 	command_args="${command_args} --conf=${lightningd_conf}"
 fi
+
+command_args="${command_args} ${lightningd_extra_args}"
 
 run_rc_command "$1"
Index: branches/2020Q1
===================================================================
--- branches/2020Q1	(revision 522631)
+++ branches/2020Q1	(revision 522632)

Property changes on: branches/2020Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r522323