From owner-svn-ports-head@freebsd.org Sun Mar 7 22:10:17 2021 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BCD0C5766AC; Sun, 7 Mar 2021 22:10:17 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DtwdP011Mz3tly; Sun, 7 Mar 2021 22:10:15 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2FB9F1DF0B; Sun, 7 Mar 2021 22:10:15 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 127MAENP027334; Sun, 7 Mar 2021 22:10:14 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 127MAEw8027333; Sun, 7 Mar 2021 22:10:14 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <202103072210.127MAEw8027333@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Sun, 7 Mar 2021 22:10:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r567610 - head/astro/weather X-SVN-Group: ports-head X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: head/astro/weather X-SVN-Commit-Revision: 567610 X-SVN-Commit-Repository: ports 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.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Mar 2021 22:10:17 -0000 Author: sunpoet Date: Sun Mar 7 22:10:14 2021 New Revision: 567610 URL: https://svnweb.freebsd.org/changeset/ports/567610 Log: Remove PYTHON_REL check after r564032 (USES=python means USES=python:3.6+) Modified: head/astro/weather/Makefile Modified: head/astro/weather/Makefile ============================================================================== --- head/astro/weather/Makefile Sun Mar 7 22:10:09 2021 (r567609) +++ head/astro/weather/Makefile Sun Mar 7 22:10:14 2021 (r567610) @@ -19,34 +19,24 @@ NO_ARCH= yes PLIST_FILES= bin/weather \ ${PYTHON_SITELIBDIR}/weather.py \ - ${PYTHON_SITELIBDIR}/${PYCACHE_DIR}${PYCACHE_FILE}.pyc \ - ${PYTHON_SITELIBDIR}/${PYCACHE_DIR}${PYCACHE_FILE}.${PYTHON_PYOEXTENSION} \ + ${PYTHON_SITELIBDIR}/__pycache__/weather.cpython-${PYTHON_SUFFIX}.pyc \ + ${PYTHON_SITELIBDIR}/__pycache__/weather.cpython-${PYTHON_SUFFIX}.${PYTHON_PYOEXTENSION} \ share/man/man1/weather.1.gz \ share/man/man5/weatherrc.5.gz PORTDATA= airports places stations zctas zones SHEBANG_FILES= weather -.include - -.if ${PYTHON_REL} < 3200 -PYCACHE_DIR= # none -PYCACHE_FILE= weather -.else -PYCACHE_DIR= __pycache__/ -PYCACHE_FILE= weather.cpython-${PYTHON_SUFFIX} -.endif - do-build: @${PYTHON_CMD} -m compileall ${WRKSRC}/weather.py @${PYTHON_CMD} -O -m compileall ${WRKSRC}/weather.py do-install: - ${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/ ${STAGEDIR}${PYTHON_SITELIBDIR}/${PYCACHE_DIR} + ${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/ ${STAGEDIR}${PYTHON_SITELIBDIR}/__pycache__/ ${INSTALL_SCRIPT} ${WRKSRC}/weather ${STAGEDIR}${PREFIX}/bin/weather ${INSTALL_DATA} ${WRKSRC}/weather.py ${STAGEDIR}${PYTHON_SITELIBDIR}/ - ${INSTALL_DATA} ${WRKSRC}/${PYCACHE_DIR}${PYCACHE_FILE}.pyc ${STAGEDIR}${PYTHON_SITELIBDIR}/${PYCACHE_DIR} - ${INSTALL_DATA} ${WRKSRC}/${PYCACHE_DIR}${PYCACHE_FILE}.${PYTHON_PYOEXTENSION} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PYCACHE_DIR} + ${INSTALL_DATA} ${WRKSRC}/__pycache__/weather.cpython-${PYTHON_SUFFIX}.pyc ${STAGEDIR}${PYTHON_SITELIBDIR}/__pycache__/ + ${INSTALL_DATA} ${WRKSRC}/__pycache__/weather.cpython-${PYTHON_SUFFIX}.${PYTHON_PYOEXTENSION} ${STAGEDIR}${PYTHON_SITELIBDIR}/__pycache__/ ${INSTALL_MAN} ${WRKSRC}/weather.1 ${STAGEDIR}${PREFIX}/share/man/man1/weather.1 ${INSTALL_MAN} ${WRKSRC}/weatherrc.5 ${STAGEDIR}${PREFIX}/share/man/man5/weatherrc.5 ${MKDIR} ${STAGEDIR}${DATADIR}/ @@ -58,4 +48,4 @@ do-install: @${ECHO_MSG} "setpath = ${DATADIR}" @${ECHO_MSG} "" -.include +.include