Index: branches/2017Q1/news/nzbget/Makefile
===================================================================
--- branches/2017Q1/news/nzbget/Makefile	(revision 434648)
+++ branches/2017Q1/news/nzbget/Makefile	(revision 434649)
@@ -1,72 +1,72 @@
 # Created by: Lewis Thompson <purple@lewiz.net>
 # $FreeBSD$
 
 PORTNAME=	nzbget
 PORTVERSION=	17.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	news
 
 MAINTAINER=	toxic@doobie.com
 COMMENT=	Binary newsreader supporting NZB files
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libxml2.so:textproc/libxml2
 
 USES=		ncurses pkgconfig shebangfix compiler:c++14-lang
 USE_RC_SUBR=	nzbget
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libcurses-includes=${NCURSESINC} \
 		--with-libcurses-libraries=${NCURSESLIB}
 CONFIGURE_ENV=	LOCALBASE="${LOCALBASE}"
 MAKE_JOBS_UNSAFE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-lpthread
 BINMODE=	0755
 
 SHEBANG_FILES=	scripts/*.py
 SUB_FILES=	pkg-message
 
 USE_GITHUB=	yes
 
 OPTIONS_DEFINE=	7Z PYTHON RAR DOCS
 OPTIONS_SINGLE=	TLSLIB
 OPTIONS_SINGLE_TLSLIB=	GNUTLS OPENSSL
 OPTIONS_DEFAULT=	OPENSSL PAR PYTHON RAR 7Z
 7Z_DESC=	Support extraction of 7z archives
 PYTHON_DESC=	Support for python post-processing scripts
 RAR_DESC=	Support extraction of rar archives
 
 7Z_RUN_DEPENDS=		7z:archivers/p7zip
 
 PYTHON_USES=		python:run
 
 RAR_RUN_DEPENDS=	unrar:archivers/unrar
 
 OPENSSL_CONFIGURE_ON=	--with-tlslib=OpenSSL \
 			--with-openssl-includes=${OPENSSLINC} \
 			--with-openssl-libraries=${OPENSSLLIB}
 OPENSSL_USE=		OPENSSL=yes
 
 GNUTLS_CONFIGURE_ON=	--with-tlslib=GnuTLS
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls \
 			libgcrypt.so:security/libgcrypt
 
 .include <bsd.port.options.mk>
 
 .if (${ARCH} == "i386")
 CONFIGURE_ARGS+=	--disable-sigchld-handler
 .endif
 
 .if ${OSVERSION} < 1000500
 USE_GCC=		yes
 CONFIGURE_ENV+=		zlib_LIBS='-lz ' \
 			zlib_CFLAGS=' '
 .endif
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/nzbget.conf \
 		${STAGEDIR}${PREFIX}/etc/nzbget.conf.sample
 
 .include <bsd.port.mk>
Index: branches/2017Q1/news/nzbget/files/nzbget.in
===================================================================
--- branches/2017Q1/news/nzbget/files/nzbget.in	(revision 434648)
+++ branches/2017Q1/news/nzbget/files/nzbget.in	(revision 434649)
@@ -1,45 +1,26 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 # PROVIDE: nzbget
 # KEYWORD: shutdown
 #
 # Add the following lines to /etc/rc.conf.local or /etc/rc.conf
 # to enable this service:
 #
 # nzbget_enable (bool):	Set to NO by default.
 #			Set it to YES to enable it.
 
 . /etc/rc.subr
 
 name=nzbget
 rcvar=nzbget_enable
 
 load_rc_config ${name}
 
 : ${nzbget_enable:=NO}
 
 command=%%PREFIX%%/bin/nzbget
-start_cmd="${name}_start"
-status_cmd="${command} -L S"
-stop_cmd="${name}_stop"
-
-nzbget_start()
-{
-	echo "Starting ${name}."
-	# artificial sleep because it doesnt want to start
-	# after a restart without it
-	sleep .5
-	${command} -D
-}
-
-nzbget_stop()
-{
-	echo "Stopping ${name}."
-	${command} -Q
-	# artificial sleep because stop is backgrounded
-	sleep 3
-}
+command_args="-D"
 
 run_rc_command "$1"
Index: branches/2017Q1
===================================================================
--- branches/2017Q1	(revision 434648)
+++ branches/2017Q1	(revision 434649)

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