Index: branches/2019Q4/multimedia/emby-server/Makefile
===================================================================
--- branches/2019Q4/multimedia/emby-server/Makefile	(revision 520402)
+++ branches/2019Q4/multimedia/emby-server/Makefile	(revision 520403)
@@ -1,123 +1,124 @@
 # $FreeBSD$
 
 PORTNAME=	emby-server
 PORTVERSION=	4.2.1.0
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	https://github.com/MediaBrowser/Emby.Releases/releases/download/${PORTVERSION}/ \
 		https://mediabrowser.github.io/embytools/
 DISTNAME=	embyserver-netframework_${PORTVERSION}
 DISTFILES=	${DISTNAME}.zip \
 		ffdetect_4.0.3_x64_freebsd12.tar.xz \
 		ffmpeg-2019_04_09.tar.gz \
 		license.docx
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${DISTNAME}.zip ffdetect_4.0.3_x64_freebsd12.tar.xz \
 		ffmpeg-2019_04_09.tar.gz
 
 MAINTAINER=	alucryd@archlinux.org
 COMMENT=	Media server to organize, play & stream audio/video to various devices
 
 LICENSE=	UNKNOWN
 LICENSE_NAME=	custom
 LICENSE_FILE=	${DISTDIR}/${DIST_SUBDIR}/license.docx
 LICENSE_PERMS=	dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
 
 ONLY_FOR_ARCHS=	amd64
 
 BUILD_DEPENDS=	nasm:devel/nasm
 LIB_DEPENDS=	libass.so:multimedia/libass \
 		libdrm.so:graphics/libdrm \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libfribidi.so:converters/fribidi \
 		libgnutls.so:security/gnutls \
 		libogg.so:audio/libogg \
 		libopus.so:audio/opus \
 		libpng.so:graphics/png \
 		libraw.so:graphics/libraw \
 		libtheora.so:multimedia/libtheora \
 		libva.so:multimedia/libva \
 		libvorbis.so:audio/libvorbis \
 		libvpx.so:multimedia/libvpx \
 		libwebp.so:graphics/webp \
 		libx264.so:multimedia/libx264 \
 		libx265.so:multimedia/x265 \
 		libzvbi.so:devel/libzvbi
 
 USES=		compiler:c11 gmake iconv localbase:ldflags mono pkgconfig \
 		sqlite
 USE_RC_SUBR=	${PORTNAME}
 
 SUB_FILES=	ImageMagickSharp.dll.config \
 		SQLitePCLRaw.provider.sqlite3.dll.config
 SUB_LIST=	GROUP=${GROUPS} \
 		PORTNAME=${PORTNAME} \
 		RC_NAME=emby_server \
 		USER=${USERS}
 
 USERS=		emby
 GROUPS=		emby
 
 WRKSRC=		${WRKDIR}/ffmpeg-2019_04_09
 
 MAKE_ENV=	V=1
 NOPRECIOUSMAKEVARS=	yes
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--cc="${CC}" \
 		--disable-alsa \
 		--disable-doc \
 		--disable-ffplay \
 		--disable-libxcb \
 		--disable-outdev=xv \
 		--disable-sdl2 \
 		--disable-shared \
 		--disable-sndio \
 		--disable-v4l2-m2m \
 		--disable-vdpau \
 		--disable-xlib \
 		--enable-fontconfig \
 		--enable-gnutls \
 		--enable-gpl \
 		--enable-iconv \
 		--enable-libass \
 		--enable-libdrm \
 		--enable-libfreetype \
 		--enable-libfribidi \
 		--enable-libopus \
 		--enable-libtheora \
 		--enable-libvorbis \
 		--enable-libvpx \
 		--enable-libwebp \
 		--enable-libx264 \
 		--enable-libx265 \
 		--enable-libzvbi \
 		--enable-optimizations \
 		--enable-static \
 		--enable-vaapi \
 		--enable-version3
 
 OPTIONS_DEFINE=		LAME SMB X11
 OPTIONS_DEFAULT=	SMB X11
 
 LAME_CONFIGURE_ENABLE=	libmp3lame
 LAME_LIB_DEPENDS=	libmp3lame.so:audio/lame
 
 SMB_CONFIGURE_ENABLE=	libsmbclient
 SMB_USES=		samba:lib
 
 X11_USE=		xorg=x11
 X11_LIB_DEPENDS=	libMagickWand-6.so:graphics/ImageMagick6
 X11_LIB_DEPENDS_OFF=	libMagickWand-6.so:graphics/ImageMagick6-nox11
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/emby-server/system
 	(${INSTALL_DATA} ${WRKDIR}/ImageMagickSharp.dll.config ${STAGEDIR}${PREFIX}/lib/emby-server/system)
 	(${INSTALL_DATA} ${WRKDIR}/SQLitePCLRaw.provider.sqlite3.dll.config ${STAGEDIR}${PREFIX}/lib/emby-server/system)
 	(cd ${WRKDIR}/system && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/emby-server/system)
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/emby-server/bin
 	(${INSTALL_PROGRAM} ${WRKDIR}/bin/ffdetect ${STAGEDIR}${PREFIX}/lib/emby-server/bin)
 	(${INSTALL_PROGRAM} ${WRKSRC}/ffmpeg ${STAGEDIR}${PREFIX}/lib/emby-server/bin)
 	(${INSTALL_PROGRAM} ${WRKSRC}/ffprobe ${STAGEDIR}${PREFIX}/lib/emby-server/bin)
 
 .include <bsd.port.mk>
