Date: Mon, 22 Nov 2010 23:05:30 +0200 (EET) From: "ports@c0decafe.net" <ports@c0decafe.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/152497: [PATCH] net-im/py26-punjab: update to 0.14, take maintainership Message-ID: <201011222105.oAML5UvF034440@absolut.c0decafe.net> Resent-Message-ID: <201011222110.oAMLAHmu079484@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 152497 >Category: ports >Synopsis: [PATCH] net-im/py26-punjab: update to 0.14, take maintainership >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon Nov 22 21:10:17 UTC 2010 >Closed-Date: >Last-Modified: >Originator: ports@c0decafe.net >Release: FreeBSD 8.1-RELEASE-p1 amd64 >Organization: c0decafe networks >Environment: System: FreeBSD absolut.c0decafe.net 8.1-RELEASE-p1 FreeBSD 8.1-RELEASE-p1 #1: Tue Sep 21 14:11:34 EEST 2010 >Description: - followup to ports/152337 - Update to 0.14 - Take maintainership Added file(s): - files/punjab.tac.in Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- py26-punjab-0.14.patch begins here --- diff -ruN --exclude=CVS /usr/ports/net-im/py-punjab.orig/Makefile /usr/ports/net-im/py-punjab/Makefile --- /usr/ports/net-im/py-punjab.orig/Makefile 2009-08-28 19:52:30.000000000 +0300 +++ /usr/ports/net-im/py-punjab/Makefile 2010-11-22 23:03:13.000000000 +0200 @@ -6,31 +6,31 @@ # PORTNAME= punjab -PORTVERSION= 0.12 +PORTVERSION= 0.14 CATEGORIES= net-im python -MASTER_SITES= http://butterfat.net/punjab/ +MASTER_SITES= http://code.stanziq.com/punjab/releases/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -MAINTAINER= ports@FreeBSD.org -COMMENT= HTTP-polling and HTTP-binding gateway for Jabber +MAINTAINER= ports@c0decafe.net +COMMENT= HTTP XMPP client interface USE_PYTHON= 2.4+ -USE_PYDISTUTILS= yes +USE_PYDISTUTILS=yes USE_TWISTED= words web conch names -RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/SOAPpy/__init__.py:${PORTSDIR}/net/py-soappy - -PORTDOCS= README.txt INSTALL.txt NOTES.txt PKG-INFO +PORTDOCS= README.txt INSTALL.txt PKG-INFO USE_RC_SUBR= punjab.sh -SUB_LIST+= "PYTHON_CMD=${PYTHONBASE}/bin/${PYTHON_VERSION}" -SUB_FILES= pkg-message +SUB_FILES= pkg-message punjab.tac +SUB_LIST+= "PYTHON_CMD=${PYTHON_CMD}" .include <bsd.port.pre.mk> post-install: @${INSTALL} -d ${WWWDIR} + @cd ${WRKSRC}/html && ${COPYTREE_SHARE} . ${WWWDIR} + @${INSTALL} ${WRKDIR}/punjab.tac ${PREFIX}/libexec/ @${CAT} ${PKGMESSAGE} .if !defined(NOPORTDOCS) @@ -38,11 +38,4 @@ @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} .endif -.if !defined(NOPORTEXAMPLES) - @cd ${WRKSRC}/html && ${COPYTREE_SHARE} . ${EXAMPLESDIR} -PLIST_SUB+= PORTEXAMPLES="" -.else -PLIST_SUB+= PORTEXAMPLES="@comment " -.endif - .include <bsd.port.post.mk> diff -ruN --exclude=CVS /usr/ports/net-im/py-punjab.orig/distinfo /usr/ports/net-im/py-punjab/distinfo --- /usr/ports/net-im/py-punjab.orig/distinfo 2008-02-15 07:05:56.000000000 +0200 +++ /usr/ports/net-im/py-punjab/distinfo 2010-11-22 21:12:49.000000000 +0200 @@ -1,3 +1,2 @@ -MD5 (punjab-0.12.tar.gz) = 4b103716a259cacd7508cfd6cc35e4a5 -SHA256 (punjab-0.12.tar.gz) = 86fbf646d8a022b1e6af24984c0ad091550b5a6d9528aaaa60c930ef783af5fd -SIZE (punjab-0.12.tar.gz) = 205343 +SHA256 (punjab-0.14.tar.gz) = 2c4c5bf67edb91acfb8986f11c738e9ff6ea6549449410c05b95e20aa8711628 +SIZE (punjab-0.14.tar.gz) = 46270 diff -ruN --exclude=CVS /usr/ports/net-im/py-punjab.orig/files/pkg-message.in /usr/ports/net-im/py-punjab/files/pkg-message.in --- /usr/ports/net-im/py-punjab.orig/files/pkg-message.in 2008-02-15 07:05:56.000000000 +0200 +++ /usr/ports/net-im/py-punjab/files/pkg-message.in 2010-11-22 22:21:34.000000000 +0200 @@ -1,9 +1,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * Punjab has been installed. -Please read the html documentation and tutorial at: -%%EXAMPLESDIR%% for setup and use. - -Docs are also installed in %%DOCSDIR%% +Please read the documentation and tutorial at: +%%DOCSDIR%% for setup and use. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * diff -ruN --exclude=CVS /usr/ports/net-im/py-punjab.orig/files/punjab.sh.in /usr/ports/net-im/py-punjab/files/punjab.sh.in --- /usr/ports/net-im/py-punjab.orig/files/punjab.sh.in 2010-03-27 02:14:16.000000000 +0200 +++ /usr/ports/net-im/py-punjab/files/punjab.sh.in 2010-11-22 23:00:49.000000000 +0200 @@ -7,16 +7,22 @@ . /etc/rc.subr -punjab_enable=${punjab_enable-"NO"} -punjab_chdir=${punjab_chdir-"%%HTMLDIR%%"} - name="punjab" rcvar=`set_rcvar` -pidfile="/var/run/twistd.pid" command="%%PREFIX%%/bin/twistd" -command_args="--pidfile $pidfile -f %%PREFIX%%/libexec/punjab.tap" -command_interpreter="%%PYTHON_CMD%%" load_rc_config $name -run_rc_command "$1" +punjab_enable=${punjab_enable-"NO"} +punjab_uid=${punjab_uid-"65534"} +punjab_gid=${punjab_gid-"65534"} +punjab_logfile=${punjab_logfile-"/var/log/punjab.log"} +punjab_pidfile=${punjab_pidfile-"/var/run/punjab.pid"} +punjab_tac=${punjab_tac-"%%PREFIX%%/libexec/punjab.tac"} + +command_interpreter="%%PYTHON_CMD%%" +pidfile=${punjab_pidfile} + +command_args="-u ${punjab_uid} -g ${punjab_gid} --pidfile ${pidfile} -l ${punjab_logfile} -y ${punjab_tac}" + +run_rc_command "$1" diff -ruN --exclude=CVS /usr/ports/net-im/py-punjab.orig/files/punjab.tac.in /usr/ports/net-im/py-punjab/files/punjab.tac.in --- /usr/ports/net-im/py-punjab.orig/files/punjab.tac.in 1970-01-01 02:00:00.000000000 +0200 +++ /usr/ports/net-im/py-punjab/files/punjab.tac.in 2010-11-22 21:56:18.000000000 +0200 @@ -0,0 +1,14 @@ +from twisted.web import server, resource, static +from twisted.application import service, internet + +from punjab.httpb import Httpb, HttpbService + +root = static.File("%%WWWDIR%%") # a static html directory + +b = resource.IResource(HttpbService(1)) # 1 means turn on verbose mode. +root.putChild('bosh', b) # url for BOSH + +site = server.Site(root) + +application = service.Application("punjab") +internet.TCPServer(5280, site).setServiceParent(application) diff -ruN --exclude=CVS /usr/ports/net-im/py-punjab.orig/pkg-descr /usr/ports/net-im/py-punjab/pkg-descr --- /usr/ports/net-im/py-punjab.orig/pkg-descr 2008-02-15 07:05:56.000000000 +0200 +++ /usr/ports/net-im/py-punjab/pkg-descr 2010-11-22 21:24:06.000000000 +0200 @@ -1,9 +1,8 @@ -PunJab is a HTTP jabber client interface. It is a SOAP, XMLRPC, -JEP-0025 or JEP-0124 server that allows persistent client connections -to a jabber server. It can be used for many things, but its main -purpose is to allow for stateless applications (ie web) a stateful -connection to jabber. +Punjab is a HTTP jabber client interface. -For more information about punjab see the following URL : +It is a BOSH or XEP-0124 connection manager that allows persistent client +connections to an XMPP server. -WWW: http://www.butterfat.net/wiki/Projects/PunJab +Supporting XMPP over BOSH or XEP-0206 + +WWW: http://code.stanziq.com/punjab/ diff -ruN --exclude=CVS /usr/ports/net-im/py-punjab.orig/pkg-plist /usr/ports/net-im/py-punjab/pkg-plist --- /usr/ports/net-im/py-punjab.orig/pkg-plist 2008-02-15 07:05:56.000000000 +0200 +++ /usr/ports/net-im/py-punjab/pkg-plist 2010-11-22 22:19:41.000000000 +0200 @@ -1,123 +1,52 @@ -%%PYTHON_SITELIBDIR%%/punjab/__init__.py -%%PYTHON_SITELIBDIR%%/punjab/__init__.pyc -%%PYTHON_SITELIBDIR%%/punjab/__init__.pyo -%%PYTHON_SITELIBDIR%%/punjab/error.py -%%PYTHON_SITELIBDIR%%/punjab/error.pyc -%%PYTHON_SITELIBDIR%%/punjab/error.pyo -%%PYTHON_SITELIBDIR%%/punjab/httpb.py -%%PYTHON_SITELIBDIR%%/punjab/httpb.pyc -%%PYTHON_SITELIBDIR%%/punjab/httpb.pyo -%%PYTHON_SITELIBDIR%%/punjab/httpp.py -%%PYTHON_SITELIBDIR%%/punjab/httpp.pyc -%%PYTHON_SITELIBDIR%%/punjab/httpp.pyo +@comment $FreeBSD$ %%PYTHON_SITELIBDIR%%/punjab/jabber.py -%%PYTHON_SITELIBDIR%%/punjab/jabber.pyc -%%PYTHON_SITELIBDIR%%/punjab/jabber.pyo -%%PYTHON_SITELIBDIR%%/punjab/livepunjab.py -%%PYTHON_SITELIBDIR%%/punjab/livepunjab.pyc -%%PYTHON_SITELIBDIR%%/punjab/livepunjab.pyo -%%PYTHON_SITELIBDIR%%/punjab/punjab.py -%%PYTHON_SITELIBDIR%%/punjab/punjab.pyc -%%PYTHON_SITELIBDIR%%/punjab/punjab.pyo -%%PYTHON_SITELIBDIR%%/punjab/rest.py -%%PYTHON_SITELIBDIR%%/punjab/rest.pyc -%%PYTHON_SITELIBDIR%%/punjab/rest.pyo -%%PYTHON_SITELIBDIR%%/punjab/sdb.py -%%PYTHON_SITELIBDIR%%/punjab/sdb.pyc -%%PYTHON_SITELIBDIR%%/punjab/sdb.pyo -%%PYTHON_SITELIBDIR%%/punjab/session.py -%%PYTHON_SITELIBDIR%%/punjab/session.pyc -%%PYTHON_SITELIBDIR%%/punjab/session.pyo -%%PYTHON_SITELIBDIR%%/punjab/soap.py -%%PYTHON_SITELIBDIR%%/punjab/soap.pyc -%%PYTHON_SITELIBDIR%%/punjab/soap.pyo %%PYTHON_SITELIBDIR%%/punjab/stream.py -%%PYTHON_SITELIBDIR%%/punjab/stream.pyc -%%PYTHON_SITELIBDIR%%/punjab/stream.pyo +%%PYTHON_SITELIBDIR%%/punjab/httpb.py %%PYTHON_SITELIBDIR%%/punjab/tap.py -%%PYTHON_SITELIBDIR%%/punjab/tap.pyc -%%PYTHON_SITELIBDIR%%/punjab/tap.pyo -%%PYTHON_SITELIBDIR%%/punjab/xmlrpc.py -%%PYTHON_SITELIBDIR%%/punjab/xmlrpc.pyc -%%PYTHON_SITELIBDIR%%/punjab/xmlrpc.pyo +%%PYTHON_SITELIBDIR%%/punjab/__init__.py +%%PYTHON_SITELIBDIR%%/punjab/error.py +%%PYTHON_SITELIBDIR%%/punjab/session.py +%%PYTHON_SITELIBDIR%%/punjab/httpb_client.py +%%PYTHON_SITELIBDIR%%/punjab/xmpp/server.py +%%PYTHON_SITELIBDIR%%/punjab/xmpp/ns.py %%PYTHON_SITELIBDIR%%/punjab/xmpp/__init__.py -%%PYTHON_SITELIBDIR%%/punjab/xmpp/__init__.pyc -%%PYTHON_SITELIBDIR%%/punjab/xmpp/__init__.pyo -%%PYTHON_SITELIBDIR%%/punjab/xmpp/client.py -%%PYTHON_SITELIBDIR%%/punjab/xmpp/client.pyc -%%PYTHON_SITELIBDIR%%/punjab/xmpp/client.pyo -%%PYTHON_SITELIBDIR%%/punjab/xmpp/component.py -%%PYTHON_SITELIBDIR%%/punjab/xmpp/component.pyc -%%PYTHON_SITELIBDIR%%/punjab/xmpp/component.pyo -%%PYTHON_SITELIBDIR%%/punjab/xmpp/disco.py -%%PYTHON_SITELIBDIR%%/punjab/xmpp/disco.pyc -%%PYTHON_SITELIBDIR%%/punjab/xmpp/disco.pyo %%PYTHON_SITELIBDIR%%/punjab/xmpp/error.py -%%PYTHON_SITELIBDIR%%/punjab/xmpp/error.pyc -%%PYTHON_SITELIBDIR%%/punjab/xmpp/error.pyo -%%PYTHON_SITELIBDIR%%/punjab/xmpp/ns.py -%%PYTHON_SITELIBDIR%%/punjab/xmpp/ns.pyc -%%PYTHON_SITELIBDIR%%/punjab/xmpp/ns.pyo -%%PYTHON_SITELIBDIR%%/punjab/xmpp/pubsub.py -%%PYTHON_SITELIBDIR%%/punjab/xmpp/pubsub.pyc -%%PYTHON_SITELIBDIR%%/punjab/xmpp/pubsub.pyo -%%PYTHON_SITELIBDIR%%/punjab/xmpp/server.py %%PYTHON_SITELIBDIR%%/punjab/xmpp/server.pyc +%%PYTHON_SITELIBDIR%%/punjab/xmpp/ns.pyc +%%PYTHON_SITELIBDIR%%/punjab/xmpp/__init__.pyc +%%PYTHON_SITELIBDIR%%/punjab/xmpp/error.pyc %%PYTHON_SITELIBDIR%%/punjab/xmpp/server.pyo +%%PYTHON_SITELIBDIR%%/punjab/xmpp/ns.pyo +%%PYTHON_SITELIBDIR%%/punjab/xmpp/__init__.pyo +%%PYTHON_SITELIBDIR%%/punjab/xmpp/error.pyo +%%PYTHON_SITELIBDIR%%/punjab/jabber.pyc +%%PYTHON_SITELIBDIR%%/punjab/stream.pyc +%%PYTHON_SITELIBDIR%%/punjab/httpb.pyc +%%PYTHON_SITELIBDIR%%/punjab/tap.pyc +%%PYTHON_SITELIBDIR%%/punjab/__init__.pyc +%%PYTHON_SITELIBDIR%%/punjab/error.pyc +%%PYTHON_SITELIBDIR%%/punjab/session.pyc +%%PYTHON_SITELIBDIR%%/punjab/httpb_client.pyc +%%PYTHON_SITELIBDIR%%/punjab/jabber.pyo +%%PYTHON_SITELIBDIR%%/punjab/stream.pyo +%%PYTHON_SITELIBDIR%%/punjab/httpb.pyo +%%PYTHON_SITELIBDIR%%/punjab/tap.pyo +%%PYTHON_SITELIBDIR%%/punjab/__init__.pyo +%%PYTHON_SITELIBDIR%%/punjab/error.pyo +%%PYTHON_SITELIBDIR%%/punjab/session.pyo +%%PYTHON_SITELIBDIR%%/punjab/httpb_client.pyo %%PYTHON_SITELIBDIR%%/twisted/plugins/punjab.py %%PYTHON_SITELIBDIR%%/twisted/plugins/punjab.pyc %%PYTHON_SITELIBDIR%%/twisted/plugins/punjab.pyo -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/LPlogin.html -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/LivePunjab.html -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/PubSub.html -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Subscribe.html -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/about.html -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/chat.html -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/css/default.css -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/css/newdefault.css -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo.html -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/favicon.ico -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/help.html -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/close-hover.gif -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/close.gif -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/folder.gif -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/folder_open.gif -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/glade-new-user.gif -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/glade-offline.gif -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/glade-online.gif -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/group_on.gif -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/preview.gif -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/roster/available-away.gif -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/roster/available-chat.gif -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/roster/available-dnd.gif -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/roster/available-online.gif -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/roster/available-xa.gif -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/roster/available.gif -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/roster/glade-groupchat-menu.xpm -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/roster/group-closed.gif -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/roster/group-opened.gif -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/roster/group_off.gif -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/roster/group_on.gif -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/roster/stalker.gif -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/roster/unavailable.gif -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/index.html -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/js/livepunjab.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/js/punchi.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/js/punjab.js -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/jwchat.html -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/punjab.gif -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/punjab.png -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/punjab_login.png -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/punjab_roster.png -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/punjaborig.gif -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/restapi.html -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xmlrpcapi.html -@dirrm %%PYTHON_SITELIBDIR%%/punjab/xmpp -@dirrm %%PYTHON_SITELIBDIR%%/punjab -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/js -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/images/roster -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/images -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/css -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% +@dirrmtry %%PYTHON_SITELIBDIR%%/twisted/plugins +@dirrmtry %%PYTHON_SITELIBDIR%%/twisted +@dirrmtry %%PYTHON_SITELIBDIR%%/punjab/xmpp +@dirrmtry %%PYTHON_SITELIBDIR%%/punjab +%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%% +libexec/punjab.tac @exec mkdir -p %D/%%WWWDIR%% +%%WWWDIR%%/favicon.ico +%%WWWDIR%%/crossdomain.xml +%%WWWDIR%%/punjab.gif +%%WWWDIR%%/index.html @dirrmtry %%WWWDIR%% --- py26-punjab-0.14.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201011222105.oAML5UvF034440>