From nobody Thu Jul 11 09:05:06 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 4WKTMQ2Khpz5Q8p8; Thu, 11 Jul 2024 09:05:06 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WKTMQ1pyLz4PB8; Thu, 11 Jul 2024 09:05:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720688706; 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=LTnh8EHl4VuDG9r6OhGtbe6Qgfj8mrC+0nl5gWyPUqg=; b=Ar4aX0qXFcPTB4u7SHwOMC9HUrZUWT2g3dvhv8H/eMWcLOBR0oeIUu/dfbsgjvRML4RSqO bPN60l1Vj9gvFNvyIDRBwJ8SYp+bbkkR2e0TrvE2Wew0qr3FX7yteQd2B+HREikjZaOoeB 4w6hL7I6PmoMsBiEW4WflJ+VIjSyO8rbiDgKee8ap9PLaUwwJo7I7kGMIiE36BuzCozZwX FSmEuVJcNk0bKrRn1mmdLm6OtSFxPj++pd242Ab7z0KWrp19oVbXMKyBAhVGomwc0zT2+W ddz2HTLrXur9aVBenu7bWZNtXpsPNrZs79ODDalstYs8DY8ABnSpJdbl4AwPuA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720688706; a=rsa-sha256; cv=none; b=rFc5oDwwAtZvrCdhExHx5PCA6Ce+UhLB6AtMo1JIDs08s8sjT5mT24nZuLkBVEPyizB0hZ nFUHvu3D6U6k3rd20tL0jrKmJc862No+80Faf4TQiHr+6oJNc23IoI4dRai2f6ou+WYzLH 6V/TrvGELwZA7FKMZKeysI9DrWCGRuB3HDSAzHXoc7OB8CwiCimBtyOhT6T1OHgxrqpEY/ K0AYlCZe4UU9sG1U8ZBKEAha1Mju2CI2ZH/f/bBKyJf3yXAMaTNarxbkqtLSC3CwUHDrlf t3RCf0KrNkOSluml8PuTsHkl3msxi32hYU29+g8xk2bTwJB+eOgF2FSLLlzs8A== 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=1720688706; 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=LTnh8EHl4VuDG9r6OhGtbe6Qgfj8mrC+0nl5gWyPUqg=; b=rlVXBVoNZBZpcxsqSI6l8Lve9n3YVGxdUdSjA9QQz3VcFkmAi1mLyNRxy+/ww2s/pNDXP0 JpjmRWPkt6pRdbbNGq3slpmZnj7lxz+9YCRgWzWDZx7leRr95FVJtEvvyE0SJ0rkXqfElr VY14iDgHl48Sk54gyA3Ou3hMKhlegUWTxSJI6YxDIc/l/I5FDyexwDgcd2hzTiTw0eEhVn JGYwG10r8+CZ68FSvYMNLwbvMfKkGYE5Dty+l0TME4AfVo4jcolfNNOfKW2AIGNFsY5HAG qL4ASOreISjh4cMH+TfU2p+lA+RaqVtJ1X7p09Kr9jEsjGykIGW/+3jGPwQOOQ== 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 4WKTMQ1QY0zv5R; Thu, 11 Jul 2024 09:05:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46B956Q4002880; Thu, 11 Jul 2024 09:05:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46B956qT002877; Thu, 11 Jul 2024 09:05:06 GMT (envelope-from git) Date: Thu, 11 Jul 2024 09:05:06 GMT Message-Id: <202407110905.46B956qT002877@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Wen Heping Subject: git: c0615e6aa3e5 - main - textproc/py-docutils: Update to 0.21.2 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: wen X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c0615e6aa3e51781df0cf60379b4b8fc69d1a6c0 Auto-Submitted: auto-generated The branch main has been updated by wen: URL: https://cgit.FreeBSD.org/ports/commit/?id=c0615e6aa3e51781df0cf60379b4b8fc69d1a6c0 commit c0615e6aa3e51781df0cf60379b4b8fc69d1a6c0 Author: Wen Heping AuthorDate: 2024-07-11 09:02:12 +0000 Commit: Wen Heping CommitDate: 2024-07-11 09:04:42 +0000 textproc/py-docutils: Update to 0.21.2 And fix some build errors caused by this update PR: 280080 Reported by: wen@ Exp-run by: antoine@ Approved by: portmgr(blanket, fix build) --- devel/libvirt/Makefile | 7 +++---- games/taisei/Makefile | 4 ++-- games/taisei/files/patch-doc_meson.build | 2 +- graphics/opensubdiv/Makefile | 4 ++-- textproc/py-docutils/Makefile | 21 ++++++++++----------- textproc/py-docutils/distinfo | 6 +++--- textproc/py-docutils/pkg-plist | 10 ---------- textproc/py-sphinx-tabs/Makefile | 4 ++-- textproc/py-sphinx/Makefile | 4 ++-- x11/py-pynput/Makefile | 2 +- x11/py-pynput/files/patch-setup.py | 9 ++++++--- x11/sddm/Makefile | 4 ++-- 12 files changed, 34 insertions(+), 43 deletions(-) diff --git a/devel/libvirt/Makefile b/devel/libvirt/Makefile index d8ef67f42f37..4f84e2d5d214 100644 --- a/devel/libvirt/Makefile +++ b/devel/libvirt/Makefile @@ -1,5 +1,6 @@ PORTNAME= libvirt PORTVERSION= 10.3.0 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://libvirt.org/sources/ \ ftp://libvirt.org/libvirt/ @@ -17,7 +18,7 @@ LIB_DEPENDS= libcurl.so:ftp/curl \ BUILD_DEPENDS= dnsmasq:dns/dnsmasq \ ${LOCALBASE}/bin/grep:textproc/gnugrep \ gsed:textproc/gsed \ - rst2html-${PYTHON_VER}:textproc/py-docutils@${PY_FLAVOR} \ + rst2html:textproc/py-docutils@${PY_FLAVOR} \ xsltproc:textproc/libxslt RUN_DEPENDS= dnsmasq:dns/dnsmasq @@ -146,9 +147,7 @@ SHLIB_VER= 0.10003.0 PLIST_SUB+= SHLIB_VER=${SHLIB_VER} PORTDOCS= * #SHEBANG_FILES= src/keycodemapdb/tools/keymap-gen -BINARY_ALIAS= python3=${PYTHON_CMD} \ - rst2man.py=rst2man.py-${PYTHON_VER} \ - rst2html5.py=rst2html5.py-${PYTHON_VER} +BINARY_ALIAS= python3=${PYTHON_CMD} SUB_FILES= pkg-message diff --git a/games/taisei/Makefile b/games/taisei/Makefile index 046d8668c5fc..d383848e5723 100644 --- a/games/taisei/Makefile +++ b/games/taisei/Makefile @@ -38,8 +38,8 @@ PORTDATA= * OPTIONS_DEFINE= DOCS -DOCS_BUILD_DEPENDS=rst2html5.py:textproc/py-docutils -DOCS_MESON_TRUE=docs +DOCS_BUILD_DEPENDS= rst2html5:textproc/py-docutils +DOCS_MESON_TRUE= docs post-install: @${RM} ${STAGEDIR}${DOCSDIR}/COPYING.txt diff --git a/games/taisei/files/patch-doc_meson.build b/games/taisei/files/patch-doc_meson.build index 608f29b0b5d8..3e5e83fc2468 100644 --- a/games/taisei/files/patch-doc_meson.build +++ b/games/taisei/files/patch-doc_meson.build @@ -18,7 +18,7 @@ - rst2html5 = find_program( - rst2html_variants, -+ 'rst2html5.py', ++ 'rst2html5', required : false ) diff --git a/graphics/opensubdiv/Makefile b/graphics/opensubdiv/Makefile index 091446f2b96e..c57679d1b80e 100644 --- a/graphics/opensubdiv/Makefile +++ b/graphics/opensubdiv/Makefile @@ -1,7 +1,7 @@ PORTNAME= opensubdiv DISTVERSIONPREFIX= v DISTVERSION= 3_6_0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MAINTAINER= FreeBSD@Shaneware.biz @@ -36,7 +36,7 @@ PTEX_DESC= ptex support TBB_DESC= Intel threading building blocks TUTORIALS_DESC= Install tutorial programs -DOCS_BUILD_DEPENDS= rst2html.py:textproc/py-docutils \ +DOCS_BUILD_DEPENDS= rst2html:textproc/py-docutils \ doxygen>=1.8.4:devel/doxygen DOCS_USES= python:build DOCS_CMAKE_BOOL_OFF= NO_DOC diff --git a/textproc/py-docutils/Makefile b/textproc/py-docutils/Makefile index 62471004272a..9b30201234a3 100644 --- a/textproc/py-docutils/Makefile +++ b/textproc/py-docutils/Makefile @@ -1,5 +1,5 @@ PORTNAME= docutils -PORTVERSION= 0.19 +PORTVERSION= 0.21.2 PORTEPOCH= 1 CATEGORIES= textproc python MASTER_SITES= PYPI @@ -12,8 +12,15 @@ WWW= https://docutils.sourceforge.io/ LICENSE= BSD2CLAUSE GPLv3+ PD PSFL LICENSE_COMB= multi -USES= python -USE_PYTHON= autoplist concurrent distutils +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flit-core>=3.4<4:devel/py-flit-core@${PY_FLAVOR} + +USES= python shebangfix +USE_PYTHON= autoplist concurrent pep517 + +SHEBANG_FILES= docutils/writers/odf_odt/prepstyles.py \ + docutils/__main__.py \ + docutils/utils/smartquotes.py \ + docutils/utils/math/math2html.py NO_ARCH= yes @@ -24,14 +31,6 @@ PYGMENTS_DESC= Syntax highlighting PYGMENTS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${PY_FLAVOR} -SCRIPTS= rst2html rst2latex rst2man rst2odt rst2odt_prepstyles \ - rst2pseudoxml rst2s5 rst2xetex rst2xml rstpep2html - -post-install: -.for script in ${SCRIPTS} - ${LN} -s ${script}.py-${PYTHON_VER} ${STAGEDIR}${PREFIX}/bin/${script} -.endfor - do-test: cd ${WRKSRC} && ${PYTHON_CMD} test/alltests.py --verbose diff --git a/textproc/py-docutils/distinfo b/textproc/py-docutils/distinfo index a9e01d2031d1..613e4d008251 100644 --- a/textproc/py-docutils/distinfo +++ b/textproc/py-docutils/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1662997695 -SHA256 (docutils-0.19.tar.gz) = 33995a6753c30b7f577febfc2c50411fec6aac7f7ffeb7c4cfe5991072dcf9e6 -SIZE (docutils-0.19.tar.gz) = 2056383 +TIMESTAMP = 1720223208 +SHA256 (docutils-0.21.2.tar.gz) = 3a6b18732edf182daa3cd12775bbb338cf5691468f91eeeb109deff6ebfa986f +SIZE (docutils-0.21.2.tar.gz) = 2204444 diff --git a/textproc/py-docutils/pkg-plist b/textproc/py-docutils/pkg-plist deleted file mode 100644 index 7d1eed03382e..000000000000 --- a/textproc/py-docutils/pkg-plist +++ /dev/null @@ -1,10 +0,0 @@ -bin/rst2html -bin/rst2latex -bin/rst2man -bin/rst2odt -bin/rst2odt_prepstyles -bin/rst2pseudoxml -bin/rst2s5 -bin/rst2xetex -bin/rst2xml -bin/rstpep2html diff --git a/textproc/py-sphinx-tabs/Makefile b/textproc/py-sphinx-tabs/Makefile index 4b184341eeaf..e0189e4d9298 100644 --- a/textproc/py-sphinx-tabs/Makefile +++ b/textproc/py-sphinx-tabs/Makefile @@ -1,6 +1,6 @@ PORTNAME= sphinx-tabs PORTVERSION= 3.4.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>=0.18.0,1<0.20.0,1:textproc/py-docutils@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>=0.18.0,1<0.22.0,1:textproc/py-docutils@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>=0,1:textproc/py-docutils@${PY_FLAVOR} \ diff --git a/textproc/py-sphinx/Makefile b/textproc/py-sphinx/Makefile index 3c5e5d2ff7be..a57539a42b95 100644 --- a/textproc/py-sphinx/Makefile +++ b/textproc/py-sphinx/Makefile @@ -1,6 +1,6 @@ PORTNAME= sphinx PORTVERSION= 5.3.0 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= textproc python MASTER_SITES= PYPI @@ -27,7 +27,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-applehelp>=0:textproc/py-sphin ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-qthelp>=0:textproc/py-sphinxcontrib-qthelp@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>=3.0:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pygments>=2.12:textproc/py-pygments@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}docutils>=0.14,1<0.20,1:textproc/py-docutils@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}docutils>=0.14,1<0.22,1:textproc/py-docutils@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}snowballstemmer>=2.0:textproc/py-snowballstemmer@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Babel>=2.9:devel/py-babel@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}alabaster>=0.7<0.8:textproc/py-alabaster@${PY_FLAVOR} \ diff --git a/x11/py-pynput/Makefile b/x11/py-pynput/Makefile index 3016c8f8c982..9cdd1b233bed 100644 --- a/x11/py-pynput/Makefile +++ b/x11/py-pynput/Makefile @@ -1,6 +1,6 @@ PORTNAME= pynput DISTVERSION= 1.7.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 MASTER_SITES= PYPI # no tests on PYPI, but GitHub tarball doesn't bui;d PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/x11/py-pynput/files/patch-setup.py b/x11/py-pynput/files/patch-setup.py index e87d2cf77536..cdb4058e3afd 100644 --- a/x11/py-pynput/files/patch-setup.py +++ b/x11/py-pynput/files/patch-setup.py @@ -1,13 +1,16 @@ - setuptools-lint isn't really needed during build ---- setup.py.orig 2023-01-31 20:21:18 UTC +--- setup.py.orig 2022-01-01 19:56:27 UTC +++ setup.py -@@ -23,7 +23,7 @@ RUNTIME_PACKAGES = [ +@@ -23,8 +23,9 @@ SETUP_PACKAGES = [ #: Additional requirements used during setup SETUP_PACKAGES = [ - 'setuptools-lint >=0.5', +- 'sphinx >=1.3.1'] + #'setuptools-lint >=0.5', - 'sphinx >=1.3.1'] ++ #'sphinx >=1.3.1'] ++ ] #: Packages requires for different environments + EXTRA_PACKAGES = { diff --git a/x11/sddm/Makefile b/x11/sddm/Makefile index 27f3009d37b6..1d858cad2df0 100644 --- a/x11/sddm/Makefile +++ b/x11/sddm/Makefile @@ -16,7 +16,7 @@ LICENSE_COMB= multi LICENSE_FILE_GPLv2+ = ${WRKSRC}/LICENSE LICENSE_FILE_CC-BY-3.0= ${WRKSRC}/LICENSE.CC-BY-3.0 -BUILD_DEPENDS= rst2man.py-${PYTHON_VER}:textproc/py-docutils@${PY_FLAVOR} +BUILD_DEPENDS= rst2man:textproc/py-docutils@${PY_FLAVOR} RUN_DEPENDS= consolekit2>1.2.5:sysutils/consolekit2 \ dbus-launch:devel/dbus \ xauth:x11/xauth \ @@ -37,7 +37,7 @@ CMAKE_ARGS= -DUID_MIN=1000 \ -DUID_MAX=65000 \ -DCMAKE_INSTALL_SYSCONFDIR:PATH=${LOCALBASE}/etc \ -DACCOUNTSSERVICE_DATA_DIR:PATH=/var/db/AccountsService \ - -DRST2MAN_EXECUTABLE=${LOCALBASE}/bin/rst2man.py-${PYTHON_VER} \ + -DRST2MAN_EXECUTABLE=${LOCALBASE}/bin/rst2man \ -DSDDM_INITIAL_VT=7 USE_RC_SUBR= sddm