Index: branches/2019Q4/multimedia/emby-server/files/emby-server.in
===================================================================
--- branches/2019Q4/multimedia/emby-server/files/emby-server.in	(revision 520402)
+++ branches/2019Q4/multimedia/emby-server/files/emby-server.in	(revision 520403)
@@ -1,71 +1,72 @@
 #!/bin/sh
 
 # $FreeBSD$
 #
 # PROVIDE: %%PORTNAME%%
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 #
 # Add the following lines to /etc/rc.conf.local or /etc/rc.conf
 # to enable this service:
 #
 # %%RC_NAME%%_enable:	Set to yes to enable the %%PORTNAME%% service.
 #			Default: no
 # %%RC_NAME%%_user:	The user account used to run the %%PORTNAME%% daemon.
 #			This is optional, however do not specifically set this to an
 #			empty string as this will cause the daemon to run as root.
 #			Default: %%USER%%
 # %%RC_NAME%%_group:	The group account used to run the %%PORTNAME%% daemon.
 #			This is optional, however do not specifically set this to an
 #			empty string as this will cause the daemon to run with group wheel.
 #			Default: %%GROUP%%
 # %%RC_NAME%%_data_dir: Directory where %%PORTNAME%% configuration
 #			data is stored.
 #			Default: /var/db/%%PORTNAME%%
 # %%RC_NAME%%_ffdetect: Path of the ffdetect binary.
 #			Default: %%PREFIX%%/lib/emby-server/bin/ffdetect
 # %%RC_NAME%%_ffmpeg:	Path of the ffmpeg binary.
 #			Default: %%PREFIX%%/lib/emby-server/bin/ffmpeg
 # %%RC_NAME%%_ffprobe:	Path of the ffprobe binary.
 #			Default: %%PREFIX%%/lib/emby-server/bin/ffprobe
 # %%RC_NAME%%_pid: 	Path of the pid file.
 #			Default: /var/run/%%PORTNAME%%.pid
 
 . /etc/rc.subr
 name=%%RC_NAME%%
 rcvar=${name}_enable
 load_rc_config ${name}
 
 : ${%%RC_NAME%%_enable:="no"}
 : ${%%RC_NAME%%_user:="%%USER%%"}
 : ${%%RC_NAME%%_group:="%%GROUP%%"}
 : ${%%RC_NAME%%_data_dir:="/var/db/%%PORTNAME%%"}
 : ${%%RC_NAME%%_ffdetect:="%%PREFIX%%/lib/emby-server/bin/ffdetect"}
 : ${%%RC_NAME%%_ffmpeg:="%%PREFIX%%/lib/emby-server/bin/ffmpeg"}
 : ${%%RC_NAME%%_ffprobe:="%%PREFIX%%/lib/emby-server/bin/ffprobe"}
 : ${%%RC_NAME%%_pid:="/var/run/%%PORTNAME%%.pid"}
 
+pidfile="${%%RC_NAME%%_pid}"
 procname="%%LOCALBASE%%/bin/mono"
 command="/usr/sbin/daemon"
 command_args="-f -p ${%%RC_NAME%%_pid} ${procname} %%PREFIX%%/lib/emby-server/system/EmbyServer.exe \
 	-os freebsd \
 	-ffdetect ${%%RC_NAME%%_ffdetect} \
 	-ffmpeg ${%%RC_NAME%%_ffmpeg} \
 	-ffprobe ${%%RC_NAME%%_ffprobe} \
 	-programdata ${%%RC_NAME%%_data_dir} \
 	-updatepackage emby-server-freebsd12_{version}_amd64.txz"
 
 start_precmd=%%RC_NAME%%_precmd
 %%RC_NAME%%_precmd()
 {
 	[ -f ${%%RC_NAME%%_pid} ] || install -g ${%%RC_NAME%%_group} -o ${%%RC_NAME%%_user} -- /dev/null ${%%RC_NAME%%_pid}
 	[ -d ${%%RC_NAME%%_data_dir} ] || install -d -g ${%%RC_NAME%%_group} -o ${%%RC_NAME%%_user} -- ${%%RC_NAME%%_data_dir}
 }
 
 stop_postcmd=%%RC_NAME%%_postcmd
 %%RC_NAME%%_postcmd()
 {
 	rm -f ${%%RC_NAME%%_pid}
 }
 
 run_rc_command "$1"
Index: branches/2019Q4
===================================================================
--- branches/2019Q4	(revision 520402)
+++ branches/2019Q4	(revision 520403)

Property changes on: branches/2019Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r520400