svn commit: r346595 - head/astro/weather

[Sunpoet Po-Chuan Hsieh]

Author: sunpoet
Date: Sat Mar  1 06:29:40 2014
New Revision: 346595
URL: http://svnweb.freebsd.org/changeset/ports/346595
QAT: https://qat.redports.org/buildarchive/r346595/

Log:
  - Fix install/package for Python 3.x

Modified:
  head/astro/weather/Makefile

Modified: head/astro/weather/Makefile
==============================================================================
--- head/astro/weather/Makefile	Sat Mar  1 06:13:39 2014	(r346594)
+++ head/astro/weather/Makefile	Sat Mar  1 06:29:40 2014	(r346595)
@@ -19,8 +19,6 @@ USES=		shebangfix
 
 PLIST_FILES=	bin/${PORTNAME} \
 		%%PYTHON_SITELIBDIR%%/${PORTNAME}.py \
-		%%PYTHON_SITELIBDIR%%/${PORTNAME}.pyc \
-		%%PYTHON_SITELIBDIR%%/${PORTNAME}.pyo \
 		man/man1/${PORTNAME}.1.gz \
 		man/man5/${PORTNAME}rc.5.gz
 PORTDATA=	airports places stations zctas zones
@@ -29,14 +27,29 @@ SHEBANG_FILES=	${PORTNAME}
 python_OLD_CMD=	${SETENV} python
 python_CMD=	${PYTHON_CMD}
 
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_REL} < 320
+PYCACHE_DIR=	# empty
+PYCACHE_FILE=	${PORTNAME}
+.else
+PYCACHE_DIR=	__pycache__/
+PYCACHE_FILE=	${PORTNAME}.cpython-${PYTHON_SUFFIX}
+.endif
+
+PLIST_FILES+=	%%PYTHON_SITELIBDIR%%/${PYCACHE_DIR}${PYCACHE_FILE}.pyc \
+		%%PYTHON_SITELIBDIR%%/${PYCACHE_DIR}${PYCACHE_FILE}.pyo
+
 do-build:
 	@${PYTHON_CMD} -m compileall ${WRKSRC}/${PORTNAME}.py
 	@${PYTHON_CMD} -O -m compileall ${WRKSRC}/${PORTNAME}.py
 
 do-install:
-	${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/
+	${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/ ${STAGEDIR}${PYTHON_SITELIBDIR}/${PYCACHE_DIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
-	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTNAME}.py ${PORTNAME}.pyc ${PORTNAME}.pyo ${STAGEDIR}${PYTHON_SITELIBDIR}/
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.py ${STAGEDIR}${PYTHON_SITELIBDIR}/
+	${INSTALL_DATA} ${WRKSRC}/${PYCACHE_DIR}${PYCACHE_FILE}.pyc ${STAGEDIR}${PYTHON_SITELIBDIR}/${PYCACHE_DIR}
+	${INSTALL_DATA} ${WRKSRC}/${PYCACHE_DIR}${PYCACHE_FILE}.pyo ${STAGEDIR}${PYTHON_SITELIBDIR}/${PYCACHE_DIR}
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1/${PORTNAME}.1
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}rc.5 ${STAGEDIR}${MANPREFIX}/man/man5/${PORTNAME}rc.5
 	${MKDIR} ${STAGEDIR}${DATADIR}/
@@ -48,4 +61,4 @@ do-install:
 	@${ECHO_MSG} "setpath = ${DATADIR}"
 	@${ECHO_MSG} ""
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>