From 43596880eda1659c6dfda6b3dca69fd4ae894892 Mon Sep 17 00:00:00 2001 From: Sunpoet Po-Chuan Hsieh Date: Sat, 1 Mar 2014 06:29:40 +0000 Subject: [PATCH] - Fix install/package for Python 3.x --- astro/weather/Makefile | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/astro/weather/Makefile b/astro/weather/Makefile index 39f8497df8a9..23e9c5a0a391 100644 --- a/astro/weather/Makefile +++ b/astro/weather/Makefile @@ -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 + +.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 +.include