Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 13 Jun 2014 10:27:53 +0000 (UTC)
From:      Pawel Pekala <pawel@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r357662 - head/misc/pypanda
Message-ID:  <201406131027.s5DARrF4025985@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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%%



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406131027.s5DARrF4025985>