From owner-dev-commits-ports-all@freebsd.org Mon Apr 19 14:56:29 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 DDC2D5F4998; Mon, 19 Apr 2021 14:56:29 +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 4FP8z15sXpz4VXX; Mon, 19 Apr 2021 14:56:29 +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 B948A20F73; Mon, 19 Apr 2021 14:56:29 +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 13JEuTpp049915; Mon, 19 Apr 2021 14:56:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13JEuTs3049914; Mon, 19 Apr 2021 14:56:29 GMT (envelope-from git) Date: Mon, 19 Apr 2021 14:56:29 GMT Message-Id: <202104191456.13JEuTs3049914@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: cd5b03f6927e - main - graphics/py-openimageio: Fix packaging with 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: cd5b03f6927ebf6c3966816a91b10ea223a84910 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:30 -0000 The branch main has been updated by kai: URL: https://cgit.FreeBSD.org/ports/commit/?id=cd5b03f6927ebf6c3966816a91b10ea223a84910 commit cd5b03f6927ebf6c3966816a91b10ea223a84910 Author: Kai Knoblich AuthorDate: 2021-04-19 14:41:42 +0000 Commit: Kai Knoblich CommitDate: 2021-04-19 14:53:13 +0000 graphics/py-openimageio: Fix packaging with Python 3.8+ * Apply the same fix as in 9cb5898561b302d952fec8e2fac66a945a2c4915 by using wildcard paths and adjust the pkg-plist for the Python bindings as well. * Also use PYTHONPREFIX_SITELIBDIR instead PYTHON_SITELIBDIR to make the port PREFIX safe while I'm here. PR: 253815 Approved by: python (with hat) --- graphics/openimageio/Makefile | 4 ++-- graphics/openimageio/pkg-plist-pybind | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile index 3132881e843b..2982b645dc59 100644 --- a/graphics/openimageio/Makefile +++ b/graphics/openimageio/Makefile @@ -117,8 +117,8 @@ CMAKE_OFF+= USE_QT USE_OPENGL OIIO_BUILD_TOOLS OIIO_BUILD_TESTS CMAKE_ARGS+= -DPYTHON_VERSION:STRING=${PYTHON_VER} do-install: - ${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR} - ${INSTALL_LIB} ${BUILD_WRKSRC}/lib/python/site-packages/OpenImageIO.so ${STAGEDIR}${PYTHON_SITELIBDIR} + ${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} + ${INSTALL_LIB} ${BUILD_WRKSRC}/lib/python/site-packages/OpenImageIO*.so ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} .else # SLAVE_PORT != yes USE_LDCONFIG= yes CMAKE_OFF+= USE_PYTHON diff --git a/graphics/openimageio/pkg-plist-pybind b/graphics/openimageio/pkg-plist-pybind index b649adc8a98e..3fcce11e90ec 100644 --- a/graphics/openimageio/pkg-plist-pybind +++ b/graphics/openimageio/pkg-plist-pybind @@ -1 +1 @@ -%%PYTHON_SITELIBDIR%%/OpenImageIO.so +%%PYTHON_SITELIBDIR%%/OpenImageIO%%PYTHON_EXT_SUFFIX%%.so