On Fri, Dec 27, 2024 at 10:01:27PM +0000, Stuart Henderson wrote:
> On 2024/12/27 22:46, Remi Locherer wrote:
> > Hi,
> >
> > I waited a long time updating vdirsyncer because digest auth was broken.
> > This has been fixed now (or since a while ...).
> >
> > The tests succeed if the user running them is allowed to communicate (pf).
> > I
> > also verified that khal which has a dependency on vdirsyncer works.
> >
> > The big change in version 0.19.0 was the change to asyncio as backend.
> > More infos on changes are recorded in the changelog:
> > https://github.com/pimutils/vdirsyncer/blob/main/CHANGELOG.rst
>
> with a hackish port to 7.6 for a machine where I'm running this
> regularly, no problems seen there either.
>
> ok sthen, however if you don't think the html docs add much to the
> package, you can also get rid of the BUILD_DEPENDS if you like with
> this diff on top of yours:
Indeed, the html files are not very accessible and do not add a lot of
value. But I think installing the documentation makes sense. We could
provide a man page instead of html files. What do you think about the
following?
On top of my previous diff:
diff /usr/ports
commit - d5f99be72a21c6f03c82c2646dd14a6f026750eb
path + /usr/ports
blob - 7609922f6430b70daac11c8a78edbf05f3ac317b
file + productivity/vdirsyncer/Makefile
--- productivity/vdirsyncer/Makefile
+++ productivity/vdirsyncer/Makefile
@@ -1,6 +1,6 @@
COMMENT = synchronize calendars and contacts
-MODPY_DISTV = 0.19.3
+MODPY_DISTV = 0.19.3
DISTNAME = vdirsyncer-${MODPY_DISTV}
CATEGORIES = productivity
@@ -16,10 +16,8 @@ MODULES = lang/python
MODPY_PI = Yes
MODPY_PYBUILD = setuptools_scm
-MODPY_PYTEST_ARGS = tests/
BUILD_DEPENDS = textproc/py-sphinx>=4.0.2 \
- textproc/py-sphinx_rtd_theme>=0.4.3 \
${RUN_DEPENDS}
RUN_DEPENDS = devel/py-atomicwrites \
@@ -42,7 +40,7 @@ TEST_ENV += DAV_SERVER=skip \
post-build:
cd ${WRKSRC}/docs; ${MAKE_ENV} PYTHONPATH=${WRKSRC} \
- sphinx-build -b html -d _build/doctrees . _build/html
+ sphinx-build -b man -d _build/doctrees . _build/man
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/vdirsyncer
@@ -50,8 +48,8 @@ post-install:
cd ${WRKSRC}; ${INSTALL_DATA} AUTHORS.rst CHANGELOG.rst \
CONTRIBUTING.rst ISSUE_TEMPLATE.md LICENSE README.rst \
${PREFIX}/share/doc/vdirsyncer
- cd ${WRKSRC}/docs/_build/html && \
- pax -rw * ${PREFIX}/share/doc/vdirsyncer
+ cd ${WRKSRC}/docs/_build/man; \
+ ${INSTALL_MAN} vdirsyncer.1 ${PREFIX}/man/man1
${INSTALL_DATA} ${WRKSRC}/config.example \
${PREFIX}/share/examples/vdirsyncer
blob - 2c5e45edb429bde87a0d3a47d5cd921f439be734
file + productivity/vdirsyncer/pkg/PLIST
--- productivity/vdirsyncer/pkg/PLIST
+++ productivity/vdirsyncer/pkg/PLIST
@@ -96,6 +96,7 @@ lib/python${MODPY_VERSION}/site-packages/vdirsyncer/sy
lib/python${MODPY_VERSION}/site-packages/vdirsyncer/utils.py
lib/python${MODPY_VERSION}/site-packages/vdirsyncer/version.py
lib/python${MODPY_VERSION}/site-packages/vdirsyncer/vobject.py
+@man man/man1/vdirsyncer.1
share/doc/vdirsyncer/
share/doc/vdirsyncer/AUTHORS.rst
share/doc/vdirsyncer/CHANGELOG.rst
@@ -103,105 +104,5 @@ share/doc/vdirsyncer/CONTRIBUTING.rst
share/doc/vdirsyncer/ISSUE_TEMPLATE.md
share/doc/vdirsyncer/LICENSE
share/doc/vdirsyncer/README.rst
-share/doc/vdirsyncer/_sources/
-share/doc/vdirsyncer/_sources/changelog.rst.txt
-share/doc/vdirsyncer/_sources/config.rst.txt
-share/doc/vdirsyncer/_sources/contact.rst.txt
-share/doc/vdirsyncer/_sources/contributing.rst.txt
-share/doc/vdirsyncer/_sources/donations.rst.txt
-share/doc/vdirsyncer/_sources/index.rst.txt
-share/doc/vdirsyncer/_sources/installation.rst.txt
-share/doc/vdirsyncer/_sources/keyring.rst.txt
-share/doc/vdirsyncer/_sources/license.rst.txt
-share/doc/vdirsyncer/_sources/packaging.rst.txt
-share/doc/vdirsyncer/_sources/partial-sync.rst.txt
-share/doc/vdirsyncer/_sources/problems.rst.txt
-share/doc/vdirsyncer/_sources/ssl-tutorial.rst.txt
-share/doc/vdirsyncer/_sources/tutorial.rst.txt
-share/doc/vdirsyncer/_sources/tutorials/
-share/doc/vdirsyncer/_sources/tutorials/baikal.rst.txt
-share/doc/vdirsyncer/_sources/tutorials/claws-mail.rst.txt
-share/doc/vdirsyncer/_sources/tutorials/davmail.rst.txt
-share/doc/vdirsyncer/_sources/tutorials/fastmail.rst.txt
-share/doc/vdirsyncer/_sources/tutorials/google.rst.txt
-share/doc/vdirsyncer/_sources/tutorials/icloud.rst.txt
-share/doc/vdirsyncer/_sources/tutorials/index.rst.txt
-share/doc/vdirsyncer/_sources/tutorials/nextcloud.rst.txt
-share/doc/vdirsyncer/_sources/tutorials/owncloud.rst.txt
-share/doc/vdirsyncer/_sources/tutorials/radicale.rst.txt
-share/doc/vdirsyncer/_sources/tutorials/systemd-timer.rst.txt
-share/doc/vdirsyncer/_sources/tutorials/todoman.rst.txt
-share/doc/vdirsyncer/_sources/tutorials/xandikos.rst.txt
-share/doc/vdirsyncer/_sources/vdir.rst.txt
-share/doc/vdirsyncer/_sources/when.rst.txt
-share/doc/vdirsyncer/_static/
-share/doc/vdirsyncer/_static/basic.css
-share/doc/vdirsyncer/_static/css/
-share/doc/vdirsyncer/_static/css/badge_only.css
-share/doc/vdirsyncer/_static/css/fonts/
-share/doc/vdirsyncer/_static/css/fonts/Roboto-Slab-Bold.woff
-share/doc/vdirsyncer/_static/css/fonts/Roboto-Slab-Bold.woff2
-share/doc/vdirsyncer/_static/css/fonts/Roboto-Slab-Regular.woff
-share/doc/vdirsyncer/_static/css/fonts/Roboto-Slab-Regular.woff2
-share/doc/vdirsyncer/_static/css/fonts/fontawesome-webfont.eot
-share/doc/vdirsyncer/_static/css/fonts/fontawesome-webfont.svg
-share/doc/vdirsyncer/_static/css/fonts/fontawesome-webfont.ttf
-share/doc/vdirsyncer/_static/css/fonts/fontawesome-webfont.woff
-share/doc/vdirsyncer/_static/css/fonts/fontawesome-webfont.woff2
-share/doc/vdirsyncer/_static/css/fonts/lato-bold-italic.woff
-share/doc/vdirsyncer/_static/css/fonts/lato-bold-italic.woff2
-share/doc/vdirsyncer/_static/css/fonts/lato-bold.woff
-share/doc/vdirsyncer/_static/css/fonts/lato-bold.woff2
-share/doc/vdirsyncer/_static/css/fonts/lato-normal-italic.woff
-share/doc/vdirsyncer/_static/css/fonts/lato-normal-italic.woff2
-share/doc/vdirsyncer/_static/css/fonts/lato-normal.woff
-share/doc/vdirsyncer/_static/css/fonts/lato-normal.woff2
-share/doc/vdirsyncer/_static/css/theme.css
-share/doc/vdirsyncer/_static/doctools.js
-share/doc/vdirsyncer/_static/documentation_options.js
-share/doc/vdirsyncer/_static/file.png
-share/doc/vdirsyncer/_static/js/
-share/doc/vdirsyncer/_static/js/badge_only.js
-share/doc/vdirsyncer/_static/js/theme.js
-share/doc/vdirsyncer/_static/language_data.js
-share/doc/vdirsyncer/_static/minus.png
-share/doc/vdirsyncer/_static/plus.png
-share/doc/vdirsyncer/_static/pygments.css
-share/doc/vdirsyncer/_static/searchtools.js
-share/doc/vdirsyncer/_static/sphinx_highlight.js
-share/doc/vdirsyncer/changelog.html
-share/doc/vdirsyncer/config.html
-share/doc/vdirsyncer/contact.html
-share/doc/vdirsyncer/contributing.html
-share/doc/vdirsyncer/donations.html
-share/doc/vdirsyncer/genindex.html
-share/doc/vdirsyncer/index.html
-share/doc/vdirsyncer/installation.html
-share/doc/vdirsyncer/keyring.html
-share/doc/vdirsyncer/license.html
-share/doc/vdirsyncer/objects.inv
-share/doc/vdirsyncer/packaging.html
-share/doc/vdirsyncer/partial-sync.html
-share/doc/vdirsyncer/problems.html
-share/doc/vdirsyncer/search.html
-share/doc/vdirsyncer/searchindex.js
-share/doc/vdirsyncer/ssl-tutorial.html
-share/doc/vdirsyncer/tutorial.html
-share/doc/vdirsyncer/tutorials/
-share/doc/vdirsyncer/tutorials/baikal.html
-share/doc/vdirsyncer/tutorials/claws-mail.html
-share/doc/vdirsyncer/tutorials/davmail.html
-share/doc/vdirsyncer/tutorials/fastmail.html
-share/doc/vdirsyncer/tutorials/google.html
-share/doc/vdirsyncer/tutorials/icloud.html
-share/doc/vdirsyncer/tutorials/index.html
-share/doc/vdirsyncer/tutorials/nextcloud.html
-share/doc/vdirsyncer/tutorials/owncloud.html
-share/doc/vdirsyncer/tutorials/radicale.html
-share/doc/vdirsyncer/tutorials/systemd-timer.html
-share/doc/vdirsyncer/tutorials/todoman.html
-share/doc/vdirsyncer/tutorials/xandikos.html
-share/doc/vdirsyncer/vdir.html
-share/doc/vdirsyncer/when.html
share/examples/vdirsyncer/
share/examples/vdirsyncer/config.example
