5 files changed, 98 insertions, 55 deletions

diff --git a/news/nzbget/Makefile b/news/nzbget/Makefile
index b6b50be8bd0e..e6f8a4971371 100644
--- a/news/nzbget/Makefile
+++ b/news/nzbget/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for:	nzbget
-# Date created:				13 April 2004
-# Whom:					Lewis Thompson <purple@lewiz.net>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	nzbget
-PORTVERSION=	0.8.0
+PORTVERSION=	9.1
 CATEGORIES=	news
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-stable/${PORTVERSION}
 
@@ -19,6 +14,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
 		sigc-2:${PORTSDIR}/devel/libsigc++20
 
+USE_RC_SUBR=	nzbget
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LOCALBASE="${LOCALBASE}"
 MAKE_JOBS_UNSAFE=yes
@@ -27,41 +23,35 @@ LDFLAGS+=	${PTHREAD_LIBS}
 CFLAGS+=	${PTHREAD_CFLAGS}
 USE_GMAKE=	yes
 
-OPTIONS=	PARCHECK "Enable autopar/parcheck (Requires libpar2)" On
-OPTIONS+=	TLSCHECK "Use GNUTLS for SSL" On
-OPTIONS+=	OSSLCHECK "Use OpenSSL for SSL" Off
+OPTIONS_DEFINE=	PARCHECK GNUTLS OPENSSL
+OPTIONS_DEFAULT=	PARCHECK GNUTLS
+PARCHECK_DESC=	Enable autopar/parcheck
 
-PLIST_FILES=	bin/nzbget
 PORTDOCS=	README
-PORTEXAMPLES=	nzbget.conf.example
 
 .include <bsd.port.pre.mk>
 
-.if defined (WITHOUT_PARCHECK)
-CONFIGURE_ARGS+=	--disable-parcheck
-.else
+.if ${PORT_OPTIONS:MPARCHECK}
 CONFIGURE_ARGS+=	--enable-parcheck
 LIB_DEPENDS+=	par2:${PORTSDIR}/archivers/libpar2
+.else
+CONFIGURE_ARGS+=	--without-parcheck
 .endif
 
-.if defined (WITH_OSSLCHECK)
+.if ${PORT_OPTIONS:MOPENSSL}
 CONFIGURE_ARGS+=	--with-tlslib=OpenSSL
 .endif
 
