diff --git a/devel/libvirt/Makefile b/devel/libvirt/Makefile index d8ef67f42f37..4f84e2d5d214 100644 --- a/devel/libvirt/Makefile +++ b/devel/libvirt/Makefile @@ -1,222 +1,221 @@ PORTNAME= libvirt PORTVERSION= 10.3.0 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://libvirt.org/sources/ \ ftp://libvirt.org/libvirt/ MAINTAINER= novel@FreeBSD.org COMMENT= Toolkit to interact with virtualization capabilities WWW= https://libvirt.org/ LICENSE= LGPL3 LIB_DEPENDS= libcurl.so:ftp/curl \ libgcrypt.so:security/libgcrypt \ libgnutls.so:security/gnutls \ libxml2.so:textproc/libxml2 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 OPTIONS_DEFINE= DOCS NLS NSS QEMU READLINE SASL LIBSSH LIBSSH2 ZFS OPTIONS_DEFAULT= READLINE LIBSSH LIBSSH2 ZFS OPTIONS_DEFINE_amd64= XEN .if exists(/usr/sbin/bhyve) OPTIONS_DEFINE_amd64+= BHYVE OPTIONS_DEFAULT_amd64+= BHYVE .else PLIST_SUB+= BHYVE="@comment " SUB_LIST+= BHYVE="@comment " MESON_ARGS+= -Ddriver_bhyve=disabled .endif QEMU_DESC= QEMU driver BHYVE_DESC= bhyve driver XEN_DESC= Xen support via libxl NSS_DESC= Name Service Switch plugin LIBSSH_DESC= libssh remote transport LIBSSH2_DESC= libssh2 remote transport ZFS_DESC= ZFS storage driver OPTIONS_SUB= yes BHYVE_MESON_ENABLED= driver_bhyve QEMU_MESON_ENABLED= driver_qemu QEMU_RUN_DEPENDS= dmidecode:sysutils/dmidecode \ qemu-io:emulators/qemu NLS_USES= gettext NLS_MESON_ENABLED= nls NLS_CFLAGS= -I${LOCALBASE}/include NSS_MESON_ENABLED= nss READLINE_MESON_ENABLED= readline READLINE_USES= readline SASL_MESON_ENABLED= sasl SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 XEN_MESON_ENABLED= driver_libxl XEN_CFLAGS= -I${LOCALBASE}/include XEN_LIB_DEPENDS= libxenlight.so:sysutils/xen-tools LIBSSH_MESON_ENABLED= libssh LIBSSH_LIB_DEPENDS= libssh.so:security/libssh LIBSSH2_MESON_ENABLED= libssh2 LIBSSH2_LIB_DEPENDS= libssh2.so:security/libssh2 ZFS_MESON_ENABLED= storage_zfs VARDIR= /var MESON_ARGS+= \ -Dapparmor=disabled \ -Dapparmor_profiles=disabled \ -Dattr=disabled \ -Daudit=disabled \ -Dblkid=disabled \ -Dcapng=disabled \ -Ddriver_hyperv=disabled \ -Ddriver_interface=disabled \ -Ddriver_libxl=disabled \ -Ddriver_lxc=disabled \ -Ddriver_openvz=disabled \ -Ddriver_remote=enabled \ -Ddriver_vz=disabled \ -Dfirewalld=disabled \ -Dfirewalld_zone=disabled \ -Dfuse=disabled \ -Dglusterfs=disabled \ -Dlibiscsi=disabled \ -Dlibnl=disabled \ -Dlibpcap=disabled \ -Dnumactl=disabled \ -Dnumad=disabled \ -Dopenwsman=disabled \ -Dpciaccess=disabled \ -Dpolkit=disabled \ -Dsanlock=disabled \ -Dsecdriver_apparmor=disabled \ -Dsecdriver_selinux=disabled \ -Dselinux=disabled \ -Dstorage_disk=disabled \ -Dstorage_fs=disabled \ -Dstorage_gluster=disabled \ -Dstorage_iscsi=disabled \ -Dstorage_iscsi_direct=disabled \ -Dstorage_lvm=disabled \ -Dstorage_mpath=disabled \ -Dstorage_rbd=disabled \ -Dstorage_vstorage=disabled \ -Dudev=disabled \ -Dnetcf=disabled \ -Dsysctl_config=disabled \ -Dnbdkit=disabled \ -Dnbdkit_config_default=disabled \ -Dlogin_shell=disabled \ -Dwireshark_dissector=disabled \ -Dinit_script=none \ -Dbash_completion=disabled \ -Duserfaultfd_sysctl=disabled \ -Dlocalstatedir=${VARDIR} # random_data fix can be removed when 8.x is eol CONFIGURE_ENV= ac_cv_type_struct_random_data="" # limit production release x.x.x PORTSCOUT= limit:\d+\.\d+\.\d+$$ LDFLAGS+= -L${LOCALBASE}/lib -fstack-protector USES= gnome charsetfix compiler:c++0x cpe gettext-runtime gmake libtool \ meson pathfix perl5 python:build pkgconfig shebangfix tar:xz USE_GNOME= glib20 USE_RC_SUBR= libvirtd virtlogd CPE_VENDOR= redhat USE_PERL5= build USE_LDCONFIG= yes INSTALL_TARGET= install-strip TEST_TARGET= check 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 .include .if ${PORT_OPTIONS:MQEMU} || ${PORT_OPTIONS:MNSS} LIB_DEPENDS+= libyajl.so:devel/yajl MESON_ARGS+= -Dyajl=enabled .else MESON_ARGS+= -Dyajl=disabled .endif .if !${PLIST_SUB:MXEN} PLIST_SUB+= XEN="@comment " .endif CONF_FILES= \ bhyve.conf \ libvirt-admin.conf \ libvirt.conf \ libvirtd.conf \ libxl.conf \ qemu.conf \ virtbhyved.conf \ virtlockd.conf \ virtlogd.conf \ virtnetworkd.conf \ virtproxyd.conf \ virtqemud.conf \ virtsecretd.conf \ virtstoraged.conf \ virtvboxd.conf \ virtxend.conf post-install: @${MKDIR} ${STAGEDIR}${ETCDIR}/qemu/networks/autostart @${MKDIR} ${STAGEDIR}${DOCSDIR} .for doc in AUTHORS.rst NEWS.rst README.rst ${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR} .endfor .for dir in run/libvirt/network \ run/libvirt/qemu \ run/libvirt/lockd \ log/libvirt/uml \ log/libvirt/qemu \ log/libvirt/lxc \ lib/libvirt/boot \ lib/libvirt/lockd/files \ lib/libvirt/images \ lib/libvirt/dnsmasq \ lib/libvirt/filesystems \ lib/libvirt/network \ lib/libvirt/qemu/channel/target \ cache/libvirt/qemu @${MKDIR} "${STAGEDIR}/${VARDIR}/${dir}" .endfor .for file in ${CONF_FILES} @if test -f ${STAGEDIR}${ETCDIR}/${file}; then \ ${MV} ${STAGEDIR}${ETCDIR}/${file} \ ${STAGEDIR}${ETCDIR}/${file}.sample; fi .endfor .include .if ${ARCH} == amd64 || ${ARCH} == i386 RUN_DEPENDS+= dmidecode:sysutils/dmidecode .endif .include diff --git a/games/taisei/Makefile b/games/taisei/Makefile index 046d8668c5fc..d383848e5723 100644 --- a/games/taisei/Makefile +++ b/games/taisei/Makefile @@ -1,47 +1,47 @@ PORTNAME= taisei PORTVERSION= 1.3.2 DISTVERSIONPREFIX= v PORTREVISION= 2 CATEGORIES= games MAINTAINER= amdmi3@FreeBSD.org COMMENT= Open source Touhou clone WWW= https://taisei-project.org/ \ https://github.com/taisei-project/taisei LICENSE= MIT CC0-1.0 PD LICENSE_COMB= multi LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpng.so:graphics/png \ libzip.so:archivers/libzip \ libwebp.so:graphics/webp \ libfreetype.so:print/freetype2 \ libopusfile.so:audio/opusfile \ libcglm.so:math/cglm BUILD_DEPENDS= glslc:graphics/shaderc USE_GITHUB= yes GH_ACCOUNT= taisei-project GH_TUPLE= taisei-project:SDL_GameControllerDB:74e31d7:gamecontrollerdb/external/gamecontrollerdb USES= compiler:c11 desktop-file-utils meson pkgconfig \ python:build sdl ssl shebangfix shared-mime-info SHEBANG_FILES= scripts/*.py MESON_ARGS= -Dversion_fallback=${PORTVERSION} -Db_lto=false MESON_ARGS+= --wrap-mode=nofallback MESON_ARGS+= -DOPENSSLLIB="${OPENSSLLIB}" USE_SDL= sdl2 ttf2 mixer2 PORTDOCS= * 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 .include 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 @@ -1,24 +1,24 @@ --- doc/meson.build.orig 2019-09-28 18:31:40 UTC +++ doc/meson.build @@ -1,20 +1,7 @@ if install_docs - rst2html_variants = [] - - # This is *completely* ridiculous, but apparently this thing has THAT many faces. - basenames = ['rst2html5', 'rst2html', 'rst2html4'] - suffixes = ['', '-3', '3', '-docutils'] - - foreach basename : basenames - foreach suffix : suffixes - variant = '@0@@1@'.format(basename, suffix) - rst2html_variants += [variant, '@0@.py'.format(variant)] - endforeach - endforeach - 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,82 +1,82 @@ PORTNAME= opensubdiv DISTVERSIONPREFIX= v DISTVERSION= 3_6_0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MAINTAINER= FreeBSD@Shaneware.biz COMMENT= High performance subdivision surface libraries WWW= https://graphics.pixar.com/opensubdiv LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= glfw>3.0.0:graphics/glfw USES= cmake gl localbase:ldflags USE_GITHUB= yes GH_ACCOUNT= PixarAnimationStudios GH_PROJECT= OpenSubdiv USE_GL= opengl USE_LDCONFIG= yes CMAKE_ON= NO_CLEW NO_CUDA NO_DX NO_METAL PLIST_SUB+= LIBVERS=${PORTVERSION} OPTIONS_DEFINE= DOCS EXAMPLES OPENCL OPENMP PTEX TBB TEST TUTORIALS OPTIONS_DEFAULT= PTEX TBB OPTIONS_DEFAULT_armv6= OPTIONS_DEFAULT_armv7= OPTIONS_DEFAULT_OTHER_ARCHS= OPENMP OPTIONS_SUB= yes 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 DOCS_PORTDOCS= * EXAMPLES_LIB_DEPENDS= libglfw.so:graphics/glfw EXAMPLES_USES= xorg EXAMPLES_USE= xorg=ice,sm,x11,xcursor,xext,xi,xinerama,xrandr,xxf86vm EXAMPLES_CMAKE_BOOL_OFF= NO_EXAMPLES OPENCL_BUILD_DEPENDS= ${LOCALBASE}/include/CL/cl.h:devel/opencl OPENCL_LIB_DEPENDS= libOpenCL.so:devel/ocl-icd OPENCL_USE= gl=gl OPENCL_CMAKE_BOOL_OFF= NO_OPENCL OPENCL_CFLAGS= -pthread OPENCL_LDFLAGS= -lGLX OPENMP_CMAKE_BOOL_OFF= NO_OMP PTEX_LIB_DEPENDS= libPtex.so:graphics/ptex PTEX_CMAKE_BOOL_OFF= NO_PTEX PTEX_CMAKE_ON= -DPTEX_INCLUDE_DIR:STRING=${LOCALBASE}/include/ptex \ -DPTEX_LOCATION:STRING=${LOCALBASE} TBB_LIB_DEPENDS= libtbb.so:devel/onetbb TBB_CMAKE_BOOL_OFF= NO_TBB TEST_LIB_DEPENDS= libglfw.so:graphics/glfw TEST_USES= xorg TEST_USE= xorg=ice,sm,x11,xcursor,xext,xi,xinerama,xrandr,xxf86vm TEST_CMAKE_BOOL_OFF= NO_REGRESSION NO_TESTS TUTORIALS_CMAKE_BOOL_OFF= NO_TUTORIALS post-patch: ${FIND} ${WRKSRC}/tutorials -name CMakeLists.txt -exec \ ${REINPLACE_CMD} -e 's|{CMAKE_BINDIR_BASE}/tutorials|{CMAKE_INSTALL_PREFIX}/${DATADIR_REL}/tutorials|g' {} + ${FIND} ${WRKSRC}/examples -name CMakeLists.txt -exec \ ${REINPLACE_CMD} -e 's|{CMAKE_BINDIR_BASE}|{CMAKE_INSTALL_PREFIX}/${EXAMPLESDIR_REL}|g' {} + ${FIND} ${WRKSRC}/regression -name CMakeLists.txt -exec \ ${REINPLACE_CMD} -e 's|{CMAKE_BINDIR_BASE}|{CMAKE_INSTALL_PREFIX}/tests/${PORTNAME}|g' {} + .include 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,38 +1,37 @@ PORTNAME= docutils -PORTVERSION= 0.19 +PORTVERSION= 0.21.2 PORTEPOCH= 1 CATEGORIES= textproc python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= python@FreeBSD.org COMMENT= Python Documentation Utilities 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 PORTSCOUT= limit:^[0-9\.]*$$ OPTIONS_DEFINE= PYGMENTS 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 .include 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,28 +1,28 @@ PORTNAME= sphinx-tabs PORTVERSION= 3.4.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= sunpoet@FreeBSD.org COMMENT= Tabbed views for Sphinx WWW= https://github.com/executablebooks/sphinx-tabs LICENSE= MIT 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} \ ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} USES= python USE_PYTHON= autoplist concurrent pep517 NO_ARCH= yes .include 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,60 +1,60 @@ PORTNAME= sphinx PORTVERSION= 5.3.0 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= textproc python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= Sphinx-${PORTVERSION} DIST_SUBDIR= python # NOTE: before committing to this port, contact portmgr to arrange for an # experimental ports run. Untested commits may be backed out at portmgr's # discretion. MAINTAINER= python@FreeBSD.org COMMENT= Python documentation generator WWW= https://www.sphinx-doc.org/ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flit-core>=3.7:devel/py-flit-core@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-applehelp>=0:textproc/py-sphinxcontrib-applehelp@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-devhelp>=0:textproc/py-sphinxcontrib-devhelp@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-jsmath>=0:textproc/py-sphinxcontrib-jsmath@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-htmlhelp>=2.0.0:textproc/py-sphinxcontrib-htmlhelp@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-serializinghtml>=1.1.5:textproc/py-sphinxcontrib-serializinghtml@${PY_FLAVOR} \ ${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} \ ${PYTHON_PKGNAMEPREFIX}imagesize>=1.3:graphics/py-imagesize@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.5.0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=21.0:devel/py-packaging@${PY_FLAVOR} \ ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}html5lib>=0:www/py-html5lib@${PY_FLAVOR} USES= python USE_PYTHON= autoplist concurrent cython_test pep517 pytest NO_ARCH= yes PYTEST_BROKEN_TESTS= test_anchors_ignored \ test_defaults \ test_defaults_json \ test_ext_imgconverter \ test_latex_images # Upstream archive contains files with UTF-8 names (#246618) # https://github.com/sphinx-doc/sphinx/issues/2395 EXTRACT_CMD= ${SETENV} LC_ALL=en_US.UTF-8 /usr/bin/bsdtar .include .if ${PYTHON_REL} < 31000 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=4.8:devel/py-importlib-metadata@${PY_FLAVOR} .endif .include 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,30 +1,30 @@ 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} MAINTAINER= yuri@FreeBSD.org COMMENT= Send virtual input commands WWW= https://github.com/moses-palmer/pynput LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING.LGPL PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}evdev>=1.3:devel/py-evdev@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}python-xlib>0:x11-toolkits/py-python-xlib@${PY_FLAVOR} BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.3.1:textproc/py-sphinx@${PY_FLAVOR} \ ${PY_DEPENDS} RUN_DEPENDS= ${PY_DEPENDS} USES= python USE_PYTHON= distutils autoplist NO_ARCH= yes TEST_ENV= ${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} TEST_WRKSRC= ${WRKSRC}/tests .include 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 @@ -1,69 +1,69 @@ PORTNAME= sddm PORTVERSION= 0.21.0 DISTVERSIONPREFIX= v CATEGORIES= x11 MAINTAINER= kde@FreeBSD.org COMMENT= QML based login manager WWW= https://github.com/sddm/sddm # The source code is GPLv2+, but the provided themes are: # - CC-BY 3.0 (default greeter theme, maldives) # - CC-BY 4.0 (maya) # - Apache20 (font included with maya) LICENSE= GPLv2+ CC-BY-3.0 CC-BY-4.0 APACHE20 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 \ xmessage:x11/xmessage USES= cmake compiler:c++17-lang cpe pkgconfig python:build qt:5 xorg CPE_VENDOR= ${PORTNAME}_project USE_GITHUB= yes USE_QT= core declarative dbus gui network \ buildtools:build linguisttools:build declarative-test:build \ qmake:build testlib:build USE_XORG= xau xcb CONFLICTS_INSTALL= lightdm CMAKE_ON= BUILD_MAN_PAGES 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 SUB_FILES= xinit-session \ xinitrc.desktop USERS= sddm GROUPS= sddm post-patch: @${REINPLACE_CMD} -e 's#/etc/X11#${LOCALBASE}/etc/X11#' \ -e 's#/usr/bin/#${LOCALBASE}/bin/#g' \ -e 's#/usr/share/#${LOCALBASE}/share/#' \ -e 's#%%LOCALBASE%%#${LOCALBASE}#g' \ ${WRKSRC}/data/scripts/Xsession \ ${WRKSRC}/src/common/Configuration.h \ ${WRKSRC}/src/greeter/waylandkeyboardbackend.cpp post-install: # Install xsession.desktop to launch .xinitrc via sddm. ${MKDIR} ${STAGEDIR}${PREFIX}/share/xsessions ${INSTALL_DATA} ${FILESDIR}/sddm.conf.default ${STAGEDIR}${PREFIX}/etc ${INSTALL_DATA} ${WRKDIR}/xinitrc.desktop ${STAGEDIR}${PREFIX}/share/xsessions ${INSTALL_SCRIPT} ${WRKDIR}/xinit-session ${STAGEDIR}${PREFIX}/share/sddm/scripts ${MV} ${STAGEDIR}${PREFIX}/etc/pam.d/sddm ${STAGEDIR}${PREFIX}/etc/pam.d/sddm.default ${MV} ${STAGEDIR}${PREFIX}/etc/pam.d/sddm-autologin ${STAGEDIR}${PREFIX}/etc/pam.d/sddm-autologin.default ${MV} ${STAGEDIR}${PREFIX}/etc/pam.d/sddm-greeter ${STAGEDIR}${PREFIX}/etc/pam.d/sddm-greeter.default .include