From owner-dev-commits-ports-all@freebsd.org Mon Apr 19 14:56:36 2021 Return-Path: Delivered-To: dev-commits-ports-all@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 C46835F48BD; Mon, 19 Apr 2021 14:56:36 +0000 (UTC) (envelope-from git@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 4FP8z84pXJz4VHW; Mon, 19 Apr 2021 14:56:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 93654213C6; Mon, 19 Apr 2021 14:56:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13JEua66050047; Mon, 19 Apr 2021 14:56:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13JEuawA050046; Mon, 19 Apr 2021 14:56:36 GMT (envelope-from git) Date: Mon, 19 Apr 2021 14:56:36 GMT Message-Id: <202104191456.13JEuawA050046@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kai Knoblich Subject: git: 70c2c6806ca3 - main - textproc/ibus-typing-booster: Adjust *_DEPENDS for Python 3.8+ MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kai X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 70c2c6806ca3e891bc6ea1c4c710f14c34df63c2 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Apr 2021 14:56:37 -0000 The branch main has been updated by kai: URL: https://cgit.FreeBSD.org/ports/commit/?id=70c2c6806ca3e891bc6ea1c4c710f14c34df63c2 commit 70c2c6806ca3e891bc6ea1c4c710f14c34df63c2 Author: Kai Knoblich AuthorDate: 2021-04-19 14:49:03 +0000 Commit: Kai Knoblich CommitDate: 2021-04-19 14:53:15 +0000 textproc/ibus-typing-booster: Adjust *_DEPENDS for Python 3.8+ * Since Python 3.8.7 (and also 3.9.2), .so files get an extension, e.g. ".cpython-38.so" if built with Python 3.8. Thus check for the presence of the Python packages instead of the actual .so files. PR: 253815 Approved by: thierry (maintainer, via e-mail) --- textproc/ibus-typing-booster/Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/textproc/ibus-typing-booster/Makefile b/textproc/ibus-typing-booster/Makefile index b9d44d089691..c0b985501756 100644 --- a/textproc/ibus-typing-booster/Makefile +++ b/textproc/ibus-typing-booster/Makefile @@ -10,16 +10,16 @@ COMMENT= Faster typing by context sensitive completion LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/xdg/Menu.py:devel/py-xdg@${PY_FLAVOR} \ - ${PYTHON_LIBDIR}/lib-dynload/_sqlite3.so:databases/py-sqlite3@${PY_FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} LIB_DEPENDS= libibus-1.0.so:textproc/ibus \ libm17n.so:devel/m17n-lib RUN_DEPENDS= CLDR>0:textproc/CLDR \ - ${PYTHON_SITELIBDIR}/xdg/Menu.py:devel/py-xdg@${PY_FLAVOR} \ - ${PYTHON_SITELIBDIR}/dbus/bus.py:devel/py-dbus@${PY_FLAVOR} \ - ${PYTHON_SITELIBDIR}/hunspell.so:textproc/py-hunspell@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}hunspell>0:textproc/py-hunspell@${PY_FLAVOR} \ ${LOCALBASE}/share/unicode/ucd/Index.txt:textproc/UCD \ - ${PYTHON_LIBDIR}/lib-dynload/_sqlite3.so:databases/py-sqlite3@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} TEST_DEPENDS= ${LOCALBASE}/share/hunspell/cs_CZ.dic:textproc/cs-hunspell \ ${LOCALBASE}/share/hunspell/de_DE.dic:german/hunspell \ ${LOCALBASE}/share/hunspell/en_US.aff:textproc/en-hunspell \ @@ -29,7 +29,7 @@ TEST_DEPENDS= ${LOCALBASE}/share/hunspell/cs_CZ.dic:textproc/cs-hunspell \ ${LOCALBASE}/share/hunspell/sv_SE.dic:textproc/sv-hunspell \ ${LOCALBASE}/libexec/ibus-engine-m17n:textproc/ibus-m17n \ ${LOCALBASE}/share/m17n/hi-inscript2.mim:devel/m17n-inscript2 \ - ${PYTHON_SITELIBDIR}/mock/mock.py:devel/py-mock@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ gmake:devel/gmake USE_GITHUB= yes