-.if defined (WITH_TLSCHECK)
+.if ${PORT_OPTIONS:MGNUTLS}
 CONFIGURE_ARGS+=	--with-tlslib=GnuTLS
 LIB_DEPENDS+=	gnutls:${PORTSDIR}/security/gnutls
 LIB_DEPENDS+=	gcrypt:${PORTSDIR}/security/libgcrypt
 .endif
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
-.if !defined(NOPORTEXAMPLES)
-	${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/nzbget.conf.example ${EXAMPLESDIR}
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/news/nzbget/distinfo b/news/nzbget/distinfo
index 7dded38cebe1..29581804b538 100644
--- a/news/nzbget/distinfo
+++ b/news/nzbget/distinfo
@@ -1,2 +1,2 @@
-SHA256 (nzbget-0.8.0.tar.gz) = 646939596097fafdeb0b4064b433463419e7d0d9af7fe32f6689d6b95ad77d95
-SIZE (nzbget-0.8.0.tar.gz) = 321351
+SHA256 (nzbget-9.1.tar.gz) = 0cd20e1c78359c720862c19c5fd908dc10d6b54658441b86f9caaa71f66e5633
+SIZE (nzbget-9.1.tar.gz) = 658935
diff --git a/news/nzbget/files/nzbget.in b/news/nzbget/files/nzbget.in
new file mode 100644
index 000000000000..bb2136fad403
--- /dev/null
+++ b/news/nzbget/files/nzbget.in
@@ -0,0 +1,46 @@
+#!/bin/sh
+#
+# 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"}
+
+start_cmd="${name}_start"
+status_cmd="${name}_status"
+stop_cmd="${name}_stop"
+command=%%PREFIX%%/sbin/nzbgetd
+
+nzbget_start()
+{
+	echo "Starting ${name}."
+	# artificial sleep because it doesnt want to start
+	# after a restart without it
+	sleep .5
+	${command} start
+}
+
+nzbget_stop()
+{
+	echo "Stopping ${name}."
+	${command} stop
+}
+
+nzbget_status()
+{
+	${command} status
+}
+
+run_rc_command "$1"
diff --git a/news/nzbget/files/patch-TLS.cpp b/news/nzbget/files/patch-TLS.cpp
deleted file mode 100644
index e691fb837cd5..000000000000
--- a/news/nzbget/files/patch-TLS.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
---- TLS.cpp.orig	2011-06-14 23:47:22.000000000 +0200
-+++ TLS.cpp	2012-08-31 09:27:41.000000000 +0200
-@@ -908,7 +908,7 @@
-     char *buf;
-     int bufsize;
-     /* needed to get the DNS subjectAltNames: */
--    STACK *subj_alt_names;
-+    STACK_OF(GENERAL_NAME) *subj_alt_names;
-     int subj_alt_names_count;
-     GENERAL_NAME *subj_alt_name;
-     /* did we find a name matching hostname? */
-@@ -960,7 +960,7 @@
-     /* Try the DNS subjectAltNames. */
-     match_found = 0;
-     if ((subj_alt_names =
--		(STACK*)X509_get_ext_d2i(x509cert, NID_subject_alt_name, NULL, NULL)))
-+		(STACK_OF(GENERAL_NAME) *)X509_get_ext_d2i(x509cert, NID_subject_alt_name, NULL, NULL)))
-     {
- 	subj_alt_names_count = sk_GENERAL_NAME_num(subj_alt_names);
- 	for (i = 0; i < subj_alt_names_count; i++) 
-@@ -1105,7 +1105,11 @@
- 
- #ifdef HAVE_OPENSSL
-     
-+    #if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+    const SSL_METHOD *ssl_method = NULL;
-+    #else
-     SSL_METHOD *ssl_method = NULL;
-+    #endif
-     
-     ssl_method = force_sslv3 ? SSLv3_client_method() : SSLv23_client_method();
-     if (!ssl_method)
diff --git a/news/nzbget/pkg-plist b/news/nzbget/pkg-plist
new file mode 100644
index 000000000000..eb88d935a1cb
--- /dev/null
+++ b/news/nzbget/pkg-plist
@@ -0,0 +1,39 @@
+bin/nzbget
+bin/nzbget-postprocess.sh
+sbin/nzbgetd
+%%DATADIR%%/nzbget.conf
+%%DATADIR%%/nzbget-postprocess.conf
+%%DATADIR%%/webui/config.js
+%%DATADIR%%/webui/downloads.js
+%%DATADIR%%/webui/edit.js
+%%DATADIR%%/webui/fasttable.js
+%%DATADIR%%/webui/history.js
+%%DATADIR%%/webui/img/download-anim-green-2x.png
+%%DATADIR%%/webui/img/download-anim-orange-2x.png
+%%DATADIR%%/webui/img/favicon.ico
+%%DATADIR%%/webui/img/icons-2x.png
+%%DATADIR%%/webui/img/icons.png
+%%DATADIR%%/webui/img/transmit-file.gif
+%%DATADIR%%/webui/img/transmit-reload-2x.gif
+%%DATADIR%%/webui/img/transmit.gif
+%%DATADIR%%/webui/index.html
+%%DATADIR%%/webui/index.js
+%%DATADIR%%/webui/lib/bootstrap.css
+%%DATADIR%%/webui/lib/bootstrap.js
+%%DATADIR%%/webui/lib/bootstrap.min.js
+%%DATADIR%%/webui/lib/jquery.js
+%%DATADIR%%/webui/lib/jquery.min.js
+%%DATADIR%%/webui/messages.js
+%%DATADIR%%/webui/nzbget-postprocess.conf
+%%DATADIR%%/webui/nzbget.conf
+%%DATADIR%%/webui/status.js
+%%DATADIR%%/webui/style.css
+%%DATADIR%%/webui/upload.js
+%%DATADIR%%/webui/util.js
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%DATADIR%%
+@dirrm %%DATADIR%%/webui
+@dirrm %%DATADIR%%/webui/img
+@dirrm %%DATADIR%%/webui/lib