From owner-svn-ports-all@FreeBSD.ORG Tue Feb 26 18:47:54 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 3591E68C; Tue, 26 Feb 2013 18:47:54 +0000 (UTC) (envelope-from rm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 1D08118A3; Tue, 26 Feb 2013 18:47:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1QIlrkb020417; Tue, 26 Feb 2013 18:47:54 GMT (envelope-from rm@svn.freebsd.org) Received: (from rm@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1QIlrrk020415; Tue, 26 Feb 2013 18:47:53 GMT (envelope-from rm@svn.freebsd.org) Message-Id: <201302261847.r1QIlrrk020415@svn.freebsd.org> From: Ruslan Mahmatkhanov Date: Tue, 26 Feb 2013 18:47:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r313002 - in head/news/hellanzb: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Feb 2013 18:47:54 -0000 Author: rm Date: Tue Feb 26 18:47:53 2013 New Revision: 313002 URL: http://svnweb.freebsd.org/changeset/ports/313002 Log: - add upstream patch to fix runtime with Twisted version > 11.1 - bump PORTREVISION while here: - trim Makefile header - define PORTDOCS uncoditionally - convert to optionsng (DOCS case) PR: 171388 Reported by: W.Scholten Approved by: maintainer timeout (4 months) Modified: head/news/hellanzb/Makefile head/news/hellanzb/files/patch-Hellanzb_HellaReactor.py Modified: head/news/hellanzb/Makefile ============================================================================== --- head/news/hellanzb/Makefile Tue Feb 26 17:27:06 2013 (r313001) +++ head/news/hellanzb/Makefile Tue Feb 26 18:47:53 2013 (r313002) @@ -1,14 +1,9 @@ -# New ports collection makefile for: hellanzb -# Date created: Sat Sep 25 18:46:46 PDT 2004 -# Whom: Philip Jenvey -# +# Created by: Philip Jenvey # $FreeBSD$ -# $Id: Makefile 828 2006-09-10 01:20:41Z pjenvey $ -# PORTNAME= hellanzb PORTVERSION= 0.13 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= news MASTER_SITES= http://www.hellanzb.com/distfiles/ @@ -26,8 +21,9 @@ RUN_DEPENDS= par2:${PORTSDIR}/archivers/ USE_PYTHON= -2.7 USE_PYDISTUTILS=yes USE_TWISTED_RUN= web +PORTDOCS= CHANGELOG CREDITS README -.include +.include # more fully-featured rar needs i386 .if ${ARCH} == "i386" @@ -36,21 +32,17 @@ RUN_DEPENDS+= rar:${PORTSDIR}/archivers/ RUN_DEPENDS+= unrar:${PORTSDIR}/archivers/unrar .endif -.if !defined(NOPORTDOCS) -PORTDOCS= CHANGELOG CREDITS README -.endif - post-install: @if [ ! -f ${PREFIX}/etc/hellanzb.conf ]; then \ ${ECHO} "Installing default configuration file."; \ ${INSTALL_DATA} ${WRKSRC}/etc/hellanzb.conf.sample ${PREFIX}/etc/hellanzb.conf; \ fi -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} .for doc in ${PORTDOCS} @${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR} .endfor .endif -.include +.include Modified: head/news/hellanzb/files/patch-Hellanzb_HellaReactor.py ============================================================================== --- head/news/hellanzb/files/patch-Hellanzb_HellaReactor.py Tue Feb 26 17:27:06 2013 (r313001) +++ head/news/hellanzb/files/patch-Hellanzb_HellaReactor.py Tue Feb 26 18:47:53 2013 (r313002) @@ -1,11 +1,15 @@ ---- Hellanzb/HellaReactor.py.orig 2007-03-27 08:20:43.000000000 +0400 -+++ Hellanzb/HellaReactor.py 2012-01-21 20:33:18.000000000 +0400 -@@ -9,7 +9,7 @@ +--- ./Hellanzb/HellaReactor.py.orig 2007-03-27 08:20:43.000000000 +0400 ++++ ./Hellanzb/HellaReactor.py 2013-02-26 22:29:07.000000000 +0400 +@@ -9,7 +9,11 @@ import Hellanzb, sys, time import twisted.copyright -if twisted.copyright.version >= '2.0.0': -+if twisted.copyright.version >= '2.0.0' or twisted.copyright.version >= '10.0.0': ++if twisted.copyright.version >= '11.1.0': ++ from twisted.internet.selectreactor import SelectReactor ++ from twisted.internet.posixbase import _NO_FILENO ++ from twisted.internet.posixbase import _NO_FILEDESC ++elif twisted.copyright.version >= '2.0.0' or twisted.copyright.version >= '10.0.0': from twisted.internet.selectreactor import SelectReactor from twisted.internet.selectreactor import _NO_FILENO from twisted.internet.selectreactor import _NO_FILEDESC