From owner-svn-ports-head@FreeBSD.ORG  Fri Jun 13 10:27:54 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 1E3AC4C6;
 Fri, 13 Jun 2014 10:27:54 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id E188C2A4C;
 Fri, 13 Jun 2014 10:27:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5DARrmU025987;
 Fri, 13 Jun 2014 10:27:53 GMT (envelope-from pawel@svn.freebsd.org)
Received: (from pawel@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5DARrF4025985;
 Fri, 13 Jun 2014 10:27:53 GMT (envelope-from pawel@svn.freebsd.org)
Message-Id: <201406131027.s5DARrF4025985@svn.freebsd.org>
From: Pawel Pekala <pawel@FreeBSD.org>
Date: Fri, 13 Jun 2014 10:27:53 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r357662 - head/misc/pypanda
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 Jun 2014 10:27:54 -0000

Author: pawel
Date: Fri Jun 13 10:27:53 2014
New Revision: 357662
URL: http://svnweb.freebsd.org/changeset/ports/357662
QAT: https://qat.redports.org/buildarchive/r357662/

Log:
  - Add staging support
  - Use PYGAME macro
  - Port is DATADIR, DOCSDIR safe - reflect this in pkg-plist

Modified:
  head/misc/pypanda/Makefile
  head/misc/pypanda/pkg-plist

Modified: head/misc/pypanda/Makefile
==============================================================================
--- head/misc/pypanda/Makefile	Fri Jun 13 09:18:53 2014	(r357661)
+++ head/misc/pypanda/Makefile	Fri Jun 13 10:27:53 2014	(r357662)
@@ -10,24 +10,22 @@ MASTER_SITES=	# none
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Viewer for San Diego Zoo Pandacam written in Python
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pygame/__init__.py:${PORTSDIR}/devel/py-game
+RUN_DEPENDS=	${PYGAME}
 
 USE_PYTHON=	yes
 
-NO_STAGE=	yes
 do-build:
 	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
 	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
 
 do-install:
-	@${MKDIR} ${DATADIR}
-.for ext in py pyc pyo jpg png
-	${INSTALL_DATA} ${WRKSRC}/*.${ext} ${DATADIR}
-.endfor
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/README ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} *.py *.pyc *.pyo *.jpg *.png \
+		${STAGEDIR}${DATADIR})
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 	@printf "#!/bin/sh\ncd ${DATADIR} && \
 		exec ${PYTHON_CMD} ${DATADIR}/pypanda.py\n" > ${WRKDIR}/pypanda.sh
-	@${INSTALL_SCRIPT} ${WRKDIR}/pypanda.sh ${PREFIX}/bin/pypanda
+	${INSTALL_SCRIPT} ${WRKDIR}/pypanda.sh ${STAGEDIR}${PREFIX}/bin/pypanda
 
 .include <bsd.port.mk>

Modified: head/misc/pypanda/pkg-plist
==============================================================================
--- head/misc/pypanda/pkg-plist	Fri Jun 13 09:18:53 2014	(r357661)
+++ head/misc/pypanda/pkg-plist	Fri Jun 13 10:27:53 2014	(r357662)
@@ -1,10 +1,10 @@
 bin/pypanda
-share/doc/pypanda/README
-share/pypanda/camdown.jpg
-share/pypanda/camrefresh.jpg
-share/pypanda/pypanda.png
-share/pypanda/pypanda.py
-share/pypanda/pypanda.pyc
-share/pypanda/pypanda.pyo
-@dirrm share/pypanda
-@dirrm share/doc/pypanda
+%%DOCSDIR%%/README
+%%DATADIR%%/camdown.jpg
+%%DATADIR%%/camrefresh.jpg
+%%DATADIR%%/pypanda.png
+%%DATADIR%%/pypanda.py
+%%DATADIR%%/pypanda.pyc
+%%DATADIR%%/pypanda.pyo
+@dirrm %%DATADIR%%
+@dirrm %%DOCSDIR%%