From owner-svn-ports-head@freebsd.org Sat Mar 20 08:39:28 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 2452857773F; Sat, 20 Mar 2021 08:39:28 +0000 (UTC) (envelope-from kai@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 4F2Z1r0KvBz3PtT; Sat, 20 Mar 2021 08:39:28 +0000 (UTC) (envelope-from kai@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 F2651248DE; Sat, 20 Mar 2021 08:39:27 +0000 (UTC) (envelope-from kai@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 12K8dR9u017058; Sat, 20 Mar 2021 08:39:27 GMT (envelope-from kai@FreeBSD.org) Received: (from kai@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 12K8dRN9017056; Sat, 20 Mar 2021 08:39:27 GMT (envelope-from kai@FreeBSD.org) Message-Id: <202103200839.12K8dRN9017056@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kai set sender to kai@FreeBSD.org using -f From: Kai Knoblich Date: Sat, 20 Mar 2021 08:39:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r568854 - head/games/anki X-SVN-Group: ports-head X-SVN-Commit-Author: kai X-SVN-Commit-Paths: head/games/anki X-SVN-Commit-Revision: 568854 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: Sat, 20 Mar 2021 08:39:28 -0000 Author: kai Date: Sat Mar 20 08:39:27 2021 New Revision: 568854 URL: https://svnweb.freebsd.org/changeset/ports/568854 Log: games/anki: Fix packaging with Python 3.8 * Add a workaround to make the transition from Python 3.7 to Python 3.8 possible because the name of the .so file is slightly different between the two releases. * Also add CARGO_INSTALL to avoid warnings about ignored duplicate scripts for the target "do-install". PR: 253815 Modified: head/games/anki/Makefile head/games/anki/pkg-plist Modified: head/games/anki/Makefile ============================================================================== --- head/games/anki/Makefile Sat Mar 20 08:33:25 2021 (r568853) +++ head/games/anki/Makefile Sat Mar 20 08:39:27 2021 (r568854) @@ -325,6 +325,7 @@ CARGO_CARGOLOCK= ${WRKSRC}/rspy/Cargo.lock CARGO_CARGOTOML= ${WRKSRC}/rspy/Cargo.toml CARGO_BUILD= no +CARGO_INSTALL= no MAKE_ARGS= DEVEL="rspy pylib ts qt" PYTHON_FILE="${PYTHON_CMD}" SHELL="${LOCALBASE}/bin/bash" # devel/py-maturin acts as a wrapper for "cargo" and "rustc". Ensure that it @@ -334,6 +335,8 @@ MAKE_ENV= ${CARGO_ENV} npm_config_offline=true ALL_TARGET= build +PLIST_SUB= _PY_SONAME=${_PY_SONAME} + OPTIONS_DEFINE= NLS OPTIONS_DEFAULT= MPV OPTIONS_GROUP= PLAYER @@ -352,6 +355,14 @@ NLS_USES= gettext # expected. _MY_BUILDHASH= 84dcaa86 +.include + +.if ${PYTHON_REL} < 3800 +_PY_SONAME= .cpython-${PYTHON_SUFFIX}m +.else +_PY_SONAME= ${PYTHON_EXT_SUFFIX} +.endif + # Place the translation files to the appropriate directories post-extract: @${RLN} ${WRKSRC_i18ncore} ${WRKSRC}/rslib/ftl/repo @@ -434,4 +445,4 @@ make-npm-cache: && ${TAR} -czf ${PORTNAME}-npm-cache-${DISTVERSION}${EXTRACT_SUFX} .npm \ && ${ECHO} "Please upload the file ${WRKDIR}/${PORTNAME}-npm-cache-${DISTVERSION}${EXTRACT_SUFX}" -.include +.include Modified: head/games/anki/pkg-plist ============================================================================== --- head/games/anki/pkg-plist Sat Mar 20 08:33:25 2021 (r568853) +++ head/games/anki/pkg-plist Sat Mar 20 08:39:27 2021 (r568854) @@ -138,7 +138,7 @@ man/man1/anki.1.gz %%DATADIR%%/anki/template_legacy.py %%DATADIR%%/anki/types.py %%DATADIR%%/anki/utils.py -%%DATADIR%%/ankirspy.cpython-%%PYTHON_SUFFIX%%m.so +%%DATADIR%%/ankirspy%%_PY_SONAME%%.so %%DATADIR%%/aqt/__init__.py %%DATADIR%%/aqt/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc %%DATADIR%%/aqt/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc