Index: head/databases/couchdb3/Makefile
===================================================================
--- head/databases/couchdb3/Makefile	(revision 539967)
+++ head/databases/couchdb3/Makefile	(revision 539968)
@@ -1,116 +1,116 @@
 # $FreeBSD$
 
 PORTNAME=	couchdb3
 DISTVERSION=	3.1.0
 PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	APACHE/couchdb/source/${DISTVERSION}
 DISTNAME=	apache-couchdb-${DISTVERSION}
 
 MAINTAINER=	dch@FreeBSD.org
 COMMENT=	JSON document database with HTTP API and scalable multi-master sync
 
 LICENSE=	APACHE20 BSD3CLAUSE ISCL WTFPL OFL11
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	rebar:devel/rebar \
 		erlang-runtime22>=22.0:lang/erlang-runtime22
 LIB_DEPENDS=	libicudata.so:devel/icu \
 		libmozjs-60.so:lang/spidermonkey60
 RUN_DEPENDS=	erlang-runtime22>=22.0:lang/erlang-runtime22
 
 USES=		compiler:c++14-lang cpe gmake libtool ncurses
 USE_RC_SUBR=	${PORTNAME}
 
 CONFLICTS=	couchdb[24]*
 
 CPE_VENDOR=	apache
 
 USERS=		couchdb
 GROUPS=		couchdb
 
 SUB_FILES=	pkg-message
 SUB_LIST=	APPDIR=${APPDIR} \
 		ERL_PATH=${LOCALBASE}/lib/erlang22/bin/erl \
 		PORTNAME=${PORTNAME} \
 		RELDIR=${RELDIR} \
 		WWWDIR=${WWWDIR}
 PLIST_SUB=	VERSION=${DISTVERSION}
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--skip-deps --user ${USERS} --rebar ${LOCALBASE}/bin/rebar \
 		--spidermonkey-version 60
 
 ALL_TARGET=	release
 
 MAKE_ENV=	PATH=${LOCALBASE}/lib/erlang22/bin:${PATH}
 
 OPTIONS_DEFINE=	DOCS
 OPTIONS_SUB=	yes
 
 DBDIR?=		/var/db/${PORTNAME}
 LOGDIR?=	/var/log/${PORTNAME}
 LOGFILE?=	${LOGDIR}/couch.log
 APPDIR=		${LOCALBASE}/libexec/${PORTNAME}
 RELDIR=		${APPDIR}/releases/${DISTVERSION}
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD && ${ARCH} == i386
 EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src_jiffy_c__src_double-conversion_strtod.cc
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} \
 	    -e 's,%%APPDIR%%,${APPDIR},g' \
 	    -e 's,%%DATADIR%%,${DATADIR},g' \
 	    -e 's,%%DBDIR%%,${DBDIR},g' \
 	    -e 's,%%LOCALBASE%%,${LOCALBASE},g' \
 	    -e 's,%%PORTNAME%%,${PORTNAME},g' \
 	    -e 's,%%WWWDIR%%,${WWWDIR},g' \
-	    -e 's,\$COUCHDB_USER,${USERS},g' \
-	    -e 's,\$LOG_FILE,${LOGFILE},g' \
+	    -e 's,$$COUCHDB_USER,${USERS},g' \
+	    -e 's,$$LOG_FILE,${LOGFILE},g' \
 	    ${WRKSRC}/configure
 # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=238514
 .if ${OPSYS} == FreeBSD && (${OSVERSION} < 1200000 || ${ARCH} == i386)
 	@${REINPLACE_CMD} \
 	    -e 's,\$FLTO_FLAG ,,g' \
 	    ${WRKSRC}/src/jiffy/rebar.config
 .endif
 
 pre-install:
 	# relocate user-modifiable runtime configs to match hier(7)
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/rel/couchdb/etc/local.ini \
 		${STAGEDIR}${ETCDIR}/local.ini.sample
 	${INSTALL_DATA} ${WRKSRC}/rel/couchdb/etc/vm.args \
 		${STAGEDIR}${ETCDIR}/vm.args.sample
 	${INSTALL_MAN} ${WRKSRC}/share/docs/man/apachecouchdb.1 \
 		${STAGEDIR}${MANPREFIX}/man/man1
 	# prune build artefacts and surplus headers
 	${FIND} -E ${WRKSRC} -type f \
 		-regex '.*\.(a|buildinfo|c|cc|cmd|d|o|orig|h|cpp)' -print -delete
 	# remove runtime dirs and files that were moved to match hier(7)
 	${RM} -rv ${WRKSRC}/rel/couchdb/var \
 		${WRKSRC}/rel/couchdb/etc/*.d \
 		${WRKSRC}/rel/couchdb/etc/local.ini \
 		${WRKSRC}/rel/couchdb/etc/vm.args \
 		${WRKSRC}/rel/couchdb/releases/*/vm.args \
 		${WRKSRC}/rel/couchdb/lib/couch-*/priv/couch*js
 	@${CP} ${WRKSRC}/src/docs/images/favicon.ico ${WRKSRC}/share/www/
 	(cd ${WRKSRC}/rel/couchdb && ${COPYTREE_SHARE} . ${STAGEDIR}${APPDIR})
 
 post-install:
 	@${FIND} -E ${STAGEDIR} -type f \
 		\( -name couchjs -o -name *.so \) \
 		-exec ${STRIP_CMD} {} +
 	@${MKDIR} \
 		${STAGEDIR}${DBDIR} \
 		${STAGEDIR}${LOGDIR}
 	# fauxton UI is a required component
 	(cd ${WRKSRC}/share/www && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR})
 
 post-install-DOCS-on:
 	(cd ${WRKSRC}/share/docs/html && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}/docs)
 
 .include <bsd.port.mk>