From owner-svn-ports-head@freebsd.org Sat Jan 5 19:35:24 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6F391141EBAC; Sat, 5 Jan 2019 19:35:24 +0000 (UTC) (envelope-from antoine@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 11B1F8FF86; Sat, 5 Jan 2019 19:35:24 +0000 (UTC) (envelope-from antoine@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 0D1B71D169; Sat, 5 Jan 2019 19:35:22 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x05JZL8h065829; Sat, 5 Jan 2019 19:35:21 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x05JZLe2065828; Sat, 5 Jan 2019 19:35:21 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201901051935.x05JZLe2065828@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Sat, 5 Jan 2019 19:35:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r489371 - head/science/scidavis X-SVN-Group: ports-head X-SVN-Commit-Author: antoine X-SVN-Commit-Paths: head/science/scidavis X-SVN-Commit-Revision: 489371 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 11B1F8FF86 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.96)[-0.957,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-0.999,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 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: Sat, 05 Jan 2019 19:35:24 -0000 Author: antoine Date: Sat Jan 5 19:35:21 2019 New Revision: 489371 URL: https://svnweb.freebsd.org/changeset/ports/489371 Log: Fix installation/packaging with DEFAULT_VERSIONS=python=3.x PR: 234633 Modified: head/science/scidavis/Makefile Modified: head/science/scidavis/Makefile ============================================================================== --- head/science/scidavis/Makefile Sat Jan 5 19:35:19 2019 (r489370) +++ head/science/scidavis/Makefile Sat Jan 5 19:35:21 2019 (r489371) @@ -39,7 +39,7 @@ OPTIONS_SUB= yes PYTHON_DESC= Python scripting support PYTHON_USES= pyqt:5 python -PYTHON_USE= pyqt=core,gui,printsupport,sip,widgets +PYTHON_USE= pyqt=core,gui,printsupport,sip,widgets python=py3kplist PYTHON_QMAKE_ON= PYTHON=${PYTHON_CMD} CONFIG+=python \ PYQT_SIPDIR=${LOCALBASE}/${_SIPDIR_REL} @@ -55,10 +55,23 @@ post-install-NLS-on: ${INSTALL_DATA} ${WRKSRC}/scidavis/translations/*.qm \ ${STAGEDIR}${DATADIR}/translations +.include + +.if ${PORT_OPTIONS:MPYTHON} +.if ${PYTHON_REL} < 3200 +PYCACHE_DIR= # none +PYCACHE_FILE= scidavisUtil.pyc +.else +PYCACHE_DIR= __pycache__/ +PYCACHE_FILE= scidavisUtil.cpython-${PYTHON_SUFFIX}.pyc +.endif +.endif + post-install-PYTHON-on: ${MV} ${STAGEDIR}${PREFIX}/etc/scidavisrc.py \ ${STAGEDIR}${PREFIX}/etc/scidavisrc.py.sample - ${INSTALL_DATA} ${WRKSRC}/scidavis/scidavisUtil.pyc \ - ${STAGEDIR}${DATADIR} + ${MKDIR} ${STAGEDIR}${DATADIR}/${PYCACHE_DIR} + ${INSTALL_DATA} ${WRKSRC}/scidavis/${PYCACHE_DIR}${PYCACHE_FILE} \ + ${STAGEDIR}${DATADIR}/${PYCACHE_DIR} -.include +.include