From nobody Fri May 17 08:51:11 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vggfl5Xlmz5KmVl; Fri, 17 May 2024 08:51:11 +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 4Vggfl4NN9z4vXT; Fri, 17 May 2024 08:51:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715935871; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C9G6U+P0t6uBTbmW2zkP36zRYINuuKS4Tx7YdKRzahM=; b=xzM1S0b2Y3Gu+E5RYNGuSsAjLsPBZgjW40VFJ8/lIx/XAQQJwGgha4tE2zy28TtbDIU9mD e0aFlGrOWkVCinC4aHw2MndgTvH51/wbxl+g6X1F5Q/qjvQU3CvVH3KAsbkfTBkTy4vhav QG1mJ/bxd8ldiCZ+9daEFTRtMDZXUEzUZ43M/GY4j1f/mgRmW4HQVHhoCq3j3cOeIic5u1 dwvp/rowpe/pO0L2AmYu3pbm9ppXQg8HMGqD6mMkzr4NEOfEtJVXd9YspUINBwTwtfuJzM hLPQ8Axm+j3+Fr12QMZ+u+epcAJQ40isZl5giMcbo75VFSE6gTXWLUSsIaj5aA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715935871; a=rsa-sha256; cv=none; b=CwpL96d+MHkmkX5kzStWuWI7tXvahxTOga6peHyfdz7y7ITxXDs962o1aNxzMOLrgt0xSF gdrcUHyPjRcVPeJkcvftsZa0Gux8CUER3ZaIoS+JKsA+YanRjMwf35UgfkLNMq64TWXp2Q B1SNg9jIz7dG0cS+havXKc6dx+sQ6fjLqKqLYtuH7KV7sLWSdgShoTN8+PQo/3/1RJRQqB pb6vbjyUyB7hIYSwYl0O+JL3WGZQqaB292vfqJpnGDcncYze6pBZZlHt6KWd995vL0JgDS dLX7TMUb/2EoTRc5H4PNpx/2pCIeHVm0+PHj7vOnFltzcSmsu0DoYy7AS43WXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715935871; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C9G6U+P0t6uBTbmW2zkP36zRYINuuKS4Tx7YdKRzahM=; b=FpxwUUqHIzOfBStE/WrTgW5g1AN2/T8uzc+bjQt39Y5sM+N05tVEmYMYebnvwAN2zN3Qm/ FG93+m65ZlgJkp+0WATeVlq32YypmdSbVSbYAskZXgaXZDSAPKO9nhWPtkCXaaue0cElyw kFI2GY1IAfzOHZ4Aj8JcgD6t/9zFAJbrDpvL2duSXYPICFgO7H3V7twVsHVhhnhXb7YYxp AcALkXHrxUepN9YBWewuh2ztzNS08XrjlRBcp4g2gGpEHs336ZsF8EDfW0Nqo5FD2jtA5a 9f1xVQ11DyGC/QrDNhHtQfFnhJzgNMcYc3TqYR98ro8qNYXCV/zAihv4r890Qw== 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 4Vggfl3ztFzZwQ; Fri, 17 May 2024 08:51:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44H8pBrW015638; Fri, 17 May 2024 08:51:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44H8pB4I015635; Fri, 17 May 2024 08:51:11 GMT (envelope-from git) Date: Fri, 17 May 2024 08:51:11 GMT Message-Id: <202405170851.44H8pB4I015635@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: bb5ef640ea2f - main - py-libxml2: Byte compile List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bb5ef640ea2f1756105b9f2aea44d85df600dd5e Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=bb5ef640ea2f1756105b9f2aea44d85df600dd5e commit bb5ef640ea2f1756105b9f2aea44d85df600dd5e Author: Jason E. Hale AuthorDate: 2024-05-17 07:51:35 +0000 Commit: Jason E. Hale CommitDate: 2024-05-17 08:51:04 +0000 py-libxml2: Byte compile This eliminates annoying fs-violation errors, notably from textproc/itstool and textproc/gtk-doc where the byte code is generated at build time instead of already having been generated by py-libxml2. It is still peculiar to me that these files are dumped directly into PYTHON_SITELIBDIR and don't have a subdirectory of their own. Worth investigating, but hierachical changes are obviously more intrusive and beyond this scope. --- textproc/libxml2/Makefile | 6 ++++++ textproc/py-libxml2/Makefile | 17 ++++++----------- textproc/py-libxml2/pkg-plist | 7 +++++++ 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile index e69bb22381d7..386af00928be 100644 --- a/textproc/libxml2/Makefile +++ b/textproc/libxml2/Makefile @@ -55,6 +55,12 @@ post-patch: post-install: .if defined(LIBXML2_SLAVE) ${STRIP_CMD} ${STAGEDIR}${PYTHON_LIBDIR}/site-packages/libxml2mod.so + ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \ + -f -d ${PYTHONPREFIX_SITELIBDIR} \ + ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} + ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \ + -f -d ${PYTHONPREFIX_SITELIBDIR} \ + ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} .endif .include diff --git a/textproc/py-libxml2/Makefile b/textproc/py-libxml2/Makefile index 33a8d506f52f..84796bac21b3 100644 --- a/textproc/py-libxml2/Makefile +++ b/textproc/py-libxml2/Makefile @@ -1,9 +1,8 @@ -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= textproc gnome python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} COMMENT= Python interface for XML parser library for GNOME -MASTERDIR= ${.CURDIR}/../libxml2 USES+= gnome python shebangfix USE_GNOME= libxml2 @@ -14,19 +13,15 @@ SHEBANG_FILES= *.py doc/*.py python/*.py python/tests/*.py # multiple versions are installed CMAKE_ARGS= -DPython_EXECUTABLE=${PYTHON_CMD} -OPTIONS_EXCLUDE= ${OPTIONS_DEFINE} +MASTERDIR= ${.CURDIR}/../libxml2 -# Tell master port we're a slave port -LIBXML2_SLAVE= python -# Grab pkg-descr from slave port DESCR= ${.CURDIR}/pkg-descr +PLIST= ${.CURDIR}/pkg-plist -# Don't append pkg-plist from master port -PLIST= +OPTIONS_EXCLUDE= ${OPTIONS_DEFINE} -PLIST_FILES= ${PYTHON_SITELIBDIR}/drv_libxml2.py \ - ${PYTHON_SITELIBDIR}/libxml2.py \ - ${PYTHON_SITELIBDIR}/libxml2mod.so +# Tell master port we're a slave port +LIBXML2_SLAVE= python do-install: ${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR} diff --git a/textproc/py-libxml2/pkg-plist b/textproc/py-libxml2/pkg-plist new file mode 100644 index 000000000000..9cd0595dabe2 --- /dev/null +++ b/textproc/py-libxml2/pkg-plist @@ -0,0 +1,7 @@ +%%PYTHON_SITELIBDIR%%/__pycache__/drv_libxml2%%PYTHON_EXT_SUFFIX%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/__pycache__/drv_libxml2%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/__pycache__/libxml2%%PYTHON_EXT_SUFFIX%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/__pycache__/libxml2%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/drv_libxml2.py +%%PYTHON_SITELIBDIR%%/libxml2.py +%%PYTHON_SITELIBDIR%%/libxml2mod.so