ports/174306: [maintainer] news/nzbget: update to 9.0

[Jeff Burchell]

The following reply was made to PR ports/174306; it has been noted by GNATS.

From: Jeff Burchell <toxic at doobie.com>
To: bug-followup at FreeBSD.org
Cc:  
Subject: Re: ports/174306: [maintainer] news/nzbget: update to 9.0
Date: Fri, 25 Jan 2013 19:28:56 -0800

 This is a multi-part message in MIME format.
 --------------070509010003030504030300
 Content-Type: text/plain; charset=ISO-8859-1; format=flowed
 Content-Transfer-Encoding: 7bit
 
 New patch attached, based mostly on Alex Kozlov's, but updated to 9.1.
 
 - Update to 9.1
 - Convert to new options framework
 - Convert Makefile headers to new style
 - Remove indefinite article from COMMENT
 - Remove ABI version numbers from LIB_DEPENDS
 - Remove LICENSE_FILE since GPLv2 is in Templates/Licenses
 
 Sorry about letting this slide over the holidays, and so on.
 
 -Jeff
 
 --------------070509010003030504030300
 Content-Type: text/x-patch;
  name="nzbget-to-9.1.diff"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="nzbget-to-9.1.diff"
 
 Index: Makefile
 ===================================================================
 --- Makefile	(revision 310996)
 +++ Makefile	(working copy)
 @@ -1,22 +1,17 @@
 -# New ports collection makefile for:	nzbget
 -# Date created:				13 April 2004
 -# Whom:					Lewis Thompson <purple at lewiz.net>
 -#
 +# Created by: Lewis Thompson <purple at lewiz.net>
  # $FreeBSD$
 -#
  
  PORTNAME=	nzbget
 -PORTVERSION=	0.8.0
 +PORTVERSION=	9.1
  CATEGORIES=	news
  MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-stable/${PORTVERSION}
  
  MAINTAINER=	toxic at doobie.com
 -COMMENT=	A binary newsreader supporting NZB files
 +COMMENT=	Binary Usenet newsreader supporting NZB files
  
  LICENSE=	GPLv2
 -LICENSE_FILE=	${WRKSRC}/COPYING
  
 -LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
 +LIB_DEPENDS=	xml2:${PORTSDIR}/textproc/libxml2 \
  		sigc-2:${PORTSDIR}/devel/libsigc++20
  
  GNU_CONFIGURE=	yes
 @@ -27,41 +22,45 @@
  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
 +PAR_DESC=	Support verifying/repairing with par2 files
 +OPTIONS_DEFINE=	PAR
 +OPTIONS_SINGLE=	TLSLIB
 +OPTIONS_SINGLE_TLSLIB=	GNUTLS OPENSSL
 +OPTIONS_DEFAULT=	PAR GNUTLS
  
 +.include <bsd.port.options.mk>
 +
  PLIST_FILES=	bin/nzbget
  PORTDOCS=	README
  PORTEXAMPLES=	nzbget.conf.example
  
 -.include <bsd.port.pre.mk>
 +.include <bsd.port.options.mk>
  
 -.if defined (WITHOUT_PARCHECK)
 -CONFIGURE_ARGS+=	--disable-parcheck
 +.if ${PORT_OPTIONS:MPAR}
 + CONFIGURE_ARGS+= --enable-parcheck --disable-libpar2-bugfixes-check
 + LIB_DEPENDS+=	par2:${PORTSDIR}/archivers/libpar2
  .else
 -CONFIGURE_ARGS+=	--enable-parcheck
 -LIB_DEPENDS+=	par2:${PORTSDIR}/archivers/libpar2
 + CONFIGURE_ARGS+= --disable-parcheck
  .endif
  
 -.if defined (WITH_OSSLCHECK)
 -CONFIGURE_ARGS+=	--with-tlslib=OpenSSL
 +.if ${PORT_OPTIONS:MOPENSSL}
 + CONFIGURE_ARGS+= --with-tlslib=OpenSSL
  .endif
  
 -.if defined (WITH_TLSCHECK)
 -CONFIGURE_ARGS+=	--with-tlslib=GnuTLS
 -LIB_DEPENDS+=	gnutls:${PORTSDIR}/security/gnutls
 -LIB_DEPENDS+=	gcrypt:${PORTSDIR}/security/libgcrypt
 +.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)
 +.if ${PORT_OPTIONS:MEXAMPLES}
  	${MKDIR} ${EXAMPLESDIR}
  	${INSTALL_DATA} ${WRKSRC}/nzbget.conf.example ${EXAMPLESDIR}
  .endif
  
 -.include <bsd.port.post.mk>
 +.include <bsd.port.mk>
 Index: distinfo
 ===================================================================
 --- distinfo	(revision 310996)
 +++ distinfo	(working copy)
 @@ -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
 Index: files/patch-TLS.cpp
 ===================================================================
 --- files/patch-TLS.cpp	(revision 310996)
 +++ files/patch-TLS.cpp	(working copy)
 @@ -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)
 
 --------------070509010003030504030300--