From 9cadd97e3e27c157bb71d2022725ecf40ff434b7 Mon Sep 17 00:00:00 2001
From: William Grzybowski <wg@FreeBSD.org>
Date: Thu, 26 Dec 2013 19:21:50 +0000
Subject: [PATCH] net-im/py-punjab: support staging

---
 net-im/py-punjab/Makefile  | 23 ++++++++------------
 net-im/py-punjab/pkg-plist | 44 --------------------------------------
 2 files changed, 9 insertions(+), 58 deletions(-)

diff --git a/net-im/py-punjab/Makefile b/net-im/py-punjab/Makefile
index 5076685d6a4c..a7944ca4e7de 100644
--- a/net-im/py-punjab/Makefile
+++ b/net-im/py-punjab/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	punjab
 PORTVERSION=	0.14
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-im python
 MASTER_SITES=	http://code.stanziq.com/punjab/releases/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -11,8 +11,9 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	HTTP XMPP client interface
 
-USE_PYTHON=	2.5+
+USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
+PYDISTUTILS_AUTOPLIST=	yes
 USES=		twisted:words,web,conch,names
 
 PORTDOCS=	README.txt INSTALL.txt PKG-INFO
@@ -22,18 +23,12 @@ USE_RC_SUBR=	punjab
 SUB_FILES=	pkg-message punjab.tac
 SUB_LIST+=	"PYTHON_CMD=${PYTHON_CMD}"
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
 post-install:
-	@${INSTALL} -d ${WWWDIR}
-	@cd ${WRKSRC}/html && ${COPYTREE_SHARE} . ${WWWDIR}
-	@${INSTALL} ${WRKDIR}/punjab.tac ${PREFIX}/libexec/
-	@${CAT} ${PKGMESSAGE}
+	@${MKDIR} ${STAGEDIR}${WWWDIR}
+	@cd ${WRKSRC}/html && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}
+	${INSTALL} ${WRKDIR}/punjab.tac ${STAGEDIR}${PREFIX}/libexec/
 
-.if !defined(NOPORTDOCS)
-	@${INSTALL} -d ${DOCSDIR}
-	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net-im/py-punjab/pkg-plist b/net-im/py-punjab/pkg-plist
index 479f13d47267..8d3850833729 100644
--- a/net-im/py-punjab/pkg-plist
+++ b/net-im/py-punjab/pkg-plist
@@ -1,47 +1,3 @@
-@comment $FreeBSD$
-%%PYTHON_SITELIBDIR%%/punjab/jabber.py
-%%PYTHON_SITELIBDIR%%/punjab/stream.py
-%%PYTHON_SITELIBDIR%%/punjab/httpb.py
-%%PYTHON_SITELIBDIR%%/punjab/tap.py
-%%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/error.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
-@dirrmtry %%PYTHON_SITELIBDIR%%/twisted/plugins
-@dirrmtry %%PYTHON_SITELIBDIR%%/twisted
-@dirrmtry %%PYTHON_SITELIBDIR%%/punjab/xmpp
-@dirrmtry %%PYTHON_SITELIBDIR%%/punjab
 libexec/punjab.tac
 %%WWWDIR%%/favicon.ico
 %%WWWDIR%%/crossdomain.xml