Index: branches/2021Q1/multimedia/get_iplayer/Makefile
===================================================================
--- branches/2021Q1/multimedia/get_iplayer/Makefile	(revision 563809)
+++ branches/2021Q1/multimedia/get_iplayer/Makefile	(revision 563810)
@@ -1,60 +1,61 @@
 # $FreeBSD$
 
 PORTNAME=	get_iplayer
 PORTVERSION=	3.26
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	multimedia net
 
 MAINTAINER=	jamie@catflap.org
 COMMENT=	Search, index, or stream archive video from BBC iPlayer
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	p5-XML-LibXML>=0:textproc/p5-XML-LibXML \
 		p5-Mojolicious>=0:www/p5-Mojolicious \
 		p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https \
 		p5-CGI>=0:www/p5-CGI
 
 USES=		perl5 shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	get-iplayer
 USE_PERL5=	run
 SHEBANG_FILES=	${PORTNAME} ${PORTNAME}.cgi
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 USE_RC_SUBR=	${PORTNAME}
 
 USERS=		get_iplayer
 GROUPS=		get_iplayer
 
 SCRIPTS=	${PORTNAME} ${PORTNAME}.cgi
 PLIST_FILES=	bin/${PORTNAME} ${SCRIPTS:S,^,${WWWDIR_REL}/,} \
 		man/man1/${PORTNAME}.1.gz
 
 DATADIR=	${WWWDIR}
 PORTDOCS=	CHANGELOG.md README.md
 
 OPTIONS_DEFINE=	DOCS FFMPEG ATOMICPARSLEY
 OPTIONS_DEFAULT=	FFMPEG ATOMICPARSLEY
 FFMPEG_DESC=	Enable file conversion using FFmpeg
 FFMPEG_RUN_DEPENDS=	ffmpeg>=0:multimedia/ffmpeg
 ATOMICPARSLEY_DESC=	Enable tagging of media files
 ATOMICPARSLEY_RUN_DEPENDS=	AtomicParsley>=0:multimedia/atomicparsley
 
 post-patch:
 	${REINPLACE_CMD} -e "108,110c\\${.newline}	\$$opt_cmdline->{getiplayer} = \"${PREFIX}/bin/${PORTNAME}\";" \
 		${WRKSRC}/get_iplayer.cgi
 
 do-install:
 	${MKDIR} ${STAGEDIR}${WWWDIR}
 	(cd ${WRKSRC}; ${INSTALL_SCRIPT} ${SCRIPTS} ${STAGEDIR}${WWWDIR})
 	${LN} -sf ${WWWDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}; ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
Index: branches/2021Q1/multimedia/get_iplayer/files/get_iplayer.in
===================================================================
--- branches/2021Q1/multimedia/get_iplayer/files/get_iplayer.in	(revision 563809)
+++ branches/2021Q1/multimedia/get_iplayer/files/get_iplayer.in	(revision 563810)
@@ -1,59 +1,58 @@
 #!/bin/sh
 
 # $FreeBSD$
 #
 # PROVIDE: get_iplayer
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 #
 # Add the following lines to /etc/rc.conf or /etc/rc.conf.local to
 # enable get_iplayer:
 # get_iplayer_enable (bool):	Set to "NO" by default.
 # get_iplayer_flags (string):	Set to "" by default.
 # get_iplayer_logfile (string):	Server info messages logfile. Set to ""
 #				(no logging) by default.
 # get_iplayer_chdir (string):	Set to the "get_iplayer" home directory
 #				by default; this is where downloaded
 #				files are stored. It should be
 #				writeable by the get_iplayer user.
 # get_iplayer_listen_address
 #               (IP address):	Set to 127.0.0.1 by default.
 # get_iplayer_bind_port
 #              (number):	Set to 9370 by default.
 #
 ##########################################################
 ## WARNING:
 ## For security reasons, do NOT set get_iplayer_bind_port
 ## unless your box is firewalled to allow only connections
 ## from your local subnet. It is safest to use SSH
 ## tunnelling if remote access is needed.
 ##########################################################
 
 
 . /etc/rc.subr
 
 name=get_iplayer
 rcvar=get_iplayer_enable
 desc="Server for fetching programs from iplayer and PVR functionality"
 
 load_rc_config $name
 
 : ${get_iplayer_enable:=NO}
 : ${get_iplayer_flags=""}
 : ${get_iplayer_chdir="$(pw usershow get_iplayer | awk -F: '{print $9}')"}
 : ${get_iplayer_listen_address=127.0.0.1}
 : ${get_iplayer_bind_port=9370}
 
 get_iplayer_logfile="${get_iplayer_logfile:+"-o $get_iplayer_logfile"}"
+get_iplayer_env="HOME='${get_iplayer_chdir}'"
 
 command=/usr/sbin/daemon
-export HOME="$get_iplayer_chdir"
-cd "$HOME" || exit 1
 command_args="-f ${get_iplayer_logfile} -u ${name} -p /var/run/${name}/${name}.pid %%WWWDIR%%/${name}.cgi -p ${get_iplayer_bind_port} -l ${get_iplayer_listen_address} --getiplayer %%WWWDIR%%/${name} ${get_iplayer_flags}"
 get_iplayer_flags="" # This is needed to stop the flags being applied to the 'daemon' program.
 procname=/usr/local/bin/perl
 pidfile=/var/run/${name}/${name}.pid
 
 start_precmd="install -d -o ${name} -m755 /var/run/${name}"
 
 run_rc_command "$1"
Index: branches/2021Q1/multimedia/get_iplayer/pkg-message
===================================================================
--- branches/2021Q1/multimedia/get_iplayer/pkg-message	(revision 563809)
+++ branches/2021Q1/multimedia/get_iplayer/pkg-message	(revision 563810)
@@ -1,16 +1,16 @@
 [
 { type: install
   message: <<EOM
 You must be in the UK, or use a UK proxy, to gain access to most iPlayer content.
 
 To use the web server cgi script, you must set "get_iplayer_enable="YES" in
 "/etc/rc.conf", and set "get_iplayer_chdir" to a valid directory to store
 configuration files and downloads. If "get_iplayer_chdir" is unset, the
-"get_uplayer" home directory is used.
+"get_iplayer" home directory is used.
 
 In the latter case you can set the home directory to (eg) '/home/get_iplayer", with:
 
 pw usermod get_iplayer -m -M 750 -k /var/empty -d /home/get_iplayer
 EOM
 }
 ]
Index: branches/2021Q1
===================================================================
--- branches/2021Q1	(revision 563809)
+++ branches/2021Q1	(revision 563810)

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