Index: Makefile
===================================================================
--- Makefile	(revision 507973)
+++ Makefile	(working copy)
@@ -2,11 +2,11 @@
 
 PORTNAME=	miniflux
 DISTVERSION=	2.0.16
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 
 MAINTAINER=	krion@FreeBSD.org
-COMMENT=	Miniflux is a self-hosted software to read RSS/Atom/JSON feeds
+COMMENT=	Self-hosted software to read RSS/Atom/JSON feeds
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
@@ -18,7 +18,7 @@
 USERS=	miniflux
 GROUPS=	miniflux
 
-WANT_PGSQL=	client
+WANT_PGSQL=	client contrib
 USE_RC_SUBR=	miniflux
 
 USE_GITHUB=	yes
@@ -30,12 +30,9 @@
 		-X miniflux.app/version.BuildDate=$$(date +'%Y-%m-%dT%H:%M:%SZ')"
 
 OPTIONS_DEFINE=		PGSQL_SERVER
-OPTIONS_DEFAULT=
 PGSQL_SERVER_DESC=	Install the PostgreSQL Server Component
 PGSQL_SERVER_VARS=	WANT_PGSQL=server
 
-.include <bsd.port.options.mk>
-
 do-install:
 	${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/miniflux.app ${STAGEDIR}${PREFIX}/bin/miniflux
 	${INSTALL_MAN} ${WRKSRC}/miniflux.1 ${STAGEDIR}${PREFIX}/man/man1/
Index: files/miniflux.in
===================================================================
--- files/miniflux.in	(revision 507973)
+++ files/miniflux.in	(working copy)
@@ -21,15 +21,11 @@
 load_rc_config $name
 
 : ${miniflux_enable="NO"}
+: ${miniflux_config="%%PREFIX%%/etc/miniflux.env"}
 
-# Miniflux doesn't use any config file, only environment variables.
-set -a
-. %%PREFIX%%/etc/miniflux.env
-set +a
-
 pidfile="/var/run/miniflux.pid"
 procname="%%PREFIX%%/bin/miniflux"
 command="/usr/sbin/daemon"
-command_args="-f -T miniflux -p ${pidfile} -u miniflux %%PREFIX%%/bin/miniflux"
+command_args="-f -T miniflux -p ${pidfile} -u miniflux %%PREFIX%%/bin/miniflux -c ${miniflux_config}"
 
 run_rc_command "$1"