- General cleanup

- unrar and Python are default enabled options
- New p7zip option, disabled by default
- The final release of 11.0 only requires --disable-sigchld-handler on
  32bit FreeBSD [1]

[1] http://nzbget.sourceforge.net/forum/viewtopic.php?f=3&t=596&start=10

PR:		ports/183026
Approved by:	maintainer, swills (mentor)

2 files changed, 20 insertions, 14 deletions

diff --git a/news/nzbget/Makefile b/news/nzbget/Makefile
index e61d3718f6f0..e20c1decf393 100644
--- a/news/nzbget/Makefile
+++ b/news/nzbget/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	nzbget
 PORTVERSION=	11.0
+PORTREVISION=	1
 CATEGORIES=	news
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-stable/${PORTVERSION}
 
@@ -23,30 +24,38 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	${PTHREAD_LIBS}
 CFLAGS+=	${PTHREAD_CFLAGS}
 
-OPTIONS_DEFINE=	PAR
+OPTIONS_DEFINE=	7Z PAR PYTHON RAR
 OPTIONS_SINGLE=	TLSLIB
 OPTIONS_SINGLE_TLSLIB=	GNUTLS OPENSSL
-OPTIONS_DEFAULT=	PAR GNUTLS
+OPTIONS_DEFAULT=	GNUTLS PAR PYTHON RAR
+7Z_DESC=	Support extraction of 7z archives
 PAR_DESC=	Support verifying/repairing with par2 files
+PYTHON_DESC=	Support for python post-processing scripts
+RAR_DESC=	Support extraction of rar archives
+
+7Z_RUN_DEPENDS=		7z:${PORTSDIR}/archivers/p7zip
 
 PAR_CONFIGURE_ON=	--enable-parcheck --disable-libpar2-bugfixes-check
 PAR_CONFIGURE_OFF=	--disable-parcheck
 PAR_LIB_DEPENDS=	libpar2.so:${PORTSDIR}/archivers/libpar2
 
+PYTHON_USE=	PYTHON=yes
+
+RAR_RUN_DEPENDS=	unrar:${PORTSDIR}/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:${PORTSDIR}/security/gnutls \
 			libgcrypt.so:${PORTSDIR}/security/libgcrypt
 
-CONFIGURE_ARGS+=	--enable-sigchld-handler
-
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MOPENSSL}
- USE_OPENSSL=	yes
+.if (${ARCH} == "i386")
+CONFIGURE_ARGS+=       --disable-sigchld-handler
 .endif
 
 post-configure:
diff --git a/news/nzbget/files/nzbget.in b/news/nzbget/files/nzbget.in
index bb2136fad403..8919aa7e0c75 100644
--- a/news/nzbget/files/nzbget.in
+++ b/news/nzbget/files/nzbget.in
@@ -1,5 +1,7 @@
 #!/bin/sh
 #
+# $FreeBSD$
+#
 # PROVIDE: nzbget
 # KEYWORD: shutdown
 #
@@ -11,15 +13,15 @@
 
 . /etc/rc.subr
 
-name="nzbget"
+name=nzbget
 rcvar=nzbget_enable
 
 load_rc_config ${name}
 
-: ${nzbget_enable:="NO"}
+: ${nzbget_enable:=NO}
 
 start_cmd="${name}_start"
-status_cmd="${name}_status"
+status_cmd="${command} status"
 stop_cmd="${name}_stop"
 command=%%PREFIX%%/sbin/nzbgetd
 
@@ -38,9 +40,4 @@ nzbget_stop()
 	${command} stop
 }
 
-nzbget_status()
-{
-	${command} status
-}
-
 run_rc_command "$1"