Index: branches/2016Q4/news/sabnzbdplus/Makefile
===================================================================
--- branches/2016Q4/news/sabnzbdplus/Makefile	(revision 425498)
+++ branches/2016Q4/news/sabnzbdplus/Makefile	(revision 425499)
@@ -1,77 +1,78 @@
 # $FreeBSD$
 
 PORTNAME=	sabnzbdplus
 PORTVERSION=	1.1.0
+PORTREVISION=	1
 CATEGORIES=	news
 MASTER_SITES=	SF
 DISTNAME=	SABnzbd-${PORTVERSION}-src
 
 MAINTAINER=	joshruehlig@gmail.com
 COMMENT=	Web-interface based binary newsgrabber in python, with nzb support
 
 LICENSE=	BSD2CLAUSE BSD3CLAUSE GPLv2+ ISCL MIT PSFL
 LICENSE_COMB=	multi
 
 RUN_DEPENDS=	cheetah:devel/py-cheetah \
 		${PYTHON_SITELIBDIR}/pythonutils/configobj.py:devel/py-utils \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
 
 USES=		python:2.7
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 WRKSRC=		${WRKDIR}/SABnzbd-${PORTVERSION}
 PLIST_SUB=	PORTNAME=${PORTNAME}
 SUB_LIST=	PORTNAME=${PORTNAME} PYTHON_CMD=${PYTHON_CMD}
 SUB_FILES=	pkg-message
 USE_RC_SUBR=	sabnzbd
 
 PORTDOCS=	ABOUT.txt \
 		COPYRIGHT.txt \
 		INSTALL.txt \
 		ISSUES.txt \
 		README.txt
 
 USERS=		_sabnzbd
 GROUPS=		_sabnzbd
 
 OPTIONS_DEFINE=	PAR2CMDLINE UNRAR 7ZIP FEEDPARSER YENC OPENSSL DOCS
 OPTIONS_DEFAULT=	PAR2CMDLINE UNRAR 7ZIP FEEDPARSER YENC OPENSSL
 PAR2CMDLINE_DESC=	Required for postprocessing of par files
 UNRAR_DESC=	Often required for unpacking many downloads
 7ZIP_DESC=	Needed for unpacking 7-Zip posts
 FEEDPARSER_DESC=	rss-feed support
 YENC_DESC=	yenc support
 
 PAR2CMDLINE_RUN_DEPENDS=	par2repair:archivers/par2cmdline-tbb
 FEEDPARSER_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}feedparser>=0:textproc/py-feedparser
 YENC_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yenc>=0:news/py-yenc
 OPENSSL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl
 UNRAR_RUN_DEPENDS=	unrar:archivers/unrar
 7ZIP_RUN_DEPENDS=	7za:archivers/p7zip
 
 post-patch:
 	@${REINPLACE_CMD} -e "s:/usr/bin/python:${PYTHON_CMD}:g" \
 		 ${WRKSRC}/SABnzbd.py
 	@${REINPLACE_CMD} -e "s:%%DATADIR%%:'${DATADIR}':g" \
 		 ${WRKSRC}/SABnzbd.py
 
 # the NO_BUILD option stops execution after configure. This should really be
 # post-build
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/SABnzbd.py ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/sabnzbd
 	cd ${WRKSRC}/sabnzbd && ${COPYTREE_SHARE} \* ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/sabnzbd
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 .for i in cherrypy gntp interfaces locale po tools util
 	@${MKDIR} ${STAGEDIR}${DATADIR}/${i}
 	cd ${WRKSRC}/${i} && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}/${i}
 .endfor
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${PORTDOCS}
 	${INSTALL_MAN} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
Index: branches/2016Q4/news/sabnzbdplus/files/sabnzbd.in
===================================================================
--- branches/2016Q4/news/sabnzbdplus/files/sabnzbd.in	(revision 425498)
+++ branches/2016Q4/news/sabnzbdplus/files/sabnzbd.in	(revision 425499)
@@ -1,57 +1,57 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 # PROVIDE: sabnzbd
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 #
 # Add the following lines to /etc/rc.conf.local or /etc/rc.conf
 # to enable this service:
 #
 # sabnzbd_enable (bool):        Set to NO by default.
 #                       Set it to YES to enable it.
 # sabnzbd_conf_dir:     Directory where sabnzbd configuration
 #                       data is stored.
 #                       Default: %%PREFIX%%/sabnzbd
 # sabnzbd_user:         The user account sabnzbd daemon runs as what
 #                       you want it to be. It uses '_sabnzbd' user by
 #                       default. Do not sets it as empty or it will run
 #                       as root.
 # sabnzbd_group:        The group account sabnzbd daemon runs as what
 #                       you want it to be. It uses '_sabnzbd' group by
 #                       default. Do not sets it as empty or it will run
 #                       as wheel.
 # sabnzbd_pidfile:      Set the location of the sabnzbd pidfile
 
 . /etc/rc.subr
 
 name=sabnzbd
 rcvar=sabnzbd_enable
 load_rc_config ${name}
 
 : ${sabnzbd_enable:=NO}
 : ${sabnzbd_user:=_sabnzbd}
 : ${sabnzbd_group:=_sabnzbd}
 : ${sabnzbd_conf_dir="%%PREFIX%%/sabnzbd"}
 : ${sabnzbd_pidfile:="/var/run/sabnzbd/sabnzbd.pid"}
 
 pidfile=${sabnzbd_pidfile}
 
 start_precmd="${name}_prestart"
 command_interpreter="%%PYTHON_CMD%%"
 command="%%PREFIX%%/bin/SABnzbd.py"
 command_args="--daemon -f ${sabnzbd_conf_dir}/sabnzbd.ini --pidfile ${pidfile}"
 
 sabnzbd_prestart()
 {
 	PATH=${PATH}:%%PREFIX%%/bin:%%PREFIX%%/sbin
-	export LC_CTYPE="UTF-8"
+	export LC_CTYPE="en_US.UTF-8"
 	for sabdir in ${sabnzbd_conf_dir} ${pidfile%/*}; do
 		if [ ! -d "${sabdir}" ]; then
 			install -d -o ${sabnzbd_user} -g ${sabnzbd_group} ${sabdir}
 		fi
 	done
 }
 
 run_rc_command "$1"
Index: branches/2016Q4
===================================================================
--- branches/2016Q4	(revision 425498)
+++ branches/2016Q4	(revision 425499)

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