From owner-svn-ports-all@FreeBSD.ORG Thu May 30 07:07:39 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 70CE15B7; Thu, 30 May 2013 07:07:39 +0000 (UTC) (envelope-from delphij@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 449DB5E8; Thu, 30 May 2013 07:07:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4U77d0F061022; Thu, 30 May 2013 07:07:39 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4U77cbX061017; Thu, 30 May 2013 07:07:38 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <201305300707.r4U77cbX061017@svn.freebsd.org> From: Xin LI Date: Thu, 30 May 2013 07:07:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r319405 - in head/net/py-txamqp: . 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: Thu, 30 May 2013 07:07:39 -0000 Author: delphij Date: Thu May 30 07:07:38 2013 New Revision: 319405 URL: http://svnweb.freebsd.org/changeset/ports/319405 Log: - Add missing type for py-txamqp codec - Pass maintainership to submitter. PR: ports/179100 Submitted by: Chenguang Li Added: head/net/py-txamqp/files/ head/net/py-txamqp/files/patch-src__txamqp__codec.py (contents, props changed) Modified: head/net/py-txamqp/Makefile Modified: head/net/py-txamqp/Makefile ============================================================================== --- head/net/py-txamqp/Makefile Thu May 30 05:55:03 2013 (r319404) +++ head/net/py-txamqp/Makefile Thu May 30 07:07:38 2013 (r319405) @@ -3,14 +3,14 @@ PORTNAME= txamqp PORTVERSION= 0.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net python MASTER_SITES= http://launchpadlibrarian.net/30388120/ \ # http://launchpad.net/txamqp/trunk/${PORTVERSION}/+download/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= python-${PORTNAME}_${PORTVERSION}.orig -MAINTAINER= ports@FreeBSD.org +MAINTAINER= horus.li@gmail.com COMMENT= Twisted Python library for the AMQP messaging protocol RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}thrift>0:${PORTSDIR}/devel/py-thrift @@ -28,7 +28,7 @@ PLIST_SUB= PORTNAME="${PORTNAME}" # TODO: Install txAMQP examples. # Don't try to install Twisted yourself, txAMQP. thx! -do-patch: +post-patch: @${REINPLACE_CMD} -e '/install_requires/s/^/#/' ${WRKSRC}/setup.py .include Added: head/net/py-txamqp/files/patch-src__txamqp__codec.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/py-txamqp/files/patch-src__txamqp__codec.py Thu May 30 07:07:38 2013 (r319405) @@ -0,0 +1,42 @@ +--- ./src/txamqp/codec.py.orig 2009-08-16 19:25:45.000000000 +0800 ++++ ./src/txamqp/codec.py 2013-05-30 13:54:50.000000000 +0800 +@@ -25,12 +25,12 @@ + """ + + from cStringIO import StringIO +-from struct import * ++from struct import pack, calcsize, unpack + + class EOF(Exception): + pass + +-class Codec: ++class Codec(object): + + def __init__(self, stream): + self.stream = stream +@@ -153,6 +153,13 @@ + def decode_longstr(self): + return self.dec_str("!L") + ++ # timestamp ++ def encode_timestamp(self, o): ++ self.pack("!Q", o) ++ ++ def decode_timestamp(self): ++ return self.unpack("!Q") ++ + # table + def encode_table(self, tbl): + enc = StringIO() +@@ -180,6 +187,10 @@ + value = self.decode_longstr() + elif type == "I": + value = self.decode_long() ++ elif type == "F": ++ value = self.decode_table() ++ elif type == "t": ++ value = (self.decode_octet() != 0) + else: + raise ValueError(repr(type)) + result[key] = value