Index: head/net-im/py-punjab/Makefile
===================================================================
--- head/net-im/py-punjab/Makefile	(revision 404359)
+++ head/net-im/py-punjab/Makefile	(revision 404360)
@@ -1,34 +1,36 @@
 # Created by: jodocus <jodocus@jodocus.org>
 # $FreeBSD$
 
 PORTNAME=	punjab
-PORTVERSION=	0.14
-PORTREVISION=	2
+PORTVERSION=	0.15
 CATEGORIES=	net-im python
-MASTER_SITES=	http://code.stanziq.com/punjab/releases/
+MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	HTTP XMPP client interface
 
-BROKEN=		unfetchable
-
-USE_PYTHON=	distutils autoplist
 USES=		python twisted:words,web,conch,names
-
-PORTDOCS=	README.txt INSTALL.txt PKG-INFO
-
+USE_PYTHON=	distutils autoplist
 USE_RC_SUBR=	punjab
 
 SUB_FILES=	pkg-message punjab.tac
-SUB_LIST+=	"PYTHON_CMD=${PYTHON_CMD}"
+SUB_LIST=	PYTHON_CMD="${PYTHON_CMD}"
 
+PORTDOCS=	README.txt INSTALL.txt PKG-INFO
+
+OPTIONS_DEFINE=	DOCS
+
 post-install:
+	(cd ${WRKDIR} && ${INSTALL_DATA} punjab.tac \
+		${STAGEDIR}${PREFIX}/libexec)
 	@${MKDIR} ${STAGEDIR}${WWWDIR}
-	@cd ${WRKSRC}/html && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}
-	${INSTALL} ${WRKDIR}/punjab.tac ${STAGEDIR}${PREFIX}/libexec/
+	@(cd ${WRKSRC}/html && ${COPYTREE_SHARE} . \
+		${STAGEDIR}${WWWDIR})
 
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} \
+		${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
Index: head/net-im/py-punjab/distinfo
===================================================================
--- head/net-im/py-punjab/distinfo	(revision 404359)
+++ head/net-im/py-punjab/distinfo	(revision 404360)
@@ -1,2 +1,2 @@
-SHA256 (punjab-0.14.tar.gz) = 2c4c5bf67edb91acfb8986f11c738e9ff6ea6549449410c05b95e20aa8711628
-SIZE (punjab-0.14.tar.gz) = 46270
+SHA256 (punjab-0.15.tar.gz) = 47e7aad42fff84765e03f385f3f7b12787dad020605a81c30acbd3895734a2d8
+SIZE (punjab-0.15.tar.gz) = 47804
Index: head/net-im/py-punjab/pkg-descr
===================================================================
--- head/net-im/py-punjab/pkg-descr	(revision 404359)
+++ head/net-im/py-punjab/pkg-descr	(revision 404360)
@@ -1,8 +1,8 @@
 Punjab is a HTTP jabber client interface.
 
 It is a BOSH or XEP-0124 connection manager that allows persistent client
 connections to an XMPP server.
 
 Supporting XMPP over BOSH or XEP-0206
 
-WWW: http://code.stanziq.com/punjab/
+WWW: https://github.com/twonds/punjab