urlwatch: update to urlwatch-2.18

Changelog:

** [2.18] -- 2020-05-03

*** Added
- New filter: `re.sub` that can replace/remove strings using regular expressions
- Support `ignore_timeout_errors` and `ignore_too_many_redirects` for URL jobs (#423, by Josh aka Zevlag)
- HTML reporter: Add `viewport` meta tag for improved viewing on mobile devices (#432, by Mike Borsetti)
- Optional support for insecure SMTP password storage in the config; use with caution (#431)

*** Fixed
- Fix `--test-filter` when the specified job is not found
- Fix another `YAMLLoadWarning` in unit tests (#382, by Louis Sautier)
- Documentation updates and typo fixes (by Nate Eagleson)
- Pushover: Fix default device config (Fixes #409 and #372, documented by Richard Goodwin)

*** Changed
- Nicer formatting of `--features` for jobs with no docstring or many keys
- The XPath and CSS filters now support XML namespaces (#404, by Chenfeng Bao)
- Drop support for Python 3.3 and Python 3.4 (new minimum requirement is Python 3.5)
- Use `html.escape` instead of `cgi.escape` (which was removed in Python 3.8; #424, by Chenfeng Bao)
- Allow non-ASCII characters in `format-json` output filter (#433, by Mike Borsetti)

urlwatch/Makefile

@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.1 2015/08/18 18:36:32 yhardy Exp $
 
-DISTNAME=	urlwatch-2.17
+DISTNAME=	urlwatch-2.18
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GITHUB:=thp/}
 
@@ -10,7 +10,10 @@ COMMENT=	Watch web pages and arbitrary URLs for changes
 LICENSE=	modified-bsd
 
 DEPENDS+=	${PYPKGPREFIX}-appdirs-[0-9]*:../../devel/py-appdirs
-DEPENDS+=	${PYPKGPREFIX}-lxml-[0-9]*:../../textproc/py-lxml/
+DEPENDS+=	${PYPKGPREFIX}-codestyle-[0-9]*:../../devel/py-codestyle
+DEPENDS+=	${PYPKGPREFIX}-cssselect-[0-9]*:../../textproc/py-cssselect
+DEPENDS+=	${PYPKGPREFIX}-keyring-[0-9]*:../../security/py-keyring
+DEPENDS+=	${PYPKGPREFIX}-lxml-[0-9]*:../../textproc/py-lxml
 DEPENDS+=	${PYPKGPREFIX}-minidb-[0-9]*:../../wip/py-minidb
 DEPENDS+=	${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests
 DEPENDS+=	${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml

urlwatch/PLIST

@@ -3,11 +3,14 @@ bin/urlwatch
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
 ${PYSITELIB}/${EGG_INFODIR}/requires.txt
 ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/urlwatch/__init__.py
 ${PYSITELIB}/urlwatch/__init__.pyo
 ${PYSITELIB}/urlwatch/__init__.pyc
+${PYSITELIB}/urlwatch/cli.pyo
+${PYSITELIB}/urlwatch/cli.pyc
 ${PYSITELIB}/urlwatch/command.pyo
 ${PYSITELIB}/urlwatch/command.pyc
 ${PYSITELIB}/urlwatch/config.pyo
@@ -36,6 +39,7 @@ ${PYSITELIB}/urlwatch/util.pyo
 ${PYSITELIB}/urlwatch/util.pyc
 ${PYSITELIB}/urlwatch/worker.pyo
 ${PYSITELIB}/urlwatch/worker.pyc
+${PYSITELIB}/urlwatch/cli.py
 ${PYSITELIB}/urlwatch/command.py
 ${PYSITELIB}/urlwatch/config.py
 ${PYSITELIB}/urlwatch/filters.py

urlwatch/distinfo

@@ -1,7 +1,7 @@
 $NetBSD: distinfo,v 1.1 2015/08/18 18:36:32 yhardy Exp $
 
-SHA1 (urlwatch-2.17.tar.gz) = bba316a8a8b111b4bda741ce94c6c64fcb0f1970
-RMD160 (urlwatch-2.17.tar.gz) = 3f22c60f36e8ad80d1c0e7add8fe2b3fd898468c
-SHA512 (urlwatch-2.17.tar.gz) = 264b72b1dafa73898d095e43a341d23fde9e29b0b54a4bc7d5094c8cecb94173792a077a4314b42765dfed376e19052808f4abda3227f3a62e1cd5a3854c101e
-Size (urlwatch-2.17.tar.gz) = 42561 bytes
+SHA1 (urlwatch-2.18.tar.gz) = 4e3f9660ae6bb02e565004b094b611cd8396898d
+RMD160 (urlwatch-2.18.tar.gz) = 6324221fcf11430207fc02c43134153ceb857d2b
+SHA512 (urlwatch-2.18.tar.gz) = d09f302894c160e59ae795bc3275f1484aee3b2db862891bfc15bbd19187a00ed0f2399985eef7bfa7873a0c617bc8e37d297bc39a96fe760c43a3fd6bdf51b6
+Size (urlwatch-2.18.tar.gz) = 47035 bytes
 SHA1 (patch-setup.py) = 2ad86a4999aa75b07fc85ec4dfd75b47a0ac4b34