Index: head/audio/spotifyd/Makefile
===================================================================
--- head/audio/spotifyd/Makefile	(revision 517092)
+++ head/audio/spotifyd/Makefile	(revision 517093)
@@ -1,400 +1,400 @@
 # $FreeBSD$
 
 PORTNAME=	spotifyd
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.2.20
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 
 MAINTAINER=	tobik@FreeBSD.org
 COMMENT=	Spotify daemon
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENCE
 
 LIB_DEPENDS=	libogg.so:audio/libogg
 
 USES=		cargo ssl:build
 USE_GITHUB=	yes
 GH_ACCOUNT=	Spotifyd
 GH_TUPLE=	plietar:dns-parser:1d3e5a5591bc72eb061c23bd426c4a25f2f73791:dnsparser \
 		librespot-org:librespot:551daadc44a39336e1c643d1e300d38cdd8426d5:librespot \
 		plietar:rust-mdns:66a74033da6c9f1a06e7b0a29f4544fd189d6479:mdns \
 		TeXitoi:structopt:0c888e962d842f2c90c6c290d3a2a40947b37005:structopt \
 		plietar:rust-tremor:5958cc302e78f535dad90e9665da981ddff4000a:tremor
 USE_RC_SUBR=	spotifyd
 
 CARGO_CRATES=	adler32-1.0.4 \
 		advapi32-sys-0.2.0 \
 		aes-0.3.2 \
 		aes-ctr-0.3.0 \
 		aes-soft-0.3.3 \
 		aesni-0.6.0 \
 		aho-corasick-0.7.6 \
 		alga-0.9.2 \
 		alsa-0.2.2 \
 		alsa-0.3.0 \
 		alsa-sys-0.1.2 \
 		ansi_term-0.11.0 \
 		approx-0.3.2 \
 		arc-swap-0.4.3 \
 		arrayref-0.3.5 \
 		arrayvec-0.4.12 \
 		atty-0.2.13 \
 		autocfg-0.1.7 \
 		backtrace-0.3.40 \
 		backtrace-sys-0.1.32 \
 		base64-0.10.1 \
 		base64-0.9.3 \
 		bindgen-0.51.1 \
 		bit-set-0.5.1 \
 		bit-vec-0.5.1 \
 		bitflags-0.3.3 \
 		bitflags-0.9.1 \
 		bitflags-1.2.1 \
 		blake2b_simd-0.5.8 \
 		block-buffer-0.7.3 \
 		block-cipher-trait-0.6.2 \
 		block-modes-0.3.3 \
 		block-padding-0.1.4 \
 		boxfnonce-0.1.1 \
 		byte-tools-0.3.1 \
 		bytecount-0.4.0 \
 		byteorder-0.5.3 \
 		byteorder-1.3.2 \
 		bytes-0.4.12 \
 		c2-chacha-0.2.3 \
 		c_linked_list-1.1.1 \
 		cargo_metadata-0.6.4 \
 		cc-1.0.46 \
 		cexpr-0.3.5 \
 		cfg-if-0.1.10 \
 		chrono-0.4.9 \
 		clang-sys-0.28.1 \
 		clap-2.33.0 \
 		cloudabi-0.0.3 \
 		constant_time_eq-0.1.4 \
 		cookie-0.12.0 \
 		cookie_store-0.7.0 \
 		core-foundation-0.6.4 \
 		core-foundation-sys-0.5.1 \
 		core-foundation-sys-0.6.2 \
 		coreaudio-rs-0.9.1 \
 		coreaudio-sys-0.2.3 \
 		cpal-0.8.2 \
 		crc32fast-1.2.0 \
 		crossbeam-deque-0.7.1 \
 		crossbeam-epoch-0.7.2 \
 		crossbeam-queue-0.1.2 \
 		crossbeam-utils-0.6.6 \
 		crypto-mac-0.7.0 \
 		ctr-0.3.2 \
 		daemonize-0.4.1 \
 		darling-0.9.0 \
 		darling_core-0.9.0 \
 		darling_macro-0.9.0 \
 		dbus-0.2.3 \
 		dbus-0.6.5 \
 		dbus-tokio-0.2.1 \
 		derive_builder-0.7.2 \
 		derive_builder_core-0.5.0 \
 		digest-0.8.1 \
 		dirs-2.0.2 \
 		dirs-sys-0.3.4 \
 		dotenv-0.13.0 \
 		dtoa-0.4.4 \
 		either-1.5.3 \
 		encoding_rs-0.8.20 \
 		env_logger-0.6.2 \
 		env_logger-0.7.1 \
 		error-chain-0.11.0 \
 		error-chain-0.12.1 \
 		extprim-1.7.0 \
 		failure-0.1.6 \
 		failure_derive-0.1.6 \
 		fake-simd-0.1.2 \
 		flate2-1.0.12 \
 		fnv-1.0.6 \
 		foreign-types-0.3.2 \
 		foreign-types-shared-0.1.1 \
 		fuchsia-cprng-0.1.1 \
 		fuchsia-zircon-0.3.3 \
 		fuchsia-zircon-sys-0.3.3 \
 		futures-0.1.29 \
 		futures-cpupool-0.1.8 \
 		gcc-0.3.55 \
 		generic-array-0.12.3 \
 		get_if_addrs-0.5.3 \
 		get_if_addrs-sys-0.1.1 \
 		gethostname-0.2.0 \
 		getopts-0.2.21 \
 		getrandom-0.1.13 \
 		glob-0.2.11 \
 		glob-0.3.0 \
 		h2-0.1.26 \
 		heck-0.3.1 \
 		hermit-abi-0.1.3 \
 		hex-0.3.2 \
 		hex-0.4.0 \
 		hkdf-0.7.1 \
 		hmac-0.7.1 \
 		http-0.1.19 \
 		http-body-0.1.0 \
 		httparse-1.3.4 \
 		humantime-1.3.0 \
 		hyper-0.11.27 \
 		hyper-0.12.35 \
 		hyper-proxy-0.4.1 \
 		hyper-tls-0.3.2 \
 		ident_case-1.0.1 \
 		idna-0.1.5 \
 		idna-0.2.0 \
 		indexmap-1.3.0 \
 		iovec-0.1.4 \
 		itertools-0.8.1 \
 		itoa-0.4.4 \
 		kernel32-sys-0.2.2 \
 		keyring-0.7.1 \
 		language-tags-0.2.2 \
 		lazy_static-1.4.0 \
 		lewton-0.9.4 \
 		libc-0.2.65 \
 		libdbus-sys-0.2.1 \
 		libloading-0.5.2 \
 		libm-0.1.4 \
 		libpulse-sys-0.0.0 \
 		linear-map-1.2.0 \
 		lock_api-0.3.1 \
 		log-0.3.9 \
 		log-0.4.8 \
 		matches-0.1.8 \
 		matrixmultiply-0.2.3 \
 		memchr-2.2.1 \
 		memoffset-0.5.2 \
 		mime-0.3.14 \
 		mime_guess-2.0.1 \
 		miniz_oxide-0.3.5 \
 		mio-0.6.19 \
 		mio-named-pipes-0.1.6 \
 		mio-uds-0.6.7 \
 		miow-0.2.1 \
 		miow-0.3.3 \
 		multimap-0.4.0 \
 		nalgebra-0.18.1 \
 		native-tls-0.2.3 \
 		net2-0.2.33 \
 		nix-0.11.1 \
 		nix-0.14.1 \
 		nix-0.9.0 \
 		nodrop-0.1.14 \
 		nom-4.2.3 \
 		num-0.2.0 \
 		num-bigint-0.2.3 \
 		num-complex-0.2.3 \
 		num-integer-0.1.41 \
 		num-iter-0.1.39 \
 		num-rational-0.2.2 \
 		num-traits-0.2.8 \
 		num_cpus-1.11.0 \
 		ogg-0.7.0 \
 		ogg-sys-0.0.9 \
 		opaque-debug-0.2.3 \
 		openssl-0.10.25 \
 		openssl-probe-0.1.2 \
 		openssl-sys-0.9.52 \
 		parking_lot-0.9.0 \
 		parking_lot_core-0.6.2 \
 		pbkdf2-0.3.0 \
 		peeking_take_while-0.1.2 \
 		percent-encoding-1.0.1 \
 		percent-encoding-2.1.0 \
 		pkg-config-0.3.17 \
 		portaudio-rs-0.3.1 \
 		portaudio-sys-0.1.1 \
 		ppv-lite86-0.2.6 \
 		proc-macro-error-0.2.6 \
 		proc-macro2-0.4.30 \
 		proc-macro2-1.0.6 \
 		protobuf-2.8.1 \
 		protobuf-codegen-2.8.1 \
 		protobuf-codegen-pure-2.8.1 \
 		publicsuffix-1.5.3 \
 		pulldown-cmark-0.2.0 \
 		quick-error-1.2.2 \
 		quote-0.6.13 \
 		quote-1.0.2 \
 		rand-0.3.23 \
 		rand-0.4.6 \
 		rand-0.5.6 \
 		rand-0.6.5 \
 		rand-0.7.2 \
 		rand_chacha-0.1.1 \
 		rand_chacha-0.2.1 \
 		rand_core-0.3.1 \
 		rand_core-0.4.2 \
 		rand_core-0.5.1 \
 		rand_hc-0.1.0 \
 		rand_hc-0.2.0 \
 		rand_isaac-0.1.1 \
 		rand_jitter-0.1.4 \
 		rand_os-0.1.3 \
 		rand_pcg-0.1.2 \
 		rand_xorshift-0.1.1 \
 		random-0.12.2 \
 		rawpointer-0.2.1 \
 		rdrand-0.4.0 \
 		redox_syscall-0.1.56 \
 		redox_users-0.3.1 \
 		regex-1.3.1 \
 		regex-syntax-0.6.12 \
 		relay-0.1.1 \
 		remove_dir_all-0.5.2 \
 		reqwest-0.9.17 \
 		result-1.0.0 \
 		rodio-0.9.0 \
 		rpassword-3.0.2 \
 		rspotify-0.7.0 \
 		rust-argon2-0.5.1 \
 		rustc-demangle-0.1.16 \
 		rustc-hash-1.0.1 \
 		rustc-serialize-0.3.24 \
 		rustc_version-0.2.3 \
 		ryu-1.0.2 \
 		safemem-0.3.3 \
 		same-file-1.0.5 \
 		schannel-0.1.16 \
 		scoped-tls-0.1.2 \
 		scopeguard-1.0.0 \
 		secret-service-1.0.0 \
 		security-framework-0.3.1 \
 		security-framework-sys-0.3.1 \
 		semver-0.9.0 \
 		semver-parser-0.7.0 \
 		serde-1.0.102 \
 		serde_derive-1.0.102 \
 		serde_ini-0.2.0 \
 		serde_json-1.0.41 \
 		serde_urlencoded-0.5.5 \
 		sha-1-0.8.1 \
 		sha2-0.8.0 \
 		shannon-0.2.0 \
 		shlex-0.1.1 \
 		signal-hook-0.1.11 \
 		signal-hook-registry-1.1.1 \
 		simplelog-0.7.4 \
 		skeptic-0.13.4 \
 		slab-0.3.0 \
 		slab-0.4.2 \
 		smallvec-0.2.1 \
 		smallvec-0.6.12 \
 		socket2-0.2.4 \
 		socket2-0.3.11 \
 		stdweb-0.1.3 \
 		stream-cipher-0.3.2 \
 		string-0.2.1 \
 		strsim-0.7.0 \
 		strsim-0.8.0 \
 		subtle-1.0.0 \
 		syn-0.15.44 \
 		syn-1.0.7 \
 		synstructure-0.12.1 \
 		syslog-4.0.1 \
 		take-0.1.0 \
 		tempdir-0.3.7 \
 		tempfile-3.1.0 \
 		term-0.6.1 \
 		termcolor-1.0.5 \
 		textwrap-0.11.0 \
 		thread_local-0.3.6 \
 		time-0.1.42 \
 		tokio-0.1.22 \
 		tokio-buf-0.1.1 \
 		tokio-codec-0.1.1 \
 		tokio-core-0.1.17 \
 		tokio-current-thread-0.1.6 \
 		tokio-executor-0.1.8 \
 		tokio-fs-0.1.6 \
 		tokio-io-0.1.12 \
 		tokio-process-0.2.4 \
 		tokio-proto-0.1.1 \
 		tokio-reactor-0.1.10 \
 		tokio-service-0.1.0 \
 		tokio-signal-0.1.5 \
 		tokio-signal-0.2.7 \
 		tokio-sync-0.1.7 \
 		tokio-tcp-0.1.3 \
 		tokio-threadpool-0.1.16 \
 		tokio-timer-0.2.11 \
 		tokio-udp-0.1.5 \
 		tokio-uds-0.2.5 \
 		try-lock-0.1.0 \
 		try-lock-0.2.2 \
 		try_from-0.3.2 \
 		typenum-1.11.2 \
 		unicase-2.5.1 \
 		unicode-bidi-0.3.4 \
 		unicode-normalization-0.1.8 \
 		unicode-segmentation-1.5.0 \
 		unicode-width-0.1.6 \
 		unicode-xid-0.1.0 \
 		unicode-xid-0.2.0 \
 		url-1.7.2 \
 		url-2.1.0 \
 		uuid-0.7.4 \
 		vcpkg-0.2.7 \
 		vec_map-0.8.1 \
 		vergen-3.0.4 \
 		version_check-0.1.5 \
 		void-1.0.2 \
 		walkdir-2.2.9 \
 		want-0.0.4 \
 		want-0.2.0 \
 		wasi-0.7.0 \
 		webbrowser-0.5.2 \
 		whoami-0.5.3 \
 		widestring-0.4.0 \
 		winapi-0.2.8 \
 		winapi-0.3.8 \
 		winapi-build-0.1.1 \
 		winapi-i686-pc-windows-gnu-0.4.0 \
 		winapi-util-0.1.2 \
 		winapi-x86_64-pc-windows-gnu-0.4.0 \
 		wincolor-1.0.2 \
 		ws2_32-sys-0.2.1 \
 		xdg-2.2.0
 CARGO_USE_GITHUB=	yes
 
 CARGO_BUILD_ARGS=	--no-default-features
 CARGO_INSTALL_ARGS=	--no-default-features
 CARGO_TEST_ARGS=	--no-default-features
 
 PLIST_FILES=	bin/spotifyd \
 		"@sample etc/spotifyd.conf.sample"
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=		DBUS DOCS PORTAUDIO PULSEAUDIO
 OPTIONS_DEFAULT=	PORTAUDIO
 
 DBUS_DESC=		D-Bus MPRIS support
 
 DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
 DBUS_VARS=		CARGO_FEATURES+=dbus_mpris
 
 PORTAUDIO_LIB_DEPENDS=	libportaudio.so:audio/portaudio
 PORTAUDIO_VARS=		CARGO_FEATURES+=portaudio_backend
 
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_VARS=	CARGO_FEATURES+=pulseaudio_backend
 
 post-patch:
 	@${REINPLACE_CMD} 's,/etc/,${PREFIX}/etc/,g' ${WRKSRC}/src/config.rs
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/spotifyd
 	${INSTALL_DATA} ${FILESDIR}/spotifyd.conf ${STAGEDIR}${PREFIX}/etc/spotifyd.conf.sample
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/audio/spotifyd/files/spotifyd.in
===================================================================
--- head/audio/spotifyd/files/spotifyd.in	(revision 517092)
+++ head/audio/spotifyd/files/spotifyd.in	(revision 517093)
@@ -1,40 +1,40 @@
 #!/bin/sh
 
 # PROVIDE: spotifyd
 # REQUIRE: DAEMON NETWORKING
 # KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf.local, /etc/rc.conf or
 # /etc/rc.conf.d/spotifyd to enable this service:
 #
 # spotifyd_enable (bool):       Set to NO by default.
 #                               Set it to "YES" to enable spotifyd.
 # spotifyd_config (str):        Set to %%PREFIX%%/etc/spotifyd.conf by default.
 #                               Path to configuration file.
 # spotifyd_user (str):          Set to "nobody" by default.
 #                               User to run spotifyd
 
 . /etc/rc.subr
 
 name=spotifyd
 rcvar=spotifyd_enable
 start_precmd="${name}_precmd"
 
 load_rc_config $name
 
 : ${spotifyd_enable:="NO"}
 : ${spotifyd_config:="%%PREFIX%%/etc/spotifyd.conf"}
 : ${spotifyd_user:="nobody"}
 
 pidfile="/var/run/${name}/${name}.pid"
 procname="%%PREFIX%%/bin/${name}"
 command="/usr/sbin/daemon"
-command_args="-S -m 3 -s info -l daemon -p ${pidfile} ${procname} --no-daemon -c ${spotifyd_config} ${spotifyd_args}"
+command_args="-S -m 3 -s info -l daemon -p ${pidfile} ${procname} --no-daemon --config-path ${spotifyd_config} ${spotifyd_args}"
 
 spotifyd_precmd()
 {
 	/usr/bin/install -d -m 0755 -o ${spotifyd_user} /var/run/${name}
 }
 
 run_rc_command "$1"