Index: head/deskutils/py-vdirsyncer/Makefile =================================================================== --- head/deskutils/py-vdirsyncer/Makefile (revision 540534) +++ head/deskutils/py-vdirsyncer/Makefile (revision 540535) @@ -1,33 +1,34 @@ # $FreeBSD$ PORTNAME= vdirsyncer DISTVERSION= 0.16.8 +PORTREVISION= 1 CATEGORIES= deskutils python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= rigoletto@FreeBSD.org COMMENT= Synchronize calendars and contacts LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.10.1:devel/py-setuptools_scm@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}atomicwrites>=0.1.7:devel/py-atomicwrites@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}click>=5.0:devel/py-click@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}click-log<0.4.0:devel/py-click-log@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}click-threading>=0.2:devel/py-click-threading@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.4.1:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests-toolbelt>=0.4.0:www/py-requests-toolbelt@${PY_FLAVOR} USES= python:3.5+ USE_PYTHON= autoplist distutils NO_ARCH= yes OPTIONS_DEFINE= GOOGLE GOOGLE_DESC= Enable Google Calendar support GOOGLE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0:www/py-requests-oauthlib@${PY_FLAVOR} .include Index: head/deskutils/py-vdirsyncer/files/patch-github_3eb9ce5.patch =================================================================== --- head/deskutils/py-vdirsyncer/files/patch-github_3eb9ce5.patch (nonexistent) +++ head/deskutils/py-vdirsyncer/files/patch-github_3eb9ce5.patch (revision 540535) @@ -0,0 +1,39 @@ +From 3eb9ce5ae4320d52e6c876874511ff96a8a45f51 Mon Sep 17 00:00:00 2001 +From: Hugo Osvaldo Barrera +Date: Tue, 9 Jun 2020 14:45:02 +0200 +Subject: [PATCH] Add compatibility with latest click + +--- + setup.py | 2 +- + tests/system/cli/test_sync.py | 5 ++++- + 2 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/setup.py b/setup.py +index 59549f16..d584b95d 100644 +--- setup.py ++++ setup.py +@@ -11,7 +11,7 @@ + + requirements = [ + # https://github.com/mitsuhiko/click/issues/200 +- 'click>=5.0,<6.0', ++ 'click>=5.0', + 'click-log>=0.3.0, <0.4.0', + + # https://github.com/pimutils/vdirsyncer/issues/478 +diff --git a/tests/system/cli/test_sync.py b/tests/system/cli/test_sync.py +index f2423764..43d35dd8 100644 +--- tests/system/cli/test_sync.py ++++ tests/system/cli/test_sync.py +@@ -123,7 +123,10 @@ def test_verbosity(tmpdir, runner): + runner.write_with_general('') + result = runner.invoke(['--verbosity=HAHA', 'sync']) + assert result.exception +- assert 'invalid value for "--verbosity"' in result.output.lower() ++ assert ( ++ 'invalid value for "--verbosity"' in result.output.lower() ++ or "invalid value for '--verbosity'" in result.output.lower() ++ ) + + + def test_collections_cache_invalidation(tmpdir, runner): Property changes on: head/deskutils/py-vdirsyncer/files/patch-github_3eb9ce5.patch ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property